diff --git a/control/operation_mode_transition_manager/CMakeLists.txt b/control/autoware_operation_mode_transition_manager/CMakeLists.txt similarity index 60% rename from control/operation_mode_transition_manager/CMakeLists.txt rename to control/autoware_operation_mode_transition_manager/CMakeLists.txt index 9c8ca29fdc277..2ebd6ec153ed2 100644 --- a/control/operation_mode_transition_manager/CMakeLists.txt +++ b/control/autoware_operation_mode_transition_manager/CMakeLists.txt @@ -1,21 +1,21 @@ cmake_minimum_required(VERSION 3.14) -project(operation_mode_transition_manager) +project(autoware_operation_mode_transition_manager) find_package(autoware_cmake REQUIRED) autoware_package() find_package(ament_cmake_auto REQUIRED) ament_auto_find_build_dependencies() -ament_auto_add_library(operation_mode_transition_manager_node SHARED +ament_auto_add_library(autoware_operation_mode_transition_manager_node SHARED src/compatibility.cpp src/data.cpp src/node.cpp src/state.cpp ) -rclcpp_components_register_node(operation_mode_transition_manager_node - PLUGIN "operation_mode_transition_manager::OperationModeTransitionManager" - EXECUTABLE operation_mode_transition_manager_exe +rclcpp_components_register_node(autoware_operation_mode_transition_manager_node + PLUGIN "autoware::operation_mode_transition_manager::OperationModeTransitionManager" + EXECUTABLE autoware_operation_mode_transition_manager_exe ) rosidl_generate_interfaces( @@ -26,12 +26,12 @@ rosidl_generate_interfaces( # to use same package defined message if(${rosidl_cmake_VERSION} VERSION_LESS 2.5.0) - rosidl_target_interfaces(operation_mode_transition_manager_node + rosidl_target_interfaces(autoware_operation_mode_transition_manager_node ${PROJECT_NAME} "rosidl_typesupport_cpp") else() rosidl_get_typesupport_target( cpp_typesupport_target ${PROJECT_NAME} "rosidl_typesupport_cpp") - target_link_libraries(operation_mode_transition_manager_node "${cpp_typesupport_target}") + target_link_libraries(autoware_operation_mode_transition_manager_node "${cpp_typesupport_target}") endif() diff --git a/control/operation_mode_transition_manager/README.md b/control/autoware_operation_mode_transition_manager/README.md similarity index 95% rename from control/operation_mode_transition_manager/README.md rename to control/autoware_operation_mode_transition_manager/README.md index 008d092565ba4..3a9680f42702b 100644 --- a/control/operation_mode_transition_manager/README.md +++ b/control/autoware_operation_mode_transition_manager/README.md @@ -1,4 +1,4 @@ -# operation_mode_transition_manager +# autoware_operation_mode_transition_manager ## Purpose / Use cases @@ -25,7 +25,7 @@ There is also an `In Transition` state that occurs during each mode transitions. ## Design -A rough design of the relationship between `operation_mode_transition_manager`` and the other nodes is shown below. +A rough design of the relationship between `autoware_operation_mode_transition_manager`` and the other nodes is shown below. ![transition_rough_structure](image/transition_rough_structure.drawio.svg) @@ -33,7 +33,7 @@ A more detailed structure is below. ![transition_detailed_structure](image/transition_detailed_structure.drawio.svg) -Here we see that `operation_mode_transition_manager` has multiple state transitions as follows +Here we see that `autoware_operation_mode_transition_manager` has multiple state transitions as follows - **AUTOWARE ENABLED <---> DISABLED** - **ENABLED**: the vehicle is controlled by Autoware. @@ -73,7 +73,7 @@ For the backward compatibility (to be removed): ### Outputs - /system/operation_mode/state [`autoware_adapi_v1_msgs/msg/OperationModeState`]: to inform the current operation mode -- /control/operation_mode_transition_manager/debug_info [`operation_mode_transition_manager/msg/OperationModeTransitionManagerDebug`]: detailed information about the operation mode transition +- /control/autoware_operation_mode_transition_manager/debug_info [`autoware_operation_mode_transition_manager/msg/OperationModeTransitionManagerDebug`]: detailed information about the operation mode transition - /control/gate_mode_cmd [`tier4_control_msgs/msg/GateMode`]: to change the `vehicle_cmd_gate` state to use its features (to be removed) - /autoware/engage [`autoware_vehicle_msgs/msg/Engage`]: @@ -83,7 +83,7 @@ For the backward compatibility (to be removed): ## Parameters -{{ json_to_markdown("control/operation_mode_transition_manager/schema/operation_mode_transition_manager.schema.json") }} +{{ json_to_markdown("control/autoware_operation_mode_transition_manager/schema/operation_mode_transition_manager.schema.json") }} | Name | Type | Description | Default value | | :--------------------------------- | :------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :------------ | diff --git a/control/operation_mode_transition_manager/config/operation_mode_transition_manager.param.yaml b/control/autoware_operation_mode_transition_manager/config/operation_mode_transition_manager.param.yaml similarity index 100% rename from control/operation_mode_transition_manager/config/operation_mode_transition_manager.param.yaml rename to control/autoware_operation_mode_transition_manager/config/operation_mode_transition_manager.param.yaml diff --git a/control/operation_mode_transition_manager/image/transition_detailed_structure.drawio.svg b/control/autoware_operation_mode_transition_manager/image/transition_detailed_structure.drawio.svg similarity index 100% rename from control/operation_mode_transition_manager/image/transition_detailed_structure.drawio.svg rename to control/autoware_operation_mode_transition_manager/image/transition_detailed_structure.drawio.svg diff --git a/control/operation_mode_transition_manager/image/transition_rough_structure.drawio.svg b/control/autoware_operation_mode_transition_manager/image/transition_rough_structure.drawio.svg similarity index 100% rename from control/operation_mode_transition_manager/image/transition_rough_structure.drawio.svg rename to control/autoware_operation_mode_transition_manager/image/transition_rough_structure.drawio.svg diff --git a/control/operation_mode_transition_manager/launch/operation_mode_transition_manager.launch.xml b/control/autoware_operation_mode_transition_manager/launch/operation_mode_transition_manager.launch.xml similarity index 75% rename from control/operation_mode_transition_manager/launch/operation_mode_transition_manager.launch.xml rename to control/autoware_operation_mode_transition_manager/launch/operation_mode_transition_manager.launch.xml index c6f03db0fcacc..700228b8afbc3 100644 --- a/control/operation_mode_transition_manager/launch/operation_mode_transition_manager.launch.xml +++ b/control/autoware_operation_mode_transition_manager/launch/operation_mode_transition_manager.launch.xml @@ -1,9 +1,9 @@ - + - - + + diff --git a/control/operation_mode_transition_manager/msg/OperationModeTransitionManagerDebug.msg b/control/autoware_operation_mode_transition_manager/msg/OperationModeTransitionManagerDebug.msg similarity index 100% rename from control/operation_mode_transition_manager/msg/OperationModeTransitionManagerDebug.msg rename to control/autoware_operation_mode_transition_manager/msg/OperationModeTransitionManagerDebug.msg diff --git a/control/operation_mode_transition_manager/package.xml b/control/autoware_operation_mode_transition_manager/package.xml similarity index 91% rename from control/operation_mode_transition_manager/package.xml rename to control/autoware_operation_mode_transition_manager/package.xml index 40232469fdb6a..c93b38c537a73 100644 --- a/control/operation_mode_transition_manager/package.xml +++ b/control/autoware_operation_mode_transition_manager/package.xml @@ -1,7 +1,7 @@ - operation_mode_transition_manager + autoware_operation_mode_transition_manager 0.1.0 - The vehicle_cmd_gate package + The operation_mode_transition_manager package Takamasa Horibe Tomoya Kimura Takayuki Murooka diff --git a/control/operation_mode_transition_manager/schema/operation_mode_transition_manager.schema.json b/control/autoware_operation_mode_transition_manager/schema/operation_mode_transition_manager.schema.json similarity index 100% rename from control/operation_mode_transition_manager/schema/operation_mode_transition_manager.schema.json rename to control/autoware_operation_mode_transition_manager/schema/operation_mode_transition_manager.schema.json diff --git a/control/operation_mode_transition_manager/src/compatibility.cpp b/control/autoware_operation_mode_transition_manager/src/compatibility.cpp similarity index 97% rename from control/operation_mode_transition_manager/src/compatibility.cpp rename to control/autoware_operation_mode_transition_manager/src/compatibility.cpp index 66a5fbd6b1b13..df22581dd361e 100644 --- a/control/operation_mode_transition_manager/src/compatibility.cpp +++ b/control/autoware_operation_mode_transition_manager/src/compatibility.cpp @@ -16,7 +16,7 @@ #include -namespace operation_mode_transition_manager +namespace autoware::operation_mode_transition_manager { Compatibility::Compatibility(rclcpp::Node * node) : node_(node) @@ -140,4 +140,4 @@ void Compatibility::set_mode(const OperationMode mode) } } -} // namespace operation_mode_transition_manager +} // namespace autoware::operation_mode_transition_manager diff --git a/control/operation_mode_transition_manager/src/compatibility.hpp b/control/autoware_operation_mode_transition_manager/src/compatibility.hpp similarity index 95% rename from control/operation_mode_transition_manager/src/compatibility.hpp rename to control/autoware_operation_mode_transition_manager/src/compatibility.hpp index d9bde7cb22872..34d4c7a24dd30 100644 --- a/control/operation_mode_transition_manager/src/compatibility.hpp +++ b/control/autoware_operation_mode_transition_manager/src/compatibility.hpp @@ -22,7 +22,7 @@ #include #include -namespace operation_mode_transition_manager +namespace autoware::operation_mode_transition_manager { class Compatibility @@ -54,6 +54,6 @@ class Compatibility SelectorModeMsg::ConstSharedPtr selector_mode_; }; -} // namespace operation_mode_transition_manager +} // namespace autoware::operation_mode_transition_manager #endif // COMPATIBILITY_HPP_ diff --git a/control/operation_mode_transition_manager/src/data.cpp b/control/autoware_operation_mode_transition_manager/src/data.cpp similarity index 94% rename from control/operation_mode_transition_manager/src/data.cpp rename to control/autoware_operation_mode_transition_manager/src/data.cpp index 8734b6d1c8e86..1fac496f3c71c 100644 --- a/control/operation_mode_transition_manager/src/data.cpp +++ b/control/autoware_operation_mode_transition_manager/src/data.cpp @@ -14,7 +14,7 @@ #include "data.hpp" -namespace operation_mode_transition_manager +namespace autoware::operation_mode_transition_manager { std::string toString(const std::optional mode) @@ -67,4 +67,4 @@ OperationModeValue toMsg(const OperationMode mode) return OperationModeState::UNKNOWN; } -} // namespace operation_mode_transition_manager +} // namespace autoware::operation_mode_transition_manager diff --git a/control/operation_mode_transition_manager/src/data.hpp b/control/autoware_operation_mode_transition_manager/src/data.hpp similarity index 95% rename from control/operation_mode_transition_manager/src/data.hpp rename to control/autoware_operation_mode_transition_manager/src/data.hpp index 8ea9f8d2b99ee..63ccc90b3af85 100644 --- a/control/operation_mode_transition_manager/src/data.hpp +++ b/control/autoware_operation_mode_transition_manager/src/data.hpp @@ -27,7 +27,7 @@ #include #include -namespace operation_mode_transition_manager +namespace autoware::operation_mode_transition_manager { using ServiceResponse = autoware_adapi_v1_msgs::srv::ChangeOperationMode::Response; @@ -81,6 +81,6 @@ std::string toString(const std::optional mode); std::optional toEnum(const ChangeOperationMode::Request & request); OperationModeValue toMsg(const OperationMode mode); -} // namespace operation_mode_transition_manager +} // namespace autoware::operation_mode_transition_manager #endif // DATA_HPP_ diff --git a/control/operation_mode_transition_manager/src/node.cpp b/control/autoware_operation_mode_transition_manager/src/node.cpp similarity index 96% rename from control/operation_mode_transition_manager/src/node.cpp rename to control/autoware_operation_mode_transition_manager/src/node.cpp index 77f7f9dc52487..ed9351aa0b079 100644 --- a/control/operation_mode_transition_manager/src/node.cpp +++ b/control/autoware_operation_mode_transition_manager/src/node.cpp @@ -16,11 +16,11 @@ #include -namespace operation_mode_transition_manager +namespace autoware::operation_mode_transition_manager { OperationModeTransitionManager::OperationModeTransitionManager(const rclcpp::NodeOptions & options) -: Node("operation_mode_transition_manager", options), compatibility_(this) +: Node("autoware_operation_mode_transition_manager", options), compatibility_(this) { cli_control_mode_ = create_client("control_mode_request"); pub_debug_info_ = create_publisher("~/debug_info", 1); @@ -281,7 +281,8 @@ void OperationModeTransitionManager::publishData() pub_debug_info_->publish(debug_info); } -} // namespace operation_mode_transition_manager +} // namespace autoware::operation_mode_transition_manager #include -RCLCPP_COMPONENTS_REGISTER_NODE(operation_mode_transition_manager::OperationModeTransitionManager) +RCLCPP_COMPONENTS_REGISTER_NODE( + autoware::operation_mode_transition_manager::OperationModeTransitionManager) diff --git a/control/operation_mode_transition_manager/src/node.hpp b/control/autoware_operation_mode_transition_manager/src/node.hpp similarity index 96% rename from control/operation_mode_transition_manager/src/node.hpp rename to control/autoware_operation_mode_transition_manager/src/node.hpp index 8cca13a2fb9eb..0cacb083fc293 100644 --- a/control/operation_mode_transition_manager/src/node.hpp +++ b/control/autoware_operation_mode_transition_manager/src/node.hpp @@ -26,7 +26,7 @@ #include #include -namespace operation_mode_transition_manager +namespace autoware::operation_mode_transition_manager { class OperationModeTransitionManager : public rclcpp::Node @@ -78,6 +78,6 @@ class OperationModeTransitionManager : public rclcpp::Node std::optional compatibility_transition_; }; -} // namespace operation_mode_transition_manager +} // namespace autoware::operation_mode_transition_manager #endif // NODE_HPP_ diff --git a/control/operation_mode_transition_manager/src/state.cpp b/control/autoware_operation_mode_transition_manager/src/state.cpp similarity index 99% rename from control/operation_mode_transition_manager/src/state.cpp rename to control/autoware_operation_mode_transition_manager/src/state.cpp index 82270875b2e17..4eaf0ddf8e764 100644 --- a/control/operation_mode_transition_manager/src/state.cpp +++ b/control/autoware_operation_mode_transition_manager/src/state.cpp @@ -23,7 +23,7 @@ #include #include -namespace operation_mode_transition_manager +namespace autoware::operation_mode_transition_manager { using motion_utils::findNearestIndex; @@ -316,4 +316,4 @@ bool AutonomousMode::isModeChangeAvailable() return is_all_ok; } -} // namespace operation_mode_transition_manager +} // namespace autoware::operation_mode_transition_manager diff --git a/control/operation_mode_transition_manager/src/state.hpp b/control/autoware_operation_mode_transition_manager/src/state.hpp similarity index 91% rename from control/operation_mode_transition_manager/src/state.hpp rename to control/autoware_operation_mode_transition_manager/src/state.hpp index 54434690f2147..a8f20ebf7369a 100644 --- a/control/operation_mode_transition_manager/src/state.hpp +++ b/control/autoware_operation_mode_transition_manager/src/state.hpp @@ -15,8 +15,8 @@ #ifndef STATE_HPP_ #define STATE_HPP_ +#include "autoware_operation_mode_transition_manager/msg/operation_mode_transition_manager_debug.hpp" #include "data.hpp" -#include "operation_mode_transition_manager/msg/operation_mode_transition_manager_debug.hpp" #include #include @@ -28,7 +28,7 @@ #include #include -namespace operation_mode_transition_manager +namespace autoware::operation_mode_transition_manager { class ModeChangeBase @@ -39,7 +39,8 @@ class ModeChangeBase virtual bool isModeChangeCompleted() = 0; virtual bool isModeChangeAvailable() = 0; - using DebugInfo = operation_mode_transition_manager::msg::OperationModeTransitionManagerDebug; + using DebugInfo = + autoware_operation_mode_transition_manager::msg::OperationModeTransitionManagerDebug; virtual DebugInfo getDebugInfo() { return DebugInfo{}; } }; @@ -105,6 +106,6 @@ class RemoteMode : public ModeChangeBase bool isModeChangeAvailable() override { return true; } }; -} // namespace operation_mode_transition_manager +} // namespace autoware::operation_mode_transition_manager #endif // STATE_HPP_ diff --git a/control/operation_mode_transition_manager/src/util.hpp b/control/autoware_operation_mode_transition_manager/src/util.hpp similarity index 85% rename from control/operation_mode_transition_manager/src/util.hpp rename to control/autoware_operation_mode_transition_manager/src/util.hpp index e3fa20aaafd74..2e7e97a9e90d7 100644 --- a/control/operation_mode_transition_manager/src/util.hpp +++ b/control/autoware_operation_mode_transition_manager/src/util.hpp @@ -15,9 +15,10 @@ #ifndef UTIL_HPP_ #define UTIL_HPP_ -#include "operation_mode_transition_manager/msg/operation_mode_transition_manager_debug.hpp" +#include "autoware_operation_mode_transition_manager/msg/operation_mode_transition_manager_debug.hpp" -using DebugInfo = operation_mode_transition_manager::msg::OperationModeTransitionManagerDebug; +using DebugInfo = + autoware_operation_mode_transition_manager::msg::OperationModeTransitionManagerDebug; void setAllOk(DebugInfo & debug_info) { diff --git a/launch/tier4_control_launch/launch/control.launch.py b/launch/tier4_control_launch/launch/control.launch.py index 632571790a645..02ad160164c32 100644 --- a/launch/tier4_control_launch/launch/control.launch.py +++ b/launch/tier4_control_launch/launch/control.launch.py @@ -53,7 +53,8 @@ def launch_setup(context, *args, **kwargs): with open(LaunchConfiguration("control_validator_param_path").perform(context), "r") as f: control_validator_param = yaml.safe_load(f)["/**"]["ros__parameters"] with open( - LaunchConfiguration("operation_mode_transition_manager_param_path").perform(context), "r" + LaunchConfiguration("operation_mode_transition_manager_param_path").perform(context), + "r", ) as f: operation_mode_transition_manager_param = yaml.safe_load(f)["/**"]["ros__parameters"] with open(LaunchConfiguration("shift_decider_param_path").perform(context), "r") as f: @@ -245,10 +246,10 @@ def launch_setup(context, *args, **kwargs): ) # operation mode transition manager - operation_mode_transition_manager_component = ComposableNode( - package="operation_mode_transition_manager", - plugin="operation_mode_transition_manager::OperationModeTransitionManager", - name="operation_mode_transition_manager", + autoware_operation_mode_transition_manager_component = ComposableNode( + package="autoware_operation_mode_transition_manager", + plugin="autoware::operation_mode_transition_manager::OperationModeTransitionManager", + name="autoware_operation_mode_transition_manager", remappings=[ # input ("kinematics", "/localization/kinematic_state"), @@ -347,7 +348,7 @@ def launch_setup(context, *args, **kwargs): lane_departure_component, shift_decider_component, vehicle_cmd_gate_component, - operation_mode_transition_manager_component, + autoware_operation_mode_transition_manager_component, glog_component, ], ) @@ -362,7 +363,7 @@ def launch_setup(context, *args, **kwargs): lane_departure_component, shift_decider_component, vehicle_cmd_gate_component, - operation_mode_transition_manager_component, + autoware_operation_mode_transition_manager_component, glog_component, ], )