From 0ec49cbf82bcc06460e0164f3b501b3e984e64a3 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <sebas.a.castro@gmail.com>
Date: Wed, 18 Dec 2024 18:44:29 -0500
Subject: [PATCH] Fix .repos files

---
 README.md                              |  2 +-
 ros2_kortex-not-released.humble.repos  |  2 +-
 ros2_kortex-not-released.rolling.repos | 12 ------------
 ros2_kortex.humble.repos               |  6 +++++-
 ros2_kortex.rolling.repos              |  4 ----
 simulation.humble.repos                |  4 ++++
 simulation.repos                       |  4 ++++
 7 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 7e3a4750..dbff9a15 100644
--- a/README.md
+++ b/README.md
@@ -327,7 +327,7 @@ ros2 launch kortex_bringup kortex_sim_control.launch.py \
 * `use_sim_time` : Use simulated clock. Default value is `true`.
 * `gripper` : Gripper to use. Possible values for the Gen3 are either `robotiq_2f_85`, `robotiq_2f_140` or `""`. Default is `robotiq_2f_85`. An empty string will not initialise any gripper.
 
-#### MoveIt2
+#### MoveIt 2
 
 To generate motion plans and execute them with a simulated 7 DoF Kinova Gen3 arm with mock hardware:
 
diff --git a/ros2_kortex-not-released.humble.repos b/ros2_kortex-not-released.humble.repos
index 2d07f82e..7b632615 100644
--- a/ros2_kortex-not-released.humble.repos
+++ b/ros2_kortex-not-released.humble.repos
@@ -13,5 +13,5 @@ repositories:
     version: ros2
   gz_ros2_control:
     type: git
-    url: https://github.com/ros-simulation/gz_ros2_control.git
+    url: https://github.com/ros-controls/gz_ros2_control.git
     version: humble
diff --git a/ros2_kortex-not-released.rolling.repos b/ros2_kortex-not-released.rolling.repos
index 12fe81c2..76a9cfea 100644
--- a/ros2_kortex-not-released.rolling.repos
+++ b/ros2_kortex-not-released.rolling.repos
@@ -1,12 +1,4 @@
 repositories:
-  ros2_control:
-    type: git
-    url: https://github.com/ros-controls/ros2_control.git
-    version: master
-  ros2_controllers:
-    type: git
-    url: https://github.com/ros-controls/ros2_controllers.git
-    version: master
   picknik_controllers:
     type: git
     url: https://github.com/picknikrobotics/picknik_controllers.git
@@ -19,7 +11,3 @@ repositories:
     type: git
     url: https://github.com/tylerjw/serial.git
     version: ros2
-  gz_ros2_control:
-    type: git
-    url: https://github.com/ros-simulation/gz_ros2_control.git
-    version: master
diff --git a/ros2_kortex.humble.repos b/ros2_kortex.humble.repos
index e93495ea..04cf46bb 100644
--- a/ros2_kortex.humble.repos
+++ b/ros2_kortex.humble.repos
@@ -14,4 +14,8 @@ repositories:
   ros2_robotiq_gripper:
     type: git
     url: https://github.com/picknikrobotics/ros2_robotiq_gripper.git
-    version: main
+    version: humble
+  gz_ros2_control:
+    type: git
+    url: https://github.com/ros-controls/gz_ros2_control.git
+    version: humble
diff --git a/ros2_kortex.rolling.repos b/ros2_kortex.rolling.repos
index c7b37a1f..578f7c06 100644
--- a/ros2_kortex.rolling.repos
+++ b/ros2_kortex.rolling.repos
@@ -3,7 +3,3 @@ repositories:
     type: git
     url: https://github.com/picknikrobotics/picknik_controllers.git
     version: main
-  gz_ros2_control:
-    type: git
-    url: https://github.com/ros-simulation/gz_ros2_control.git
-    version: master
diff --git a/simulation.humble.repos b/simulation.humble.repos
index d2d434d8..5d63f7f8 100644
--- a/simulation.humble.repos
+++ b/simulation.humble.repos
@@ -3,3 +3,7 @@ repositories:
     type: git
     url: https://github.com/gazebosim/ros_gz.git
     version: humble
+  gz_ros2_control:
+    type: git
+    url: https://github.com/ros-controls/gz_ros2_control.git
+    version: humble
diff --git a/simulation.repos b/simulation.repos
index d41e6355..4c54e918 100644
--- a/simulation.repos
+++ b/simulation.repos
@@ -3,3 +3,7 @@ repositories:
     type: git
     url: https://github.com/gazebosim/ros_gz.git
     version: ros2
+  gz_ros2_control:
+    type: git
+    url: https://github.com/ros-controls/gz_ros2_control.git
+    version: rolling