Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: apply autoware_ prefix for mrm_comfortable_stop_operator #10011

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ system/autoware_dummy_diag_publisher/** [email protected] tetsuhiro.kawaguch
system/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]
Expand Down
2 changes: 1 addition & 1 deletion launch/tier4_system_launch/launch/system.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
19 changes: 19 additions & 0 deletions system/autoware_mrm_comfortable_stop_operator/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
)
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -29,7 +29,7 @@
// ROS 2 core
#include <rclcpp/rclcpp.hpp>

namespace mrm_comfortable_stop_operator
namespace autoware::mrm_comfortable_stop_operator
{

struct Parameters
Expand Down Expand Up @@ -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_
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -123,7 +123,7 @@
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)

Check warning on line 129 in system/autoware_mrm_comfortable_stop_operator/src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp

View check run for this annotation

Codecov / codecov/patch

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

Added line #L129 was not covered by tests
18 changes: 0 additions & 18 deletions system/mrm_comfortable_stop_operator/CMakeLists.txt

This file was deleted.

Loading