Update paths of GPL includes (#1487)

(cherry picked from commit bfe622c)

# Conflicts:
#	ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp
#	admittance_controller/include/admittance_controller/admittance_controller.hpp
#	admittance_controller/include/admittance_controller/admittance_rule.hpp
#	bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp
#	diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp
#	force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp
#	forward_command_controller/include/forward_command_controller/forward_command_controller.hpp
#	forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp
#	gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp
#	gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp
#	imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp
#	joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp
#	joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
#	mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp
#	parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp
#	pid_controller/include/pid_controller/pid_controller.hpp
#	pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp
#	range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp
#	steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp
#	tricycle_controller/include/tricycle_controller/tricycle_controller.hpp
#	tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp

Author: christophfroehlich

ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp

@@ -20,8 +20,12 @@
 
 #include <memory>
 
+<<<<<<< HEAD
 #include "ackermann_steering_controller/visibility_control.h"
 #include "ackermann_steering_controller_parameters.hpp"
+=======
+#include "ackermann_steering_controller/ackermann_steering_controller_parameters.hpp"
+>>>>>>> bfe622c (Update paths of GPL includes (#1487))
 #include "steering_controllers_library/steering_controllers_library.hpp"
 
 namespace ackermann_steering_controller

admittance_controller/include/admittance_controller/admittance_controller.hpp

@@ -22,8 +22,13 @@
 #include <string>
 #include <vector>
 
+<<<<<<< HEAD
 // include generated parameter library
 #include "admittance_controller_parameters.hpp"
+=======
+// auto-generated by generate_parameter_library
+#include "admittance_controller/admittance_controller_parameters.hpp"
+>>>>>>> bfe622c (Update paths of GPL includes (#1487))
 
 #include "admittance_controller/admittance_rule.hpp"
 #include "admittance_controller/visibility_control.h"

admittance_controller/include/admittance_controller/admittance_rule.hpp

@@ -24,6 +24,10 @@
 #include <string>
 #include <vector>
 
+<<<<<<< HEAD
+=======
+#include "admittance_controller/admittance_controller_parameters.hpp"
+>>>>>>> bfe622c (Update paths of GPL includes (#1487))
 #include "control_msgs/msg/admittance_controller_state.hpp"
 #include "control_toolbox/filters.hpp"
 #include "controller_interface/controller_interface.hpp"

bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp

@@ -20,8 +20,12 @@
 
 #include <memory>
 
+<<<<<<< HEAD
 #include "bicycle_steering_controller/visibility_control.h"
 #include "bicycle_steering_controller_parameters.hpp"
+=======
+#include "bicycle_steering_controller/bicycle_steering_controller_parameters.hpp"
+>>>>>>> bfe622c (Update paths of GPL includes (#1487))
 #include "steering_controllers_library/steering_controllers_library.hpp"
 
 namespace bicycle_steering_controller

diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp

@@ -41,7 +41,12 @@
 #include "realtime_tools/realtime_publisher.hpp"
 #include "tf2_msgs/msg/tf_message.hpp"
 
+<<<<<<< HEAD
 #include "diff_drive_controller_parameters.hpp"
+=======
+// auto-generated by generate_parameter_library
+#include "diff_drive_controller/diff_drive_controller_parameters.hpp"
+>>>>>>> bfe622c (Update paths of GPL includes (#1487))
 
 namespace diff_drive_controller
 {

force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp

@@ -23,9 +23,15 @@
 #include <string>
 #include <vector>
 
+<<<<<<< HEAD
 #include "controller_interface/controller_interface.hpp"
 #include "force_torque_sensor_broadcaster/visibility_control.h"
 #include "force_torque_sensor_broadcaster_parameters.hpp"
+=======
+#include "controller_interface/chainable_controller_interface.hpp"
+// auto-generated by generate_parameter_library
+#include "force_torque_sensor_broadcaster/force_torque_sensor_broadcaster_parameters.hpp"
+>>>>>>> bfe622c (Update paths of GPL includes (#1487))
 #include "geometry_msgs/msg/wrench_stamped.hpp"
 #include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
 #include "rclcpp_lifecycle/state.hpp"

forward_command_controller/include/forward_command_controller/forward_command_controller.hpp

@@ -20,8 +20,13 @@
 #include <vector>
 
 #include "forward_command_controller/forward_controllers_base.hpp"
+<<<<<<< HEAD
 #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"
+>>>>>>> bfe622c (Update paths of GPL includes (#1487))
 
 namespace forward_command_controller
 {

forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp

@@ -20,8 +20,12 @@
 #include <vector>
 
 #include "forward_command_controller/forward_controllers_base.hpp"
+<<<<<<< HEAD
 #include "forward_command_controller/visibility_control.h"
 #include "multi_interface_forward_command_controller_parameters.hpp"
+=======
+#include "forward_command_controller/multi_interface_forward_command_controller_parameters.hpp"
+>>>>>>> bfe622c (Update paths of GPL includes (#1487))
 
 namespace forward_command_controller
 {

gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp

@@ -22,14 +22,19 @@
 
 #include "control_msgs/msg/dynamic_interface_group_values.hpp"
 #include "controller_interface/controller_interface.hpp"
+<<<<<<< HEAD
 #include "gpio_command_controller_parameters.hpp"
 #include "gpio_controllers/visibility_control.h"
 #include "hardware_interface/hardware_info.hpp"
+=======
+>>>>>>> bfe622c (Update paths of GPL includes (#1487))
 #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;

gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp

@@ -41,8 +41,15 @@
 #include "realtime_tools/realtime_server_goal_handle.hpp"
 
 // Project
+<<<<<<< HEAD
 #include "gripper_action_controller_parameters.hpp"
 #include "gripper_controllers/hardware_interface_adapter.hpp"
+=======
+#include "gripper_controllers/hardware_interface_adapter.hpp"
+
+// auto-generated by generate_parameter_library
+#include "gripper_controllers/gripper_action_controller_parameters.hpp"
+>>>>>>> bfe622c (Update paths of GPL includes (#1487))
 
 namespace gripper_action_controller
 {