diff --git a/launch/tier4_system_launch/launch/system.launch.xml b/launch/tier4_system_launch/launch/system.launch.xml index c37db6bca4ffe..56c7e8ab810ce 100644 --- a/launch/tier4_system_launch/launch/system.launch.xml +++ b/launch/tier4_system_launch/launch/system.launch.xml @@ -105,7 +105,7 @@ - + diff --git a/system/mrm_handler/CHANGELOG.rst b/system/autoware_mrm_handler/CHANGELOG.rst similarity index 100% rename from system/mrm_handler/CHANGELOG.rst rename to system/autoware_mrm_handler/CHANGELOG.rst diff --git a/system/mrm_handler/CMakeLists.txt b/system/autoware_mrm_handler/CMakeLists.txt similarity index 82% rename from system/mrm_handler/CMakeLists.txt rename to system/autoware_mrm_handler/CMakeLists.txt index 93e03e7f20ead..ba960c05924d5 100644 --- a/system/mrm_handler/CMakeLists.txt +++ b/system/autoware_mrm_handler/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(mrm_handler) +project(autoware_mrm_handler) find_package(autoware_cmake REQUIRED) autoware_package() @@ -9,7 +9,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED ) rclcpp_components_register_node(${PROJECT_NAME} - PLUGIN "MrmHandler" + PLUGIN "autoware::mrm_handler::MrmHandler" EXECUTABLE ${PROJECT_NAME}_node EXECUTOR MultiThreadedExecutor ) diff --git a/system/mrm_handler/README.md b/system/autoware_mrm_handler/README.md similarity index 97% rename from system/mrm_handler/README.md rename to system/autoware_mrm_handler/README.md index 8ccb95e6ca8d3..ea2a63e51cd4b 100644 --- a/system/mrm_handler/README.md +++ b/system/autoware_mrm_handler/README.md @@ -37,7 +37,7 @@ MRM Handler is a node to select a proper MRM from a system failure state contain ## Parameters -{{ json_to_markdown("system/mrm_handler/schema/mrm_handler.schema.json") }} +{{ json_to_markdown("system/autoware_mrm_handler/schema/mrm_handler.schema.json") }} ## Assumptions / Known limits diff --git a/system/mrm_handler/config/mrm_handler.param.yaml b/system/autoware_mrm_handler/config/mrm_handler.param.yaml similarity index 100% rename from system/mrm_handler/config/mrm_handler.param.yaml rename to system/autoware_mrm_handler/config/mrm_handler.param.yaml diff --git a/system/mrm_handler/image/mrm-state.svg b/system/autoware_mrm_handler/image/mrm-state.svg similarity index 100% rename from system/mrm_handler/image/mrm-state.svg rename to system/autoware_mrm_handler/image/mrm-state.svg diff --git a/system/mrm_handler/include/mrm_handler/mrm_handler_core.hpp b/system/autoware_mrm_handler/include/autoware/mrm_handler/mrm_handler_core.hpp similarity index 96% rename from system/mrm_handler/include/mrm_handler/mrm_handler_core.hpp rename to system/autoware_mrm_handler/include/autoware/mrm_handler/mrm_handler_core.hpp index b292ab1d874d3..8d74db4e5c843 100644 --- a/system/mrm_handler/include/mrm_handler/mrm_handler_core.hpp +++ b/system/autoware_mrm_handler/include/autoware/mrm_handler/mrm_handler_core.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MRM_HANDLER__MRM_HANDLER_CORE_HPP_ -#define MRM_HANDLER__MRM_HANDLER_CORE_HPP_ +#ifndef AUTOWARE__MRM_HANDLER__MRM_HANDLER_CORE_HPP_ +#define AUTOWARE__MRM_HANDLER__MRM_HANDLER_CORE_HPP_ // Core #include @@ -41,6 +41,9 @@ #include #include +namespace autoware::mrm_handler +{ + struct HazardLampPolicy { bool emergency; @@ -162,4 +165,6 @@ class MrmHandler : public rclcpp::Node bool isArrivedAtGoal(); }; -#endif // MRM_HANDLER__MRM_HANDLER_CORE_HPP_ +} // namespace autoware::mrm_handler + +#endif // AUTOWARE__MRM_HANDLER__MRM_HANDLER_CORE_HPP_ diff --git a/system/mrm_handler/launch/mrm_handler.launch.xml b/system/autoware_mrm_handler/launch/mrm_handler.launch.xml similarity index 92% rename from system/mrm_handler/launch/mrm_handler.launch.xml rename to system/autoware_mrm_handler/launch/mrm_handler.launch.xml index 51a22cf92bebc..d3ed4fb499729 100644 --- a/system/mrm_handler/launch/mrm_handler.launch.xml +++ b/system/autoware_mrm_handler/launch/mrm_handler.launch.xml @@ -17,10 +17,10 @@ - + - + diff --git a/system/mrm_handler/package.xml b/system/autoware_mrm_handler/package.xml similarity index 90% rename from system/mrm_handler/package.xml rename to system/autoware_mrm_handler/package.xml index d330680e87049..cf70663b81122 100644 --- a/system/mrm_handler/package.xml +++ b/system/autoware_mrm_handler/package.xml @@ -1,12 +1,13 @@ - mrm_handler + autoware_mrm_handler 0.40.0 The mrm_handler ROS 2 package Makoto Kurihara Ryuta Kambe Tetsuhiro Kawaguchi + Junya Sasaki Apache License 2.0 ament_cmake_auto diff --git a/system/mrm_handler/schema/mrm_handler.schema.json b/system/autoware_mrm_handler/schema/mrm_handler.schema.json similarity index 100% rename from system/mrm_handler/schema/mrm_handler.schema.json rename to system/autoware_mrm_handler/schema/mrm_handler.schema.json diff --git a/system/mrm_handler/src/mrm_handler/mrm_handler_core.cpp b/system/autoware_mrm_handler/src/mrm_handler/mrm_handler_core.cpp similarity index 99% rename from system/mrm_handler/src/mrm_handler/mrm_handler_core.cpp rename to system/autoware_mrm_handler/src/mrm_handler/mrm_handler_core.cpp index b5f4bbaeefc46..e9429300de573 100644 --- a/system/mrm_handler/src/mrm_handler/mrm_handler_core.cpp +++ b/system/autoware_mrm_handler/src/mrm_handler/mrm_handler_core.cpp @@ -11,13 +11,16 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language // governing permissions and limitations under the License. -#include "mrm_handler/mrm_handler_core.hpp" +#include "autoware/mrm_handler/mrm_handler_core.hpp" #include #include #include #include +namespace autoware::mrm_handler +{ + MrmHandler::MrmHandler(const rclcpp::NodeOptions & options) : Node("mrm_handler", options) { // Parameter @@ -583,5 +586,7 @@ bool MrmHandler::isArrivedAtGoal() return state->mode == OperationModeState::STOP; } +} // namespace autoware::mrm_handler + #include -RCLCPP_COMPONENTS_REGISTER_NODE(MrmHandler) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::mrm_handler::MrmHandler)