Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add grid_map and its dependencies #240

Merged
merged 6 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,7 @@ gz_utils_vendor:
add_build: ["vcstool"]
rosx_introspection:
add_host: ["rapidjson"]
octomap_ros:
add_host: ["octomap"]
octomap_rviz_plugins:
add_host: ["octomap"]
17 changes: 17 additions & 0 deletions patch/ros-humble-grid-map-cv.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/include/grid_map_cv/GridMapCvConverter.hpp b/include/grid_map_cv/GridMapCvConverter.hpp
index 233c28a..6f785ba 100644
--- a/include/grid_map_cv/GridMapCvConverter.hpp
+++ b/include/grid_map_cv/GridMapCvConverter.hpp
@@ -262,8 +262,10 @@ public:
imageIndex(0),
imageIndex(1))[++channel] = imageValue;
}
- if (hasAlpha) {
- image.at<cv::Vec<Type_, NChannels_>>(imageIndex(0), imageIndex(1))[++channel] = imageMax;
+ if constexpr (NChannels_ >= 4) {
+ if (hasAlpha) {
+ image.at<cv::Vec<Type_, NChannels_>>(imageIndex(0), imageIndex(1))[++channel] = imageMax;
+ }
}
}
}
4 changes: 2 additions & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "8295f8f9b0fade22
generate-recipes = { cmd = "vinca -m", depends_on = ["rename-file"] }
remove-file = { cmd = "rm vinca.yaml; rm -rf recipes" }
build_additional_recipes = { cmd = "rattler-build build --recipe-dir ./additional_recipes -m ./conda_build_config.yaml --skip-existing" }
build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml --skip-existing", depends_on = ["build_additional_recipes", "generate-recipes"] }
build_one_package = { cmd = "cp ./patch/$PACKAGE.*patch ./recipes/$PACKAGE/patch/; rattler-build build --recipe ./recipes/$PACKAGE/recipe.yaml -m ./conda_build_config.yaml", env = { PACKAGE = "ros-humble-ros-workspace" } }
build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing", depends_on = ["build_additional_recipes", "generate-recipes"] }
build_one_package = { cmd = "cp ./patch/$PACKAGE.*patch ./recipes/$PACKAGE/patch/; rattler-build build --recipe ./recipes/$PACKAGE/recipe.yaml -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge", env = { PACKAGE = "ros-humble-ros-workspace" } }

[environments]
beta = ["beta"]
Expand Down
3 changes: 2 additions & 1 deletion vinca_linux_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ skip_existing:

packages_select_by_deps:
# only subset of packages to reduce maintainer load
# trigger

# build 7 reselect
- ros_workspace
Expand Down Expand Up @@ -169,6 +168,8 @@ packages_select_by_deps:
- turtle_tf2_py
- turtle_tf2_cpp

- grid_map

# ----- end of package support -----

# - rtabmap
Expand Down
Loading