feat: apply autoware_ prefix for mrm_comfortable_stop_operator (#…

…10011) * feat(mrm_comfortable_stop_operator): apply `autoware_` prefix (see below): Note: * In this commit, I did not organize a folder structure. The folder structure will be organized in the next some commits. * The changes will follow the Autoware's guideline as below: - https://autowarefoundation.github.io/autoware-documentation/main/contributing/coding-guidelines/ros-nodes/directory-structure/#package-folder Signed-off-by: Junya Sasaki <[email protected]> * rename(mrm_comfortable_stop_operator): move a header under `include/autoware` * Fixes due to this changes for .hpp/.cpp files will be applied in the next commit Signed-off-by: Junya Sasaki <[email protected]> * fix(mrm_comfortable_stop_operator): fix include header path * To follow the previous commit Signed-off-by: Junya Sasaki <[email protected]> * rename: `mrm_comfortable_stop_operator` => `autoware_mrm_comfortable_stop_operator` Signed-off-by: Junya Sasaki <[email protected]> * update: `CODEOWNERS` Signed-off-by: Junya Sasaki <[email protected]> --------- Signed-off-by: Junya Sasaki <[email protected]>
autowarefoundation · Jan 23, 2025 · 972f445 · 972f445
1 parent c53af8a
commit 972f445
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 33 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -221,7 +221,7 @@ system/autoware_dummy_diag_publisher/** [email protected] tetsuhiro.kawaguch
 system/autoware_dummy_infrastructure/** [email protected]
 system/autoware_duplicated_node_checker/** [email protected] [email protected] [email protected] [email protected]
 system/hazard_status_converter/** [email protected]
-system/mrm_comfortable_stop_operator/** [email protected] [email protected]
+system/autoware_mrm_comfortable_stop_operator/** [email protected] tomohito.ando@tier4.jp junya.sasaki@tier4.jp
 system/mrm_emergency_stop_operator/** [email protected] [email protected]
 system/mrm_handler/** [email protected] [email protected] [email protected]
 system/system_diagnostic_monitor/** [email protected]

diff --git a/launch/tier4_system_launch/launch/system.launch.xml b/launch/tier4_system_launch/launch/system.launch.xml
@@ -80,7 +80,7 @@
 
     <!-- MRM Operator -->
     <group>
-      <include file="$(find-pkg-share mrm_comfortable_stop_operator)/launch/mrm_comfortable_stop_operator.launch.py">
+      <include file="$(find-pkg-share autoware_mrm_comfortable_stop_operator)/launch/mrm_comfortable_stop_operator.launch.py">
         <arg name="config_file" value="$(var mrm_comfortable_stop_operator_param_path)"/>
       </include>
     </group>

diff --git a/...m_comfortable_stop_operator/CHANGELOG.rst → ...m_comfortable_stop_operator/CHANGELOG.rst b/...m_comfortable_stop_operator/CHANGELOG.rst → ...m_comfortable_stop_operator/CHANGELOG.rst
diff --git a/system/autoware_mrm_comfortable_stop_operator/CMakeLists.txt b/system/autoware_mrm_comfortable_stop_operator/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.14)
+project(autoware_mrm_comfortable_stop_operator)
+
+find_package(autoware_cmake REQUIRED)
+autoware_package()
+
+ament_auto_add_library(${PROJECT_NAME}_component SHARED
+  src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp
+)
+
+rclcpp_components_register_node(${PROJECT_NAME}_component
+  PLUGIN "autoware::mrm_comfortable_stop_operator::MrmComfortableStopOperator"
+  EXECUTABLE ${PROJECT_NAME}_node
+)
+
+ament_auto_package(INSTALL_TO_SHARE
+  launch
+  config
+)
diff --git a/...m/mrm_comfortable_stop_operator/README.md → ...e_mrm_comfortable_stop_operator/README.md b/...m/mrm_comfortable_stop_operator/README.md → ...e_mrm_comfortable_stop_operator/README.md
diff --git a/.../mrm_comfortable_stop_operator.param.yaml → .../mrm_comfortable_stop_operator.param.yaml b/.../mrm_comfortable_stop_operator.param.yaml → .../mrm_comfortable_stop_operator.param.yaml
diff --git a/...or/mrm_comfortable_stop_operator_core.hpp → ...or/mrm_comfortable_stop_operator_core.hpp b/...or/mrm_comfortable_stop_operator_core.hpp → ...or/mrm_comfortable_stop_operator_core.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
-#define MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
+#ifndef AUTOWARE__MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
+#define AUTOWARE__MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
 
 // Core
 #include <memory>
@@ -29,7 +29,7 @@
 // ROS 2 core
 #include <rclcpp/rclcpp.hpp>
 
-namespace mrm_comfortable_stop_operator
+namespace autoware::mrm_comfortable_stop_operator
 {
 
 struct Parameters
@@ -81,6 +81,6 @@ class MrmComfortableStopOperator : public rclcpp::Node
   OnSetParametersCallbackHandle::SharedPtr set_param_res_;
 };
 
-}  // namespace mrm_comfortable_stop_operator
+}  // namespace autoware::mrm_comfortable_stop_operator
 
-#endif  // MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
+#endif  // AUTOWARE__MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
diff --git a/...h/mrm_comfortable_stop_operator.launch.py → ...h/mrm_comfortable_stop_operator.launch.py b/...h/mrm_comfortable_stop_operator.launch.py → ...h/mrm_comfortable_stop_operator.launch.py
@@ -28,8 +28,8 @@ def launch_setup(context, *args, **kwargs):
         params = yaml.safe_load(f)["/**"]["ros__parameters"]
 
     component = ComposableNode(
-        package="mrm_comfortable_stop_operator",
-        plugin="mrm_comfortable_stop_operator::MrmComfortableStopOperator",
+        package="autoware_mrm_comfortable_stop_operator",
+        plugin="autoware::mrm_comfortable_stop_operator::MrmComfortableStopOperator",
         name="mrm_comfortable_stop_operator",
         parameters=[
             params,
@@ -61,7 +61,7 @@ def generate_launch_description():
         DeclareLaunchArgument(
             "config_file",
             default_value=[
-                FindPackageShare("mrm_comfortable_stop_operator"),
+                FindPackageShare("autoware_mrm_comfortable_stop_operator"),
                 "/config/mrm_comfortable_stop_operator.param.yaml",
             ],
             description="path to the parameter file of mrm_comfortable_stop_operator",

diff --git a/...mrm_comfortable_stop_operator/package.xml → ...mrm_comfortable_stop_operator/package.xml b/...mrm_comfortable_stop_operator/package.xml → ...mrm_comfortable_stop_operator/package.xml
@@ -1,11 +1,12 @@
 <?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_comfortable_stop_operator</name>
+  <name>autoware_mrm_comfortable_stop_operator</name>
   <version>0.40.0</version>
   <description>The MRM comfortable stop operator package</description>
   <maintainer email="[email protected]">Makoto Kurihara</maintainer>
   <maintainer email="[email protected]">Tomohito Ando</maintainer>
+  <maintainer email="[email protected]">Junya Sasaki</maintainer>
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>

diff --git a/...or/mrm_comfortable_stop_operator_core.cpp → ...or/mrm_comfortable_stop_operator_core.cpp b/...or/mrm_comfortable_stop_operator_core.cpp → ...or/mrm_comfortable_stop_operator_core.cpp
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp"
+#include "autoware/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp"
 
 #include <autoware/universe_utils/ros/update_param.hpp>
 
 #include <vector>
 
-namespace mrm_comfortable_stop_operator
+namespace autoware::mrm_comfortable_stop_operator
 {
 
 MrmComfortableStopOperator::MrmComfortableStopOperator(const rclcpp::NodeOptions & node_options)
@@ -123,7 +123,7 @@ void MrmComfortableStopOperator::onTimer() const
   publishStatus();
 }
 
-}  // namespace mrm_comfortable_stop_operator
+}  // namespace autoware::mrm_comfortable_stop_operator
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(mrm_comfortable_stop_operator::MrmComfortableStopOperator)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::mrm_comfortable_stop_operator::MrmComfortableStopOperator)
diff --git a/system/mrm_comfortable_stop_operator/CMakeLists.txt b/system/mrm_comfortable_stop_operator/CMakeLists.txt