Skip to content

Commit 8a60aa3

Browse files
committed
Renamed message naming
1 parent 8d9cc8e commit 8a60aa3

File tree

5 files changed

+6
-2
lines changed

5 files changed

+6
-2
lines changed

steering_controllers_library/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
2121
tf2
2222
tf2_msgs
2323
tf2_geometry_msgs
24+
ackermann_msgs
2425
)
2526

2627
find_package(ament_cmake REQUIRED)

steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "geometry_msgs/msg/twist_stamped.hpp"
3333
#include "nav_msgs/msg/odometry.hpp"
3434
#include "tf2_msgs/msg/tf_message.hpp"
35+
#include "ackermann_msgs/msg/ackermann_drive_stamped.hpp"
3536

3637
#include "steering_controllers_library/steering_controllers_library_parameters.hpp"
3738
#include "steering_controllers_library/steering_odometry.hpp"
@@ -71,6 +72,7 @@ class SteeringControllersLibrary : public controller_interface::ChainableControl
7172
const rclcpp::Time & time, const rclcpp::Duration & period) override;
7273

7374
using ControllerTwistReferenceMsg = geometry_msgs::msg::TwistStamped;
75+
using ControllerAckermannReferenceMsg = ackermann_msgs::msg::AckermannDriveStamped;
7476
using ControllerStateMsgOdom = nav_msgs::msg::Odometry;
7577
using ControllerStateMsgTf = tf2_msgs::msg::TFMessage;
7678
using SteeringControllerStateMsg = control_msgs::msg::SteeringControllerStatus;

steering_controllers_library/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<depend>tf2</depend>
4141
<depend>tf2_msgs</depend>
4242
<depend>tf2_geometry_msgs</depend>
43+
<depend>ackermann_msgs</depend>
4344

4445
<test_depend>ament_cmake_gmock</test_depend>
4546
<test_depend>controller_manager</test_depend>

steering_controllers_library/test/test_steering_controllers_library.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using ControllerStateMsg =
3535
steering_controllers_library::SteeringControllersLibrary::SteeringControllerStateMsg;
36-
using ControllerReferenceMsg =
36+
using ControllerTwistReferenceMsg =
3737
steering_controllers_library::SteeringControllersLibrary::ControllerTwistReferenceMsg;
3838
using ControllerAckermannReferenceMsg =
3939
steering_controllers_library::SteeringControllersLibrary::ControllerAckermannReferenceMsg;

steering_controllers_library/test/test_steering_controllers_library_ackermann.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "steering_controllers_library/steering_controllers_library.hpp"
3333

3434
using ControllerStateMsg =
35-
steering_controllers_library::SteeringControllersLibrary::AckermannControllerState;
35+
steering_controllers_library::SteeringControllersLibrary::SteeringControllerStateMsg;
3636
using ControllerAckermannReferenceMsg =
3737
steering_controllers_library::SteeringControllersLibrary::ControllerAckermannReferenceMsg;
3838

0 commit comments

Comments
 (0)