Merge branch 'main' into fix-moveit

RoboStack · Mar 22, 2024 · dac43a0 · dac43a0
2 parents 019053a + 0878b64
commit dac43a0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 130 deletions.
diff --git a/patch/ros-humble-controller-manager.patch b/patch/ros-humble-controller-manager.patch
diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -111,6 +111,7 @@ packages_select_by_deps:
   - ament_cmake_catch2
   - apriltag
   - apriltag_ros
+  - marker-msgs
   # - moveit
   # - moveit-ros-perception
   # - moveit-runtime
@@ -125,6 +126,9 @@ packages_select_by_deps:
   - realsense2-description
   - webots_ros2
 
+  # ros2_control
+  - gazebo-ros2-control
+
   # Modern gz-sim integration
   - ros-gz
   - libg2o

diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
@@ -85,6 +85,9 @@ packages_select_by_deps:
   # - control_toolbox
   # - ros1_bridge
 
+  # ros2_control
+  - gazebo-ros2-control
+
   # Modern gz-sim integration
   - ros-gz
 

diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -81,7 +81,6 @@ packages_select_by_deps:
   - gazebo_dev
   - gazebo_ros
   - gazebo_plugins
-  - gazebo_ros2_control
   - gazebo_ros_pkgs
 
   - turtlebot3_gazebo
@@ -91,6 +90,11 @@ packages_select_by_deps:
   - apriltag
   - apriltag_ros
 
+  # ros2_control
+  - gazebo_ros2_control
+  - ros2_control
+  - ros2_controllers
+
   # Modern gz-sim integration
   - ros-gz
 

diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
@@ -72,8 +72,6 @@ packages_select_by_deps:
   - plotjuggler-ros
   - plotjuggler
 
-  - ros2_control
-  - ros2_controllers
   - ament_cmake_catch2
 
   - apriltag
@@ -83,6 +81,11 @@ packages_select_by_deps:
   - sbg_driver
   - ackermann-msgs
 
+  # ros2_control
+  - ros2_control
+  - ros2_controllers
+  - gazebo-ros2-control
+
   # Modern gz-sim integration
   - ros-gz
 

diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -43,6 +43,8 @@ packages_select_by_deps:
   - ros_base
   - rmw_cyclonedds_cpp
   - moveit
+  - xacro
+  - gazebo-ros
   # - navigation2
   # - desktop
   # - cv_bridge
@@ -58,6 +60,13 @@ packages_select_by_deps:
   # - ament_cmake_catch2
   # - nav2-mppi-controller
 
+  # ros2_control
+  - gazebo-ros2-control
+  - ros2-controllers-test-nodes
+  - joint-state-publisher-gui
+
+  # PREVIOUSLY SUPPORTED PACKAGES, CURRENTLY BROKEN
+  # Currently has upstream issues with git LFS
   # Broken for now until we migrate to newer gazebo
   # - desktop_full