Skip to content

Commit 0f894d7

Browse files
authored
feat!: remove VehicleControlCommand, VehicleKinematicState, and vehicleOdometry messages (#6895)
Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>
1 parent c01438c commit 0f894d7

File tree

5 files changed

+0
-12
lines changed

5 files changed

+0
-12
lines changed

control/mpc_lateral_controller/include/mpc_lateral_controller/mpc_lateral_controller.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "autoware_control_msgs/msg/lateral.hpp"
2626
#include "autoware_planning_msgs/msg/trajectory.hpp"
2727
#include "autoware_vehicle_msgs/msg/steering_report.hpp"
28-
#include "autoware_vehicle_msgs/msg/vehicle_odometry.hpp"
2928
#include "geometry_msgs/msg/pose.hpp"
3029
#include "geometry_msgs/msg/pose_stamped.hpp"
3130
#include "nav_msgs/msg/odometry.hpp"

control/pid_longitudinal_controller/include/pid_longitudinal_controller/pid_longitudinal_controller.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include "autoware_adapi_v1_msgs/msg/operation_mode_state.hpp"
3636
#include "autoware_control_msgs/msg/longitudinal.hpp"
3737
#include "autoware_planning_msgs/msg/trajectory.hpp"
38-
#include "autoware_vehicle_msgs/msg/vehicle_odometry.hpp"
3938
#include "geometry_msgs/msg/pose_stamped.hpp"
4039
#include "nav_msgs/msg/odometry.hpp"
4140
#include "tf2_msgs/msg/tf_message.hpp"

control/trajectory_follower_node/include/trajectory_follower_node/controller_node.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "autoware_control_msgs/msg/control.hpp"
3434
#include "autoware_control_msgs/msg/longitudinal.hpp"
3535
#include "autoware_planning_msgs/msg/trajectory.hpp"
36-
#include "autoware_vehicle_msgs/msg/vehicle_odometry.hpp"
3736
#include "geometry_msgs/msg/accel_stamped.hpp"
3837
#include "geometry_msgs/msg/accel_with_covariance_stamped.hpp"
3938
#include "geometry_msgs/msg/pose_stamped.hpp"

control/trajectory_follower_node/test/test_controller_node.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "autoware_control_msgs/msg/control.hpp"
2525
#include "autoware_planning_msgs/msg/trajectory.hpp"
2626
#include "autoware_vehicle_msgs/msg/steering_report.hpp"
27-
#include "autoware_vehicle_msgs/msg/vehicle_odometry.hpp"
2827
#include "geometry_msgs/msg/accel_with_covariance_stamped.hpp"
2928
#include "geometry_msgs/msg/pose.hpp"
3029
#include "geometry_msgs/msg/pose_stamped.hpp"

simulator/simple_planning_simulator/include/simple_planning_simulator/simple_planning_simulator_core.hpp

-8
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "autoware_vehicle_msgs/msg/steering_report.hpp"
3333
#include "autoware_vehicle_msgs/msg/turn_indicators_command.hpp"
3434
#include "autoware_vehicle_msgs/msg/turn_indicators_report.hpp"
35-
#include "autoware_vehicle_msgs/msg/vehicle_control_command.hpp"
3635
#include "autoware_vehicle_msgs/msg/velocity_report.hpp"
3736
#include "autoware_vehicle_msgs/srv/control_mode_command.hpp"
3837
#include "geometry_msgs/msg/accel_with_covariance_stamped.hpp"
@@ -72,7 +71,6 @@ using autoware_vehicle_msgs::msg::HazardLightsReport;
7271
using autoware_vehicle_msgs::msg::SteeringReport;
7372
using autoware_vehicle_msgs::msg::TurnIndicatorsCommand;
7473
using autoware_vehicle_msgs::msg::TurnIndicatorsReport;
75-
using autoware_vehicle_msgs::msg::VehicleControlCommand;
7674
using autoware_vehicle_msgs::msg::VelocityReport;
7775
using autoware_vehicle_msgs::srv::ControlModeCommand;
7876
using geometry_msgs::msg::AccelWithCovarianceStamped;
@@ -140,7 +138,6 @@ class PLANNING_SIMULATOR_PUBLIC SimplePlanningSimulator : public rclcpp::Node
140138
rclcpp::Subscription<GearCommand>::SharedPtr sub_manual_gear_cmd_;
141139
rclcpp::Subscription<TurnIndicatorsCommand>::SharedPtr sub_turn_indicators_cmd_;
142140
rclcpp::Subscription<HazardLightsCommand>::SharedPtr sub_hazard_lights_cmd_;
143-
rclcpp::Subscription<VehicleControlCommand>::SharedPtr sub_vehicle_cmd_;
144141
rclcpp::Subscription<Control>::SharedPtr sub_ackermann_cmd_;
145142
rclcpp::Subscription<Control>::SharedPtr sub_manual_ackermann_cmd_;
146143
rclcpp::Subscription<LaneletMapBin>::SharedPtr sub_map_;
@@ -211,11 +208,6 @@ class PLANNING_SIMULATOR_PUBLIC SimplePlanningSimulator : public rclcpp::Node
211208
} vehicle_model_type_; //!< @brief vehicle model type to decide the model dynamics
212209
std::shared_ptr<SimModelInterface> vehicle_model_ptr_; //!< @brief vehicle model pointer
213210

214-
/**
215-
* @brief set current_vehicle_cmd_ptr_ with received message
216-
*/
217-
void on_vehicle_cmd(const VehicleControlCommand::ConstSharedPtr msg);
218-
219211
/**
220212
* @brief set input steering, velocity, and acceleration of the vehicle model
221213
*/

0 commit comments

Comments
 (0)