From bfe622cd03fa4516d07c84ab12764282ad1bc693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Wed, 15 Jan 2025 23:36:11 +0100
Subject: [PATCH] Update paths of GPL includes (#1487)

---
 .../ackermann_steering_controller.hpp                |  2 +-
 .../admittance_controller/admittance_controller.hpp  |  2 +-
 .../admittance_controller/admittance_rule.hpp        |  2 +-
 .../bicycle_steering_controller.hpp                  |  2 +-
 .../diff_drive_controller/diff_drive_controller.hpp  |  2 +-
 .../force_torque_sensor_broadcaster.hpp              |  2 +-
 .../forward_command_controller.hpp                   |  2 +-
 .../multi_interface_forward_command_controller.hpp   |  2 +-
 .../gpio_controllers/gpio_command_controller.hpp     |  3 ++-
 .../gripper_action_controller.hpp                    |  2 +-
 .../imu_sensor_broadcaster.hpp                       |  7 ++++---
 .../joint_state_broadcaster.hpp                      |  5 +++--
 .../joint_trajectory_controller.hpp                  |  2 +-
 .../joint_trajectory_controller/tolerances.hpp       |  2 +-
 .../mecanum_drive_controller.hpp                     | 12 ++++++------
 .../parallel_gripper_action_controller.hpp           |  2 +-
 .../include/pid_controller/pid_controller.hpp        |  3 ++-
 .../include/pose_broadcaster/pose_broadcaster.hpp    |  3 ++-
 .../range_sensor_broadcaster.hpp                     |  3 ++-
 ros2_controllers-not-released.jazzy.repos            |  9 +++++----
 ros2_controllers-not-released.rolling.repos          |  9 +++++----
 .../steering_controllers_library.hpp                 |  5 +++--
 .../tricycle_controller/tricycle_controller.hpp      |  4 ++--
 .../tricycle_steering_controller.hpp                 |  2 +-
 24 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp b/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp
index c1eacb40bb..3e4109b2fd 100644
--- a/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp
+++ b/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "ackermann_steering_controller_parameters.hpp"
+#include "ackermann_steering_controller/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
index 35b072f8d7..dc69431f1c 100644
--- a/admittance_controller/include/admittance_controller/admittance_controller.hpp
+++ b/admittance_controller/include/admittance_controller/admittance_controller.hpp
@@ -22,7 +22,7 @@
 #include <vector>
 
 // auto-generated by generate_parameter_library
-#include "admittance_controller_parameters.hpp"
+#include "admittance_controller/admittance_controller_parameters.hpp"
 
 #include "admittance_controller/admittance_rule.hpp"
 #include "control_msgs/msg/admittance_controller_state.hpp"
diff --git a/admittance_controller/include/admittance_controller/admittance_rule.hpp b/admittance_controller/include/admittance_controller/admittance_rule.hpp
index bfb3a612c7..e2592f518e 100644
--- a/admittance_controller/include/admittance_controller/admittance_rule.hpp
+++ b/admittance_controller/include/admittance_controller/admittance_rule.hpp
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-#include "admittance_controller_parameters.hpp"
+#include "admittance_controller/admittance_controller_parameters.hpp"
 #include "control_msgs/msg/admittance_controller_state.hpp"
 #include "controller_interface/controller_interface_base.hpp"
 #include "kinematics_interface/kinematics_interface.hpp"
diff --git a/bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp b/bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp
index efb893f2bb..70c6cdeaae 100644
--- a/bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp
+++ b/bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "bicycle_steering_controller_parameters.hpp"
+#include "bicycle_steering_controller/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
index 0e37cc0b0b..265e000b79 100644
--- a/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp
+++ b/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp
@@ -37,7 +37,7 @@
 #include "tf2_msgs/msg/tf_message.hpp"
 
 // auto-generated by generate_parameter_library
-#include "diff_drive_controller_parameters.hpp"
+#include "diff_drive_controller/diff_drive_controller_parameters.hpp"
 
 namespace diff_drive_controller
 {
diff --git a/force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp b/force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp
index 0861715678..34b7f242ee 100644
--- a/force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp
+++ b/force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp
@@ -24,7 +24,7 @@
 
 #include "controller_interface/chainable_controller_interface.hpp"
 // auto-generated by generate_parameter_library
-#include "force_torque_sensor_broadcaster_parameters.hpp"
+#include "force_torque_sensor_broadcaster/force_torque_sensor_broadcaster_parameters.hpp"
 #include "geometry_msgs/msg/wrench_stamped.hpp"
 #include "rclcpp_lifecycle/state.hpp"
 #include "realtime_tools/realtime_publisher.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
index 5401263ec6..b4e92640a4 100644
--- a/forward_command_controller/include/forward_command_controller/forward_command_controller.hpp
+++ b/forward_command_controller/include/forward_command_controller/forward_command_controller.hpp
@@ -19,7 +19,7 @@
 
 #include "forward_command_controller/forward_controllers_base.hpp"
 // auto-generated by generate_parameter_library
-#include "forward_command_controller_parameters.hpp"
+#include "forward_command_controller/forward_command_controller_parameters.hpp"
 
 namespace forward_command_controller
 {
diff --git a/forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp b/forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp
index 6ba33be018..7715a38c3a 100644
--- a/forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp
+++ b/forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp
@@ -18,7 +18,7 @@
 #include <memory>
 
 #include "forward_command_controller/forward_controllers_base.hpp"
-#include "multi_interface_forward_command_controller_parameters.hpp"
+#include "forward_command_controller/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
index 0513d9e1f4..35cf7c283d 100644
--- a/gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp
+++ b/gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp
@@ -22,12 +22,13 @@
 
 #include "control_msgs/msg/dynamic_interface_group_values.hpp"
 #include "controller_interface/controller_interface.hpp"
-#include "gpio_command_controller_parameters.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
index d166d12478..a23bd5d6e8 100644
--- a/gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp
+++ b/gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp
@@ -43,7 +43,7 @@
 #include "gripper_controllers/hardware_interface_adapter.hpp"
 
 // auto-generated by generate_parameter_library
-#include "gripper_action_controller_parameters.hpp"
+#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
index fda18af83f..01045b7510 100644
--- a/imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp
+++ b/imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp
@@ -21,14 +21,15 @@
 
 #include <memory>
 
-#include "controller_interface/controller_interface.hpp"
-// auto-generated by generate_parameter_library
-#include "imu_sensor_broadcaster_parameters.hpp"
 #include "rclcpp_lifecycle/state.hpp"
 #include "realtime_tools/realtime_publisher.hpp"
 #include "semantic_components/imu_sensor.hpp"
 #include "sensor_msgs/msg/imu.hpp"
 
+#include "controller_interface/controller_interface.hpp"
+// auto-generated by generate_parameter_library
+#include "imu_sensor_broadcaster/imu_sensor_broadcaster_parameters.hpp"
+
 namespace imu_sensor_broadcaster
 {
 class IMUSensorBroadcaster : public controller_interface::ControllerInterface
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
index f0f100d6d0..2ffd28e0f5 100644
--- a/joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp
+++ b/joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp
@@ -22,8 +22,6 @@
 
 #include "control_msgs/msg/dynamic_joint_state.hpp"
 #include "controller_interface/controller_interface.hpp"
-// auto-generated by generate_parameter_library
-#include "joint_state_broadcaster_parameters.hpp"
 #include "realtime_tools/realtime_publisher.hpp"
 #include "sensor_msgs/msg/joint_state.hpp"
 
@@ -34,6 +32,9 @@
 #include "urdf/model.h"
 #endif
 
+// auto-generated by generate_parameter_library
+#include "joint_state_broadcaster/joint_state_broadcaster_parameters.hpp"
+
 namespace joint_state_broadcaster
 {
 /**
diff --git a/joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp b/joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
index dd91377ee1..6c265ecacb 100644
--- a/joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
+++ b/joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
@@ -42,7 +42,7 @@
 #include "trajectory_msgs/msg/joint_trajectory_point.hpp"
 
 // auto-generated by generate_parameter_library
-#include "joint_trajectory_controller_parameters.hpp"
+#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
index b33a2bf5c5..fbd11b9cdb 100644
--- 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"
 
 namespace joint_trajectory_controller
 {
diff --git a/mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp b/mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp
index 00d28ab4c8..189805c17c 100644
--- a/mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp
+++ b/mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp
@@ -23,19 +23,19 @@
 #include <utility>
 #include <vector>
 
+#include "control_msgs/msg/mecanum_drive_controller_state.hpp"
 #include "controller_interface/chainable_controller_interface.hpp"
-#include "mecanum_drive_controller/odometry.hpp"
-#include "mecanum_drive_controller_parameters.hpp"
+#include "geometry_msgs/msg/twist_stamped.hpp"
+#include "nav_msgs/msg/odometry.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 "std_srvs/srv/set_bool.hpp"
-
-#include "control_msgs/msg/mecanum_drive_controller_state.hpp"
-#include "geometry_msgs/msg/twist_stamped.hpp"
-#include "nav_msgs/msg/odometry.hpp"
 #include "tf2_msgs/msg/tf_message.hpp"
+
+#include "mecanum_drive_controller/mecanum_drive_controller_parameters.hpp"
+#include "mecanum_drive_controller/odometry.hpp"
 namespace mecanum_drive_controller
 {
 // name constants for state interfaces
diff --git a/parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp b/parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp
index f5f5e97939..903ba825e3 100644
--- a/parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp
+++ b/parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp
@@ -40,7 +40,7 @@
 #include "realtime_tools/realtime_server_goal_handle.hpp"
 
 // Project
-#include "parallel_gripper_action_controller_parameters.hpp"
+#include "parallel_gripper_controller/parallel_gripper_action_controller_parameters.hpp"
 
 namespace parallel_gripper_action_controller
 {
diff --git a/pid_controller/include/pid_controller/pid_controller.hpp b/pid_controller/include/pid_controller/pid_controller.hpp
index afd5555c0c..e0a36f7b6b 100644
--- a/pid_controller/include/pid_controller/pid_controller.hpp
+++ b/pid_controller/include/pid_controller/pid_controller.hpp
@@ -26,12 +26,13 @@
 #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_parameters.hpp"
 #include "rclcpp_lifecycle/state.hpp"
 #include "realtime_tools/realtime_buffer.hpp"
 #include "realtime_tools/realtime_publisher.hpp"
 #include "std_srvs/srv/set_bool.hpp"
 
+#include "pid_controller/pid_controller_parameters.hpp"
+
 namespace pid_controller
 {
 
diff --git a/pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp b/pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp
index 024aa41602..4c1d2adc14 100644
--- a/pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp
+++ b/pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp
@@ -21,13 +21,14 @@
 
 #include "controller_interface/controller_interface.hpp"
 #include "geometry_msgs/msg/pose_stamped.hpp"
-#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
index f1e2c8e72f..65a1d3092f 100644
--- a/range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp
+++ b/range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp
@@ -22,12 +22,13 @@
 #include <memory>
 
 #include "controller_interface/controller_interface.hpp"
-#include "range_sensor_broadcaster_parameters.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
index 66352f4960..1b3910e7e7 100644
--- 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: git@github.com:<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
index 66352f4960..1b3910e7e7 100644
--- 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: git@github.com:<some_github_namespace>/<some_ros_package>.git
+#     version: master
diff --git a/steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp b/steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp
index c671534353..786132d2b0 100644
--- a/steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp
+++ b/steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp
@@ -25,8 +25,6 @@
 #include "rclcpp_lifecycle/state.hpp"
 #include "realtime_tools/realtime_buffer.hpp"
 #include "realtime_tools/realtime_publisher.hpp"
-#include "steering_controllers_library/steering_odometry.hpp"
-#include "steering_controllers_library_parameters.hpp"
 
 // TODO(anyone): Replace with controller specific messages
 #include "ackermann_msgs/msg/ackermann_drive_stamped.hpp"
@@ -35,6 +33,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
index cd6251e803..3a1c996b78 100644
--- a/tricycle_controller/include/tricycle_controller/tricycle_controller.hpp
+++ b/tricycle_controller/include/tricycle_controller/tricycle_controller.hpp
@@ -37,12 +37,12 @@
 #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"
-
 // auto-generated by generate_parameter_library
-#include "tricycle_controller_parameters.hpp"
+#include "tricycle_controller/tricycle_controller_parameters.hpp"
 
 namespace tricycle_controller
 {
diff --git a/tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp b/tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp
index 28e477a578..acc23034d2 100644
--- a/tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp
+++ b/tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp
@@ -21,7 +21,7 @@
 #include <memory>
 
 #include "steering_controllers_library/steering_controllers_library.hpp"
-#include "tricycle_steering_controller_parameters.hpp"
+#include "tricycle_steering_controller/tricycle_steering_controller_parameters.hpp"
 
 namespace tricycle_steering_controller
 {