Add control_toolbox repo (#687)

(cherry picked from commit 66b61ab) # Conflicts: # ros2_control_demos.jazzy.repos # ros2_control_demos.rolling.repos
ros-controls · Jan 15, 2025 · 7a0b8ec · 7a0b8ec
1 parent 15a8cea
commit 7a0b8ec
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/ros2_control_demos.humble.repos b/ros2_control_demos.humble.repos
@@ -19,3 +19,7 @@ repositories:
     type: git
     url: https://github.com/ros-controls/gazebo_ros2_control.git
     version: humble
+  control_toolbox:
+    type: git
+    url: https://github.com/ros-controls/control_toolbox.git
+    version: humble
diff --git a/ros2_control_demos.jazzy.repos b/ros2_control_demos.jazzy.repos
@@ -18,4 +18,12 @@ repositories:
   gz_ros2_control:
     type: git
     url: https://github.com/ros-controls/gz_ros2_control.git
+<<<<<<< HEAD
     version: master
+=======
+    version: jazzy
+  control_toolbox:
+    type: git
+    url: https://github.com/ros-controls/control_toolbox.git
+    version: ros2-master
+>>>>>>> 66b61ab (Add control_toolbox repo (#687))
diff --git a/ros2_control_demos.rolling.repos b/ros2_control_demos.rolling.repos
@@ -17,5 +17,14 @@ repositories:
     version: master
   gazebo_ros2_control:
     type: git
+<<<<<<< HEAD
     url: https://github.com/ros-controls/gazebo_ros2_control.git
     version: master
+=======
+    url: https://github.com/ros-controls/gz_ros2_control.git
+    version: rolling
+  control_toolbox:
+    type: git
+    url: https://github.com/ros-controls/control_toolbox.git
+    version: ros2-master
+>>>>>>> 66b61ab (Add control_toolbox repo (#687))