feat: apply autoware_ prefix for mrm_handler

launch/tier4_system_launch/launch/system.launch.xml

@@ -105,7 +105,7 @@
 
     <!-- MRM Handler -->
     <group>
-      <include file="$(find-pkg-share mrm_handler)/launch/mrm_handler.launch.xml">
+      <include file="$(find-pkg-share autoware_mrm_handler)/launch/mrm_handler.launch.xml">
         <arg name="config_file" value="$(var mrm_handler_param_path)"/>
       </include>
     </group>

system/mrm_handler/CMakeLists.txt → 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
 )

system/mrm_handler/README.md → 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
 

system/mrm_handler/include/mrm_handler/mrm_handler_core.hpp → 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 <memory>
@@ -41,6 +41,9 @@
 #include <diagnostic_msgs/msg/diagnostic_array.hpp>
 #include <nav_msgs/msg/odometry.hpp>
 
+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_

system/mrm_handler/launch/mrm_handler.launch.xml → system/autoware_mrm_handler/launch/mrm_handler.launch.xml

@@ -17,10 +17,10 @@
   <arg name="output_mrm_comfortable_stop_operate" default="/system/mrm/comfortable_stop/operate"/>
   <arg name="output_mrm_emergency_stop_operate" default="/system/mrm/emergency_stop/operate"/>
 
-  <arg name="config_file" default="$(find-pkg-share mrm_handler)/config/mrm_handler.param.yaml"/>
+  <arg name="config_file" default="$(find-pkg-share autoware_mrm_handler)/config/mrm_handler.param.yaml"/>
 
   <!-- mrm_handler -->
-  <node pkg="mrm_handler" exec="mrm_handler_node" name="mrm_handler" output="screen">
+  <node pkg="autoware_mrm_handler" exec="autoware_mrm_handler_node" name="autoware_mrm_handler" output="screen">
     <remap from="~/input/operation_mode_availability" to="$(var input_operation_mode_availability)"/>
     <remap from="~/input/odometry" to="$(var input_odometry)"/>
     <remap from="~/input/control_mode" to="$(var input_control_mode)"/>

system/mrm_handler/package.xml → system/autoware_mrm_handler/package.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>mrm_handler</name>
+  <name>autoware_mrm_handler</name>
   <version>0.40.0</version>
   <description>The mrm_handler ROS 2 package</description>
   <maintainer email="[email protected]">Makoto Kurihara</maintainer>
   <maintainer email="[email protected]">Ryuta Kambe</maintainer>
   <maintainer email="[email protected]">Tetsuhiro Kawaguchi</maintainer>
+  <maintainer email="[email protected]">Junya Sasaki</maintainer>
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>

system/mrm_handler/src/mrm_handler/mrm_handler_core.cpp → 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 <chrono>
 #include <memory>
 #include <string>
 #include <utility>
 
+namespace autoware::mrm_handler
+{
+
 MrmHandler::MrmHandler(const rclcpp::NodeOptions & options) : Node("mrm_handler", options)
 {
   // Parameter
@@ -583,5 +586,7 @@
   return state->mode == OperationModeState::STOP;
 }
 
+}  // namespace autoware::mrm_handler
+
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(MrmHandler)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::mrm_handler::MrmHandler)