Skip to content

Commit 972f445

Browse files
authored
feat: apply autoware_ prefix for mrm_comfortable_stop_operator (autowarefoundation#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 <junya.sasaki@tier4.jp> * 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 <junya.sasaki@tier4.jp> * fix(mrm_comfortable_stop_operator): fix include header path * To follow the previous commit Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp> * rename: `mrm_comfortable_stop_operator` => `autoware_mrm_comfortable_stop_operator` Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp> * update: `CODEOWNERS` Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp> --------- Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp>
1 parent c53af8a commit 972f445

File tree

11 files changed

+35
-33
lines changed

11 files changed

+35
-33
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ system/autoware_dummy_diag_publisher/** fumihito.ito@tier4.jp tetsuhiro.kawaguch
221221
system/autoware_dummy_infrastructure/** ryohsuke.mitsudome@tier4.jp
222222
system/autoware_duplicated_node_checker/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp uken.ryu@tier4.jp junya.sasaki@tier4.jp
223223
system/hazard_status_converter/** isamu.takagi@tier4.jp
224-
system/mrm_comfortable_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@tier4.jp
224+
system/autoware_mrm_comfortable_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@tier4.jp junya.sasaki@tier4.jp
225225
system/mrm_emergency_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@tier4.jp
226226
system/mrm_handler/** makoto.kurihara@tier4.jp ryuta.kambe@tier4.jp tetsuhiro.kawaguchi@tier4.jp
227227
system/system_diagnostic_monitor/** isamu.takagi@tier4.jp

launch/tier4_system_launch/launch/system.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181
<!-- MRM Operator -->
8282
<group>
83-
<include file="$(find-pkg-share mrm_comfortable_stop_operator)/launch/mrm_comfortable_stop_operator.launch.py">
83+
<include file="$(find-pkg-share autoware_mrm_comfortable_stop_operator)/launch/mrm_comfortable_stop_operator.launch.py">
8484
<arg name="config_file" value="$(var mrm_comfortable_stop_operator_param_path)"/>
8585
</include>
8686
</group>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
cmake_minimum_required(VERSION 3.14)
2+
project(autoware_mrm_comfortable_stop_operator)
3+
4+
find_package(autoware_cmake REQUIRED)
5+
autoware_package()
6+
7+
ament_auto_add_library(${PROJECT_NAME}_component SHARED
8+
src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp
9+
)
10+
11+
rclcpp_components_register_node(${PROJECT_NAME}_component
12+
PLUGIN "autoware::mrm_comfortable_stop_operator::MrmComfortableStopOperator"
13+
EXECUTABLE ${PROJECT_NAME}_node
14+
)
15+
16+
ament_auto_package(INSTALL_TO_SHARE
17+
launch
18+
config
19+
)

system/mrm_comfortable_stop_operator/include/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp system/autoware_mrm_comfortable_stop_operator/include/autoware/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
16-
#define MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
15+
#ifndef AUTOWARE__MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
16+
#define AUTOWARE__MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
1717

1818
// Core
1919
#include <memory>
@@ -29,7 +29,7 @@
2929
// ROS 2 core
3030
#include <rclcpp/rclcpp.hpp>
3131

32-
namespace mrm_comfortable_stop_operator
32+
namespace autoware::mrm_comfortable_stop_operator
3333
{
3434

3535
struct Parameters
@@ -81,6 +81,6 @@ class MrmComfortableStopOperator : public rclcpp::Node
8181
OnSetParametersCallbackHandle::SharedPtr set_param_res_;
8282
};
8383

84-
} // namespace mrm_comfortable_stop_operator
84+
} // namespace autoware::mrm_comfortable_stop_operator
8585

86-
#endif // MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
86+
#endif // AUTOWARE__MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_

system/mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py system/autoware_mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ def launch_setup(context, *args, **kwargs):
2828
params = yaml.safe_load(f)["/**"]["ros__parameters"]
2929

3030
component = ComposableNode(
31-
package="mrm_comfortable_stop_operator",
32-
plugin="mrm_comfortable_stop_operator::MrmComfortableStopOperator",
31+
package="autoware_mrm_comfortable_stop_operator",
32+
plugin="autoware::mrm_comfortable_stop_operator::MrmComfortableStopOperator",
3333
name="mrm_comfortable_stop_operator",
3434
parameters=[
3535
params,
@@ -61,7 +61,7 @@ def generate_launch_description():
6161
DeclareLaunchArgument(
6262
"config_file",
6363
default_value=[
64-
FindPackageShare("mrm_comfortable_stop_operator"),
64+
FindPackageShare("autoware_mrm_comfortable_stop_operator"),
6565
"/config/mrm_comfortable_stop_operator.param.yaml",
6666
],
6767
description="path to the parameter file of mrm_comfortable_stop_operator",

system/mrm_comfortable_stop_operator/package.xml system/autoware_mrm_comfortable_stop_operator/package.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>mrm_comfortable_stop_operator</name>
4+
<name>autoware_mrm_comfortable_stop_operator</name>
55
<version>0.40.0</version>
66
<description>The MRM comfortable stop operator package</description>
77
<maintainer email="makoto.kurihara@tier4.jp">Makoto Kurihara</maintainer>
88
<maintainer email="tomohito.ando@tier4.jp">Tomohito Ando</maintainer>
9+
<maintainer email="junya.sasaki@tier4.jp">Junya Sasaki</maintainer>
910
<license>Apache License 2.0</license>
1011

1112
<buildtool_depend>ament_cmake_auto</buildtool_depend>

system/mrm_comfortable_stop_operator/src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp system/autoware_mrm_comfortable_stop_operator/src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp"
15+
#include "autoware/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp"
1616

1717
#include <autoware/universe_utils/ros/update_param.hpp>
1818

1919
#include <vector>
2020

21-
namespace mrm_comfortable_stop_operator
21+
namespace autoware::mrm_comfortable_stop_operator
2222
{
2323

2424
MrmComfortableStopOperator::MrmComfortableStopOperator(const rclcpp::NodeOptions & node_options)
@@ -123,7 +123,7 @@ void MrmComfortableStopOperator::onTimer() const
123123
publishStatus();
124124
}
125125

126-
} // namespace mrm_comfortable_stop_operator
126+
} // namespace autoware::mrm_comfortable_stop_operator
127127

128128
#include <rclcpp_components/register_node_macro.hpp>
129-
RCLCPP_COMPONENTS_REGISTER_NODE(mrm_comfortable_stop_operator::MrmComfortableStopOperator)
129+
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::mrm_comfortable_stop_operator::MrmComfortableStopOperator)

system/mrm_comfortable_stop_operator/CMakeLists.txt

-18
This file was deleted.

0 commit comments

Comments
 (0)