Update paths of GPL includes (backport #1487) (#1493)

Co-authored-by: Christoph Fröhlich <[email protected]>
ros-controls · Jan 16, 2025 · 3e292ba · 3e292ba
1 parent 82b6965
commit 3e292ba
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 28 deletions.
diff --git a/...eering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp b/...eering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp
@@ -20,8 +20,8 @@
 
 #include <memory>
 
+#include "ackermann_steering_controller/ackermann_steering_controller_parameters.hpp"
 #include "ackermann_steering_controller/visibility_control.h"
-#include "ackermann_steering_controller_parameters.hpp"
 #include "steering_controllers_library/steering_controllers_library.hpp"
 
 namespace ackermann_steering_controller

diff --git a/admittance_controller/include/admittance_controller/admittance_controller.hpp b/admittance_controller/include/admittance_controller/admittance_controller.hpp
@@ -22,8 +22,8 @@
 #include <string>
 #include <vector>
 
-// include generated parameter library
-#include "admittance_controller_parameters.hpp"
+// auto-generated by generate_parameter_library
+#include "admittance_controller/admittance_controller_parameters.hpp"
 
 #include "admittance_controller/admittance_rule.hpp"
 #include "admittance_controller/visibility_control.h"

diff --git a/admittance_controller/include/admittance_controller/admittance_rule.hpp b/admittance_controller/include/admittance_controller/admittance_rule.hpp
@@ -24,6 +24,7 @@
 #include <string>
 #include <vector>
 
+#include "admittance_controller/admittance_controller_parameters.hpp"
 #include "control_msgs/msg/admittance_controller_state.hpp"
 #include "control_toolbox/filters.hpp"
 #include "controller_interface/controller_interface.hpp"

diff --git a/...e_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp b/...e_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp
@@ -20,8 +20,8 @@
 
 #include <memory>
 
+#include "bicycle_steering_controller/bicycle_steering_controller_parameters.hpp"
 #include "bicycle_steering_controller/visibility_control.h"
-#include "bicycle_steering_controller_parameters.hpp"
 #include "steering_controllers_library/steering_controllers_library.hpp"
 
 namespace bicycle_steering_controller

diff --git a/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp b/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp
@@ -41,7 +41,8 @@
 #include "realtime_tools/realtime_publisher.hpp"
 #include "tf2_msgs/msg/tf_message.hpp"
 
-#include "diff_drive_controller_parameters.hpp"
+// auto-generated by generate_parameter_library
+#include "diff_drive_controller/diff_drive_controller_parameters.hpp"
 
 namespace diff_drive_controller
 {

diff --git a/...r_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp b/...r_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include "controller_interface/controller_interface.hpp"
+#include "force_torque_sensor_broadcaster/force_torque_sensor_broadcaster_parameters.hpp"
 #include "force_torque_sensor_broadcaster/visibility_control.h"
-#include "force_torque_sensor_broadcaster_parameters.hpp"
 #include "geometry_msgs/msg/wrench_stamped.hpp"
 #include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
 #include "rclcpp_lifecycle/state.hpp"

diff --git a/forward_command_controller/include/forward_command_controller/forward_command_controller.hpp b/forward_command_controller/include/forward_command_controller/forward_command_controller.hpp
@@ -21,7 +21,8 @@
 
 #include "forward_command_controller/forward_controllers_base.hpp"
 #include "forward_command_controller/visibility_control.h"
-#include "forward_command_controller_parameters.hpp"
+// auto-generated by generate_parameter_library
+#include "forward_command_controller/forward_command_controller_parameters.hpp"
 
 namespace forward_command_controller
 {

diff --git a/...troller/include/forward_command_controller/multi_interface_forward_command_controller.hpp b/...troller/include/forward_command_controller/multi_interface_forward_command_controller.hpp
@@ -20,8 +20,8 @@
 #include <vector>
 
 #include "forward_command_controller/forward_controllers_base.hpp"
+#include "forward_command_controller/multi_interface_forward_command_controller_parameters.hpp"
 #include "forward_command_controller/visibility_control.h"
-#include "multi_interface_forward_command_controller_parameters.hpp"
 
 namespace forward_command_controller
 {

diff --git a/gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp b/gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp
@@ -22,14 +22,15 @@
 
 #include "control_msgs/msg/dynamic_interface_group_values.hpp"
 #include "controller_interface/controller_interface.hpp"
-#include "gpio_command_controller_parameters.hpp"
 #include "gpio_controllers/visibility_control.h"
 #include "hardware_interface/hardware_info.hpp"
 #include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
 #include "rclcpp_lifecycle/state.hpp"
 #include "realtime_tools/realtime_buffer.hpp"
 #include "realtime_tools/realtime_publisher.hpp"
 
+#include "gpio_controllers/gpio_command_controller_parameters.hpp"
+
 namespace gpio_controllers
 {
 using CmdType = control_msgs::msg::DynamicInterfaceGroupValues;

diff --git a/gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp b/gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp
@@ -41,9 +41,11 @@
 #include "realtime_tools/realtime_server_goal_handle.hpp"
 
 // Project
-#include "gripper_action_controller_parameters.hpp"
 #include "gripper_controllers/hardware_interface_adapter.hpp"
 
+// auto-generated by generate_parameter_library
+#include "gripper_controllers/gripper_action_controller_parameters.hpp"
+
 namespace gripper_action_controller
 {
 /**

diff --git a/imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp b/imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp
@@ -25,12 +25,13 @@
 
 #include "controller_interface/controller_interface.hpp"
 #include "imu_sensor_broadcaster/visibility_control.h"
-#include "imu_sensor_broadcaster_parameters.hpp"
 #include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
 #include "rclcpp_lifecycle/state.hpp"
 #include "realtime_tools/realtime_publisher.hpp"
 #include "semantic_components/imu_sensor.hpp"
 #include "sensor_msgs/msg/imu.hpp"
+// auto-generated by generate_parameter_library
+#include "imu_sensor_broadcaster/imu_sensor_broadcaster_parameters.hpp"
 
 namespace imu_sensor_broadcaster
 {

diff --git a/joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp b/joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp
@@ -23,12 +23,14 @@
 #include "control_msgs/msg/dynamic_joint_state.hpp"
 #include "controller_interface/controller_interface.hpp"
 #include "joint_state_broadcaster/visibility_control.h"
-#include "joint_state_broadcaster_parameters.hpp"
 #include "rclcpp_lifecycle/lifecycle_publisher.hpp"
 #include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
 #include "realtime_tools/realtime_publisher.hpp"
 #include "sensor_msgs/msg/joint_state.hpp"
 
+// auto-generated by generate_parameter_library
+#include "joint_state_broadcaster/joint_state_broadcaster_parameters.hpp"
+
 namespace joint_state_broadcaster
 {
 /**

diff --git a/...trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp b/...trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
@@ -44,7 +44,8 @@
 #include "trajectory_msgs/msg/joint_trajectory.hpp"
 #include "trajectory_msgs/msg/joint_trajectory_point.hpp"
 
-#include "joint_trajectory_controller_parameters.hpp"
+// auto-generated by generate_parameter_library
+#include "joint_trajectory_controller/joint_trajectory_controller_parameters.hpp"
 
 using namespace std::chrono_literals;  // NOLINT
 

diff --git a/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp b/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
@@ -36,7 +36,7 @@
 #include <vector>
 
 #include "control_msgs/action/follow_joint_trajectory.hpp"
-#include "joint_trajectory_controller_parameters.hpp"
+#include "joint_trajectory_controller/joint_trajectory_controller_parameters.hpp"
 
 #include "rclcpp/node.hpp"
 #include "rclcpp/time.hpp"

diff --git a/pid_controller/include/pid_controller/pid_controller.hpp b/pid_controller/include/pid_controller/pid_controller.hpp
@@ -26,8 +26,8 @@
 #include "control_msgs/msg/multi_dof_state_stamped.hpp"
 #include "control_toolbox/pid_ros.hpp"
 #include "controller_interface/chainable_controller_interface.hpp"
+#include "pid_controller/pid_controller_parameters.hpp"
 #include "pid_controller/visibility_control.h"
-#include "pid_controller_parameters.hpp"
 #include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
 #include "rclcpp_lifecycle/state.hpp"
 #include "realtime_tools/realtime_buffer.hpp"

diff --git a/pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp b/pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp
@@ -22,13 +22,14 @@
 #include "controller_interface/controller_interface.hpp"
 #include "geometry_msgs/msg/pose_stamped.hpp"
 #include "pose_broadcaster/visibility_control.h"
-#include "pose_broadcaster_parameters.hpp"
 #include "rclcpp/publisher.hpp"
 #include "rclcpp_lifecycle/state.hpp"
 #include "realtime_tools/realtime_publisher.hpp"
 #include "semantic_components/pose_sensor.hpp"
 #include "tf2_msgs/msg/tf_message.hpp"
 
+#include "pose_broadcaster/pose_broadcaster_parameters.hpp"
+
 namespace pose_broadcaster
 {
 

diff --git a/range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp b/range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp
@@ -25,13 +25,14 @@
 
 #include "controller_interface/controller_interface.hpp"
 #include "range_sensor_broadcaster/visibility_control.h"
-#include "range_sensor_broadcaster_parameters.hpp"
 #include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
 #include "rclcpp_lifecycle/state.hpp"
 #include "realtime_tools/realtime_publisher.hpp"
 #include "semantic_components/range_sensor.hpp"
 #include "sensor_msgs/msg/range.hpp"
 
+#include "range_sensor_broadcaster/range_sensor_broadcaster_parameters.hpp"
+
 namespace range_sensor_broadcaster
 {
 class RangeSensorBroadcaster : public controller_interface::ControllerInterface

diff --git a/ros2_controllers-not-released.jazzy.repos b/ros2_controllers-not-released.jazzy.repos
@@ -1,5 +1,6 @@
 repositories:
-  generate_parameter_library:
-    type: git
-    url: https://github.com/picknikrobotics/generate_parameter_library.git
-    version: main
+  ## EXAMPLE DEPENDENCY
+#   <some_ros_package>:
+#     type: git
+#     url: [email protected]:<some_github_namespace>/<some_ros_package>.git
+#     version: master
diff --git a/ros2_controllers-not-released.rolling.repos b/ros2_controllers-not-released.rolling.repos
@@ -1,5 +1,6 @@
 repositories:
-  generate_parameter_library:
-    type: git
-    url: https://github.com/picknikrobotics/generate_parameter_library.git
-    version: main
+  ## EXAMPLE DEPENDENCY
+#   <some_ros_package>:
+#     type: git
+#     url: [email protected]:<some_github_namespace>/<some_ros_package>.git
+#     version: master
diff --git a/...controllers_library/include/steering_controllers_library/steering_controllers_library.hpp b/...controllers_library/include/steering_controllers_library/steering_controllers_library.hpp
@@ -30,9 +30,7 @@
 #include "realtime_tools/realtime_buffer.hpp"
 #include "realtime_tools/realtime_publisher.hpp"
 #include "std_srvs/srv/set_bool.hpp"
-#include "steering_controllers_library/steering_odometry.hpp"
 #include "steering_controllers_library/visibility_control.h"
-#include "steering_controllers_library_parameters.hpp"
 
 // TODO(anyone): Replace with controller specific messages
 #include "ackermann_msgs/msg/ackermann_drive_stamped.hpp"
@@ -42,6 +40,9 @@
 #include "nav_msgs/msg/odometry.hpp"
 #include "tf2_msgs/msg/tf_message.hpp"
 
+#include "steering_controllers_library/steering_controllers_library_parameters.hpp"
+#include "steering_controllers_library/steering_odometry.hpp"
+
 namespace steering_controllers_library
 {
 class SteeringControllersLibrary : public controller_interface::ChainableControllerInterface

diff --git a/tricycle_controller/include/tricycle_controller/tricycle_controller.hpp b/tricycle_controller/include/tricycle_controller/tricycle_controller.hpp
@@ -39,6 +39,7 @@
 #include "realtime_tools/realtime_publisher.hpp"
 #include "std_srvs/srv/empty.hpp"
 #include "tf2_msgs/msg/tf_message.hpp"
+
 #include "tricycle_controller/odometry.hpp"
 #include "tricycle_controller/steering_limiter.hpp"
 #include "tricycle_controller/traction_limiter.hpp"

diff --git a/...steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp b/...steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp
@@ -21,8 +21,8 @@
 #include <memory>
 
 #include "steering_controllers_library/steering_controllers_library.hpp"
+#include "tricycle_steering_controller/tricycle_steering_controller_parameters.hpp"
 #include "tricycle_steering_controller/visibility_control.h"
-#include "tricycle_steering_controller_parameters.hpp"
 
 namespace tricycle_steering_controller
 {