From 801e643d80ab61b554f2f8d2159ed6129607ebd2 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Sun, 19 Jan 2025 19:39:12 +0900 Subject: [PATCH 1/9] feat(dummy_infrastructure): 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 --- system/dummy_infrastructure/CMakeLists.txt | 10 +++++----- .../dummy_infrastructure_node.hpp | 12 ++++++------ .../launch/dummy_infrastructure.launch.xml | 4 ++-- system/dummy_infrastructure/package.xml | 3 ++- .../dummy_infrastructure_node.cpp | 8 ++++---- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/system/dummy_infrastructure/CMakeLists.txt b/system/dummy_infrastructure/CMakeLists.txt index 5d3d39d02365d..dc025c8d643f1 100644 --- a/system/dummy_infrastructure/CMakeLists.txt +++ b/system/dummy_infrastructure/CMakeLists.txt @@ -1,16 +1,16 @@ cmake_minimum_required(VERSION 3.14) -project(dummy_infrastructure) +project(autoware_dummy_infrastructure) find_package(autoware_cmake REQUIRED) autoware_package() -ament_auto_add_library(dummy_infrastructure_node_component SHARED +ament_auto_add_library(autoware_dummy_infrastructure_node_component SHARED src/dummy_infrastructure_node/dummy_infrastructure_node.cpp ) -rclcpp_components_register_node(dummy_infrastructure_node_component - PLUGIN "dummy_infrastructure::DummyInfrastructureNode" - EXECUTABLE dummy_infrastructure_node +rclcpp_components_register_node(autoware_dummy_infrastructure_node_component + PLUGIN "autoware::dummy_infrastructure::DummyInfrastructureNode" + EXECUTABLE ${PROJECT_NAME}_node ) ament_auto_package( diff --git a/system/dummy_infrastructure/include/dummy_infrastructure/dummy_infrastructure_node.hpp b/system/dummy_infrastructure/include/dummy_infrastructure/dummy_infrastructure_node.hpp index 38d41750610b1..22f6eb008c45f 100644 --- a/system/dummy_infrastructure/include/dummy_infrastructure/dummy_infrastructure_node.hpp +++ b/system/dummy_infrastructure/include/dummy_infrastructure/dummy_infrastructure_node.hpp @@ -1,4 +1,4 @@ -// Copyright 2021 Tier IV +// Copyright 2025 Tier IV // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DUMMY_INFRASTRUCTURE__DUMMY_INFRASTRUCTURE_NODE_HPP_ -#define DUMMY_INFRASTRUCTURE__DUMMY_INFRASTRUCTURE_NODE_HPP_ +#ifndef AUTOWARE__DUMMY_INFRASTRUCTURE__DUMMY_INFRASTRUCTURE_NODE_HPP_ +#define AUTOWARE__DUMMY_INFRASTRUCTURE__DUMMY_INFRASTRUCTURE_NODE_HPP_ #include @@ -25,7 +25,7 @@ #include #include -namespace dummy_infrastructure +namespace autoware::dummy_infrastructure { using tier4_v2x_msgs::msg::InfrastructureCommand; using tier4_v2x_msgs::msg::InfrastructureCommandArray; @@ -75,6 +75,6 @@ class DummyInfrastructureNode : public rclcpp::Node NodeParam node_param_{}; }; -} // namespace dummy_infrastructure +} // namespace autoware::dummy_infrastructure -#endif // DUMMY_INFRASTRUCTURE__DUMMY_INFRASTRUCTURE_NODE_HPP_ +#endif // AUTOWARE__DUMMY_INFRASTRUCTURE__DUMMY_INFRASTRUCTURE_NODE_HPP_ diff --git a/system/dummy_infrastructure/launch/dummy_infrastructure.launch.xml b/system/dummy_infrastructure/launch/dummy_infrastructure.launch.xml index bc45abdebec70..8dea215e4a546 100644 --- a/system/dummy_infrastructure/launch/dummy_infrastructure.launch.xml +++ b/system/dummy_infrastructure/launch/dummy_infrastructure.launch.xml @@ -7,10 +7,10 @@ - + - + diff --git a/system/dummy_infrastructure/package.xml b/system/dummy_infrastructure/package.xml index 49c1b00757094..70fd5b1da88be 100644 --- a/system/dummy_infrastructure/package.xml +++ b/system/dummy_infrastructure/package.xml @@ -1,10 +1,11 @@ - dummy_infrastructure + autoware_dummy_infrastructure 0.40.0 dummy_infrastructure Ryohsuke Mitsudome + Junya Sasaki Apache License 2.0 ament_cmake_auto diff --git a/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp b/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp index 4760c9366da46..21800e92a0d27 100644 --- a/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp +++ b/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp @@ -1,4 +1,4 @@ -// Copyright 2021 Tier IV +// Copyright 2025 Tier IV // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ using std::chrono::duration; using std::chrono::duration_cast; using std::chrono::nanoseconds; -namespace dummy_infrastructure +namespace autoware::dummy_infrastructure { namespace { @@ -192,7 +192,7 @@ void DummyInfrastructureNode::onTimer() pub_state_array_->publish(state_array); } -} // namespace dummy_infrastructure +} // namespace autoware::dummy_infrastructure #include -RCLCPP_COMPONENTS_REGISTER_NODE(dummy_infrastructure::DummyInfrastructureNode) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::dummy_infrastructure::DummyInfrastructureNode) From 12f3df133dc47edf6a0bfb42c242a0324c14bf30 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Sun, 19 Jan 2025 19:40:34 +0900 Subject: [PATCH 2/9] rename(dummy_infrastructure): 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 --- .../dummy_infrastructure/dummy_infrastructure_node.hpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename system/dummy_infrastructure/include/{ => autoware}/dummy_infrastructure/dummy_infrastructure_node.hpp (100%) diff --git a/system/dummy_infrastructure/include/dummy_infrastructure/dummy_infrastructure_node.hpp b/system/dummy_infrastructure/include/autoware/dummy_infrastructure/dummy_infrastructure_node.hpp similarity index 100% rename from system/dummy_infrastructure/include/dummy_infrastructure/dummy_infrastructure_node.hpp rename to system/dummy_infrastructure/include/autoware/dummy_infrastructure/dummy_infrastructure_node.hpp From ce628e0ef52ca47e0c6c89166b1836db94e88847 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Sun, 19 Jan 2025 19:42:53 +0900 Subject: [PATCH 3/9] fix(dummy_infrastructure): fix include header path * To follow the previous commit Signed-off-by: Junya Sasaki --- .../src/dummy_infrastructure_node/dummy_infrastructure_node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp b/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp index 21800e92a0d27..c4a37c6e6e340 100644 --- a/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp +++ b/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dummy_infrastructure/dummy_infrastructure_node.hpp" +#include "autoware/dummy_infrastructure/dummy_infrastructure_node.hpp" #include From 20a4a2e1eb88a76a42b9bf06c5a19ee062bcb1bf Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Sun, 19 Jan 2025 19:43:56 +0900 Subject: [PATCH 4/9] rename: `dummy_infrastructure` => `autoware_dummy_infrastructure` Signed-off-by: Junya Sasaki --- .../CHANGELOG.rst | 0 .../CMakeLists.txt | 0 .../README.md | 0 .../config/dummy_infrastructure.param.yaml | 0 .../autoware/dummy_infrastructure/dummy_infrastructure_node.hpp | 0 .../launch/dummy_infrastructure.launch.xml | 0 .../package.xml | 0 .../schema/dummy_infrastructure.schema.json | 0 .../src/dummy_infrastructure_node/dummy_infrastructure_node.cpp | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename system/{dummy_infrastructure => autoware_dummy_infrastructure}/CHANGELOG.rst (100%) rename system/{dummy_infrastructure => autoware_dummy_infrastructure}/CMakeLists.txt (100%) rename system/{dummy_infrastructure => autoware_dummy_infrastructure}/README.md (100%) rename system/{dummy_infrastructure => autoware_dummy_infrastructure}/config/dummy_infrastructure.param.yaml (100%) rename system/{dummy_infrastructure => autoware_dummy_infrastructure}/include/autoware/dummy_infrastructure/dummy_infrastructure_node.hpp (100%) rename system/{dummy_infrastructure => autoware_dummy_infrastructure}/launch/dummy_infrastructure.launch.xml (100%) rename system/{dummy_infrastructure => autoware_dummy_infrastructure}/package.xml (100%) rename system/{dummy_infrastructure => autoware_dummy_infrastructure}/schema/dummy_infrastructure.schema.json (100%) rename system/{dummy_infrastructure => autoware_dummy_infrastructure}/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp (100%) diff --git a/system/dummy_infrastructure/CHANGELOG.rst b/system/autoware_dummy_infrastructure/CHANGELOG.rst similarity index 100% rename from system/dummy_infrastructure/CHANGELOG.rst rename to system/autoware_dummy_infrastructure/CHANGELOG.rst diff --git a/system/dummy_infrastructure/CMakeLists.txt b/system/autoware_dummy_infrastructure/CMakeLists.txt similarity index 100% rename from system/dummy_infrastructure/CMakeLists.txt rename to system/autoware_dummy_infrastructure/CMakeLists.txt diff --git a/system/dummy_infrastructure/README.md b/system/autoware_dummy_infrastructure/README.md similarity index 100% rename from system/dummy_infrastructure/README.md rename to system/autoware_dummy_infrastructure/README.md diff --git a/system/dummy_infrastructure/config/dummy_infrastructure.param.yaml b/system/autoware_dummy_infrastructure/config/dummy_infrastructure.param.yaml similarity index 100% rename from system/dummy_infrastructure/config/dummy_infrastructure.param.yaml rename to system/autoware_dummy_infrastructure/config/dummy_infrastructure.param.yaml diff --git a/system/dummy_infrastructure/include/autoware/dummy_infrastructure/dummy_infrastructure_node.hpp b/system/autoware_dummy_infrastructure/include/autoware/dummy_infrastructure/dummy_infrastructure_node.hpp similarity index 100% rename from system/dummy_infrastructure/include/autoware/dummy_infrastructure/dummy_infrastructure_node.hpp rename to system/autoware_dummy_infrastructure/include/autoware/dummy_infrastructure/dummy_infrastructure_node.hpp diff --git a/system/dummy_infrastructure/launch/dummy_infrastructure.launch.xml b/system/autoware_dummy_infrastructure/launch/dummy_infrastructure.launch.xml similarity index 100% rename from system/dummy_infrastructure/launch/dummy_infrastructure.launch.xml rename to system/autoware_dummy_infrastructure/launch/dummy_infrastructure.launch.xml diff --git a/system/dummy_infrastructure/package.xml b/system/autoware_dummy_infrastructure/package.xml similarity index 100% rename from system/dummy_infrastructure/package.xml rename to system/autoware_dummy_infrastructure/package.xml diff --git a/system/dummy_infrastructure/schema/dummy_infrastructure.schema.json b/system/autoware_dummy_infrastructure/schema/dummy_infrastructure.schema.json similarity index 100% rename from system/dummy_infrastructure/schema/dummy_infrastructure.schema.json rename to system/autoware_dummy_infrastructure/schema/dummy_infrastructure.schema.json diff --git a/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp b/system/autoware_dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp similarity index 100% rename from system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp rename to system/autoware_dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp From 6f2a984fd2b63bd70afa566ef8e0b7b34e44c554 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Wed, 22 Jan 2025 14:25:13 +0900 Subject: [PATCH 5/9] bug(autoware_dummy_infrastructure): revert wrongly updated copyrights Signed-off-by: Junya Sasaki --- .../autoware/dummy_infrastructure/dummy_infrastructure_node.hpp | 2 +- .../src/dummy_infrastructure_node/dummy_infrastructure_node.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/autoware_dummy_infrastructure/include/autoware/dummy_infrastructure/dummy_infrastructure_node.hpp b/system/autoware_dummy_infrastructure/include/autoware/dummy_infrastructure/dummy_infrastructure_node.hpp index 22f6eb008c45f..10f7f81f4e7ff 100644 --- a/system/autoware_dummy_infrastructure/include/autoware/dummy_infrastructure/dummy_infrastructure_node.hpp +++ b/system/autoware_dummy_infrastructure/include/autoware/dummy_infrastructure/dummy_infrastructure_node.hpp @@ -1,4 +1,4 @@ -// Copyright 2025 Tier IV +// Copyright 2021 Tier IV // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/system/autoware_dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp b/system/autoware_dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp index c4a37c6e6e340..2f1500e7db1e0 100644 --- a/system/autoware_dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp +++ b/system/autoware_dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp @@ -1,4 +1,4 @@ -// Copyright 2025 Tier IV +// Copyright 2021 Tier IV // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From 58228521f4e2cd7068efc659d2a0eedaf10d6e5a Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Wed, 22 Jan 2025 14:29:00 +0900 Subject: [PATCH 6/9] update(autoware_dummy_infrastructure): `README.md` Signed-off-by: Junya Sasaki --- system/autoware_dummy_infrastructure/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/autoware_dummy_infrastructure/README.md b/system/autoware_dummy_infrastructure/README.md index d032bfa1a7e3d..9cc908f950828 100644 --- a/system/autoware_dummy_infrastructure/README.md +++ b/system/autoware_dummy_infrastructure/README.md @@ -5,7 +5,7 @@ This is a debug node for infrastructure communication. ## Usage ```sh -ros2 launch dummy_infrastructure dummy_infrastructure.launch.xml +ros2 launch autoware_dummy_infrastructure dummy_infrastructure.launch.xml ros2 run rqt_reconfigure rqt_reconfigure ``` From 56dc46cf2de5c35b2797afafd5f70e17308249af Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Wed, 22 Jan 2025 14:29:42 +0900 Subject: [PATCH 7/9] update: `CODEOWNERS` Signed-off-by: Junya Sasaki --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7ee7e376111cc..e0ca92b36fe57 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -218,7 +218,7 @@ system/default_ad_api_helpers/automatic_pose_initializer/** isamu.takagi@tier4.j system/diagnostic_graph_aggregator/** isamu.takagi@tier4.jp system/diagnostic_graph_utils/** isamu.takagi@tier4.jp system/autoware_dummy_diag_publisher/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp -system/dummy_infrastructure/** ryohsuke.mitsudome@tier4.jp +system/autoware_dummy_infrastructure/** ryohsuke.mitsudome@tier4.jp junya.sasaki@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 system/mrm_comfortable_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@tier4.jp From 1f257b6599c7c44572cd120f9d12554e2ed33498 Mon Sep 17 00:00:00 2001 From: Ryohsuke Mitsudome Date: Wed, 22 Jan 2025 22:58:59 +0900 Subject: [PATCH 8/9] fix(autoware_dummy_infrastructure): fix package name in CHANGELOG.rst Signed-off-by: Ryohsuke Mitsudome --- system/autoware_dummy_infrastructure/CHANGELOG.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/autoware_dummy_infrastructure/CHANGELOG.rst b/system/autoware_dummy_infrastructure/CHANGELOG.rst index 50ecdd8d7fa96..f42190ddc4b82 100644 --- a/system/autoware_dummy_infrastructure/CHANGELOG.rst +++ b/system/autoware_dummy_infrastructure/CHANGELOG.rst @@ -1,6 +1,6 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package dummy_infrastructure -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package autoware_dummy_infrastructure +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.40.0 (2024-12-12) ------------------- From 1b83cb13e58f7c0ef549f2e46c1db4db3679b14c Mon Sep 17 00:00:00 2001 From: Ryohsuke Mitsudome Date: Wed, 22 Jan 2025 23:00:09 +0900 Subject: [PATCH 9/9] docs(autoware_dummy_infrastructure): fix package name in README and package description Signed-off-by: Ryohsuke Mitsudome --- system/autoware_dummy_infrastructure/README.md | 2 +- system/autoware_dummy_infrastructure/package.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/autoware_dummy_infrastructure/README.md b/system/autoware_dummy_infrastructure/README.md index 9cc908f950828..a070489ec0513 100644 --- a/system/autoware_dummy_infrastructure/README.md +++ b/system/autoware_dummy_infrastructure/README.md @@ -1,4 +1,4 @@ -# dummy_infrastructure +# autoware_dummy_infrastructure This is a debug node for infrastructure communication. diff --git a/system/autoware_dummy_infrastructure/package.xml b/system/autoware_dummy_infrastructure/package.xml index 70fd5b1da88be..fd710eb1efeb0 100644 --- a/system/autoware_dummy_infrastructure/package.xml +++ b/system/autoware_dummy_infrastructure/package.xml @@ -3,7 +3,7 @@ autoware_dummy_infrastructure 0.40.0 - dummy_infrastructure + autoware_dummy_infrastructure Ryohsuke Mitsudome Junya Sasaki Apache License 2.0