From b4a3e1e142e3f158a06fcf59b797f7402641d83d Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Sun, 19 Jan 2025 20:24:18 +0900 Subject: [PATCH 1/8] feat(hazard_status_converter): apply `autoware_` prefix Signed-off-by: Junya Sasaki --- system/hazard_status_converter/CMakeLists.txt | 6 +++--- .../launch/hazard_status_converter.launch.xml | 2 +- system/hazard_status_converter/package.xml | 3 ++- system/hazard_status_converter/src/converter.cpp | 8 ++++---- system/hazard_status_converter/src/converter.hpp | 12 ++++++------ 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/system/hazard_status_converter/CMakeLists.txt b/system/hazard_status_converter/CMakeLists.txt index b253f9fc51f2b..b49a67f24a693 100644 --- a/system/hazard_status_converter/CMakeLists.txt +++ b/system/hazard_status_converter/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(hazard_status_converter) +project(autoware_hazard_status_converter) find_package(autoware_cmake REQUIRED) autoware_package() @@ -9,8 +9,8 @@ ament_auto_add_library(${PROJECT_NAME} SHARED ) rclcpp_components_register_node(${PROJECT_NAME} - PLUGIN "hazard_status_converter::Converter" - EXECUTABLE converter + PLUGIN "autoware::hazard_status_converter::Converter" + EXECUTABLE ${PROJECT_NAME}_node ) ament_auto_package(INSTALL_TO_SHARE launch) diff --git a/system/hazard_status_converter/launch/hazard_status_converter.launch.xml b/system/hazard_status_converter/launch/hazard_status_converter.launch.xml index 84318a921d4ce..26164c5ad50b0 100644 --- a/system/hazard_status_converter/launch/hazard_status_converter.launch.xml +++ b/system/hazard_status_converter/launch/hazard_status_converter.launch.xml @@ -1,5 +1,5 @@ - + diff --git a/system/hazard_status_converter/package.xml b/system/hazard_status_converter/package.xml index 80cc53c08e16d..412300df7202e 100644 --- a/system/hazard_status_converter/package.xml +++ b/system/hazard_status_converter/package.xml @@ -1,10 +1,11 @@ - hazard_status_converter + autoware_hazard_status_converter 0.40.0 The hazard_status_converter package Takagi, Isamu + Junya Sasaki Apache License 2.0 ament_cmake_auto diff --git a/system/hazard_status_converter/src/converter.cpp b/system/hazard_status_converter/src/converter.cpp index 52cfef93aa522..4745c27dca592 100644 --- a/system/hazard_status_converter/src/converter.cpp +++ b/system/hazard_status_converter/src/converter.cpp @@ -1,4 +1,4 @@ -// Copyright 2023 The Autoware Contributors +// Copyright 2025 The Autoware Contributors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ #include #include -namespace hazard_status_converter +namespace autoware::hazard_status_converter { Converter::Converter(const rclcpp::NodeOptions & options) : Node("converter", options) @@ -125,7 +125,7 @@ void Converter::on_update(DiagGraph::ConstSharedPtr graph) pub_hazard_->publish(hazard); } -} // namespace hazard_status_converter +} // namespace autoware::hazard_status_converter #include -RCLCPP_COMPONENTS_REGISTER_NODE(hazard_status_converter::Converter) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::hazard_status_converter::Converter) diff --git a/system/hazard_status_converter/src/converter.hpp b/system/hazard_status_converter/src/converter.hpp index 8011b911f3d42..359dc93223c6e 100644 --- a/system/hazard_status_converter/src/converter.hpp +++ b/system/hazard_status_converter/src/converter.hpp @@ -1,4 +1,4 @@ -// Copyright 2023 The Autoware Contributors +// Copyright 2025 The Autoware Contributors // // 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 CONVERTER_HPP_ -#define CONVERTER_HPP_ +#ifndef AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ +#define AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ #include #include @@ -24,7 +24,7 @@ #include -namespace hazard_status_converter +namespace autoware::hazard_status_converter { class Converter : public rclcpp::Node @@ -48,6 +48,6 @@ class Converter : public rclcpp::Node std::unordered_set auto_mode_tree_; }; -} // namespace hazard_status_converter +} // namespace autoware::hazard_status_converter -#endif // CONVERTER_HPP_ +#endif // AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ From 5a88be85a3b921c4d66e3cdb214df4f3595c9011 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Sun, 19 Jan 2025 20:26:29 +0900 Subject: [PATCH 2/8] rename: `hazard_status_converter` => `autoware_hazard_status_converter` Signed-off-by: Junya Sasaki --- .../CHANGELOG.rst | 0 .../CMakeLists.txt | 0 .../launch/hazard_status_converter.launch.xml | 0 .../package.xml | 0 .../src/converter.cpp | 0 .../src/converter.hpp | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename system/{hazard_status_converter => autoware_hazard_status_converter}/CHANGELOG.rst (100%) rename system/{hazard_status_converter => autoware_hazard_status_converter}/CMakeLists.txt (100%) rename system/{hazard_status_converter => autoware_hazard_status_converter}/launch/hazard_status_converter.launch.xml (100%) rename system/{hazard_status_converter => autoware_hazard_status_converter}/package.xml (100%) rename system/{hazard_status_converter => autoware_hazard_status_converter}/src/converter.cpp (100%) rename system/{hazard_status_converter => autoware_hazard_status_converter}/src/converter.hpp (100%) diff --git a/system/hazard_status_converter/CHANGELOG.rst b/system/autoware_hazard_status_converter/CHANGELOG.rst similarity index 100% rename from system/hazard_status_converter/CHANGELOG.rst rename to system/autoware_hazard_status_converter/CHANGELOG.rst diff --git a/system/hazard_status_converter/CMakeLists.txt b/system/autoware_hazard_status_converter/CMakeLists.txt similarity index 100% rename from system/hazard_status_converter/CMakeLists.txt rename to system/autoware_hazard_status_converter/CMakeLists.txt diff --git a/system/hazard_status_converter/launch/hazard_status_converter.launch.xml b/system/autoware_hazard_status_converter/launch/hazard_status_converter.launch.xml similarity index 100% rename from system/hazard_status_converter/launch/hazard_status_converter.launch.xml rename to system/autoware_hazard_status_converter/launch/hazard_status_converter.launch.xml diff --git a/system/hazard_status_converter/package.xml b/system/autoware_hazard_status_converter/package.xml similarity index 100% rename from system/hazard_status_converter/package.xml rename to system/autoware_hazard_status_converter/package.xml diff --git a/system/hazard_status_converter/src/converter.cpp b/system/autoware_hazard_status_converter/src/converter.cpp similarity index 100% rename from system/hazard_status_converter/src/converter.cpp rename to system/autoware_hazard_status_converter/src/converter.cpp diff --git a/system/hazard_status_converter/src/converter.hpp b/system/autoware_hazard_status_converter/src/converter.hpp similarity index 100% rename from system/hazard_status_converter/src/converter.hpp rename to system/autoware_hazard_status_converter/src/converter.hpp From 4d02451607b464b61f4821a5a81cfea449361ddd Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2025 11:31:08 +0000 Subject: [PATCH 3/8] style(pre-commit): autofix --- system/autoware_hazard_status_converter/src/converter.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/autoware_hazard_status_converter/src/converter.hpp b/system/autoware_hazard_status_converter/src/converter.hpp index 359dc93223c6e..a1fad4b93e2b6 100644 --- a/system/autoware_hazard_status_converter/src/converter.hpp +++ b/system/autoware_hazard_status_converter/src/converter.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ -#define AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ +#ifndef CONVERTER_HPP_ +#define CONVERTER_HPP_ #include #include @@ -50,4 +50,4 @@ class Converter : public rclcpp::Node } // namespace autoware::hazard_status_converter -#endif // AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ +#endif // CONVERTER_HPP_ From 4244cfa3421b83746294dc9721b880bc19e5b473 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Wed, 22 Jan 2025 14:38:25 +0900 Subject: [PATCH 4/8] bug(autoware_hazard_status_converter): revert wrongly updated copyrights Signed-off-by: Junya Sasaki --- system/autoware_hazard_status_converter/src/converter.cpp | 2 +- system/autoware_hazard_status_converter/src/converter.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/autoware_hazard_status_converter/src/converter.cpp b/system/autoware_hazard_status_converter/src/converter.cpp index 4745c27dca592..9faf4e186e06c 100644 --- a/system/autoware_hazard_status_converter/src/converter.cpp +++ b/system/autoware_hazard_status_converter/src/converter.cpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2023 The Autoware Contributors // // 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_hazard_status_converter/src/converter.hpp b/system/autoware_hazard_status_converter/src/converter.hpp index a1fad4b93e2b6..651ccdf45285c 100644 --- a/system/autoware_hazard_status_converter/src/converter.hpp +++ b/system/autoware_hazard_status_converter/src/converter.hpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2023 The Autoware Contributors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From 44df5c31921d00fb24ea6e54e1d5f4847cf3d2c3 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Wed, 22 Jan 2025 15:46:47 +0900 Subject: [PATCH 5/8] bug(autoware_hazard_status_converter): fix consistency bugs Signed-off-by: Junya Sasaki --- system/autoware_hazard_status_converter/src/converter.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/autoware_hazard_status_converter/src/converter.hpp b/system/autoware_hazard_status_converter/src/converter.hpp index 651ccdf45285c..03bde01f80854 100644 --- a/system/autoware_hazard_status_converter/src/converter.hpp +++ b/system/autoware_hazard_status_converter/src/converter.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef CONVERTER_HPP_ -#define CONVERTER_HPP_ +#ifndef AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ +#define AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ #include #include @@ -50,4 +50,4 @@ class Converter : public rclcpp::Node } // namespace autoware::hazard_status_converter -#endif // CONVERTER_HPP_ +#endif // AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ From 19b130618615c1bdabfc257836fdbc9d25349a92 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 07:07:33 +0000 Subject: [PATCH 6/8] style(pre-commit): autofix --- system/autoware_hazard_status_converter/src/converter.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/autoware_hazard_status_converter/src/converter.hpp b/system/autoware_hazard_status_converter/src/converter.hpp index 03bde01f80854..651ccdf45285c 100644 --- a/system/autoware_hazard_status_converter/src/converter.hpp +++ b/system/autoware_hazard_status_converter/src/converter.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ -#define AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ +#ifndef CONVERTER_HPP_ +#define CONVERTER_HPP_ #include #include @@ -50,4 +50,4 @@ class Converter : public rclcpp::Node } // namespace autoware::hazard_status_converter -#endif // AUTOWARE__HAZARD_STATUS_CONVERTER__CONVERTER_HPP_ +#endif // CONVERTER_HPP_ From 0da8d5e76a30d10492c526bdf2508b7ed5be632c Mon Sep 17 00:00:00 2001 From: Shintaro Sakoda Date: Thu, 23 Jan 2025 18:17:35 +0900 Subject: [PATCH 7/8] Fixed to autoware_hazard_status_converter Signed-off-by: Shintaro Sakoda --- launch/tier4_system_launch/launch/system.launch.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launch/tier4_system_launch/launch/system.launch.xml b/launch/tier4_system_launch/launch/system.launch.xml index c37db6bca4ffe..c9df58aee3bc9 100644 --- a/launch/tier4_system_launch/launch/system.launch.xml +++ b/launch/tier4_system_launch/launch/system.launch.xml @@ -100,7 +100,7 @@ - + From 5b22fda0be82f51932c576e18fa52179f1237a69 Mon Sep 17 00:00:00 2001 From: Ryohsuke Mitsudome Date: Fri, 24 Jan 2025 12:19:26 +0900 Subject: [PATCH 8/8] docs(autoware_hazard_status_converter): update package names in docs Signed-off-by: Ryohsuke Mitsudome --- system/autoware_hazard_status_converter/CHANGELOG.rst | 6 +++--- system/autoware_hazard_status_converter/package.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/autoware_hazard_status_converter/CHANGELOG.rst b/system/autoware_hazard_status_converter/CHANGELOG.rst index a0c8e0ae193d1..aca530f3acf9b 100644 --- a/system/autoware_hazard_status_converter/CHANGELOG.rst +++ b/system/autoware_hazard_status_converter/CHANGELOG.rst @@ -1,6 +1,6 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package hazard_status_converter -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package autoware_hazard_status_converter +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.40.0 (2024-12-12) ------------------- diff --git a/system/autoware_hazard_status_converter/package.xml b/system/autoware_hazard_status_converter/package.xml index 412300df7202e..f2f7d93c19132 100644 --- a/system/autoware_hazard_status_converter/package.xml +++ b/system/autoware_hazard_status_converter/package.xml @@ -3,7 +3,7 @@ autoware_hazard_status_converter 0.40.0 - The hazard_status_converter package + The autoware_hazard_status_converter package Takagi, Isamu Junya Sasaki Apache License 2.0