Merge branch 'humble' into mergify/bp/humble/pr-985

ros-controls · Feb 5, 2024 · 9d62b6a · 9d62b6a
2 parents afa75f0 + 529a051
commit 9d62b6a
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 638 deletions.
diff --git a/ackermann_steering_controller/package.xml b/ackermann_steering_controller/package.xml
@@ -26,6 +26,7 @@
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>controller_manager</test_depend>
+  <test_depend>hardware_interface_testing</test_depend>
   <test_depend>hardware_interface</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
 

diff --git a/admittance_controller/package.xml b/admittance_controller/package.xml
@@ -34,6 +34,7 @@
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>controller_manager</test_depend>
+  <test_depend>hardware_interface_testing</test_depend>
   <test_depend>kinematics_interface_kdl</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
 

diff --git a/bicycle_steering_controller/package.xml b/bicycle_steering_controller/package.xml
@@ -27,6 +27,7 @@
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>controller_manager</test_depend>
   <test_depend>hardware_interface</test_depend>
+  <test_depend>hardware_interface_testing</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
 
   <export>

diff --git a/diff_drive_controller/package.xml b/diff_drive_controller/package.xml
@@ -26,6 +26,7 @@
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>controller_manager</test_depend>
+  <test_depend>hardware_interface_testing</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
 
   <export>

diff --git a/diff_drive_controller/test/test_load_diff_drive_controller.cpp b/diff_drive_controller/test/test_load_diff_drive_controller.cpp
@@ -16,6 +16,9 @@
 #include <memory>
 
 #include "controller_manager/controller_manager.hpp"
+#include "hardware_interface/resource_manager.hpp"
+#include "rclcpp/executor.hpp"
+#include "rclcpp/executors/single_threaded_executor.hpp"
 #include "rclcpp/utilities.hpp"
 #include "ros2_control_test_assets/descriptions.hpp"
 

diff --git a/effort_controllers/package.xml b/effort_controllers/package.xml
@@ -17,6 +17,8 @@
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>controller_manager</test_depend>
+  <test_depend>hardware_interface_testing</test_depend>
+  <test_depend>hardware_interface</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
 
   <export>

diff --git a/effort_controllers/test/test_load_joint_group_effort_controller.cpp b/effort_controllers/test/test_load_joint_group_effort_controller.cpp
@@ -17,7 +17,9 @@
 
 #include "controller_manager/controller_manager.hpp"
 #include "hardware_interface/resource_manager.hpp"
+#include "rclcpp/executor.hpp"
 #include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/utilities.hpp"
 #include "ros2_control_test_assets/descriptions.hpp"
 
 TEST(TestLoadJointGroupVelocityController, load_controller)

diff --git a/force_torque_sensor_broadcaster/package.xml b/force_torque_sensor_broadcaster/package.xml
@@ -23,6 +23,7 @@
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>controller_manager</test_depend>
+  <test_depend>hardware_interface_testing</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
 
   <export>

diff --git a/forward_command_controller/package.xml b/forward_command_controller/package.xml
@@ -22,6 +22,7 @@
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>controller_manager</test_depend>
+  <test_depend>hardware_interface_testing</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
 
   <export>

diff --git a/gripper_controllers/package.xml b/gripper_controllers/package.xml
@@ -27,6 +27,7 @@
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>controller_manager</test_depend>
+  <test_depend>hardware_interface_testing</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
 
   <export>

diff --git a/gripper_controllers/test/test_load_gripper_action_controllers.cpp b/gripper_controllers/test/test_load_gripper_action_controllers.cpp
@@ -17,7 +17,9 @@
 
 #include "controller_manager/controller_manager.hpp"
 #include "hardware_interface/resource_manager.hpp"
+#include "rclcpp/executor.hpp"
 #include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/utilities.hpp"
 #include "ros2_control_test_assets/descriptions.hpp"
 
 TEST(TestLoadGripperActionControllers, load_controller)

diff --git a/imu_sensor_broadcaster/package.xml b/imu_sensor_broadcaster/package.xml
@@ -25,6 +25,7 @@
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend>controller_manager</test_depend>
+  <test_depend>hardware_interface_testing</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
 
   <export>

diff --git a/joint_state_broadcaster/package.xml b/joint_state_broadcaster/package.xml
@@ -25,6 +25,7 @@
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>controller_manager</test_depend>
+  <test_depend>hardware_interface_testing</test_depend>
   <test_depend>hardware_interface</test_depend>
   <test_depend>rclcpp</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>

diff --git a/joint_trajectory_controller/package.xml b/joint_trajectory_controller/package.xml
@@ -28,6 +28,7 @@
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>controller_manager</test_depend>
+  <test_depend>hardware_interface_testing</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
 
   <export>