update

Signed-off-by: Takamasa Horibe <[email protected]>
autowarefoundation · Jun 9, 2022 · 5ac451b · 5ac451b
1 parent 8088594
commit 5ac451b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/control/engage_transition_manager/include/engage_transition_manager/data.hpp b/control/engage_transition_manager/include/engage_transition_manager/data.hpp
@@ -15,9 +15,9 @@
 #ifndef ENGAGE_TRANSITION_MANAGER__DATA_HPP_
 #define ENGAGE_TRANSITION_MANAGER__DATA_HPP_
 
-#include <tier4_vehicle_msgs/msg/operation_mode.hpp>
+#include <tier4_system_msgs/msg/operation_mode.hpp>
 #include <tier4_vehicle_msgs/msg/control_mode.hpp>
-#include <tier4_vehicle_msgs/srv/operation_mode_request.hpp>
+#include <tier4_system_msgs/srv/operation_mode_request.hpp>
 #include <tier4_vehicle_msgs/srv/control_mode_request.hpp>
 #include <rclcpp/rclcpp.hpp>
 
@@ -32,8 +32,8 @@ using nav_msgs::msg::Odometry;
 
 using autoware_auto_planning_msgs::msg::Trajectory;
 using tier4_vehicle_msgs::msg::ControlMode;
-using tier4_vehicle_msgs::msg::OperationMode;
-using tier4_vehicle_msgs::srv::OperationModeRequest;
+using tier4_system_msgs::msg::OperationMode;
+using tier4_system_msgs::srv::OperationModeRequest;
 using tier4_vehicle_msgs::srv::ControlModeRequest;
 
 enum class State {

diff --git a/...engage_transition_manager/include/engage_transition_manager/engage_transition_manager.hpp b/...engage_transition_manager/include/engage_transition_manager/engage_transition_manager.hpp
@@ -24,8 +24,8 @@
 #include <nav_msgs/msg/odometry.hpp>
 #include <autoware_auto_planning_msgs/msg/trajectory.hpp>
 #include <autoware_auto_control_msgs/msg/ackermann_control_command.hpp>
-#include <tier4_vehicle_msgs/srv/operation_mode_request.hpp>
-#include <tier4_vehicle_msgs/msg/operation_mode.hpp>
+#include <tier4_system_msgs/srv/operation_mode_request.hpp>
+#include <tier4_system_msgs/msg/operation_mode.hpp>
 #include <tier4_vehicle_msgs/msg/is_autonomous_available.hpp>
 
 namespace engage_transition_manager
@@ -34,8 +34,8 @@ namespace engage_transition_manager
 using nav_msgs::msg::Odometry;
 
 using autoware_auto_planning_msgs::msg::Trajectory;
-using tier4_vehicle_msgs::srv::OperationModeRequest;
-using tier4_vehicle_msgs::msg::OperationMode;
+using tier4_system_msgs::srv::OperationModeRequest;
+using tier4_system_msgs::msg::OperationMode;
 using tier4_vehicle_msgs::msg::IsAutonomousAvailable;
 
 class EngageTransitionManager : public rclcpp::Node

diff --git a/control/engage_transition_manager/include/engage_transition_manager/state.hpp b/control/engage_transition_manager/include/engage_transition_manager/state.hpp
@@ -16,8 +16,8 @@
 #define ENGAGE_TRANSITION_MANAGER__STATE_HPP_
 
 #include <engage_transition_manager/data.hpp>
-#include <tier4_vehicle_msgs/msg/operation_mode.hpp>
-#include <tier4_vehicle_msgs/srv/operation_mode_request.hpp>
+#include <tier4_system_msgs/msg/operation_mode.hpp>
+#include <tier4_system_msgs/srv/operation_mode_request.hpp>
 #include <tier4_vehicle_msgs/srv/control_mode_request.hpp>
 #include <rclcpp/rclcpp.hpp>
 

diff --git a/control/engage_transition_manager/package.xml b/control/engage_transition_manager/package.xml
@@ -22,6 +22,7 @@
   <depend>tier4_debug_msgs</depend>
   <depend>tier4_external_api_msgs</depend>
   <depend>tier4_vehicle_msgs</depend>
+  <depend>tier4_system_msgs</depend>
   <depend>vehicle_info_util</depend>
 
   <test_depend>ament_cmake_gtest</test_depend>

diff --git a/control/vehicle_cmd_gate/include/vehicle_cmd_gate/vehicle_cmd_gate.hpp b/control/vehicle_cmd_gate/include/vehicle_cmd_gate/vehicle_cmd_gate.hpp
@@ -37,7 +37,7 @@
 #include <tier4_external_api_msgs/srv/engage.hpp>
 #include <tier4_external_api_msgs/srv/set_emergency.hpp>
 #include <tier4_vehicle_msgs/msg/vehicle_emergency_stamped.hpp>
-#include <tier4_vehicle_msgs/msg/operation_mode.hpp>
+#include <tier4_system_msgs/msg/operation_mode.hpp>
 
 #include <memory>
 
@@ -55,7 +55,7 @@ using tier4_external_api_msgs::msg::Emergency;
 using tier4_external_api_msgs::msg::Heartbeat;
 using tier4_external_api_msgs::srv::SetEmergency;
 using tier4_vehicle_msgs::msg::VehicleEmergencyStamped;
-using tier4_vehicle_msgs::msg::OperationMode;
+using tier4_system_msgs::msg::OperationMode;
 
 using diagnostic_msgs::msg::DiagnosticStatus;
 using nav_msgs::msg::Odometry;

diff --git a/control/vehicle_cmd_gate/package.xml b/control/vehicle_cmd_gate/package.xml
@@ -24,6 +24,7 @@
   <depend>tier4_debug_msgs</depend>
   <depend>tier4_external_api_msgs</depend>
   <depend>tier4_vehicle_msgs</depend>
+  <depend>tier4_system_msgs</depend>
   <depend>vehicle_info_util</depend>
   <depend>engage_transition_manager</depend><!-- TMP: move engage_status.msg to msg pkg -->