From 6d37c0c83b6a9982f9460d666f3868d0eb427c26 Mon Sep 17 00:00:00 2001
From: Luke Schmitt <luke@trossenrobotics.com>
Date: Tue, 13 Jan 2026 09:11:49 -0600
Subject: [PATCH 1/3] Add missing test dependency to xs_ros_control

---
 interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml b/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml
index 8e403245..9a41dec0 100644
--- a/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml
+++ b/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml
@@ -26,6 +26,7 @@
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>hardware_interface</test_depend>
   <test_depend>rclcpp</test_depend>
+  <test_depend>ros2_control_test_assets</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>

From d9c49c9449db27d7707c8b7dedc67f79f7613376 Mon Sep 17 00:00:00 2001
From: Luke Schmitt <luke@trossenrobotics.com>
Date: Tue, 13 Jan 2026 09:48:11 -0600
Subject: [PATCH 2/3] Move to depends

---
 interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml b/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml
index 9a41dec0..31aa9ba1 100644
--- a/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml
+++ b/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml
@@ -15,6 +15,7 @@
   <depend>pluginlib</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_lifecycle</depend>
+  <depend>ros2_control_test_assets</depend>
   <depend>ros2_controllers</depend>
   <depend>ros2controlcli</depend>
   <depend>interbotix_xs_msgs</depend>
@@ -26,7 +27,6 @@
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>hardware_interface</test_depend>
   <test_depend>rclcpp</test_depend>
-  <test_depend>ros2_control_test_assets</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>

From f67622212f3d2bb33ccb1c56ee8367535a2d99ad Mon Sep 17 00:00:00 2001
From: Luke Schmitt <luke@trossenrobotics.com>
Date: Wed, 14 Jan 2026 16:17:50 -0600
Subject: [PATCH 3/3] move back

---
 interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml b/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml
index 31aa9ba1..c891fcc8 100644
--- a/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml
+++ b/interbotix_xs_toolbox/interbotix_xs_ros_control/package.xml
@@ -15,7 +15,6 @@
   <depend>pluginlib</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_lifecycle</depend>
-  <depend>ros2_control_test_assets</depend>
   <depend>ros2_controllers</depend>
   <depend>ros2controlcli</depend>
   <depend>interbotix_xs_msgs</depend>
@@ -26,6 +25,7 @@
   <test_depend>ament_lint_common</test_depend>
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>hardware_interface</test_depend>
+  <test_depend>ros2_control_test_assets</test_depend>
   <test_depend>rclcpp</test_depend>
 
   <export>