Use new include path for generated parameter headers

urfeex · urfeex · commit 79905bbe46a2 · 2025-02-03T08:17:40.000+01:00
This got updated in generate_parameters_library.
diff --git a/ur_controllers/include/ur_controllers/force_mode_controller.hpp b/ur_controllers/include/ur_controllers/force_mode_controller.hpp
@@ -47,7 +47,7 @@
 #include <std_srvs/srv/trigger.hpp>
 #include <ur_msgs/srv/set_force_mode.hpp>
 
-#include "force_mode_controller_parameters.hpp"
+#include "ur_controllers/force_mode_controller_parameters.hpp"
 
 namespace ur_controllers
 {
diff --git a/ur_controllers/include/ur_controllers/freedrive_mode_controller.hpp b/ur_controllers/include/ur_controllers/freedrive_mode_controller.hpp
@@ -53,7 +53,7 @@
 #include <rclcpp/duration.hpp>
 #include "std_msgs/msg/bool.hpp"
 
-#include "freedrive_mode_controller_parameters.hpp"
+#include "ur_controllers/freedrive_mode_controller_parameters.hpp"
 
 namespace ur_controllers
 {
diff --git a/ur_controllers/include/ur_controllers/gpio_controller.hpp b/ur_controllers/include/ur_controllers/gpio_controller.hpp
@@ -57,7 +57,7 @@
 #include "rclcpp/time.hpp"
 #include "rclcpp/duration.hpp"
 #include "std_msgs/msg/bool.hpp"
-#include "gpio_controller_parameters.hpp"
+#include "ur_controllers/gpio_controller_parameters.hpp"
 
 namespace ur_controllers
 {
diff --git a/ur_controllers/include/ur_controllers/passthrough_trajectory_controller.hpp b/ur_controllers/include/ur_controllers/passthrough_trajectory_controller.hpp
@@ -64,7 +64,7 @@
 #include <trajectory_msgs/msg/joint_trajectory.hpp>
 #include <control_msgs/action/follow_joint_trajectory.hpp>
 
-#include "passthrough_trajectory_controller_parameters.hpp"
+#include "ur_controllers/passthrough_trajectory_controller_parameters.hpp"
 
 namespace ur_controllers
 {
diff --git a/ur_controllers/include/ur_controllers/scaled_joint_trajectory_controller.hpp b/ur_controllers/include/ur_controllers/scaled_joint_trajectory_controller.hpp
@@ -45,7 +45,7 @@
 #include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
 #include "rclcpp/time.hpp"
 #include "rclcpp/duration.hpp"
-#include "scaled_joint_trajectory_controller_parameters.hpp"
+#include "ur_controllers/scaled_joint_trajectory_controller_parameters.hpp"
 
 namespace ur_controllers
 {
diff --git a/ur_controllers/include/ur_controllers/speed_scaling_state_broadcaster.hpp b/ur_controllers/include/ur_controllers/speed_scaling_state_broadcaster.hpp
@@ -48,7 +48,7 @@
 #include "rclcpp/time.hpp"
 #include "rclcpp/duration.hpp"
 #include "std_msgs/msg/float64.hpp"
-#include "speed_scaling_state_broadcaster_parameters.hpp"
+#include "ur_controllers/speed_scaling_state_broadcaster_parameters.hpp"
 
 namespace ur_controllers
 {
diff --git a/ur_controllers/include/ur_controllers/ur_configuration_controller.hpp b/ur_controllers/include/ur_controllers/ur_configuration_controller.hpp
@@ -50,7 +50,7 @@
 #include <controller_interface/controller_interface.hpp>
 
 #include "ur_msgs/srv/get_robot_software_version.hpp"
-#include "ur_configuration_controller_parameters.hpp"
+#include "ur_controllers/ur_configuration_controller_parameters.hpp"
 
 namespace ur_controllers
 {
diff --git a/ur_controllers/package.xml b/ur_controllers/package.xml
@@ -24,6 +24,7 @@
 
   <depend>angles</depend>
   <depend>controller_interface</depend>
+  <depend>generate_parameter_library</depend>
   <depend>geometry_msgs</depend>
   <depend>hardware_interface</depend>
   <depend>joint_trajectory_controller</depend>

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`#include <std_srvs/srv/trigger.hpp>`
`48`	`48`	`#include <ur_msgs/srv/set_force_mode.hpp>`
`49`	`49`
`50`		`-#include "force_mode_controller_parameters.hpp"`
	`50`	`+#include "ur_controllers/force_mode_controller_parameters.hpp"`
`51`	`51`
`52`	`52`	`namespace ur_controllers`
`53`	`53`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@`
`53`	`53`	`#include <rclcpp/duration.hpp>`
`54`	`54`	`#include "std_msgs/msg/bool.hpp"`
`55`	`55`
`56`		`-#include "freedrive_mode_controller_parameters.hpp"`
	`56`	`+#include "ur_controllers/freedrive_mode_controller_parameters.hpp"`
`57`	`57`
`58`	`58`	`namespace ur_controllers`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`#include "rclcpp/time.hpp"`
`58`	`58`	`#include "rclcpp/duration.hpp"`
`59`	`59`	`#include "std_msgs/msg/bool.hpp"`
`60`		`-#include "gpio_controller_parameters.hpp"`
	`60`	`+#include "ur_controllers/gpio_controller_parameters.hpp"`
`61`	`61`
`62`	`62`	`namespace ur_controllers`
`63`	`63`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`	`#include <trajectory_msgs/msg/joint_trajectory.hpp>`
`65`	`65`	`#include <control_msgs/action/follow_joint_trajectory.hpp>`
`66`	`66`
`67`		`-#include "passthrough_trajectory_controller_parameters.hpp"`
	`67`	`+#include "ur_controllers/passthrough_trajectory_controller_parameters.hpp"`
`68`	`68`
`69`	`69`	`namespace ur_controllers`
`70`	`70`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`#include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"`
`46`	`46`	`#include "rclcpp/time.hpp"`
`47`	`47`	`#include "rclcpp/duration.hpp"`
`48`		`-#include "scaled_joint_trajectory_controller_parameters.hpp"`
	`48`	`+#include "ur_controllers/scaled_joint_trajectory_controller_parameters.hpp"`
`49`	`49`
`50`	`50`	`namespace ur_controllers`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`#include "rclcpp/time.hpp"`
`49`	`49`	`#include "rclcpp/duration.hpp"`
`50`	`50`	`#include "std_msgs/msg/float64.hpp"`
`51`		`-#include "speed_scaling_state_broadcaster_parameters.hpp"`
	`51`	`+#include "ur_controllers/speed_scaling_state_broadcaster_parameters.hpp"`
`52`	`52`
`53`	`53`	`namespace ur_controllers`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`#include <controller_interface/controller_interface.hpp>`
`51`	`51`
`52`	`52`	`#include "ur_msgs/srv/get_robot_software_version.hpp"`
`53`		`-#include "ur_configuration_controller_parameters.hpp"`
	`53`	`+#include "ur_controllers/ur_configuration_controller_parameters.hpp"`
`54`	`54`
`55`	`55`	`namespace ur_controllers`
`56`	`56`	`{`