Update includes for generate_parameter_library 0.4.0 (#3255)

sea-bass · web-flow · commit e11cabbadf89 · 2025-01-22T01:16:41.000Z
* Update includes for generate_parameter_library 0.4.0

* Fix header prefix in IKFast template
diff --git a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp
@@ -78,7 +78,7 @@ c --------x--- v   |
 #include <moveit/robot_model/robot_model.hpp>
 #include <moveit/robot_state/robot_state.hpp>
 #include <moveit/utils/logger.hpp>
-#include <moveit_acceleration_filter_parameters.hpp>
+#include <moveit_core/moveit_acceleration_filter_parameters.hpp>
 
 #include <osqp.h>
 #include <types.h>
diff --git a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp
@@ -41,9 +41,9 @@
 
 #include <cstddef>
 
-#include <moveit_butterworth_filter_parameters.hpp>
 #include <moveit/robot_model/robot_model.hpp>
 #include <moveit/online_signal_smoothing/smoothing_base_class.hpp>
+#include <moveit_core/moveit_butterworth_filter_parameters.hpp>
 
 namespace online_signal_smoothing
 {
diff --git a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp
@@ -42,7 +42,7 @@ Description: Applies jerk/acceleration/velocity limits to online motion commands
 
 #include <moveit/robot_model/robot_model.hpp>
 #include <moveit/online_signal_smoothing/smoothing_base_class.hpp>
-#include <moveit_ruckig_filter_parameters.hpp>
+#include <moveit_core/moveit_ruckig_filter_parameters.hpp>
 
 #include <ruckig/ruckig.hpp>
 
diff --git a/moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp b/moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp
@@ -55,8 +55,8 @@
 #include <unordered_map>
 #include <utility>
 #include <filesystem>
-#include <cached_ik_kinematics_parameters.hpp>
 #include <moveit/utils/logger.hpp>
+#include <moveit_kinematics/cached_ik_kinematics_parameters.hpp>
 
 namespace cached_ik_kinematics_plugin
 {
diff --git a/moveit_kinematics/ikfast_kinematics_plugin/templates/ikfast61_moveit_plugin_template.cpp b/moveit_kinematics/ikfast_kinematics_plugin/templates/ikfast61_moveit_plugin_template.cpp
@@ -47,8 +47,8 @@
 #include <Eigen/Geometry>
 #include <tf2_kdl/tf2_kdl.hpp>
 #include <tf2_eigen/tf2_eigen.hpp>
-#include <ikfast_kinematics_parameters.hpp>
 #include <moveit/utils/logger.hpp>
+#include <_PACKAGE_NAME_/ikfast_kinematics_parameters.hpp>
 
 using namespace moveit::core;
 
diff --git a/moveit_kinematics/kdl_kinematics_plugin/include/moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp b/moveit_kinematics/kdl_kinematics_plugin/include/moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp
@@ -39,7 +39,6 @@
 // ROS
 #include <rclcpp/rclcpp.hpp>
 #include <random_numbers/random_numbers.h>
-#include <kdl_kinematics_parameters.hpp>
 
 // ROS msgs
 #include <geometry_msgs/msg/pose_stamped.hpp>
@@ -58,6 +57,7 @@
 #include <moveit/kdl_kinematics_plugin/joint_mimic.hpp>
 #include <moveit/robot_model/robot_model.hpp>
 #include <moveit/robot_state/robot_state.hpp>
+#include <moveit_kinematics/kdl_kinematics_parameters.hpp>
 
 #include <cfloat>
 
diff --git a/moveit_kinematics/srv_kinematics_plugin/include/moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp b/moveit_kinematics/srv_kinematics_plugin/include/moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp
@@ -43,7 +43,6 @@
 
 // ROS2
 #include <rclcpp/rclcpp.hpp>
-#include <srv_kinematics_parameters.hpp>
 
 // System
 #include <memory>
@@ -56,6 +55,7 @@
 // MoveIt
 #include <moveit/kinematics_base/kinematics_base.hpp>
 #include <moveit/robot_state/robot_state.hpp>
+#include <moveit_kinematics/srv_kinematics_parameters.hpp>
 
 namespace srv_kinematics_plugin
 {
diff --git a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/command_list_manager.hpp b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/command_list_manager.hpp
@@ -48,7 +48,7 @@
 #include <pilz_industrial_motion_planner/trajectory_blender.hpp>
 #include <pilz_industrial_motion_planner/trajectory_generation_exceptions.hpp>
 
-#include <cartesian_limits_parameters.hpp>
+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 
 namespace pilz_industrial_motion_planner
 {
diff --git a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/limits_container.hpp b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/limits_container.hpp
@@ -37,7 +37,7 @@
 #include <pilz_industrial_motion_planner/joint_limits_container.hpp>
 #include <math.h>
 
-#include "cartesian_limits_parameters.hpp"
+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 
 namespace pilz_industrial_motion_planner
 {
diff --git a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/pilz_industrial_motion_planner.hpp b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/pilz_industrial_motion_planner.hpp
@@ -45,7 +45,7 @@
 #include <pluginlib/class_loader.hpp>
 #include <memory>
 
-#include <cartesian_limits_parameters.hpp>
+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 
 namespace pilz_industrial_motion_planner
 {
diff --git a/moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp b/moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp
@@ -44,7 +44,7 @@
 #include <moveit/robot_state/conversions.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include "cartesian_limits_parameters.hpp"
+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 #include <pilz_industrial_motion_planner/joint_limits_aggregator.hpp>
 #include <pilz_industrial_motion_planner/tip_frame_getter.hpp>
 #include <pilz_industrial_motion_planner/trajectory_blend_request.hpp>
diff --git a/moveit_planners/pilz_industrial_motion_planner/src/pilz_industrial_motion_planner.cpp b/moveit_planners/pilz_industrial_motion_planner/src/pilz_industrial_motion_planner.cpp
@@ -40,7 +40,7 @@
 #include <pilz_industrial_motion_planner/planning_context_loader_ptp.hpp>
 #include <pilz_industrial_motion_planner/planning_exceptions.hpp>
 
-#include "cartesian_limits_parameters.hpp"
+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 #include <pilz_industrial_motion_planner/joint_limits_aggregator.hpp>
 
 #include <pluginlib/class_list_macros.hpp>
diff --git a/moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_common.cpp b/moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_common.cpp
@@ -53,7 +53,7 @@
 
 #include <rclcpp/rclcpp.hpp>
 
-#include "cartesian_limits_parameters.hpp"
+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>
 
 const std::string PARAM_MODEL_NO_GRIPPER_NAME{ "robot_description" };
 const std::string PARAM_MODEL_WITH_GRIPPER_NAME{ "robot_description_pg70" };
diff --git a/moveit_planners/stomp/include/stomp_moveit/stomp_moveit_planning_context.hpp b/moveit_planners/stomp/include/stomp_moveit/stomp_moveit_planning_context.hpp
@@ -41,7 +41,7 @@
 
 #include <moveit/planning_interface/planning_interface.hpp>
 
-#include <stomp_moveit_parameters.hpp>
+#include <moveit_planners_stomp/stomp_moveit_parameters.hpp>
 
 // Forward declaration
 namespace stomp
diff --git a/moveit_planners/stomp/src/stomp_moveit_planning_context.cpp b/moveit_planners/stomp/src/stomp_moveit_planning_context.cpp
@@ -47,7 +47,7 @@
 #include <stomp_moveit/noise_generators.hpp>
 #include <stomp_moveit/cost_functions.hpp>
 #include <stomp_moveit/stomp_moveit_task.hpp>
-#include <stomp_moveit_parameters.hpp>
+#include <moveit_planners_stomp/stomp_moveit_parameters.hpp>
 
 #include <moveit/constraint_samplers/constraint_sampler_manager.hpp>
 #include <moveit/robot_state/conversions.hpp>
diff --git a/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/src/prbt_manipulator_ikfast_moveit_plugin.cpp b/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/src/prbt_manipulator_ikfast_moveit_plugin.cpp
@@ -52,7 +52,7 @@
 #include <tf2_kdl/tf2_kdl.hpp>
 #include <moveit/kinematics_base/kinematics_base.hpp>
 #include <moveit/robot_state/robot_state.hpp>
-#include <prbt_ikfast_kinematics_parameters.hpp>
+#include <moveit_resources_prbt_ikfast_manipulator_plugin/prbt_ikfast_kinematics_parameters.hpp>
 
 using namespace moveit::core;
 
diff --git a/moveit_ros/hybrid_planning/hybrid_planning_manager/hybrid_planning_manager_component/src/hybrid_planning_manager.cpp b/moveit_ros/hybrid_planning/hybrid_planning_manager/hybrid_planning_manager_component/src/hybrid_planning_manager.cpp
@@ -34,7 +34,7 @@
 
 #include <moveit/hybrid_planning_manager/hybrid_planning_manager.hpp>
 #include <moveit/hybrid_planning_manager/hybrid_planning_events.hpp>
-#include <hp_manager_parameters.hpp>
+#include <moveit_hybrid_planning/hp_manager_parameters.hpp>
 #include <moveit/utils/logger.hpp>
 
 namespace moveit::hybrid_planning
diff --git a/moveit_ros/hybrid_planning/local_planner/local_planner_component/src/local_planner_component.cpp b/moveit_ros/hybrid_planning/local_planner/local_planner_component/src/local_planner_component.cpp
@@ -33,7 +33,7 @@
  *********************************************************************/
 
 #include <moveit/local_planner/local_planner_component.hpp>
-#include <local_planner_parameters.hpp>
+#include <moveit_hybrid_planning/local_planner_parameters.hpp>
 
 #include <moveit/planning_scene/planning_scene.hpp>
 #include <moveit/robot_state/robot_state.hpp>
diff --git a/moveit_ros/moveit_servo/include/moveit_servo/collision_monitor.hpp b/moveit_ros/moveit_servo/include/moveit_servo/collision_monitor.hpp
@@ -41,9 +41,9 @@
 
 #pragma once
 
-#include <moveit_servo_lib_parameters.hpp>
 #include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
 #include <moveit/planning_scene/planning_scene.hpp>
+#include <moveit_servo/moveit_servo_lib_parameters.hpp>
 
 namespace moveit_servo
 {
diff --git a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
@@ -41,8 +41,8 @@
 
 #pragma once
 
-#include <moveit_servo_lib_parameters.hpp>
 #include <moveit_servo/collision_monitor.hpp>
+#include <moveit_servo/moveit_servo_lib_parameters.hpp>
 #include <moveit_servo/utils/command.hpp>
 #include <moveit_servo/utils/datatypes.hpp>
 #include <moveit/kinematics_base/kinematics_base.hpp>
diff --git a/moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp b/moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp
@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include <moveit_servo_lib_parameters.hpp>
+#include <moveit_servo/moveit_servo_lib_parameters.hpp>
 #include <moveit_servo/utils/datatypes.hpp>
 #include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
 #include <moveit/robot_model/joint_model_group.hpp>
diff --git a/moveit_ros/planning/kinematics_plugin_loader/include/moveit/kinematics_plugin_loader/kinematics_plugin_loader.hpp b/moveit_ros/planning/kinematics_plugin_loader/include/moveit/kinematics_plugin_loader/kinematics_plugin_loader.hpp
@@ -39,8 +39,8 @@
 #include <moveit/macros/class_forward.hpp>
 #include <moveit/robot_model/robot_model.hpp>
 #include <moveit/kinematics_base/kinematics_base.hpp>
-#include <kinematics_parameters.hpp>
 #include <moveit/utils/logger.hpp>
+#include <moveit_ros_planning/kinematics_parameters.hpp>
 
 namespace kinematics_plugin_loader
 {
diff --git a/moveit_ros/planning/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.hpp b/moveit_ros/planning/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.hpp
@@ -49,7 +49,7 @@
 #include <moveit_msgs/msg/pipeline_state.hpp>
 #include <memory>
 #include <moveit_planning_pipeline_export.h>
-#include <planning_pipeline_parameters.hpp>
+#include <moveit_ros_planning/planning_pipeline_parameters.hpp>
 
 namespace planning_pipeline
 {
diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/check_for_stacked_constraints.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/check_for_stacked_constraints.cpp
@@ -43,7 +43,7 @@
 #include <rclcpp/node.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include <default_request_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_request_adapter_parameters.hpp>
 
 namespace default_planning_request_adapters
 {
diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_bounds.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_bounds.cpp
@@ -53,7 +53,7 @@
 #include <rclcpp/parameter_value.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include <default_request_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_request_adapter_parameters.hpp>
 
 namespace default_planning_request_adapters
 {
diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_collision.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_collision.cpp
@@ -45,7 +45,7 @@
 #include <rclcpp/parameter_value.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include <default_request_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_request_adapter_parameters.hpp>
 
 namespace default_planning_request_adapters
 {
diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/validate_workspace_bounds.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/validate_workspace_bounds.cpp
@@ -44,7 +44,7 @@
 #include <rclcpp/node.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include <default_request_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_request_adapter_parameters.hpp>
 
 namespace default_planning_request_adapters
 {
diff --git a/moveit_ros/planning/planning_response_adapter_plugins/src/add_time_optimal_parameterization.cpp b/moveit_ros/planning/planning_response_adapter_plugins/src/add_time_optimal_parameterization.cpp
@@ -39,7 +39,7 @@
 #include <class_loader/class_loader.hpp>
 #include <moveit/utils/logger.hpp>
 
-#include <default_response_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_response_adapter_parameters.hpp>
 
 namespace default_planning_response_adapters
 {
diff --git a/moveit_ros/planning/planning_response_adapter_plugins/src/display_motion_path.cpp b/moveit_ros/planning/planning_response_adapter_plugins/src/display_motion_path.cpp
@@ -42,7 +42,7 @@
 #include <moveit/utils/logger.hpp>
 #include <moveit_msgs/msg/display_trajectory.hpp>
 
-#include <default_response_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_response_adapter_parameters.hpp>
 
 namespace default_planning_response_adapters
 {
diff --git a/moveit_ros/planning/planning_response_adapter_plugins/src/validate_path.cpp b/moveit_ros/planning/planning_response_adapter_plugins/src/validate_path.cpp
@@ -42,7 +42,8 @@
 #include <visualization_msgs/msg/marker_array.hpp>
 #include <moveit/collision_detection/collision_tools.hpp>
 
-#include <default_response_adapter_parameters.hpp>
+#include <moveit_ros_planning/default_response_adapter_parameters.hpp>
+
 namespace default_planning_response_adapters
 {
 /**

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@`
`41`	`41`
`42`	`42`	`#include <cstddef>`
`43`	`43`
`44`		`-#include <moveit_butterworth_filter_parameters.hpp>`
`45`	`44`	`#include <moveit/robot_model/robot_model.hpp>`
`46`	`45`	`#include <moveit/online_signal_smoothing/smoothing_base_class.hpp>`
	`46`	`+#include <moveit_core/moveit_butterworth_filter_parameters.hpp>`
`47`	`47`
`48`	`48`	`namespace online_signal_smoothing`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@`
`55`	`55`	`#include <unordered_map>`
`56`	`56`	`#include <utility>`
`57`	`57`	`#include <filesystem>`
`58`		`-#include <cached_ik_kinematics_parameters.hpp>`
`59`	`58`	`#include <moveit/utils/logger.hpp>`
	`59`	`+#include <moveit_kinematics/cached_ik_kinematics_parameters.hpp>`
`60`	`60`
`61`	`61`	`namespace cached_ik_kinematics_plugin`
`62`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`#include <pilz_industrial_motion_planner/trajectory_blender.hpp>`
`49`	`49`	`#include <pilz_industrial_motion_planner/trajectory_generation_exceptions.hpp>`
`50`	`50`
`51`		`-#include <cartesian_limits_parameters.hpp>`
	`51`	`+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>`
`52`	`52`
`53`	`53`	`namespace pilz_industrial_motion_planner`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`#include <pilz_industrial_motion_planner/joint_limits_container.hpp>`
`38`	`38`	`#include <math.h>`
`39`	`39`
`40`		`-#include "cartesian_limits_parameters.hpp"`
	`40`	`+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>`
`41`	`41`
`42`	`42`	`namespace pilz_industrial_motion_planner`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`#include <pluginlib/class_loader.hpp>`
`46`	`46`	`#include <memory>`
`47`	`47`
`48`		`-#include <cartesian_limits_parameters.hpp>`
	`48`	`+#include <pilz_industrial_motion_planner/cartesian_limits_parameters.hpp>`
`49`	`49`
`50`	`50`	`namespace pilz_industrial_motion_planner`
`51`	`51`	`{`