From 3e292ba278e065c43269afccbfd858462e37fb60 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 09:22:41 +0100
Subject: [PATCH] Update paths of GPL includes (backport #1487) (#1493)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
---
 .../ackermann_steering_controller.hpp                    | 2 +-
 .../admittance_controller/admittance_controller.hpp      | 4 ++--
 .../include/admittance_controller/admittance_rule.hpp    | 1 +
 .../bicycle_steering_controller.hpp                      | 2 +-
 .../diff_drive_controller/diff_drive_controller.hpp      | 3 ++-
 .../force_torque_sensor_broadcaster.hpp                  | 2 +-
 .../forward_command_controller.hpp                       | 3 ++-
 .../multi_interface_forward_command_controller.hpp       | 2 +-
 .../include/gpio_controllers/gpio_command_controller.hpp | 3 ++-
 .../gripper_controllers/gripper_action_controller.hpp    | 4 +++-
 .../imu_sensor_broadcaster/imu_sensor_broadcaster.hpp    | 3 ++-
 .../joint_state_broadcaster/joint_state_broadcaster.hpp  | 4 +++-
 .../joint_trajectory_controller.hpp                      | 3 ++-
 .../include/joint_trajectory_controller/tolerances.hpp   | 2 +-
 pid_controller/include/pid_controller/pid_controller.hpp | 2 +-
 .../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 +++--
 .../include/tricycle_controller/tricycle_controller.hpp  | 1 +
 .../tricycle_steering_controller.hpp                     | 2 +-
 22 files changed, 44 insertions(+), 28 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 0cb6bcd016..c69d08809f 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,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
index eccf184e6a..69bbdb7feb 100644
--- 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
index cfc09d2be8..2b6d7a9459 100644
--- 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/bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp b/bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp
index 1b3e050a37..bb72922213 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,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
index 472df15159..2f35f24141 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
@@ -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/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 f19dd6a45b..1d2e5ea7dd 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,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
index 8a697847cd..88ede8da9f 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
@@ -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/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 fd7c0d480e..a2e3010f82 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
@@ -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
index 8cab4e9dfa..c37ed3f55a 100644
--- a/gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp
+++ b/gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp
@@ -22,7 +22,6 @@
 
 #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"
@@ -30,6 +29,8 @@
 #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 b94b7dc0c3..e72b2e75ce 100644
--- 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
index 4142ee6ac6..cdbf4490a0 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
@@ -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
index 77b523efb4..70ab9fd489 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
@@ -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/joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp b/joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
index 21a938b5cf..4fa6b25119 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
@@ -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
index 2224be86a9..57548682d4 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"
 
 #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
index 3d3f95d290..9dfa669537 100644
--- 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
index 9317fce5e1..5923cb8890 100644
--- 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
index 9a6f1c78df..a265595333 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
@@ -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
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 1f6a41d8ee..77b8234b69 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
@@ -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
index 8db71d2bc4..9c8a1d5aca 100644
--- 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/tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp b/tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp
index 607a684df5..7fa189a277 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,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
 {