Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update paths of GPL includes #1487

Merged
merged 4 commits into from
Jan 15, 2025
+49 −40
Merged

Update paths of GPL includes #1487

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1625896
Update paths of GPL
christophfroehlich Jan 11, 2025
5d84061
Merge branch 'master' into update/gpl
christophfroehlich Jan 15, 2025
3103240
Use released GPL for binary builds
christophfroehlich Jan 15, 2025
918c4f0
Merge branch 'master' into update/gpl
christophfroehlich Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...eering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion admittance_controller/include/admittance_controller/admittance_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion admittance_controller/include/admittance_controller/admittance_rule.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...e_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion ...r_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion forward_command_controller/include/forward_command_controller/forward_command_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion ...troller/include/forward_command_controller/multi_interface_forward_command_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
3 changes: 2 additions & 1 deletion gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
7 changes: 4 additions & 3 deletions imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
{
/**
Expand Down
2 changes: 1 addition & 1 deletion ...trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
12 changes: 6 additions & 6 deletions mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...per_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
3 changes: 2 additions & 1 deletion pid_controller/include/pid_controller/pid_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{

Expand Down
3 changes: 2 additions & 1 deletion pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{

Expand Down
3 changes: 2 additions & 1 deletion range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions ...controllers_library/include/steering_controllers_library/steering_controllers_library.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tricycle_controller/include/tricycle_controller/tricycle_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion ...steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Loading