From 3be94708607eb37bfedc85d118b809aaaa97f909 Mon Sep 17 00:00:00 2001 From: TetsuKawa Date: Sat, 18 Jan 2025 14:55:42 +0900 Subject: [PATCH 1/3] fic: add autoare_ prefix Signed-off-by: TetsuKawa --- .../CHANGELOG.rst | 0 .../CMakeLists.txt | 4 ++-- .../README.md | 2 +- .../config/_empty.param.yaml | 0 .../config/dummy_diag_publisher.param.yaml | 0 .../config/extra.param.yaml | 0 .../dummy_diag_publisher_core.hpp | 9 ++++++--- .../launch/dummy_diag_publisher.launch.xml | 6 +++--- .../launch/dummy_diag_publisher_node.launch.xml | 13 +++++++++++++ .../package.xml | 2 +- .../src/dummy_diag_publisher_core.cpp | 8 ++++---- .../launch/dummy_diag_publisher_node.launch.xml | 13 ------------- 12 files changed, 30 insertions(+), 27 deletions(-) rename system/{dummy_diag_publisher => autoware_dummy_diag_publisher}/CHANGELOG.rst (100%) rename system/{dummy_diag_publisher => autoware_dummy_diag_publisher}/CMakeLists.txt (76%) rename system/{dummy_diag_publisher => autoware_dummy_diag_publisher}/README.md (96%) rename system/{dummy_diag_publisher => autoware_dummy_diag_publisher}/config/_empty.param.yaml (100%) rename system/{dummy_diag_publisher => autoware_dummy_diag_publisher}/config/dummy_diag_publisher.param.yaml (100%) rename system/{dummy_diag_publisher => autoware_dummy_diag_publisher}/config/extra.param.yaml (100%) rename system/{dummy_diag_publisher/include => autoware_dummy_diag_publisher/include/autoware}/dummy_diag_publisher/dummy_diag_publisher_core.hpp (86%) rename system/{dummy_diag_publisher => autoware_dummy_diag_publisher}/launch/dummy_diag_publisher.launch.xml (81%) create mode 100644 system/autoware_dummy_diag_publisher/launch/dummy_diag_publisher_node.launch.xml rename system/{dummy_diag_publisher => autoware_dummy_diag_publisher}/package.xml (95%) rename system/{dummy_diag_publisher => autoware_dummy_diag_publisher}/src/dummy_diag_publisher_core.cpp (96%) delete mode 100644 system/dummy_diag_publisher/launch/dummy_diag_publisher_node.launch.xml diff --git a/system/dummy_diag_publisher/CHANGELOG.rst b/system/autoware_dummy_diag_publisher/CHANGELOG.rst similarity index 100% rename from system/dummy_diag_publisher/CHANGELOG.rst rename to system/autoware_dummy_diag_publisher/CHANGELOG.rst diff --git a/system/dummy_diag_publisher/CMakeLists.txt b/system/autoware_dummy_diag_publisher/CMakeLists.txt similarity index 76% rename from system/dummy_diag_publisher/CMakeLists.txt rename to system/autoware_dummy_diag_publisher/CMakeLists.txt index 794e7d35e1194..73e354b7d4d84 100644 --- a/system/dummy_diag_publisher/CMakeLists.txt +++ b/system/autoware_dummy_diag_publisher/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(dummy_diag_publisher) +project(autoware_dummy_diag_publisher) 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 "DummyDiagPublisher" + PLUGIN "autoware::dummy_diag_publisher::DummyDiagPublisher" EXECUTABLE ${PROJECT_NAME}_node ) diff --git a/system/dummy_diag_publisher/README.md b/system/autoware_dummy_diag_publisher/README.md similarity index 96% rename from system/dummy_diag_publisher/README.md rename to system/autoware_dummy_diag_publisher/README.md index 9704cc4af9bc5..759ae509c29a1 100644 --- a/system/dummy_diag_publisher/README.md +++ b/system/autoware_dummy_diag_publisher/README.md @@ -42,7 +42,7 @@ TBD. ### launch ```sh -ros2 launch dummy_diag_publisher dummy_diag_publisher.launch.xml +ros2 launch autoware_dummy_diag_publisher dummy_diag_publisher.launch.xml ``` ### reconfigure diff --git a/system/dummy_diag_publisher/config/_empty.param.yaml b/system/autoware_dummy_diag_publisher/config/_empty.param.yaml similarity index 100% rename from system/dummy_diag_publisher/config/_empty.param.yaml rename to system/autoware_dummy_diag_publisher/config/_empty.param.yaml diff --git a/system/dummy_diag_publisher/config/dummy_diag_publisher.param.yaml b/system/autoware_dummy_diag_publisher/config/dummy_diag_publisher.param.yaml similarity index 100% rename from system/dummy_diag_publisher/config/dummy_diag_publisher.param.yaml rename to system/autoware_dummy_diag_publisher/config/dummy_diag_publisher.param.yaml diff --git a/system/dummy_diag_publisher/config/extra.param.yaml b/system/autoware_dummy_diag_publisher/config/extra.param.yaml similarity index 100% rename from system/dummy_diag_publisher/config/extra.param.yaml rename to system/autoware_dummy_diag_publisher/config/extra.param.yaml diff --git a/system/dummy_diag_publisher/include/dummy_diag_publisher/dummy_diag_publisher_core.hpp b/system/autoware_dummy_diag_publisher/include/autoware/dummy_diag_publisher/dummy_diag_publisher_core.hpp similarity index 86% rename from system/dummy_diag_publisher/include/dummy_diag_publisher/dummy_diag_publisher_core.hpp rename to system/autoware_dummy_diag_publisher/include/autoware/dummy_diag_publisher/dummy_diag_publisher_core.hpp index 64e2e0426046d..4e3c63665b835 100644 --- a/system/dummy_diag_publisher/include/dummy_diag_publisher/dummy_diag_publisher_core.hpp +++ b/system/autoware_dummy_diag_publisher/include/autoware/dummy_diag_publisher/dummy_diag_publisher_core.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_ -#define DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_ +#ifndef AUTOWARE__DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_ +#define AUTOWARE__DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_ #include @@ -23,6 +23,8 @@ #include #include +namespace autoware::dummy_diag_publisher +{ struct DiagConfig { std::string hardware_id; @@ -75,5 +77,6 @@ class DummyDiagPublisher : public rclcpp::Node rclcpp::TimerBase::SharedPtr timer_; rclcpp::Publisher::SharedPtr pub_; }; + } // namespace autoware::dummy_diag_publisher -#endif // DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_ +#endif // AUTOWARE__DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_ diff --git a/system/dummy_diag_publisher/launch/dummy_diag_publisher.launch.xml b/system/autoware_dummy_diag_publisher/launch/dummy_diag_publisher.launch.xml similarity index 81% rename from system/dummy_diag_publisher/launch/dummy_diag_publisher.launch.xml rename to system/autoware_dummy_diag_publisher/launch/dummy_diag_publisher.launch.xml index ae4436fdc9a6d..0c5ec80815c94 100644 --- a/system/dummy_diag_publisher/launch/dummy_diag_publisher.launch.xml +++ b/system/autoware_dummy_diag_publisher/launch/dummy_diag_publisher.launch.xml @@ -1,6 +1,6 @@ - - + + @@ -26,7 +26,7 @@ - + diff --git a/system/autoware_dummy_diag_publisher/launch/dummy_diag_publisher_node.launch.xml b/system/autoware_dummy_diag_publisher/launch/dummy_diag_publisher_node.launch.xml new file mode 100644 index 0000000000000..4527c5fe21c01 --- /dev/null +++ b/system/autoware_dummy_diag_publisher/launch/dummy_diag_publisher_node.launch.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/system/dummy_diag_publisher/package.xml b/system/autoware_dummy_diag_publisher/package.xml similarity index 95% rename from system/dummy_diag_publisher/package.xml rename to system/autoware_dummy_diag_publisher/package.xml index e6b0302216e14..d9e212f922102 100644 --- a/system/dummy_diag_publisher/package.xml +++ b/system/autoware_dummy_diag_publisher/package.xml @@ -1,7 +1,7 @@ - dummy_diag_publisher + autoware_dummy_diag_publisher 0.40.0 The dummy_diag_publisher ROS 2 package Fumihito Ito diff --git a/system/dummy_diag_publisher/src/dummy_diag_publisher_core.cpp b/system/autoware_dummy_diag_publisher/src/dummy_diag_publisher_core.cpp similarity index 96% rename from system/dummy_diag_publisher/src/dummy_diag_publisher_core.cpp rename to system/autoware_dummy_diag_publisher/src/dummy_diag_publisher_core.cpp index 5d0e4ee0316cf..57473e1562620 100644 --- a/system/dummy_diag_publisher/src/dummy_diag_publisher_core.cpp +++ b/system/autoware_dummy_diag_publisher/src/dummy_diag_publisher_core.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dummy_diag_publisher/dummy_diag_publisher_core.hpp" +#include "autoware/dummy_diag_publisher/dummy_diag_publisher_core.hpp" #include #include @@ -24,7 +24,7 @@ #include -namespace +namespace autoware::dummy_diag_publisher { std::vector split(const std::string & str, const char delim) { @@ -36,7 +36,6 @@ std::vector split(const std::string & str, const char delim) } return elems; } -} // namespace std::optional DummyDiagPublisher::convertStrToStatus( const std::string & status_str) @@ -226,6 +225,7 @@ DummyDiagPublisher::DummyDiagPublisher(const rclcpp::NodeOptions & options) param_callback_handle_ = this->add_on_set_parameters_callback( std::bind(&DummyDiagPublisher::onSetParams, this, std::placeholders::_1)); } +} // namespace autoware::dummy_diag_publisher #include -RCLCPP_COMPONENTS_REGISTER_NODE(DummyDiagPublisher) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::dummy_diag_publisher::DummyDiagPublisher) diff --git a/system/dummy_diag_publisher/launch/dummy_diag_publisher_node.launch.xml b/system/dummy_diag_publisher/launch/dummy_diag_publisher_node.launch.xml deleted file mode 100644 index 9d9193fb5f7a7..0000000000000 --- a/system/dummy_diag_publisher/launch/dummy_diag_publisher_node.launch.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - From f22e5723cd1aecbd06095cc07f713d5759f57540 Mon Sep 17 00:00:00 2001 From: TetsuKawa Date: Sat, 18 Jan 2025 14:57:48 +0900 Subject: [PATCH 2/3] fix: add autoare_ prefix codeowner Signed-off-by: TetsuKawa --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4fea7c85e1926..abc0ac42f7d43 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -217,7 +217,7 @@ system/default_ad_api_helpers/ad_api_visualizers/** isamu.takagi@tier4.jp ryohsu system/default_ad_api_helpers/automatic_pose_initializer/** isamu.takagi@tier4.jp ryohsuke.mitsudome@tier4.jp yukihiro.saito@tier4.jp system/diagnostic_graph_aggregator/** isamu.takagi@tier4.jp system/diagnostic_graph_utils/** isamu.takagi@tier4.jp -system/dummy_diag_publisher/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp +system/autoware_dummy_diag_publisher/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp system/dummy_infrastructure/** ryohsuke.mitsudome@tier4.jp system/duplicated_node_checker/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp uken.ryu@tier4.jp system/hazard_status_converter/** isamu.takagi@tier4.jp From 8581431f85d2b5086e30feef4dc488daf03e343f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2025 06:08:40 +0000 Subject: [PATCH 3/3] style(pre-commit): autofix --- .../autoware/dummy_diag_publisher/dummy_diag_publisher_core.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/autoware_dummy_diag_publisher/include/autoware/dummy_diag_publisher/dummy_diag_publisher_core.hpp b/system/autoware_dummy_diag_publisher/include/autoware/dummy_diag_publisher/dummy_diag_publisher_core.hpp index 4e3c63665b835..e94085fcff560 100644 --- a/system/autoware_dummy_diag_publisher/include/autoware/dummy_diag_publisher/dummy_diag_publisher_core.hpp +++ b/system/autoware_dummy_diag_publisher/include/autoware/dummy_diag_publisher/dummy_diag_publisher_core.hpp @@ -77,6 +77,6 @@ class DummyDiagPublisher : public rclcpp::Node rclcpp::TimerBase::SharedPtr timer_; rclcpp::Publisher::SharedPtr pub_; }; - } // namespace autoware::dummy_diag_publisher +} // namespace autoware::dummy_diag_publisher #endif // AUTOWARE__DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_