Skip to content

Commit 4fd0b24

Browse files
authored
Remove build warnings for Humble (#1234)
* Update to new realtime_tools header extension * Update pin validation to avoid compiler warning * Use new include path for generated parameter headers This got updated in generate_parameters_library. * Update more headers
1 parent f06092e commit 4fd0b24

11 files changed

+15
-15
lines changed

ur_controllers/include/ur_controllers/force_mode_controller.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@
3737
#pragma once
3838
#include <tf2_ros/buffer.h>
3939
#include <tf2_ros/transform_listener.h>
40-
#include <realtime_tools/realtime_buffer.h>
4140
#include <array>
4241
#include <memory>
4342

4443
#include <controller_interface/controller_interface.hpp>
4544
#include <geometry_msgs/msg/pose_stamped.hpp>
45+
#include <realtime_tools/realtime_buffer.hpp>
4646
#include <rclcpp/rclcpp.hpp>
4747
#include <std_srvs/srv/trigger.hpp>
4848
#include <ur_msgs/srv/set_force_mode.hpp>
4949

50-
#include "force_mode_controller_parameters.hpp"
50+
#include "ur_controllers/force_mode_controller_parameters.hpp"
5151

5252
namespace ur_controllers
5353
{

ur_controllers/include/ur_controllers/freedrive_mode_controller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#include <rclcpp/duration.hpp>
5454
#include "std_msgs/msg/bool.hpp"
5555

56-
#include "freedrive_mode_controller_parameters.hpp"
56+
#include "ur_controllers/freedrive_mode_controller_parameters.hpp"
5757

5858
namespace ur_controllers
5959
{

ur_controllers/include/ur_controllers/gpio_controller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
#include "rclcpp/time.hpp"
5858
#include "rclcpp/duration.hpp"
5959
#include "std_msgs/msg/bool.hpp"
60-
#include "gpio_controller_parameters.hpp"
60+
#include "ur_controllers/gpio_controller_parameters.hpp"
6161

6262
namespace ur_controllers
6363
{

ur_controllers/include/ur_controllers/passthrough_trajectory_controller.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343

4444
#include <stdint.h>
4545

46-
#include <realtime_tools/realtime_buffer.h>
47-
#include <realtime_tools/realtime_server_goal_handle.h>
48-
4946
#include <functional>
5047
#include <limits>
5148
#include <memory>
@@ -54,6 +51,8 @@
5451
#include <vector>
5552

5653
#include <controller_interface/controller_interface.hpp>
54+
#include <realtime_tools/realtime_buffer.hpp>
55+
#include <realtime_tools/realtime_server_goal_handle.hpp>
5756
#include <rclcpp_action/server.hpp>
5857
#include <rclcpp_action/create_server.hpp>
5958
#include <rclcpp/rclcpp.hpp>
@@ -65,7 +64,7 @@
6564
#include <trajectory_msgs/msg/joint_trajectory.hpp>
6665
#include <control_msgs/action/follow_joint_trajectory.hpp>
6766

68-
#include "passthrough_trajectory_controller_parameters.hpp"
67+
#include "ur_controllers/passthrough_trajectory_controller_parameters.hpp"
6968

7069
namespace ur_controllers
7170
{

ur_controllers/include/ur_controllers/scaled_joint_trajectory_controller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
4646
#include "rclcpp/time.hpp"
4747
#include "rclcpp/duration.hpp"
48-
#include "scaled_joint_trajectory_controller_parameters.hpp"
48+
#include "ur_controllers/scaled_joint_trajectory_controller_parameters.hpp"
4949

5050
namespace ur_controllers
5151
{

ur_controllers/include/ur_controllers/speed_scaling_state_broadcaster.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#include "rclcpp/time.hpp"
4949
#include "rclcpp/duration.hpp"
5050
#include "std_msgs/msg/float64.hpp"
51-
#include "speed_scaling_state_broadcaster_parameters.hpp"
51+
#include "ur_controllers/speed_scaling_state_broadcaster_parameters.hpp"
5252

5353
namespace ur_controllers
5454
{

ur_controllers/include/ur_controllers/ur_configuration_controller.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@
4343

4444
// TODO(fmauch): Currently, the realtime_box_best_effort doesn't include this
4545
#include <functional>
46-
#include <realtime_tools/realtime_box_best_effort.h> // NOLINT
4746

4847
#include <memory>
4948

5049
#include <controller_interface/controller_interface.hpp>
50+
#include <realtime_tools/realtime_box_best_effort.hpp>
5151

5252
#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"
5454

5555
namespace ur_controllers
5656
{

ur_controllers/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
<depend>angles</depend>
2626
<depend>controller_interface</depend>
27+
<depend>generate_parameter_library</depend>
2728
<depend>geometry_msgs</depend>
2829
<depend>hardware_interface</depend>
2930
<depend>joint_trajectory_controller</depend>

ur_controllers/src/gpio_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ bool GPIOController::setAnalogOutput(ur_msgs::srv::SetAnalogOutput::Request::Sha
407407
return false;
408408
}
409409

410-
if (req->data.pin < 0 || req->data.pin > 1) {
410+
if (!(req->data.pin == 0 || req->data.pin == 1)) {
411411
RCLCPP_ERROR(get_node()->get_logger(), "Invalid pin selected. Only pins 0 and 1 are allowed.");
412412
resp->success = false;
413413
return false;

ur_controllers/src/ur_configuration_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
//----------------------------------------------------------------------
4040

4141
#include <ur_controllers/ur_configuration_controller.hpp>
42-
#include <realtime_tools/realtime_box.h>
42+
#include <realtime_tools/realtime_box.hpp>
4343
namespace ur_controllers
4444
{
4545

0 commit comments

Comments
 (0)