From d5bc291c715faa29dccda1de37ddc721ea666fc5 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Sun, 19 Jan 2025 18:13:38 +0900 Subject: [PATCH 01/15] feat(diagnostic_graph_utils): apply `autoware_` prefix 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/diagnostic_graph_utils/CMakeLists.txt | 14 +++++++------- .../include/diagnostic_graph_utils/graph.hpp | 12 ++++++------ .../diagnostic_graph_utils/subscription.hpp | 12 ++++++------ .../launch/logging.launch.xml | 2 +- system/diagnostic_graph_utils/package.xml | 3 ++- system/diagnostic_graph_utils/src/lib/graph.cpp | 6 +++--- .../src/lib/subscription.cpp | 6 +++--- .../diagnostic_graph_utils/src/node/converter.cpp | 8 ++++---- .../diagnostic_graph_utils/src/node/converter.hpp | 12 ++++++------ system/diagnostic_graph_utils/src/node/dump.cpp | 8 ++++---- system/diagnostic_graph_utils/src/node/dump.hpp | 12 ++++++------ system/diagnostic_graph_utils/src/node/logging.cpp | 8 ++++---- system/diagnostic_graph_utils/src/node/logging.hpp | 12 ++++++------ 13 files changed, 58 insertions(+), 57 deletions(-) diff --git a/system/diagnostic_graph_utils/CMakeLists.txt b/system/diagnostic_graph_utils/CMakeLists.txt index 0c36964f49237..937a5cc5493ba 100644 --- a/system/diagnostic_graph_utils/CMakeLists.txt +++ b/system/diagnostic_graph_utils/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(diagnostic_graph_utils) +project(autoware_diagnostic_graph_utils) find_package(autoware_cmake REQUIRED) autoware_package() @@ -16,18 +16,18 @@ ament_auto_add_library(${PROJECT_NAME}_tools SHARED ) rclcpp_components_register_node(${PROJECT_NAME}_tools - PLUGIN "diagnostic_graph_utils::DumpNode" - EXECUTABLE dump_node + PLUGIN "autoware::diagnostic_graph_utils::DumpNode" + EXECUTABLE autoware_dump_node ) rclcpp_components_register_node(${PROJECT_NAME}_tools - PLUGIN "diagnostic_graph_utils::ConverterNode" - EXECUTABLE converter_node + PLUGIN "autoware::diagnostic_graph_utils::ConverterNode" + EXECUTABLE autoware_converter_node ) rclcpp_components_register_node(${PROJECT_NAME}_tools - PLUGIN "diagnostic_graph_utils::LoggingNode" - EXECUTABLE logging_node + PLUGIN "autoware::diagnostic_graph_utils::LoggingNode" + EXECUTABLE autoware_logging_node ) ament_auto_package(INSTALL_TO_SHARE launch) diff --git a/system/diagnostic_graph_utils/include/diagnostic_graph_utils/graph.hpp b/system/diagnostic_graph_utils/include/diagnostic_graph_utils/graph.hpp index 275e4ffcb1c7e..bcba8f0dfd9b7 100644 --- a/system/diagnostic_graph_utils/include/diagnostic_graph_utils/graph.hpp +++ b/system/diagnostic_graph_utils/include/diagnostic_graph_utils/graph.hpp @@ -1,4 +1,4 @@ -// Copyright 2024 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 DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_ -#define DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_ +#ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_ +#define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_ #include @@ -27,7 +27,7 @@ #include #include -namespace diagnostic_graph_utils +namespace autoware::diagnostic_graph_utils { class DiagLink; @@ -139,6 +139,6 @@ class DiagGraph std::vector> links_; }; -} // namespace diagnostic_graph_utils +} // namespace autoware::diagnostic_graph_utils -#endif // DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_ +#endif // AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_ diff --git a/system/diagnostic_graph_utils/include/diagnostic_graph_utils/subscription.hpp b/system/diagnostic_graph_utils/include/diagnostic_graph_utils/subscription.hpp index 5aebde7ea3a38..37ac3ac7b2107 100644 --- a/system/diagnostic_graph_utils/include/diagnostic_graph_utils/subscription.hpp +++ b/system/diagnostic_graph_utils/include/diagnostic_graph_utils/subscription.hpp @@ -1,4 +1,4 @@ -// Copyright 2024 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 DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_ -#define DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_ +#ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_ +#define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_ #include "diagnostic_graph_utils/graph.hpp" @@ -22,7 +22,7 @@ #include #include -namespace diagnostic_graph_utils +namespace autoware::diagnostic_graph_utils { class DiagGraphSubscription @@ -48,6 +48,6 @@ class DiagGraphSubscription CallbackType update_callback_; }; -} // namespace diagnostic_graph_utils +} // namespace autoware::diagnostic_graph_utils -#endif // DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_ +#endif // AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_ diff --git a/system/diagnostic_graph_utils/launch/logging.launch.xml b/system/diagnostic_graph_utils/launch/logging.launch.xml index f14a045919599..218cd18febe7c 100644 --- a/system/diagnostic_graph_utils/launch/logging.launch.xml +++ b/system/diagnostic_graph_utils/launch/logging.launch.xml @@ -2,7 +2,7 @@ - + diff --git a/system/diagnostic_graph_utils/package.xml b/system/diagnostic_graph_utils/package.xml index b777ee530ecc9..055bebc31b722 100644 --- a/system/diagnostic_graph_utils/package.xml +++ b/system/diagnostic_graph_utils/package.xml @@ -1,10 +1,11 @@ - diagnostic_graph_utils + autoware_diagnostic_graph_utils 0.40.0 The diagnostic_graph_utils package Takagi, Isamu + Junya Sasaki Apache License 2.0 ament_cmake_auto diff --git a/system/diagnostic_graph_utils/src/lib/graph.cpp b/system/diagnostic_graph_utils/src/lib/graph.cpp index 007b42547bee1..81adb0ed55833 100644 --- a/system/diagnostic_graph_utils/src/lib/graph.cpp +++ b/system/diagnostic_graph_utils/src/lib/graph.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 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. @@ -16,7 +16,7 @@ #include -namespace diagnostic_graph_utils +namespace autoware::diagnostic_graph_utils { DiagUnit::DiagnosticStatus DiagNode::create_diagnostic_status() const @@ -112,4 +112,4 @@ std::vector DiagGraph::links() const return create_ptrs(links_); } -} // namespace diagnostic_graph_utils +} // namespace autoware::diagnostic_graph_utils diff --git a/system/diagnostic_graph_utils/src/lib/subscription.cpp b/system/diagnostic_graph_utils/src/lib/subscription.cpp index c10481ef8f16e..560276e2d56f7 100644 --- a/system/diagnostic_graph_utils/src/lib/subscription.cpp +++ b/system/diagnostic_graph_utils/src/lib/subscription.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 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. @@ -16,7 +16,7 @@ #include -namespace diagnostic_graph_utils +namespace autoware::diagnostic_graph_utils { DiagGraphSubscription::DiagGraphSubscription() @@ -66,4 +66,4 @@ void DiagGraphSubscription::on_status(const DiagGraphStatus & msg) } } -} // namespace diagnostic_graph_utils +} // namespace autoware::diagnostic_graph_utils diff --git a/system/diagnostic_graph_utils/src/node/converter.cpp b/system/diagnostic_graph_utils/src/node/converter.cpp index 159cc6e0c3cab..9bdb695371cf0 100644 --- a/system/diagnostic_graph_utils/src/node/converter.cpp +++ b/system/diagnostic_graph_utils/src/node/converter.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 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. @@ -16,7 +16,7 @@ #include -namespace diagnostic_graph_utils +namespace autoware::diagnostic_graph_utils { ConverterNode::ConverterNode(const rclcpp::NodeOptions & options) : Node("converter", options) @@ -38,7 +38,7 @@ void ConverterNode::on_update(DiagGraph::ConstSharedPtr graph) pub_array_->publish(array); } -} // namespace diagnostic_graph_utils +} // namespace autoware::diagnostic_graph_utils #include -RCLCPP_COMPONENTS_REGISTER_NODE(diagnostic_graph_utils::ConverterNode) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::diagnostic_graph_utils::ConverterNode) diff --git a/system/diagnostic_graph_utils/src/node/converter.hpp b/system/diagnostic_graph_utils/src/node/converter.hpp index 19364a8ff8240..dc3245c57cb4f 100644 --- a/system/diagnostic_graph_utils/src/node/converter.hpp +++ b/system/diagnostic_graph_utils/src/node/converter.hpp @@ -1,4 +1,4 @@ -// Copyright 2024 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 NODE__CONVERTER_HPP_ -#define NODE__CONVERTER_HPP_ +#ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__CONVERTER_HPP_ +#define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__CONVERTER_HPP_ #include "diagnostic_graph_utils/subscription.hpp" @@ -22,7 +22,7 @@ #include #include -namespace diagnostic_graph_utils +namespace autoware::diagnostic_graph_utils { class ConverterNode : public rclcpp::Node @@ -38,6 +38,6 @@ class ConverterNode : public rclcpp::Node DiagGraphSubscription sub_graph_; }; -} // namespace diagnostic_graph_utils +} // namespace autoware::diagnostic_graph_utils -#endif // NODE__CONVERTER_HPP_ +#endif // AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__CONVERTER_HPP_ diff --git a/system/diagnostic_graph_utils/src/node/dump.cpp b/system/diagnostic_graph_utils/src/node/dump.cpp index 42c66224b2c37..60e794e477e78 100644 --- a/system/diagnostic_graph_utils/src/node/dump.cpp +++ b/system/diagnostic_graph_utils/src/node/dump.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 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. @@ -22,7 +22,7 @@ #include #include -namespace diagnostic_graph_utils +namespace autoware::diagnostic_graph_utils { DumpNode::DumpNode(const rclcpp::NodeOptions & options) : Node("dump", options) @@ -131,7 +131,7 @@ void DumpNode::on_update(DiagGraph::ConstSharedPtr graph) } } -} // namespace diagnostic_graph_utils +} // namespace autoware::diagnostic_graph_utils #include -RCLCPP_COMPONENTS_REGISTER_NODE(diagnostic_graph_utils::DumpNode) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::diagnostic_graph_utils::DumpNode) diff --git a/system/diagnostic_graph_utils/src/node/dump.hpp b/system/diagnostic_graph_utils/src/node/dump.hpp index c990fb77a53db..eaeb657923b9c 100644 --- a/system/diagnostic_graph_utils/src/node/dump.hpp +++ b/system/diagnostic_graph_utils/src/node/dump.hpp @@ -1,4 +1,4 @@ -// Copyright 2024 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 NODE__DUMP_HPP_ -#define NODE__DUMP_HPP_ +#ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__DUMP_HPP_ +#define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__DUMP_HPP_ #include "diagnostic_graph_utils/subscription.hpp" @@ -22,7 +22,7 @@ #include #include -namespace diagnostic_graph_utils +namespace autoware::diagnostic_graph_utils { class DumpNode : public rclcpp::Node @@ -47,6 +47,6 @@ class DumpNode : public rclcpp::Node std::string border_; }; -} // namespace diagnostic_graph_utils +} // namespace autoware::diagnostic_graph_utils -#endif // NODE__DUMP_HPP_ +#endif // AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__DUMP_HPP_ diff --git a/system/diagnostic_graph_utils/src/node/logging.cpp b/system/diagnostic_graph_utils/src/node/logging.cpp index 2dfc939469172..5db5e989bc0b8 100644 --- a/system/diagnostic_graph_utils/src/node/logging.cpp +++ b/system/diagnostic_graph_utils/src/node/logging.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 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. @@ -22,7 +22,7 @@ #include #include -namespace diagnostic_graph_utils +namespace autoware::diagnostic_graph_utils { LoggingNode::LoggingNode(const rclcpp::NodeOptions & options) : Node("logging", options) @@ -107,7 +107,7 @@ void LoggingNode::dump_unit(DiagUnit * unit, int depth, const std::string & inde } } -} // namespace diagnostic_graph_utils +} // namespace autoware::diagnostic_graph_utils #include -RCLCPP_COMPONENTS_REGISTER_NODE(diagnostic_graph_utils::LoggingNode) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::diagnostic_graph_utils::LoggingNode) diff --git a/system/diagnostic_graph_utils/src/node/logging.hpp b/system/diagnostic_graph_utils/src/node/logging.hpp index 81acfcd2ad82f..e418231cb5904 100644 --- a/system/diagnostic_graph_utils/src/node/logging.hpp +++ b/system/diagnostic_graph_utils/src/node/logging.hpp @@ -1,4 +1,4 @@ -// Copyright 2024 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 NODE__LOGGING_HPP_ -#define NODE__LOGGING_HPP_ +#ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__LOGGING_HPP_ +#define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__LOGGING_HPP_ #include "diagnostic_graph_utils/subscription.hpp" @@ -24,7 +24,7 @@ #include #include -namespace diagnostic_graph_utils +namespace autoware::diagnostic_graph_utils { class LoggingNode : public rclcpp::Node @@ -48,6 +48,6 @@ class LoggingNode : public rclcpp::Node bool enable_terminal_log_; }; -} // namespace diagnostic_graph_utils +} // namespace autoware::diagnostic_graph_utils -#endif // NODE__LOGGING_HPP_ +#endif // AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__LOGGING_HPP_ From f25c1b36c13d27b6151c14f62605b19ee10bd032 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Sun, 19 Jan 2025 18:17:27 +0900 Subject: [PATCH 02/15] rename(diagnostic_graph_utils): move headers under `include/autoware`: * Fixes due to this changes for .hpp/.cpp files will be applied in the next commit Signed-off-by: Junya Sasaki --- .../include/{ => autoware}/diagnostic_graph_utils/graph.hpp | 0 .../{ => autoware}/diagnostic_graph_utils/subscription.hpp | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename system/diagnostic_graph_utils/include/{ => autoware}/diagnostic_graph_utils/graph.hpp (100%) rename system/diagnostic_graph_utils/include/{ => autoware}/diagnostic_graph_utils/subscription.hpp (100%) diff --git a/system/diagnostic_graph_utils/include/diagnostic_graph_utils/graph.hpp b/system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/graph.hpp similarity index 100% rename from system/diagnostic_graph_utils/include/diagnostic_graph_utils/graph.hpp rename to system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/graph.hpp diff --git a/system/diagnostic_graph_utils/include/diagnostic_graph_utils/subscription.hpp b/system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp similarity index 100% rename from system/diagnostic_graph_utils/include/diagnostic_graph_utils/subscription.hpp rename to system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp From 6135e6405fa7c1b3c250415bf78bb0f222124e1f Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Sun, 19 Jan 2025 19:17:37 +0900 Subject: [PATCH 03/15] fix(diagnostic_graph_utils): fix include paths * To follow the previous commit Signed-off-by: Junya Sasaki --- .../include/autoware/diagnostic_graph_utils/subscription.hpp | 2 +- system/diagnostic_graph_utils/src/lib/graph.cpp | 2 +- system/diagnostic_graph_utils/src/lib/subscription.cpp | 2 +- system/diagnostic_graph_utils/src/node/converter.hpp | 2 +- system/diagnostic_graph_utils/src/node/dump.hpp | 2 +- system/diagnostic_graph_utils/src/node/logging.hpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp b/system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp index 37ac3ac7b2107..f4c00a62d3cdb 100644 --- a/system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp +++ b/system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp @@ -15,7 +15,7 @@ #ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_ #define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_ -#include "diagnostic_graph_utils/graph.hpp" +#include "autoware/diagnostic_graph_utils/graph.hpp" #include diff --git a/system/diagnostic_graph_utils/src/lib/graph.cpp b/system/diagnostic_graph_utils/src/lib/graph.cpp index 81adb0ed55833..9d8a8a52160ff 100644 --- a/system/diagnostic_graph_utils/src/lib/graph.cpp +++ b/system/diagnostic_graph_utils/src/lib/graph.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "diagnostic_graph_utils/graph.hpp" +#include "autoware/diagnostic_graph_utils/graph.hpp" #include diff --git a/system/diagnostic_graph_utils/src/lib/subscription.cpp b/system/diagnostic_graph_utils/src/lib/subscription.cpp index 560276e2d56f7..4cafd22acc907 100644 --- a/system/diagnostic_graph_utils/src/lib/subscription.cpp +++ b/system/diagnostic_graph_utils/src/lib/subscription.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "diagnostic_graph_utils/subscription.hpp" +#include "autoware/diagnostic_graph_utils/subscription.hpp" #include diff --git a/system/diagnostic_graph_utils/src/node/converter.hpp b/system/diagnostic_graph_utils/src/node/converter.hpp index dc3245c57cb4f..3156ffd20f490 100644 --- a/system/diagnostic_graph_utils/src/node/converter.hpp +++ b/system/diagnostic_graph_utils/src/node/converter.hpp @@ -15,7 +15,7 @@ #ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__CONVERTER_HPP_ #define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__CONVERTER_HPP_ -#include "diagnostic_graph_utils/subscription.hpp" +#include "autoware/diagnostic_graph_utils/subscription.hpp" #include diff --git a/system/diagnostic_graph_utils/src/node/dump.hpp b/system/diagnostic_graph_utils/src/node/dump.hpp index eaeb657923b9c..509d2048b3a09 100644 --- a/system/diagnostic_graph_utils/src/node/dump.hpp +++ b/system/diagnostic_graph_utils/src/node/dump.hpp @@ -15,7 +15,7 @@ #ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__DUMP_HPP_ #define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__DUMP_HPP_ -#include "diagnostic_graph_utils/subscription.hpp" +#include "autoware/diagnostic_graph_utils/subscription.hpp" #include diff --git a/system/diagnostic_graph_utils/src/node/logging.hpp b/system/diagnostic_graph_utils/src/node/logging.hpp index e418231cb5904..284a15c79edb2 100644 --- a/system/diagnostic_graph_utils/src/node/logging.hpp +++ b/system/diagnostic_graph_utils/src/node/logging.hpp @@ -15,7 +15,7 @@ #ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__LOGGING_HPP_ #define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__LOGGING_HPP_ -#include "diagnostic_graph_utils/subscription.hpp" +#include "autoware/diagnostic_graph_utils/subscription.hpp" #include From 132761166d0108b5ff422ea3a7dae6e441e36211 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Sun, 19 Jan 2025 19:19:10 +0900 Subject: [PATCH 04/15] rename: `diagnostic_graph_utils` => `autoware_diagnostic_graph_utils` Signed-off-by: Junya Sasaki --- .../CHANGELOG.rst | 0 .../CMakeLists.txt | 0 .../README.md | 0 .../doc/node/converter.md | 0 .../doc/node/dump.md | 0 .../doc/node/images/rqt_runtime_monitor.png | Bin .../autoware/diagnostic_graph_utils/graph.hpp | 0 .../diagnostic_graph_utils/subscription.hpp | 0 .../launch/logging.launch.xml | 0 .../package.xml | 0 .../src/lib/graph.cpp | 0 .../src/lib/subscription.cpp | 0 .../src/node/converter.cpp | 0 .../src/node/converter.hpp | 0 .../src/node/dump.cpp | 0 .../src/node/dump.hpp | 0 .../src/node/logging.cpp | 0 .../src/node/logging.hpp | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/CHANGELOG.rst (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/CMakeLists.txt (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/README.md (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/doc/node/converter.md (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/doc/node/dump.md (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/doc/node/images/rqt_runtime_monitor.png (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/include/autoware/diagnostic_graph_utils/graph.hpp (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/include/autoware/diagnostic_graph_utils/subscription.hpp (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/launch/logging.launch.xml (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/package.xml (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/src/lib/graph.cpp (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/src/lib/subscription.cpp (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/src/node/converter.cpp (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/src/node/converter.hpp (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/src/node/dump.cpp (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/src/node/dump.hpp (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/src/node/logging.cpp (100%) rename system/{diagnostic_graph_utils => autoware_diagnostic_graph_utils}/src/node/logging.hpp (100%) diff --git a/system/diagnostic_graph_utils/CHANGELOG.rst b/system/autoware_diagnostic_graph_utils/CHANGELOG.rst similarity index 100% rename from system/diagnostic_graph_utils/CHANGELOG.rst rename to system/autoware_diagnostic_graph_utils/CHANGELOG.rst diff --git a/system/diagnostic_graph_utils/CMakeLists.txt b/system/autoware_diagnostic_graph_utils/CMakeLists.txt similarity index 100% rename from system/diagnostic_graph_utils/CMakeLists.txt rename to system/autoware_diagnostic_graph_utils/CMakeLists.txt diff --git a/system/diagnostic_graph_utils/README.md b/system/autoware_diagnostic_graph_utils/README.md similarity index 100% rename from system/diagnostic_graph_utils/README.md rename to system/autoware_diagnostic_graph_utils/README.md diff --git a/system/diagnostic_graph_utils/doc/node/converter.md b/system/autoware_diagnostic_graph_utils/doc/node/converter.md similarity index 100% rename from system/diagnostic_graph_utils/doc/node/converter.md rename to system/autoware_diagnostic_graph_utils/doc/node/converter.md diff --git a/system/diagnostic_graph_utils/doc/node/dump.md b/system/autoware_diagnostic_graph_utils/doc/node/dump.md similarity index 100% rename from system/diagnostic_graph_utils/doc/node/dump.md rename to system/autoware_diagnostic_graph_utils/doc/node/dump.md diff --git a/system/diagnostic_graph_utils/doc/node/images/rqt_runtime_monitor.png b/system/autoware_diagnostic_graph_utils/doc/node/images/rqt_runtime_monitor.png similarity index 100% rename from system/diagnostic_graph_utils/doc/node/images/rqt_runtime_monitor.png rename to system/autoware_diagnostic_graph_utils/doc/node/images/rqt_runtime_monitor.png diff --git a/system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/graph.hpp b/system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/graph.hpp similarity index 100% rename from system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/graph.hpp rename to system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/graph.hpp diff --git a/system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp b/system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp similarity index 100% rename from system/diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp rename to system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp diff --git a/system/diagnostic_graph_utils/launch/logging.launch.xml b/system/autoware_diagnostic_graph_utils/launch/logging.launch.xml similarity index 100% rename from system/diagnostic_graph_utils/launch/logging.launch.xml rename to system/autoware_diagnostic_graph_utils/launch/logging.launch.xml diff --git a/system/diagnostic_graph_utils/package.xml b/system/autoware_diagnostic_graph_utils/package.xml similarity index 100% rename from system/diagnostic_graph_utils/package.xml rename to system/autoware_diagnostic_graph_utils/package.xml diff --git a/system/diagnostic_graph_utils/src/lib/graph.cpp b/system/autoware_diagnostic_graph_utils/src/lib/graph.cpp similarity index 100% rename from system/diagnostic_graph_utils/src/lib/graph.cpp rename to system/autoware_diagnostic_graph_utils/src/lib/graph.cpp diff --git a/system/diagnostic_graph_utils/src/lib/subscription.cpp b/system/autoware_diagnostic_graph_utils/src/lib/subscription.cpp similarity index 100% rename from system/diagnostic_graph_utils/src/lib/subscription.cpp rename to system/autoware_diagnostic_graph_utils/src/lib/subscription.cpp diff --git a/system/diagnostic_graph_utils/src/node/converter.cpp b/system/autoware_diagnostic_graph_utils/src/node/converter.cpp similarity index 100% rename from system/diagnostic_graph_utils/src/node/converter.cpp rename to system/autoware_diagnostic_graph_utils/src/node/converter.cpp diff --git a/system/diagnostic_graph_utils/src/node/converter.hpp b/system/autoware_diagnostic_graph_utils/src/node/converter.hpp similarity index 100% rename from system/diagnostic_graph_utils/src/node/converter.hpp rename to system/autoware_diagnostic_graph_utils/src/node/converter.hpp diff --git a/system/diagnostic_graph_utils/src/node/dump.cpp b/system/autoware_diagnostic_graph_utils/src/node/dump.cpp similarity index 100% rename from system/diagnostic_graph_utils/src/node/dump.cpp rename to system/autoware_diagnostic_graph_utils/src/node/dump.cpp diff --git a/system/diagnostic_graph_utils/src/node/dump.hpp b/system/autoware_diagnostic_graph_utils/src/node/dump.hpp similarity index 100% rename from system/diagnostic_graph_utils/src/node/dump.hpp rename to system/autoware_diagnostic_graph_utils/src/node/dump.hpp diff --git a/system/diagnostic_graph_utils/src/node/logging.cpp b/system/autoware_diagnostic_graph_utils/src/node/logging.cpp similarity index 100% rename from system/diagnostic_graph_utils/src/node/logging.cpp rename to system/autoware_diagnostic_graph_utils/src/node/logging.cpp diff --git a/system/diagnostic_graph_utils/src/node/logging.hpp b/system/autoware_diagnostic_graph_utils/src/node/logging.hpp similarity index 100% rename from system/diagnostic_graph_utils/src/node/logging.hpp rename to system/autoware_diagnostic_graph_utils/src/node/logging.hpp From 1c7c15bb1aff514b2338a945f50fe16a1ba33716 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 10:25:56 +0000 Subject: [PATCH 05/15] style(pre-commit): autofix --- .../autoware_diagnostic_graph_utils/src/node/converter.hpp | 6 +++--- system/autoware_diagnostic_graph_utils/src/node/dump.hpp | 6 +++--- system/autoware_diagnostic_graph_utils/src/node/logging.hpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/system/autoware_diagnostic_graph_utils/src/node/converter.hpp b/system/autoware_diagnostic_graph_utils/src/node/converter.hpp index 3156ffd20f490..43d5b93ee515d 100644 --- a/system/autoware_diagnostic_graph_utils/src/node/converter.hpp +++ b/system/autoware_diagnostic_graph_utils/src/node/converter.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__CONVERTER_HPP_ -#define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__CONVERTER_HPP_ +#ifndef NODE__CONVERTER_HPP_ +#define NODE__CONVERTER_HPP_ #include "autoware/diagnostic_graph_utils/subscription.hpp" @@ -40,4 +40,4 @@ class ConverterNode : public rclcpp::Node } // namespace autoware::diagnostic_graph_utils -#endif // AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__CONVERTER_HPP_ +#endif // NODE__CONVERTER_HPP_ diff --git a/system/autoware_diagnostic_graph_utils/src/node/dump.hpp b/system/autoware_diagnostic_graph_utils/src/node/dump.hpp index 509d2048b3a09..dc15b51e629c6 100644 --- a/system/autoware_diagnostic_graph_utils/src/node/dump.hpp +++ b/system/autoware_diagnostic_graph_utils/src/node/dump.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__DUMP_HPP_ -#define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__DUMP_HPP_ +#ifndef NODE__DUMP_HPP_ +#define NODE__DUMP_HPP_ #include "autoware/diagnostic_graph_utils/subscription.hpp" @@ -49,4 +49,4 @@ class DumpNode : public rclcpp::Node } // namespace autoware::diagnostic_graph_utils -#endif // AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__DUMP_HPP_ +#endif // NODE__DUMP_HPP_ diff --git a/system/autoware_diagnostic_graph_utils/src/node/logging.hpp b/system/autoware_diagnostic_graph_utils/src/node/logging.hpp index 284a15c79edb2..00f3452b10641 100644 --- a/system/autoware_diagnostic_graph_utils/src/node/logging.hpp +++ b/system/autoware_diagnostic_graph_utils/src/node/logging.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__LOGGING_HPP_ -#define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__LOGGING_HPP_ +#ifndef NODE__LOGGING_HPP_ +#define NODE__LOGGING_HPP_ #include "autoware/diagnostic_graph_utils/subscription.hpp" @@ -50,4 +50,4 @@ class LoggingNode : public rclcpp::Node } // namespace autoware::diagnostic_graph_utils -#endif // AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__NODE__LOGGING_HPP_ +#endif // NODE__LOGGING_HPP_ From d062769e1291c6ef9ca670ca1afe43f576e8b7f5 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Wed, 22 Jan 2025 13:36:13 +0900 Subject: [PATCH 06/15] fix(autoware_diagnostic_graph_utils): fix executable names * Following the comment: - https://github.com/autowarefoundation/autoware.universe/pull/9968/files#r1923419643 Signed-off-by: Junya Sasaki --- system/autoware_diagnostic_graph_utils/CMakeLists.txt | 6 +++--- .../launch/logging.launch.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/autoware_diagnostic_graph_utils/CMakeLists.txt b/system/autoware_diagnostic_graph_utils/CMakeLists.txt index 937a5cc5493ba..b1de417b1bc7d 100644 --- a/system/autoware_diagnostic_graph_utils/CMakeLists.txt +++ b/system/autoware_diagnostic_graph_utils/CMakeLists.txt @@ -17,17 +17,17 @@ ament_auto_add_library(${PROJECT_NAME}_tools SHARED rclcpp_components_register_node(${PROJECT_NAME}_tools PLUGIN "autoware::diagnostic_graph_utils::DumpNode" - EXECUTABLE autoware_dump_node + EXECUTABLE dump_node ) rclcpp_components_register_node(${PROJECT_NAME}_tools PLUGIN "autoware::diagnostic_graph_utils::ConverterNode" - EXECUTABLE autoware_converter_node + EXECUTABLE converter_node ) rclcpp_components_register_node(${PROJECT_NAME}_tools PLUGIN "autoware::diagnostic_graph_utils::LoggingNode" - EXECUTABLE autoware_logging_node + EXECUTABLE logging_node ) ament_auto_package(INSTALL_TO_SHARE launch) diff --git a/system/autoware_diagnostic_graph_utils/launch/logging.launch.xml b/system/autoware_diagnostic_graph_utils/launch/logging.launch.xml index 218cd18febe7c..fd1d998ac9f22 100644 --- a/system/autoware_diagnostic_graph_utils/launch/logging.launch.xml +++ b/system/autoware_diagnostic_graph_utils/launch/logging.launch.xml @@ -2,7 +2,7 @@ - + From e1735070042fac4b772f9e1b99e9c488f96b8ce1 Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Wed, 22 Jan 2025 13:44:14 +0900 Subject: [PATCH 07/15] bug(autoware_diagnostic_graph_utils): revert wrongly updated copyrights Signed-off-by: Junya Sasaki --- .../include/autoware/diagnostic_graph_utils/graph.hpp | 2 +- .../include/autoware/diagnostic_graph_utils/subscription.hpp | 2 +- system/autoware_diagnostic_graph_utils/src/lib/graph.cpp | 2 +- system/autoware_diagnostic_graph_utils/src/lib/subscription.cpp | 2 +- system/autoware_diagnostic_graph_utils/src/node/converter.cpp | 2 +- system/autoware_diagnostic_graph_utils/src/node/converter.hpp | 2 +- system/autoware_diagnostic_graph_utils/src/node/dump.cpp | 2 +- system/autoware_diagnostic_graph_utils/src/node/dump.hpp | 2 +- system/autoware_diagnostic_graph_utils/src/node/logging.cpp | 2 +- system/autoware_diagnostic_graph_utils/src/node/logging.hpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/graph.hpp b/system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/graph.hpp index bcba8f0dfd9b7..3114ffe108b5b 100644 --- a/system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/graph.hpp +++ b/system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/graph.hpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2024 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_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp b/system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp index f4c00a62d3cdb..97a110d0305b0 100644 --- a/system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp +++ b/system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2024 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_diagnostic_graph_utils/src/lib/graph.cpp b/system/autoware_diagnostic_graph_utils/src/lib/graph.cpp index 9d8a8a52160ff..6bee048f23400 100644 --- a/system/autoware_diagnostic_graph_utils/src/lib/graph.cpp +++ b/system/autoware_diagnostic_graph_utils/src/lib/graph.cpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2024 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_diagnostic_graph_utils/src/lib/subscription.cpp b/system/autoware_diagnostic_graph_utils/src/lib/subscription.cpp index 4cafd22acc907..b1464fd2a6ccc 100644 --- a/system/autoware_diagnostic_graph_utils/src/lib/subscription.cpp +++ b/system/autoware_diagnostic_graph_utils/src/lib/subscription.cpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2024 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_diagnostic_graph_utils/src/node/converter.cpp b/system/autoware_diagnostic_graph_utils/src/node/converter.cpp index 9bdb695371cf0..8ab7f98457cae 100644 --- a/system/autoware_diagnostic_graph_utils/src/node/converter.cpp +++ b/system/autoware_diagnostic_graph_utils/src/node/converter.cpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2024 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_diagnostic_graph_utils/src/node/converter.hpp b/system/autoware_diagnostic_graph_utils/src/node/converter.hpp index 43d5b93ee515d..d47d27c9626ca 100644 --- a/system/autoware_diagnostic_graph_utils/src/node/converter.hpp +++ b/system/autoware_diagnostic_graph_utils/src/node/converter.hpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2024 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_diagnostic_graph_utils/src/node/dump.cpp b/system/autoware_diagnostic_graph_utils/src/node/dump.cpp index 60e794e477e78..3999c2698a087 100644 --- a/system/autoware_diagnostic_graph_utils/src/node/dump.cpp +++ b/system/autoware_diagnostic_graph_utils/src/node/dump.cpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2024 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_diagnostic_graph_utils/src/node/dump.hpp b/system/autoware_diagnostic_graph_utils/src/node/dump.hpp index dc15b51e629c6..9412692fa530c 100644 --- a/system/autoware_diagnostic_graph_utils/src/node/dump.hpp +++ b/system/autoware_diagnostic_graph_utils/src/node/dump.hpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2024 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_diagnostic_graph_utils/src/node/logging.cpp b/system/autoware_diagnostic_graph_utils/src/node/logging.cpp index 5db5e989bc0b8..abe59ac28031d 100644 --- a/system/autoware_diagnostic_graph_utils/src/node/logging.cpp +++ b/system/autoware_diagnostic_graph_utils/src/node/logging.cpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2024 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_diagnostic_graph_utils/src/node/logging.hpp b/system/autoware_diagnostic_graph_utils/src/node/logging.hpp index 00f3452b10641..cbf28c3908105 100644 --- a/system/autoware_diagnostic_graph_utils/src/node/logging.hpp +++ b/system/autoware_diagnostic_graph_utils/src/node/logging.hpp @@ -1,4 +1,4 @@ -// Copyright 2025 The Autoware Contributors +// Copyright 2024 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 bda94693fb59461e2e9bafcf6af39ee36ade653d Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Wed, 22 Jan 2025 13:55:17 +0900 Subject: [PATCH 08/15] bug(autoware_diagnostic_graph_utils): fix wrong dependencies Signed-off-by: Junya Sasaki --- system/autoware_default_adapi/package.xml | 2 +- system/hazard_status_converter/package.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/autoware_default_adapi/package.xml b/system/autoware_default_adapi/package.xml index 094882d0e4dd3..bfd8224c1c486 100644 --- a/system/autoware_default_adapi/package.xml +++ b/system/autoware_default_adapi/package.xml @@ -23,7 +23,7 @@ autoware_system_msgs autoware_vehicle_info_utils autoware_vehicle_msgs - diagnostic_graph_utils + autoware_diagnostic_graph_utils geographic_msgs nav_msgs rclcpp diff --git a/system/hazard_status_converter/package.xml b/system/hazard_status_converter/package.xml index 80cc53c08e16d..0501a580137f2 100644 --- a/system/hazard_status_converter/package.xml +++ b/system/hazard_status_converter/package.xml @@ -13,7 +13,7 @@ autoware_adapi_v1_msgs autoware_system_msgs autoware_universe_utils - diagnostic_graph_utils + autoware_diagnostic_graph_utils diagnostic_msgs rclcpp rclcpp_components From f8176d2d569be38993a61a200285739b7614c4cb Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Wed, 22 Jan 2025 13:56:28 +0900 Subject: [PATCH 09/15] update(autoware_diagnostic_graph_utils): `README.md` Signed-off-by: Junya Sasaki --- system/autoware_diagnostic_graph_utils/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/autoware_diagnostic_graph_utils/README.md b/system/autoware_diagnostic_graph_utils/README.md index a06d664622bff..18cb6e8fc3051 100644 --- a/system/autoware_diagnostic_graph_utils/README.md +++ b/system/autoware_diagnostic_graph_utils/README.md @@ -9,5 +9,5 @@ This package is a utility for diagnostic graph published by [diagnostic_graph_ag ## C++ library -- [DiagGraph](./include/diagnostic_graph_utils/graph.hpp) -- [DiagGraphSubscription](./include/diagnostic_graph_utils/subscription.hpp) +- [DiagGraph](./include/autoware/diagnostic_graph_utils/graph.hpp) +- [DiagGraphSubscription](./include/autoware/diagnostic_graph_utils/subscription.hpp) From aa15c1977bdd6788afafd616f798d8fcf1867bfa 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 05:02:27 +0000 Subject: [PATCH 10/15] style(pre-commit): autofix --- system/autoware_default_adapi/package.xml | 2 +- system/hazard_status_converter/package.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/autoware_default_adapi/package.xml b/system/autoware_default_adapi/package.xml index bfd8224c1c486..5125844cbfedf 100644 --- a/system/autoware_default_adapi/package.xml +++ b/system/autoware_default_adapi/package.xml @@ -17,13 +17,13 @@ autoware_adapi_version_msgs autoware_component_interface_specs_universe autoware_component_interface_utils + autoware_diagnostic_graph_utils autoware_geography_utils autoware_motion_utils autoware_planning_msgs autoware_system_msgs autoware_vehicle_info_utils autoware_vehicle_msgs - autoware_diagnostic_graph_utils geographic_msgs nav_msgs rclcpp diff --git a/system/hazard_status_converter/package.xml b/system/hazard_status_converter/package.xml index 0501a580137f2..57cc8e40126cd 100644 --- a/system/hazard_status_converter/package.xml +++ b/system/hazard_status_converter/package.xml @@ -11,9 +11,9 @@ autoware_cmake autoware_adapi_v1_msgs + autoware_diagnostic_graph_utils autoware_system_msgs autoware_universe_utils - autoware_diagnostic_graph_utils diagnostic_msgs rclcpp rclcpp_components From 420788920e412f196603f5c6e839a8e6f1cb929f Mon Sep 17 00:00:00 2001 From: Junya Sasaki Date: Thu, 23 Jan 2025 22:04:21 +0900 Subject: [PATCH 11/15] bug(tier4_simulator_launch): fix a wrong package name Signed-off-by: Junya Sasaki --- launch/tier4_simulator_launch/launch/simulator.launch.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launch/tier4_simulator_launch/launch/simulator.launch.xml b/launch/tier4_simulator_launch/launch/simulator.launch.xml index a879340bc4d0c..e5468b4f22a18 100644 --- a/launch/tier4_simulator_launch/launch/simulator.launch.xml +++ b/launch/tier4_simulator_launch/launch/simulator.launch.xml @@ -40,7 +40,7 @@ - + From 51959ddc89b3d07f1af458ee8b2175d0b91ff2b9 Mon Sep 17 00:00:00 2001 From: Ryohsuke Mitsudome Date: Fri, 24 Jan 2025 12:26:59 +0900 Subject: [PATCH 12/15] docs(autoware_diagnostic_graph_utils): rename package name in docs Signed-off-by: Ryohsuke Mitsudome --- system/autoware_diagnostic_graph_utils/README.md | 2 +- system/autoware_diagnostic_graph_utils/doc/node/converter.md | 4 ++-- system/autoware_diagnostic_graph_utils/doc/node/dump.md | 4 ++-- system/autoware_diagnostic_graph_utils/package.xml | 2 +- system/diagnostic_graph_aggregator/README.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/system/autoware_diagnostic_graph_utils/README.md b/system/autoware_diagnostic_graph_utils/README.md index 18cb6e8fc3051..ac941a3575445 100644 --- a/system/autoware_diagnostic_graph_utils/README.md +++ b/system/autoware_diagnostic_graph_utils/README.md @@ -1,4 +1,4 @@ -# diagnostic_graph_utils +# autoware_diagnostic_graph_utils This package is a utility for diagnostic graph published by [diagnostic_graph_aggregator](../diagnostic_graph_aggregator/README.md). diff --git a/system/autoware_diagnostic_graph_utils/doc/node/converter.md b/system/autoware_diagnostic_graph_utils/doc/node/converter.md index 407a99c87f73e..a7793b815c0b7 100644 --- a/system/autoware_diagnostic_graph_utils/doc/node/converter.md +++ b/system/autoware_diagnostic_graph_utils/doc/node/converter.md @@ -5,7 +5,7 @@ This tool converts `/diagnostics_graph` to `/diagnostics_array` so it can be rea ## Usage ```bash -ros2 run diagnostic_graph_utils converter_node +ros2 run autoware_diagnostic_graph_utils converter_node ``` ## Examples @@ -19,7 +19,7 @@ ros2 launch diagnostic_graph_aggregator example-main.launch.xml Terminal 2: ```bash -ros2 run diagnostic_graph_utils converter_node +ros2 run autoware_diagnostic_graph_utils converter_node ``` Terminal 3: diff --git a/system/autoware_diagnostic_graph_utils/doc/node/dump.md b/system/autoware_diagnostic_graph_utils/doc/node/dump.md index c76bb85ed75cb..fac23d655ed64 100644 --- a/system/autoware_diagnostic_graph_utils/doc/node/dump.md +++ b/system/autoware_diagnostic_graph_utils/doc/node/dump.md @@ -5,7 +5,7 @@ This tool displays `/diagnostics_graph` in table format. ## Usage ```bash -ros2 run diagnostic_graph_utils dump_node +ros2 run autoware_diagnostic_graph_utils dump_node ``` ## Examples @@ -19,7 +19,7 @@ ros2 launch diagnostic_graph_aggregator example-main.launch.xml Terminal 2: ```bash -ros2 run diagnostic_graph_utils dump_node +ros2 run autoware_diagnostic_graph_utils dump_node ``` Output: diff --git a/system/autoware_diagnostic_graph_utils/package.xml b/system/autoware_diagnostic_graph_utils/package.xml index 29d0f8e59c6c2..57e35d149bc0a 100644 --- a/system/autoware_diagnostic_graph_utils/package.xml +++ b/system/autoware_diagnostic_graph_utils/package.xml @@ -3,7 +3,7 @@ autoware_diagnostic_graph_utils 0.40.0 - The diagnostic_graph_utils package + The autoware_diagnostic_graph_utils package Takagi, Isamu Junya Sasaki Apache License 2.0 diff --git a/system/diagnostic_graph_aggregator/README.md b/system/diagnostic_graph_aggregator/README.md index c0cd78e0610c2..76513ca414541 100644 --- a/system/diagnostic_graph_aggregator/README.md +++ b/system/diagnostic_graph_aggregator/README.md @@ -80,7 +80,7 @@ ros2 launch diagnostic_graph_aggregator example-edit.launch.xml ## Debug tools - [tree](./doc/tool/tree.md) -- [diagnostic_graph_utils](../diagnostic_graph_utils/README.md) +- [autoware_diagnostic_graph_utils](../autoware_diagnostic_graph_utils/README.md) ## Graph file format From 380451725ef32a460fc64d21f8028270c52ffd50 Mon Sep 17 00:00:00 2001 From: Ryohsuke Mitsudome Date: Fri, 24 Jan 2025 12:30:16 +0900 Subject: [PATCH 13/15] feat(autoware_default_adapi): update package name for autoware_diagnostic_graph_utils Signed-off-by: Ryohsuke Mitsudome --- system/autoware_default_adapi/src/diagnostics.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/autoware_default_adapi/src/diagnostics.hpp b/system/autoware_default_adapi/src/diagnostics.hpp index b382887aaa694..dfd94d9b06f2a 100644 --- a/system/autoware_default_adapi/src/diagnostics.hpp +++ b/system/autoware_default_adapi/src/diagnostics.hpp @@ -15,7 +15,7 @@ #ifndef DIAGNOSTICS_HPP_ #define DIAGNOSTICS_HPP_ -#include "diagnostic_graph_utils/subscription.hpp" +#include "autoware/diagnostic_graph_utils/subscription.hpp" #include @@ -31,14 +31,14 @@ class DiagnosticsNode : public rclcpp::Node explicit DiagnosticsNode(const rclcpp::NodeOptions & options); private: - using DiagGraph = diagnostic_graph_utils::DiagGraph; - using DiagUnit = diagnostic_graph_utils::DiagUnit; - using DiagLink = diagnostic_graph_utils::DiagLink; + using DiagGraph = autoware::diagnostic_graph_utils::DiagGraph; + using DiagUnit = autoware::diagnostic_graph_utils::DiagUnit; + using DiagLink = autoware::diagnostic_graph_utils::DiagLink; void on_create(DiagGraph::ConstSharedPtr graph); void on_update(DiagGraph::ConstSharedPtr graph); rclcpp::Publisher::SharedPtr pub_struct_; rclcpp::Publisher::SharedPtr pub_status_; - diagnostic_graph_utils::DiagGraphSubscription sub_graph_; + autoware::diagnostic_graph_utils::DiagGraphSubscription sub_graph_; }; } // namespace autoware::default_adapi From cafd13f4099c2fc4df7fc9b91f381ad60e1662a2 Mon Sep 17 00:00:00 2001 From: Ryohsuke Mitsudome Date: Fri, 24 Jan 2025 12:29:34 +0900 Subject: [PATCH 14/15] feat(hazard_status_converter): update package name for autoware_diagnostic_graph_utils Signed-off-by: Ryohsuke Mitsudome --- system/hazard_status_converter/src/converter.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/hazard_status_converter/src/converter.hpp b/system/hazard_status_converter/src/converter.hpp index 8011b911f3d42..97797125e1e57 100644 --- a/system/hazard_status_converter/src/converter.hpp +++ b/system/hazard_status_converter/src/converter.hpp @@ -16,7 +16,7 @@ #define CONVERTER_HPP_ #include -#include +#include #include #include @@ -34,11 +34,11 @@ class Converter : public rclcpp::Node private: using HazardStatusStamped = autoware_system_msgs::msg::HazardStatusStamped; - using DiagGraph = diagnostic_graph_utils::DiagGraph; - using DiagUnit = diagnostic_graph_utils::DiagUnit; + using DiagGraph = autoware::diagnostic_graph_utils::DiagGraph; + using DiagUnit = autoware::diagnostic_graph_utils::DiagUnit; void on_create(DiagGraph::ConstSharedPtr graph); void on_update(DiagGraph::ConstSharedPtr graph); - diagnostic_graph_utils::DiagGraphSubscription sub_graph_; + autoware::diagnostic_graph_utils::DiagGraphSubscription sub_graph_; rclcpp::Publisher::SharedPtr pub_hazard_; autoware::universe_utils::InterProcessPollingSubscriber< tier4_system_msgs::msg::EmergencyHoldingState> From 3face812c4726514fec133b87508b07ca19cd2fe Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 03:54:52 +0000 Subject: [PATCH 15/15] style(pre-commit): autofix --- system/hazard_status_converter/src/converter.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/hazard_status_converter/src/converter.hpp b/system/hazard_status_converter/src/converter.hpp index 97797125e1e57..a95f50ff3a068 100644 --- a/system/hazard_status_converter/src/converter.hpp +++ b/system/hazard_status_converter/src/converter.hpp @@ -15,8 +15,8 @@ #ifndef CONVERTER_HPP_ #define CONVERTER_HPP_ -#include #include +#include #include #include