From ad6df85f9e024b9ab1b4af592bddabdf43e03e36 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Mon, 8 Jul 2024 08:06:47 -0400 Subject: [PATCH 1/6] Add gazebo_ros2_control repo to repos file --- moveit2_tutorials.repos | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/moveit2_tutorials.repos b/moveit2_tutorials.repos index fb5931a414..ea0cdb8664 100644 --- a/moveit2_tutorials.repos +++ b/moveit2_tutorials.repos @@ -42,3 +42,9 @@ repositories: type: git url: https://github.com/PickNikRobotics/pick_ik version: main + # This needs to be included due to the ros2_kortex repo: + # https://github.com/Kinovarobotics/ros2_kortex/issues/217 + gazebo_ros2_control + type: git + url: https://github.com/ros-controls/gazebo_ros2_control + version: master From f02360526ffdd87986c810c60dd2b9bb941e6048 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Mon, 8 Jul 2024 08:22:05 -0400 Subject: [PATCH 2/6] Add to upstream.repos file as well --- .github/upstream.repos | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/upstream.repos b/.github/upstream.repos index f09982304c..0414e601c1 100644 --- a/.github/upstream.repos +++ b/.github/upstream.repos @@ -30,3 +30,9 @@ repositories: type: git url: https://github.com/tylerjw/serial.git version: ros2 + # This needs to be included due to the ros2_kortex repo: + # https://github.com/Kinovarobotics/ros2_kortex/issues/217 + gazebo_ros2_control + type: git + url: https://github.com/ros-controls/gazebo_ros2_control + version: master From d6c5e29ed13e36756eba62a6faa11b7c13f31343 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Mon, 8 Jul 2024 08:27:20 -0400 Subject: [PATCH 3/6] Fix typos --- .github/upstream.repos | 2 +- moveit2_tutorials.repos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/upstream.repos b/.github/upstream.repos index 0414e601c1..8f1b1f522d 100644 --- a/.github/upstream.repos +++ b/.github/upstream.repos @@ -32,7 +32,7 @@ repositories: version: ros2 # This needs to be included due to the ros2_kortex repo: # https://github.com/Kinovarobotics/ros2_kortex/issues/217 - gazebo_ros2_control + gazebo_ros2_control: type: git url: https://github.com/ros-controls/gazebo_ros2_control version: master diff --git a/moveit2_tutorials.repos b/moveit2_tutorials.repos index ea0cdb8664..ed3388159b 100644 --- a/moveit2_tutorials.repos +++ b/moveit2_tutorials.repos @@ -44,7 +44,7 @@ repositories: version: main # This needs to be included due to the ros2_kortex repo: # https://github.com/Kinovarobotics/ros2_kortex/issues/217 - gazebo_ros2_control + gazebo_ros2_control: type: git url: https://github.com/ros-controls/gazebo_ros2_control version: master From ddddeddefa08fc17955812c99d80f74b9a7c38a3 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Mon, 8 Jul 2024 08:40:30 -0400 Subject: [PATCH 4/6] Try using fork --- .github/upstream.repos | 12 ++++-------- moveit2_tutorials.repos | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/upstream.repos b/.github/upstream.repos index 8f1b1f522d..15e638e4e0 100644 --- a/.github/upstream.repos +++ b/.github/upstream.repos @@ -16,10 +16,12 @@ repositories: url: https://github.com/PickNikRobotics/rviz_visual_tools.git version: ros2 # Remove ros2_kortex when rolling binaries are available. + # Need to use this fork since ros2_kortex depends on Gazebo classic packages: + # https://github.com/Kinovarobotics/ros2_kortex/issues/217 ros2_kortex: type: git - url: https://github.com/Kinovarobotics/ros2_kortex.git - version: main + url: https://github.com/sea-bass/ros2_kortex.git + version: remove-gazebo-classic # Remove ros2_robotiq_gripper when rolling binaries are available. ros2_robotiq_gripper: type: git @@ -30,9 +32,3 @@ repositories: type: git url: https://github.com/tylerjw/serial.git version: ros2 - # This needs to be included due to the ros2_kortex repo: - # https://github.com/Kinovarobotics/ros2_kortex/issues/217 - gazebo_ros2_control: - type: git - url: https://github.com/ros-controls/gazebo_ros2_control - version: master diff --git a/moveit2_tutorials.repos b/moveit2_tutorials.repos index ed3388159b..bcc53b3ce2 100644 --- a/moveit2_tutorials.repos +++ b/moveit2_tutorials.repos @@ -8,10 +8,12 @@ repositories: url: https://github.com/moveit/moveit_visual_tools version: ros2 # Remove ros2_kortex when rolling binaries are available. + # Need to use this fork since ros2_kortex depends on Gazebo classic packages: + # https://github.com/Kinovarobotics/ros2_kortex/issues/217 ros2_kortex: type: git - url: https://github.com/Kinovarobotics/ros2_kortex.git - version: main + url: https://github.com/sea-bass/ros2_kortex.git + version: remove-gazebo-classic # Remove ros2_robotiq_gripper when rolling binaries are available. ros2_robotiq_gripper: type: git @@ -42,9 +44,3 @@ repositories: type: git url: https://github.com/PickNikRobotics/pick_ik version: main - # This needs to be included due to the ros2_kortex repo: - # https://github.com/Kinovarobotics/ros2_kortex/issues/217 - gazebo_ros2_control: - type: git - url: https://github.com/ros-controls/gazebo_ros2_control - version: master From c1be501b76a177799ceb13877c3126d38a7da357 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Mon, 8 Jul 2024 08:44:38 -0400 Subject: [PATCH 5/6] Add gz_ros2_control repo --- .github/upstream.repos | 5 +++++ moveit2_tutorials.repos | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/upstream.repos b/.github/upstream.repos index 15e638e4e0..4cc537a0c8 100644 --- a/.github/upstream.repos +++ b/.github/upstream.repos @@ -32,3 +32,8 @@ repositories: type: git url: https://github.com/tylerjw/serial.git version: ros2 + # Doesn't seem to be available from binaries yet + gz_ros2_control: + type: git + url: https://github.com/ros-controls/gz_ros2_control.git + version: master \ No newline at end of file diff --git a/moveit2_tutorials.repos b/moveit2_tutorials.repos index bcc53b3ce2..7694222299 100644 --- a/moveit2_tutorials.repos +++ b/moveit2_tutorials.repos @@ -44,3 +44,8 @@ repositories: type: git url: https://github.com/PickNikRobotics/pick_ik version: main + # Doesn't seem to be available from binaries yet + gz_ros2_control: + type: git + url: https://github.com/ros-controls/gz_ros2_control.git + version: master From 34d4586fdbde0a200379a3aa0f550d8f06bc0af4 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Mon, 8 Jul 2024 08:47:14 -0400 Subject: [PATCH 6/6] Formatting --- .github/upstream.repos | 4 ++-- moveit2_tutorials.repos | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/upstream.repos b/.github/upstream.repos index 4cc537a0c8..9ceb4b40d4 100644 --- a/.github/upstream.repos +++ b/.github/upstream.repos @@ -32,8 +32,8 @@ repositories: type: git url: https://github.com/tylerjw/serial.git version: ros2 - # Doesn't seem to be available from binaries yet + # Doesn't seem to be available from binaries yet gz_ros2_control: type: git url: https://github.com/ros-controls/gz_ros2_control.git - version: master \ No newline at end of file + version: master diff --git a/moveit2_tutorials.repos b/moveit2_tutorials.repos index 7694222299..c6e8eaf7b3 100644 --- a/moveit2_tutorials.repos +++ b/moveit2_tutorials.repos @@ -44,7 +44,7 @@ repositories: type: git url: https://github.com/PickNikRobotics/pick_ik version: main - # Doesn't seem to be available from binaries yet + # Doesn't seem to be available from binaries yet gz_ros2_control: type: git url: https://github.com/ros-controls/gz_ros2_control.git