diff --git a/launch/tier4_system_launch/launch/system.launch.xml b/launch/tier4_system_launch/launch/system.launch.xml index 8e8e17bc772e0..c22b8b091bf59 100644 --- a/launch/tier4_system_launch/launch/system.launch.xml +++ b/launch/tier4_system_launch/launch/system.launch.xml @@ -72,7 +72,7 @@ - + @@ -92,7 +92,7 @@ - + diff --git a/launch/tier4_system_launch/package.xml b/launch/tier4_system_launch/package.xml index fd76fd52a0f29..65a8c11feaa73 100644 --- a/launch/tier4_system_launch/package.xml +++ b/launch/tier4_system_launch/package.xml @@ -11,8 +11,8 @@ ament_cmake_auto autoware_cmake + autoware_component_state_monitor autoware_system_monitor - component_state_monitor ament_lint_auto autoware_lint_common diff --git a/system/component_state_monitor/CHANGELOG.rst b/system/autoware_component_state_monitor/CHANGELOG.rst similarity index 97% rename from system/component_state_monitor/CHANGELOG.rst rename to system/autoware_component_state_monitor/CHANGELOG.rst index 40843314ddf4a..b7e38c40b2ed3 100644 --- a/system/component_state_monitor/CHANGELOG.rst +++ b/system/autoware_component_state_monitor/CHANGELOG.rst @@ -1,6 +1,6 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package component_state_monitor -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package autoware_component_state_monitor +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.40.0 (2024-12-12) ------------------- diff --git a/system/component_state_monitor/CMakeLists.txt b/system/autoware_component_state_monitor/CMakeLists.txt similarity index 73% rename from system/component_state_monitor/CMakeLists.txt rename to system/autoware_component_state_monitor/CMakeLists.txt index 23037b1400e2d..3ca6e4f5c4e1a 100644 --- a/system/component_state_monitor/CMakeLists.txt +++ b/system/autoware_component_state_monitor/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(component_state_monitor) +project(autoware_component_state_monitor) find_package(autoware_cmake REQUIRED) autoware_package() @@ -9,7 +9,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED ) rclcpp_components_register_nodes(${PROJECT_NAME} - "component_state_monitor::StateMonitor" + "autoware::component_state_monitor::StateMonitor" ) ament_auto_package(INSTALL_TO_SHARE config launch) diff --git a/system/component_state_monitor/README.md b/system/autoware_component_state_monitor/README.md similarity index 87% rename from system/component_state_monitor/README.md rename to system/autoware_component_state_monitor/README.md index 327c7b7651caf..a7ea12624da0d 100644 --- a/system/component_state_monitor/README.md +++ b/system/autoware_component_state_monitor/README.md @@ -1,4 +1,4 @@ -# component_state_monitor +# autoware_component_state_monitor The component state monitor checks the state of each component using topic state monitor. This is an implementation for backward compatibility with the AD service state monitor. diff --git a/system/component_state_monitor/config/topics.yaml b/system/autoware_component_state_monitor/config/topics.yaml similarity index 100% rename from system/component_state_monitor/config/topics.yaml rename to system/autoware_component_state_monitor/config/topics.yaml diff --git a/system/component_state_monitor/launch/component_state_monitor.launch.py b/system/autoware_component_state_monitor/launch/component_state_monitor.launch.py similarity index 94% rename from system/component_state_monitor/launch/component_state_monitor.launch.py rename to system/autoware_component_state_monitor/launch/component_state_monitor.launch.py index 6fcb4e6f13020..0fd166bd80d37 100644 --- a/system/component_state_monitor/launch/component_state_monitor.launch.py +++ b/system/autoware_component_state_monitor/launch/component_state_monitor.launch.py @@ -39,7 +39,7 @@ def create_topic_monitor_name(row): def create_topic_monitor_node(row): tf_mode = "" if "topic_type" in row["args"] else "_tf" - package = FindPackageShare("topic_state_monitor") + package = FindPackageShare("autoware_topic_state_monitor") include = PathJoinSubstitution([package, f"launch/topic_state_monitor{tf_mode}.launch.xml"]) diag_name = create_diagnostic_name(row) arguments = [("diag_name", diag_name)] + [(k, str(v)) for k, v in row["args"].items()] @@ -62,8 +62,8 @@ def launch_setup(context, *args, **kwargs): component = ComposableNode( namespace="component_state_monitor", name="component", - package="component_state_monitor", - plugin="component_state_monitor::StateMonitor", + package="autoware_component_state_monitor", + plugin="autoware::component_state_monitor::StateMonitor", parameters=[{"topic_monitor_names": topic_monitor_names}, topic_monitor_param], ) container = ComposableNodeContainer( diff --git a/system/component_state_monitor/package.xml b/system/autoware_component_state_monitor/package.xml similarity index 74% rename from system/component_state_monitor/package.xml rename to system/autoware_component_state_monitor/package.xml index b92dd4af9517f..c57725b0c1f85 100644 --- a/system/component_state_monitor/package.xml +++ b/system/autoware_component_state_monitor/package.xml @@ -1,10 +1,11 @@ - component_state_monitor + autoware_component_state_monitor 0.40.0 - The component_state_monitor package + The autoware_component_state_monitor package Takagi, Isamu + Junya Sasaki Apache License 2.0 ament_cmake_auto @@ -15,7 +16,7 @@ rclcpp_components tier4_system_msgs - topic_state_monitor + autoware_topic_state_monitor ament_lint_auto autoware_lint_common diff --git a/system/component_state_monitor/src/main.cpp b/system/autoware_component_state_monitor/src/main.cpp similarity index 95% rename from system/component_state_monitor/src/main.cpp rename to system/autoware_component_state_monitor/src/main.cpp index c87963b1b21c0..43278c7ae894c 100644 --- a/system/component_state_monitor/src/main.cpp +++ b/system/autoware_component_state_monitor/src/main.cpp @@ -18,7 +18,7 @@ #include #include -namespace component_state_monitor +namespace autoware::component_state_monitor { // clang-format off @@ -129,7 +129,7 @@ void StateMonitor::on_diag(const DiagnosticArray::ConstSharedPtr msg) } } -} // namespace component_state_monitor +} // namespace autoware::component_state_monitor #include -RCLCPP_COMPONENTS_REGISTER_NODE(component_state_monitor::StateMonitor) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::component_state_monitor::StateMonitor) diff --git a/system/component_state_monitor/src/main.hpp b/system/autoware_component_state_monitor/src/main.hpp similarity index 95% rename from system/component_state_monitor/src/main.hpp rename to system/autoware_component_state_monitor/src/main.hpp index 73f57f56b4f87..81904553bb272 100644 --- a/system/component_state_monitor/src/main.hpp +++ b/system/autoware_component_state_monitor/src/main.hpp @@ -24,7 +24,7 @@ #include #include -namespace component_state_monitor +namespace autoware::component_state_monitor { // clang-format off @@ -73,6 +73,6 @@ class StateMonitor : public rclcpp::Node void on_diag(const DiagnosticArray::ConstSharedPtr msg); }; -} // namespace component_state_monitor +} // namespace autoware::component_state_monitor #endif // MAIN_HPP_ diff --git a/system/autoware_default_adapi/document/autoware-state.md b/system/autoware_default_adapi/document/autoware-state.md index eb31a4d41bc1d..cb4d95af14c68 100644 --- a/system/autoware_default_adapi/document/autoware-state.md +++ b/system/autoware_default_adapi/document/autoware-state.md @@ -3,7 +3,7 @@ ## Overview Since `/autoware/state` was so widely used, this packages creates it from the states of AD API for backwards compatibility. -The diagnostic checks that ad_service_state_monitor used to perform have been replaced by component_state_monitor. +The diagnostic checks that ad_service_state_monitor used to perform have been replaced by autoware_component_state_monitor. The service `/autoware/shutdown` to change autoware state to finalizing is also supported for compatibility. ![autoware-state-architecture](images/autoware-state-architecture.drawio.svg) diff --git a/system/diagnostic_graph_aggregator/CHANGELOG.rst b/system/autoware_diagnostic_graph_aggregator/CHANGELOG.rst similarity index 97% rename from system/diagnostic_graph_aggregator/CHANGELOG.rst rename to system/autoware_diagnostic_graph_aggregator/CHANGELOG.rst index 51abe33dcfbdf..c396519a9467b 100644 --- a/system/diagnostic_graph_aggregator/CHANGELOG.rst +++ b/system/autoware_diagnostic_graph_aggregator/CHANGELOG.rst @@ -1,6 +1,6 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package diagnostic_graph_aggregator -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package autoware_diagnostic_graph_aggregator +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.40.0 (2024-12-12) ------------------- diff --git a/system/diagnostic_graph_aggregator/CMakeLists.txt b/system/autoware_diagnostic_graph_aggregator/CMakeLists.txt similarity index 89% rename from system/diagnostic_graph_aggregator/CMakeLists.txt rename to system/autoware_diagnostic_graph_aggregator/CMakeLists.txt index 4f18407e2a108..69882ad10bd81 100644 --- a/system/diagnostic_graph_aggregator/CMakeLists.txt +++ b/system/autoware_diagnostic_graph_aggregator/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(diagnostic_graph_aggregator) +project(autoware_diagnostic_graph_aggregator) find_package(autoware_cmake REQUIRED) autoware_package() @@ -30,8 +30,8 @@ ament_auto_add_library(aggregator SHARED target_include_directories(aggregator PRIVATE src/common) rclcpp_components_register_node(aggregator - PLUGIN "diagnostic_graph_aggregator::AggregatorNode" - EXECUTABLE aggregator_node + PLUGIN "autoware::diagnostic_graph_aggregator::AggregatorNode" + EXECUTABLE ${PROJECT_NAME}_node ) if(BUILD_TESTING) diff --git a/system/diagnostic_graph_aggregator/README.md b/system/autoware_diagnostic_graph_aggregator/README.md similarity index 96% rename from system/diagnostic_graph_aggregator/README.md rename to system/autoware_diagnostic_graph_aggregator/README.md index 76513ca414541..892a2a381f324 100644 --- a/system/diagnostic_graph_aggregator/README.md +++ b/system/autoware_diagnostic_graph_aggregator/README.md @@ -1,4 +1,4 @@ -# diagnostic_graph_aggregator +# autoware_diagnostic_graph_aggregator ## Overview @@ -66,7 +66,7 @@ This is an example of a diagnostic graph configuration. The configuration can be - [module2.yaml](./example/graph/module2.yaml) ```bash -ros2 launch diagnostic_graph_aggregator example-main.launch.xml +ros2 launch autoware_diagnostic_graph_aggregator example-main.launch.xml ``` You can reuse the graph by making partial edits. For example, disable hardware checks for simulation. @@ -74,7 +74,7 @@ You can reuse the graph by making partial edits. For example, disable hardware c - [edit.yaml](./example/graph/edit.yaml) ```bash -ros2 launch diagnostic_graph_aggregator example-edit.launch.xml +ros2 launch autoware_diagnostic_graph_aggregator example-edit.launch.xml ``` ## Debug tools diff --git a/system/diagnostic_graph_aggregator/config/default.param.yaml b/system/autoware_diagnostic_graph_aggregator/config/default.param.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/config/default.param.yaml rename to system/autoware_diagnostic_graph_aggregator/config/default.param.yaml diff --git a/system/diagnostic_graph_aggregator/doc/format/edit.md b/system/autoware_diagnostic_graph_aggregator/doc/format/edit.md similarity index 100% rename from system/diagnostic_graph_aggregator/doc/format/edit.md rename to system/autoware_diagnostic_graph_aggregator/doc/format/edit.md diff --git a/system/diagnostic_graph_aggregator/doc/format/edit/remove.md b/system/autoware_diagnostic_graph_aggregator/doc/format/edit/remove.md similarity index 100% rename from system/diagnostic_graph_aggregator/doc/format/edit/remove.md rename to system/autoware_diagnostic_graph_aggregator/doc/format/edit/remove.md diff --git a/system/diagnostic_graph_aggregator/doc/format/graph.md b/system/autoware_diagnostic_graph_aggregator/doc/format/graph.md similarity index 100% rename from system/diagnostic_graph_aggregator/doc/format/graph.md rename to system/autoware_diagnostic_graph_aggregator/doc/format/graph.md diff --git a/system/diagnostic_graph_aggregator/doc/format/path.md b/system/autoware_diagnostic_graph_aggregator/doc/format/path.md similarity index 100% rename from system/diagnostic_graph_aggregator/doc/format/path.md rename to system/autoware_diagnostic_graph_aggregator/doc/format/path.md diff --git a/system/diagnostic_graph_aggregator/doc/format/unit.md b/system/autoware_diagnostic_graph_aggregator/doc/format/unit.md similarity index 100% rename from system/diagnostic_graph_aggregator/doc/format/unit.md rename to system/autoware_diagnostic_graph_aggregator/doc/format/unit.md diff --git a/system/diagnostic_graph_aggregator/doc/format/unit/and.md b/system/autoware_diagnostic_graph_aggregator/doc/format/unit/and.md similarity index 100% rename from system/diagnostic_graph_aggregator/doc/format/unit/and.md rename to system/autoware_diagnostic_graph_aggregator/doc/format/unit/and.md diff --git a/system/diagnostic_graph_aggregator/doc/format/unit/const.md b/system/autoware_diagnostic_graph_aggregator/doc/format/unit/const.md similarity index 100% rename from system/diagnostic_graph_aggregator/doc/format/unit/const.md rename to system/autoware_diagnostic_graph_aggregator/doc/format/unit/const.md diff --git a/system/diagnostic_graph_aggregator/doc/format/unit/diag.md b/system/autoware_diagnostic_graph_aggregator/doc/format/unit/diag.md similarity index 100% rename from system/diagnostic_graph_aggregator/doc/format/unit/diag.md rename to system/autoware_diagnostic_graph_aggregator/doc/format/unit/diag.md diff --git a/system/diagnostic_graph_aggregator/doc/format/unit/link.md b/system/autoware_diagnostic_graph_aggregator/doc/format/unit/link.md similarity index 100% rename from system/diagnostic_graph_aggregator/doc/format/unit/link.md rename to system/autoware_diagnostic_graph_aggregator/doc/format/unit/link.md diff --git a/system/diagnostic_graph_aggregator/doc/format/unit/or.md b/system/autoware_diagnostic_graph_aggregator/doc/format/unit/or.md similarity index 100% rename from system/diagnostic_graph_aggregator/doc/format/unit/or.md rename to system/autoware_diagnostic_graph_aggregator/doc/format/unit/or.md diff --git a/system/diagnostic_graph_aggregator/doc/format/unit/remap.md b/system/autoware_diagnostic_graph_aggregator/doc/format/unit/remap.md similarity index 100% rename from system/diagnostic_graph_aggregator/doc/format/unit/remap.md rename to system/autoware_diagnostic_graph_aggregator/doc/format/unit/remap.md diff --git a/system/diagnostic_graph_aggregator/doc/overview.drawio.svg b/system/autoware_diagnostic_graph_aggregator/doc/overview.drawio.svg similarity index 100% rename from system/diagnostic_graph_aggregator/doc/overview.drawio.svg rename to system/autoware_diagnostic_graph_aggregator/doc/overview.drawio.svg diff --git a/system/diagnostic_graph_aggregator/doc/tool/tree.md b/system/autoware_diagnostic_graph_aggregator/doc/tool/tree.md similarity index 83% rename from system/diagnostic_graph_aggregator/doc/tool/tree.md rename to system/autoware_diagnostic_graph_aggregator/doc/tool/tree.md index 12b664ecc48d6..2bbedcce4aeb4 100644 --- a/system/diagnostic_graph_aggregator/doc/tool/tree.md +++ b/system/autoware_diagnostic_graph_aggregator/doc/tool/tree.md @@ -5,13 +5,13 @@ This tool displays the graph structure of the configuration file in tree format. ## Usage ```bash -ros2 run diagnostic_graph_aggregator tree +ros2 run autoware_diagnostic_graph_aggregator tree ``` ## Examples ```bash -ros2 run diagnostic_graph_aggregator tree '$(find-pkg-share diagnostic_graph_aggregator)/example/graph/main.yaml' +ros2 run autoware_diagnostic_graph_aggregator tree '$(find-pkg-share autoware_diagnostic_graph_aggregator)/example/graph/main.yaml' ``` ```txt diff --git a/system/diagnostic_graph_aggregator/example/dummy-diags.py b/system/autoware_diagnostic_graph_aggregator/example/dummy-diags.py similarity index 100% rename from system/diagnostic_graph_aggregator/example/dummy-diags.py rename to system/autoware_diagnostic_graph_aggregator/example/dummy-diags.py diff --git a/system/autoware_diagnostic_graph_aggregator/example/example-edit.launch.xml b/system/autoware_diagnostic_graph_aggregator/example/example-edit.launch.xml new file mode 100644 index 0000000000000..1a15bbe929f6e --- /dev/null +++ b/system/autoware_diagnostic_graph_aggregator/example/example-edit.launch.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/system/autoware_diagnostic_graph_aggregator/example/example-main.launch.xml b/system/autoware_diagnostic_graph_aggregator/example/example-main.launch.xml new file mode 100644 index 0000000000000..712da5128d09b --- /dev/null +++ b/system/autoware_diagnostic_graph_aggregator/example/example-main.launch.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/system/diagnostic_graph_aggregator/example/graph/edit.yaml b/system/autoware_diagnostic_graph_aggregator/example/graph/edit.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/example/graph/edit.yaml rename to system/autoware_diagnostic_graph_aggregator/example/graph/edit.yaml diff --git a/system/diagnostic_graph_aggregator/example/graph/main.yaml b/system/autoware_diagnostic_graph_aggregator/example/graph/main.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/example/graph/main.yaml rename to system/autoware_diagnostic_graph_aggregator/example/graph/main.yaml diff --git a/system/diagnostic_graph_aggregator/example/graph/module1.yaml b/system/autoware_diagnostic_graph_aggregator/example/graph/module1.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/example/graph/module1.yaml rename to system/autoware_diagnostic_graph_aggregator/example/graph/module1.yaml diff --git a/system/diagnostic_graph_aggregator/example/graph/module2.yaml b/system/autoware_diagnostic_graph_aggregator/example/graph/module2.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/example/graph/module2.yaml rename to system/autoware_diagnostic_graph_aggregator/example/graph/module2.yaml diff --git a/system/autoware_diagnostic_graph_aggregator/launch/aggregator.launch.xml b/system/autoware_diagnostic_graph_aggregator/launch/aggregator.launch.xml new file mode 100644 index 0000000000000..89dac8e5f439b --- /dev/null +++ b/system/autoware_diagnostic_graph_aggregator/launch/aggregator.launch.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/system/diagnostic_graph_aggregator/package.xml b/system/autoware_diagnostic_graph_aggregator/package.xml similarity index 87% rename from system/diagnostic_graph_aggregator/package.xml rename to system/autoware_diagnostic_graph_aggregator/package.xml index ae9266a3bf302..33d7dfdff9637 100644 --- a/system/diagnostic_graph_aggregator/package.xml +++ b/system/autoware_diagnostic_graph_aggregator/package.xml @@ -1,10 +1,11 @@ - diagnostic_graph_aggregator + autoware_diagnostic_graph_aggregator 0.40.0 The diagnostic_graph_aggregator package Takagi, Isamu + Junya Sasaki Apache License 2.0 ament_cmake_auto diff --git a/system/diagnostic_graph_aggregator/script/dump.py b/system/autoware_diagnostic_graph_aggregator/script/dump.py similarity index 100% rename from system/diagnostic_graph_aggregator/script/dump.py rename to system/autoware_diagnostic_graph_aggregator/script/dump.py diff --git a/system/diagnostic_graph_aggregator/src/common/graph/config.cpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/config.cpp similarity index 98% rename from system/diagnostic_graph_aggregator/src/common/graph/config.cpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/config.cpp index e622d089109f4..3b95d06befb8e 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/config.cpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/config.cpp @@ -29,7 +29,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { std::string resolve_substitution(const std::string & substitution, const TreeData & data) @@ -309,4 +309,4 @@ FileConfig TreeLoader::construct() return config; } -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator diff --git a/system/diagnostic_graph_aggregator/src/common/graph/config.hpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/config.hpp similarity index 96% rename from system/diagnostic_graph_aggregator/src/common/graph/config.hpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/config.hpp index 935b65203afbe..f74f2ef721ee0 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/config.hpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/config.hpp @@ -23,7 +23,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { struct PathConfig @@ -98,6 +98,6 @@ class TreeLoader std::vector files_; }; -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator #endif // COMMON__GRAPH__CONFIG_HPP_ diff --git a/system/diagnostic_graph_aggregator/src/common/graph/data.cpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/data.cpp similarity index 95% rename from system/diagnostic_graph_aggregator/src/common/graph/data.cpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/data.cpp index e1d053e6d259c..60fb356d41910 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/data.cpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/data.cpp @@ -16,7 +16,7 @@ #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { TreeData TreeData::Load(const std::string & path) @@ -96,4 +96,4 @@ double TreeData::real(double fail) return yaml_.as(fail); } -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator diff --git a/system/diagnostic_graph_aggregator/src/common/graph/data.hpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/data.hpp similarity index 93% rename from system/diagnostic_graph_aggregator/src/common/graph/data.hpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/data.hpp index 437e3793df398..6ddac7897746d 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/data.hpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/data.hpp @@ -23,7 +23,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { class TreeData @@ -51,6 +51,6 @@ class TreeData TreePath path_; }; -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator #endif // COMMON__GRAPH__DATA_HPP_ diff --git a/system/diagnostic_graph_aggregator/src/common/graph/error.cpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/error.cpp similarity index 93% rename from system/diagnostic_graph_aggregator/src/common/graph/error.cpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/error.cpp index 7a4336e62d8a3..976fc63aab8ab 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/error.cpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/error.cpp @@ -16,7 +16,7 @@ #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { TreePath::TreePath(const std::string & file) @@ -57,4 +57,4 @@ std::string TreePath::text() const return " (" + file_ + sep + node_ + ")"; } -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator diff --git a/system/diagnostic_graph_aggregator/src/common/graph/error.hpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/error.hpp similarity index 97% rename from system/diagnostic_graph_aggregator/src/common/graph/error.hpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/error.hpp index d923e12caf783..cef345a1243ca 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/error.hpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/error.hpp @@ -18,7 +18,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { struct TreePath @@ -127,6 +127,6 @@ struct GraphStructure : public Exception using Exception::Exception; }; -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator #endif // COMMON__GRAPH__ERROR_HPP_ diff --git a/system/diagnostic_graph_aggregator/src/common/graph/graph.cpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/graph.cpp similarity index 95% rename from system/diagnostic_graph_aggregator/src/common/graph/graph.cpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/graph.cpp index 7977209b4905c..ff6c5a8db21ed 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/graph.cpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/graph.cpp @@ -22,7 +22,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { void Graph::create(const std::string & file, const std::string & id) @@ -77,4 +77,4 @@ DiagGraphStatus Graph::create_status(const rclcpp::Time & stamp) const Graph::Graph() = default; Graph::~Graph() = default; -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator diff --git a/system/diagnostic_graph_aggregator/src/common/graph/graph.hpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/graph.hpp similarity index 94% rename from system/diagnostic_graph_aggregator/src/common/graph/graph.hpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/graph.hpp index 14a27dae9a539..13362613d9952 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/graph.hpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/graph.hpp @@ -24,7 +24,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { class Graph @@ -51,6 +51,6 @@ class Graph std::string id_; }; -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator #endif // COMMON__GRAPH__GRAPH_HPP_ diff --git a/system/diagnostic_graph_aggregator/src/common/graph/loader.cpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/loader.cpp similarity index 98% rename from system/diagnostic_graph_aggregator/src/common/graph/loader.cpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/loader.cpp index 5edef61340fe8..8a21a4f47951e 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/loader.cpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/loader.cpp @@ -26,7 +26,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { struct UnitLoader::GraphLinks @@ -190,4 +190,4 @@ std::unique_ptr GraphLoader::create_node(const UnitLoader & unit) throw UnknownUnitType(unit.data().path(), unit.type()); } -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator diff --git a/system/diagnostic_graph_aggregator/src/common/graph/loader.hpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/loader.hpp similarity index 94% rename from system/diagnostic_graph_aggregator/src/common/graph/loader.hpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/loader.hpp index 226b3ab279b22..c9f6923c5bcfd 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/loader.hpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/loader.hpp @@ -22,7 +22,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { class UnitLoader @@ -62,6 +62,6 @@ class GraphLoader std::vector> links_; }; -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator #endif // COMMON__GRAPH__LOADER_HPP_ diff --git a/system/diagnostic_graph_aggregator/src/common/graph/names.hpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/names.hpp similarity index 83% rename from system/diagnostic_graph_aggregator/src/common/graph/names.hpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/names.hpp index aa5a9c46e7b37..36645b320f496 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/names.hpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/names.hpp @@ -15,7 +15,7 @@ #ifndef COMMON__GRAPH__NAMES_HPP_ #define COMMON__GRAPH__NAMES_HPP_ -namespace diagnostic_graph_aggregator::unit_name +namespace autoware::diagnostic_graph_aggregator::unit_name { constexpr char const * link = "link"; @@ -30,13 +30,13 @@ constexpr char const * warn = "warn"; constexpr char const * error = "error"; constexpr char const * stale = "stale"; -} // namespace diagnostic_graph_aggregator::unit_name +} // namespace autoware::diagnostic_graph_aggregator::unit_name -namespace diagnostic_graph_aggregator::edit_name +namespace autoware::diagnostic_graph_aggregator::edit_name { constexpr char const * remove = "remove"; -} // namespace diagnostic_graph_aggregator::edit_name +} // namespace autoware::diagnostic_graph_aggregator::edit_name #endif // COMMON__GRAPH__NAMES_HPP_ diff --git a/system/diagnostic_graph_aggregator/src/common/graph/types.hpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/types.hpp similarity index 95% rename from system/diagnostic_graph_aggregator/src/common/graph/types.hpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/types.hpp index 6eae26a1f98c7..f7844b3d1b327 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/types.hpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/types.hpp @@ -31,7 +31,7 @@ #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { using diagnostic_msgs::msg::DiagnosticArray; @@ -59,6 +59,6 @@ class DiagUnit; class Graph; class UnitLoader; -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator #endif // COMMON__GRAPH__TYPES_HPP_ diff --git a/system/diagnostic_graph_aggregator/src/common/graph/units.cpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/units.cpp similarity index 98% rename from system/diagnostic_graph_aggregator/src/common/graph/units.cpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/units.cpp index 5ebd603964add..3d7919027aae5 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/units.cpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/units.cpp @@ -20,7 +20,7 @@ #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { void UnitLink::initialize_object(BaseUnit * parent, BaseUnit * child) @@ -226,4 +226,4 @@ StaleUnit::StaleUnit(const UnitLoader & unit) : ConstUnit(unit) status_.level = DiagnosticStatus::STALE; } -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator diff --git a/system/diagnostic_graph_aggregator/src/common/graph/units.hpp b/system/autoware_diagnostic_graph_aggregator/src/common/graph/units.hpp similarity index 98% rename from system/diagnostic_graph_aggregator/src/common/graph/units.hpp rename to system/autoware_diagnostic_graph_aggregator/src/common/graph/units.hpp index 323053db08385..248f4694c17ae 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/units.hpp +++ b/system/autoware_diagnostic_graph_aggregator/src/common/graph/units.hpp @@ -24,7 +24,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { class UnitLink @@ -225,6 +225,6 @@ class StaleUnit : public ConstUnit std::string type() const override { return unit_name::stale; } }; -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator #endif // COMMON__GRAPH__UNITS_HPP_ diff --git a/system/diagnostic_graph_aggregator/src/node/aggregator.cpp b/system/autoware_diagnostic_graph_aggregator/src/node/aggregator.cpp similarity index 94% rename from system/diagnostic_graph_aggregator/src/node/aggregator.cpp rename to system/autoware_diagnostic_graph_aggregator/src/node/aggregator.cpp index 4d2ec73bfceca..ac0fa587895e5 100644 --- a/system/diagnostic_graph_aggregator/src/node/aggregator.cpp +++ b/system/autoware_diagnostic_graph_aggregator/src/node/aggregator.cpp @@ -18,7 +18,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { AggregatorNode::AggregatorNode(const rclcpp::NodeOptions & options) : Node("aggregator", options) @@ -97,7 +97,7 @@ void AggregatorNode::on_diag(const DiagnosticArray & msg) // pub_status_->publish(); } -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator #include -RCLCPP_COMPONENTS_REGISTER_NODE(diagnostic_graph_aggregator::AggregatorNode) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::diagnostic_graph_aggregator::AggregatorNode) diff --git a/system/diagnostic_graph_aggregator/src/node/aggregator.hpp b/system/autoware_diagnostic_graph_aggregator/src/node/aggregator.hpp similarity index 93% rename from system/diagnostic_graph_aggregator/src/node/aggregator.hpp rename to system/autoware_diagnostic_graph_aggregator/src/node/aggregator.hpp index f71780f19a5c7..53e2ba3562aaa 100644 --- a/system/diagnostic_graph_aggregator/src/node/aggregator.hpp +++ b/system/autoware_diagnostic_graph_aggregator/src/node/aggregator.hpp @@ -24,7 +24,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { class AggregatorNode : public rclcpp::Node @@ -48,6 +48,6 @@ class AggregatorNode : public rclcpp::Node std::unordered_map unknown_diags_; }; -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator #endif // NODE__AGGREGATOR_HPP_ diff --git a/system/diagnostic_graph_aggregator/src/node/availability.cpp b/system/autoware_diagnostic_graph_aggregator/src/node/availability.cpp similarity index 96% rename from system/diagnostic_graph_aggregator/src/node/availability.cpp rename to system/autoware_diagnostic_graph_aggregator/src/node/availability.cpp index 60ad418799716..df232143aa005 100644 --- a/system/diagnostic_graph_aggregator/src/node/availability.cpp +++ b/system/autoware_diagnostic_graph_aggregator/src/node/availability.cpp @@ -22,7 +22,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { ModesAvailability::ModesAvailability(rclcpp::Node & node, const Graph & graph) @@ -73,4 +73,4 @@ void ModesAvailability::update(const rclcpp::Time & stamp) const pub_->publish(message); } -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator diff --git a/system/diagnostic_graph_aggregator/src/node/availability.hpp b/system/autoware_diagnostic_graph_aggregator/src/node/availability.hpp similarity index 93% rename from system/diagnostic_graph_aggregator/src/node/availability.hpp rename to system/autoware_diagnostic_graph_aggregator/src/node/availability.hpp index c91db089266f5..f93b19fd55046 100644 --- a/system/diagnostic_graph_aggregator/src/node/availability.hpp +++ b/system/autoware_diagnostic_graph_aggregator/src/node/availability.hpp @@ -21,7 +21,7 @@ #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { class ModesAvailability @@ -44,6 +44,6 @@ class ModesAvailability BaseUnit * pull_over_mrm_; }; -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator #endif // NODE__AVAILABILITY_HPP_ diff --git a/system/diagnostic_graph_aggregator/src/tool/plantuml.cpp b/system/autoware_diagnostic_graph_aggregator/src/tool/plantuml.cpp similarity index 88% rename from system/diagnostic_graph_aggregator/src/tool/plantuml.cpp rename to system/autoware_diagnostic_graph_aggregator/src/tool/plantuml.cpp index 68c0082908430..a87df3c47a19f 100644 --- a/system/diagnostic_graph_aggregator/src/tool/plantuml.cpp +++ b/system/autoware_diagnostic_graph_aggregator/src/tool/plantuml.cpp @@ -18,7 +18,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { void dump_root(const std::string & path) @@ -40,7 +40,7 @@ void dump_root(const std::string & path) } } -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator int main(int argc, char ** argv) { @@ -48,5 +48,5 @@ int main(int argc, char ** argv) std::cerr << "usage: plantuml " << std::endl; return 1; } - diagnostic_graph_aggregator::dump_root(argv[1]); + autoware::diagnostic_graph_aggregator::dump_root(argv[1]); } diff --git a/system/diagnostic_graph_aggregator/src/tool/tree.cpp b/system/autoware_diagnostic_graph_aggregator/src/tool/tree.cpp similarity index 92% rename from system/diagnostic_graph_aggregator/src/tool/tree.cpp rename to system/autoware_diagnostic_graph_aggregator/src/tool/tree.cpp index f367ec2113808..f37f0c3e575a7 100644 --- a/system/diagnostic_graph_aggregator/src/tool/tree.cpp +++ b/system/autoware_diagnostic_graph_aggregator/src/tool/tree.cpp @@ -18,7 +18,7 @@ #include #include -namespace diagnostic_graph_aggregator +namespace autoware::diagnostic_graph_aggregator { void dump_unit(const BaseUnit * unit, const std::string & indent = "", bool root = true) @@ -60,7 +60,7 @@ void dump_root(const std::string & path) } } -} // namespace diagnostic_graph_aggregator +} // namespace autoware::diagnostic_graph_aggregator int main(int argc, char ** argv) { @@ -68,5 +68,5 @@ int main(int argc, char ** argv) std::cerr << "usage: tree " << std::endl; return 1; } - diagnostic_graph_aggregator::dump_root(argv[1]); + autoware::diagnostic_graph_aggregator::dump_root(argv[1]); } diff --git a/system/diagnostic_graph_aggregator/test/files/test1/field-not-found.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test1/field-not-found.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test1/field-not-found.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test1/field-not-found.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test1/file-not-found.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test1/file-not-found.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test1/file-not-found.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test1/file-not-found.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test1/graph-circulation.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test1/graph-circulation.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test1/graph-circulation.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test1/graph-circulation.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test1/invalid-dict-type.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test1/invalid-dict-type.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test1/invalid-dict-type.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test1/invalid-dict-type.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test1/invalid-list-type.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test1/invalid-list-type.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test1/invalid-list-type.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test1/invalid-list-type.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test1/path-conflict.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test1/path-conflict.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test1/path-conflict.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test1/path-conflict.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test1/path-not-found.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test1/path-not-found.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test1/path-not-found.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test1/path-not-found.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test1/unknown-substitution.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test1/unknown-substitution.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test1/unknown-substitution.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test1/unknown-substitution.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test1/unknown-unit-type.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test1/unknown-unit-type.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test1/unknown-unit-type.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test1/unknown-unit-type.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test2/and.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test2/and.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test2/and.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test2/and.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test2/or.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test2/or.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test2/or.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test2/or.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test2/warn-to-error.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test2/warn-to-error.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test2/warn-to-error.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test2/warn-to-error.yaml diff --git a/system/diagnostic_graph_aggregator/test/files/test2/warn-to-ok.yaml b/system/autoware_diagnostic_graph_aggregator/test/files/test2/warn-to-ok.yaml similarity index 100% rename from system/diagnostic_graph_aggregator/test/files/test2/warn-to-ok.yaml rename to system/autoware_diagnostic_graph_aggregator/test/files/test2/warn-to-ok.yaml diff --git a/system/diagnostic_graph_aggregator/test/src/test1.cpp b/system/autoware_diagnostic_graph_aggregator/test/src/test1.cpp similarity index 96% rename from system/diagnostic_graph_aggregator/test/src/test1.cpp rename to system/autoware_diagnostic_graph_aggregator/test/src/test1.cpp index ea157852675ec..30182314df48f 100644 --- a/system/diagnostic_graph_aggregator/test/src/test1.cpp +++ b/system/autoware_diagnostic_graph_aggregator/test/src/test1.cpp @@ -18,7 +18,7 @@ #include -using namespace diagnostic_graph_aggregator; // NOLINT(build/namespaces) +using namespace autoware::diagnostic_graph_aggregator; // NOLINT(build/namespaces) TEST(ConfigFile, RootNotFound) { diff --git a/system/diagnostic_graph_aggregator/test/src/test2.cpp b/system/autoware_diagnostic_graph_aggregator/test/src/test2.cpp similarity index 98% rename from system/diagnostic_graph_aggregator/test/src/test2.cpp rename to system/autoware_diagnostic_graph_aggregator/test/src/test2.cpp index 169e3017f8cd4..d0f9a8c2e2557 100644 --- a/system/diagnostic_graph_aggregator/test/src/test2.cpp +++ b/system/autoware_diagnostic_graph_aggregator/test/src/test2.cpp @@ -25,7 +25,7 @@ #include #include -using namespace diagnostic_graph_aggregator; // NOLINT(build/namespaces) +using namespace autoware::diagnostic_graph_aggregator; // NOLINT(build/namespaces) using diagnostic_msgs::msg::DiagnosticArray; using diagnostic_msgs::msg::DiagnosticStatus; diff --git a/system/diagnostic_graph_aggregator/test/src/utils.cpp b/system/autoware_diagnostic_graph_aggregator/test/src/utils.cpp similarity index 100% rename from system/diagnostic_graph_aggregator/test/src/utils.cpp rename to system/autoware_diagnostic_graph_aggregator/test/src/utils.cpp diff --git a/system/diagnostic_graph_aggregator/test/src/utils.hpp b/system/autoware_diagnostic_graph_aggregator/test/src/utils.hpp similarity index 100% rename from system/diagnostic_graph_aggregator/test/src/utils.hpp rename to system/autoware_diagnostic_graph_aggregator/test/src/utils.hpp diff --git a/system/system_diagnostic_monitor/CHANGELOG.rst b/system/autoware_system_diagnostic_monitor/CHANGELOG.rst similarity index 95% rename from system/system_diagnostic_monitor/CHANGELOG.rst rename to system/autoware_system_diagnostic_monitor/CHANGELOG.rst index 9a5721b05d7ee..3c03aaf85535e 100644 --- a/system/system_diagnostic_monitor/CHANGELOG.rst +++ b/system/autoware_system_diagnostic_monitor/CHANGELOG.rst @@ -1,6 +1,6 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package system_diagnostic_monitor -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package autoware_system_diagnostic_monitor +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.40.0 (2024-12-12) ------------------- diff --git a/system/system_diagnostic_monitor/CMakeLists.txt b/system/autoware_system_diagnostic_monitor/CMakeLists.txt similarity index 86% rename from system/system_diagnostic_monitor/CMakeLists.txt rename to system/autoware_system_diagnostic_monitor/CMakeLists.txt index b253b5dbc0529..562079abf84fb 100644 --- a/system/system_diagnostic_monitor/CMakeLists.txt +++ b/system/autoware_system_diagnostic_monitor/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(system_diagnostic_monitor) +project(autoware_system_diagnostic_monitor) find_package(autoware_cmake REQUIRED) autoware_package() diff --git a/system/system_diagnostic_monitor/README.md b/system/autoware_system_diagnostic_monitor/README.md similarity index 100% rename from system/system_diagnostic_monitor/README.md rename to system/autoware_system_diagnostic_monitor/README.md diff --git a/system/system_diagnostic_monitor/config/autoware-main.yaml b/system/autoware_system_diagnostic_monitor/config/autoware-main.yaml similarity index 78% rename from system/system_diagnostic_monitor/config/autoware-main.yaml rename to system/autoware_system_diagnostic_monitor/config/autoware-main.yaml index 26f3fee2863d0..30b6ce9bad9f4 100644 --- a/system/system_diagnostic_monitor/config/autoware-main.yaml +++ b/system/autoware_system_diagnostic_monitor/config/autoware-main.yaml @@ -1,11 +1,11 @@ files: - - { path: $(find-pkg-share system_diagnostic_monitor)/config/map.yaml } - - { path: $(find-pkg-share system_diagnostic_monitor)/config/localization.yaml } - - { path: $(find-pkg-share system_diagnostic_monitor)/config/planning.yaml } - - { path: $(find-pkg-share system_diagnostic_monitor)/config/perception.yaml } - - { path: $(find-pkg-share system_diagnostic_monitor)/config/control.yaml } - - { path: $(find-pkg-share system_diagnostic_monitor)/config/vehicle.yaml } - - { path: $(find-pkg-share system_diagnostic_monitor)/config/system.yaml } + - { path: $(dirname)/map.yaml } + - { path: $(dirname)/localization.yaml } + - { path: $(dirname)/planning.yaml } + - { path: $(dirname)/perception.yaml } + - { path: $(dirname)/control.yaml } + - { path: $(dirname)/vehicle.yaml } + - { path: $(dirname)/system.yaml } units: - path: /autoware/modes/stop diff --git a/system/system_diagnostic_monitor/config/autoware-psim.yaml b/system/autoware_system_diagnostic_monitor/config/autoware-psim.yaml similarity index 100% rename from system/system_diagnostic_monitor/config/autoware-psim.yaml rename to system/autoware_system_diagnostic_monitor/config/autoware-psim.yaml diff --git a/system/system_diagnostic_monitor/config/control.yaml b/system/autoware_system_diagnostic_monitor/config/control.yaml similarity index 100% rename from system/system_diagnostic_monitor/config/control.yaml rename to system/autoware_system_diagnostic_monitor/config/control.yaml diff --git a/system/system_diagnostic_monitor/config/hardware.yaml b/system/autoware_system_diagnostic_monitor/config/hardware.yaml similarity index 100% rename from system/system_diagnostic_monitor/config/hardware.yaml rename to system/autoware_system_diagnostic_monitor/config/hardware.yaml diff --git a/system/system_diagnostic_monitor/config/localization.yaml b/system/autoware_system_diagnostic_monitor/config/localization.yaml similarity index 100% rename from system/system_diagnostic_monitor/config/localization.yaml rename to system/autoware_system_diagnostic_monitor/config/localization.yaml diff --git a/system/system_diagnostic_monitor/config/map.yaml b/system/autoware_system_diagnostic_monitor/config/map.yaml similarity index 100% rename from system/system_diagnostic_monitor/config/map.yaml rename to system/autoware_system_diagnostic_monitor/config/map.yaml diff --git a/system/system_diagnostic_monitor/config/perception.yaml b/system/autoware_system_diagnostic_monitor/config/perception.yaml similarity index 100% rename from system/system_diagnostic_monitor/config/perception.yaml rename to system/autoware_system_diagnostic_monitor/config/perception.yaml diff --git a/system/system_diagnostic_monitor/config/planning.yaml b/system/autoware_system_diagnostic_monitor/config/planning.yaml similarity index 100% rename from system/system_diagnostic_monitor/config/planning.yaml rename to system/autoware_system_diagnostic_monitor/config/planning.yaml diff --git a/system/system_diagnostic_monitor/config/system.yaml b/system/autoware_system_diagnostic_monitor/config/system.yaml similarity index 100% rename from system/system_diagnostic_monitor/config/system.yaml rename to system/autoware_system_diagnostic_monitor/config/system.yaml diff --git a/system/system_diagnostic_monitor/config/vehicle.yaml b/system/autoware_system_diagnostic_monitor/config/vehicle.yaml similarity index 100% rename from system/system_diagnostic_monitor/config/vehicle.yaml rename to system/autoware_system_diagnostic_monitor/config/vehicle.yaml diff --git a/system/autoware_system_diagnostic_monitor/launch/system_diagnostic_monitor.launch.xml b/system/autoware_system_diagnostic_monitor/launch/system_diagnostic_monitor.launch.xml new file mode 100644 index 0000000000000..9a9fcb494d4e2 --- /dev/null +++ b/system/autoware_system_diagnostic_monitor/launch/system_diagnostic_monitor.launch.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/system/system_diagnostic_monitor/package.xml b/system/autoware_system_diagnostic_monitor/package.xml similarity index 74% rename from system/system_diagnostic_monitor/package.xml rename to system/autoware_system_diagnostic_monitor/package.xml index 095d7cf040517..48c93e0b18ab2 100644 --- a/system/system_diagnostic_monitor/package.xml +++ b/system/autoware_system_diagnostic_monitor/package.xml @@ -1,17 +1,18 @@ - system_diagnostic_monitor + autoware_system_diagnostic_monitor 0.40.0 - The system_diagnostic_monitor package + The autoware_system_diagnostic_monitor package Takagi, Isamu + Junya Sasaki Apache License 2.0 ament_cmake_auto autoware_cmake autoware_adapi_v1_msgs - diagnostic_graph_aggregator + autoware_diagnostic_graph_aggregator diagnostic_msgs rclpy tier4_system_msgs diff --git a/system/system_diagnostic_monitor/script/component_state_diagnostics.py b/system/autoware_system_diagnostic_monitor/script/component_state_diagnostics.py similarity index 100% rename from system/system_diagnostic_monitor/script/component_state_diagnostics.py rename to system/autoware_system_diagnostic_monitor/script/component_state_diagnostics.py diff --git a/system/topic_state_monitor/CHANGELOG.rst b/system/autoware_topic_state_monitor/CHANGELOG.rst similarity index 98% rename from system/topic_state_monitor/CHANGELOG.rst rename to system/autoware_topic_state_monitor/CHANGELOG.rst index 1eebcd1bcb1b1..b1faa2cd63683 100644 --- a/system/topic_state_monitor/CHANGELOG.rst +++ b/system/autoware_topic_state_monitor/CHANGELOG.rst @@ -1,6 +1,6 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package topic_state_monitor -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package autoware_topic_state_monitor +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 0.40.0 (2024-12-12) ------------------- diff --git a/system/topic_state_monitor/CMakeLists.txt b/system/autoware_topic_state_monitor/CMakeLists.txt similarity index 50% rename from system/topic_state_monitor/CMakeLists.txt rename to system/autoware_topic_state_monitor/CMakeLists.txt index a4a040c449cdb..822560a12e3d5 100644 --- a/system/topic_state_monitor/CMakeLists.txt +++ b/system/autoware_topic_state_monitor/CMakeLists.txt @@ -1,17 +1,17 @@ cmake_minimum_required(VERSION 3.14) -project(topic_state_monitor) +project(autoware_topic_state_monitor) find_package(autoware_cmake REQUIRED) autoware_package() -ament_auto_add_library(topic_state_monitor SHARED +ament_auto_add_library(${PROJECT_NAME} SHARED src/topic_state_monitor/topic_state_monitor.cpp src/topic_state_monitor_core.cpp ) -rclcpp_components_register_node(topic_state_monitor - PLUGIN "topic_state_monitor::TopicStateMonitorNode" - EXECUTABLE topic_state_monitor_node +rclcpp_components_register_node(${PROJECT_NAME} + PLUGIN "autoware::topic_state_monitor::TopicStateMonitorNode" + EXECUTABLE ${PROJECT_NAME}_node ) ament_auto_package(INSTALL_TO_SHARE diff --git a/system/topic_state_monitor/README.md b/system/autoware_topic_state_monitor/README.md similarity index 99% rename from system/topic_state_monitor/README.md rename to system/autoware_topic_state_monitor/README.md index 28333305ef5a9..bebf096db08ac 100644 --- a/system/topic_state_monitor/README.md +++ b/system/autoware_topic_state_monitor/README.md @@ -1,4 +1,4 @@ -# topic_state_monitor +# autoware_topic_state_monitor ## Purpose diff --git a/system/topic_state_monitor/include/topic_state_monitor/topic_state_monitor.hpp b/system/autoware_topic_state_monitor/include/autoware/topic_state_monitor/topic_state_monitor.hpp similarity index 84% rename from system/topic_state_monitor/include/topic_state_monitor/topic_state_monitor.hpp rename to system/autoware_topic_state_monitor/include/autoware/topic_state_monitor/topic_state_monitor.hpp index 2057ca4c5c86c..e9a651fef3879 100644 --- a/system/topic_state_monitor/include/topic_state_monitor/topic_state_monitor.hpp +++ b/system/autoware_topic_state_monitor/include/autoware/topic_state_monitor/topic_state_monitor.hpp @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_HPP_ -#define TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_HPP_ +#ifndef AUTOWARE__TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_HPP_ +#define AUTOWARE__TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_HPP_ #include #include #include -namespace topic_state_monitor +namespace autoware::topic_state_monitor { struct Param { @@ -68,6 +68,6 @@ class TopicStateMonitor bool isErrorRate() const; bool isTimeout() const; }; -} // namespace topic_state_monitor +} // namespace autoware::topic_state_monitor -#endif // TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_HPP_ +#endif // AUTOWARE__TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_HPP_ diff --git a/system/topic_state_monitor/include/topic_state_monitor/topic_state_monitor_core.hpp b/system/autoware_topic_state_monitor/include/autoware/topic_state_monitor/topic_state_monitor_core.hpp similarity index 83% rename from system/topic_state_monitor/include/topic_state_monitor/topic_state_monitor_core.hpp rename to system/autoware_topic_state_monitor/include/autoware/topic_state_monitor/topic_state_monitor_core.hpp index 4696823ffbd4b..5d72d437f7b12 100644 --- a/system/topic_state_monitor/include/topic_state_monitor/topic_state_monitor_core.hpp +++ b/system/autoware_topic_state_monitor/include/autoware/topic_state_monitor/topic_state_monitor_core.hpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_CORE_HPP_ -#define TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_CORE_HPP_ +#ifndef AUTOWARE__TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_CORE_HPP_ +#define AUTOWARE__TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_CORE_HPP_ -#include "topic_state_monitor/topic_state_monitor.hpp" +#include "autoware/topic_state_monitor/topic_state_monitor.hpp" #include #include @@ -28,7 +28,7 @@ #include #include -namespace topic_state_monitor +namespace autoware::topic_state_monitor { struct NodeParam { @@ -74,6 +74,6 @@ class TopicStateMonitorNode : public rclcpp::Node void checkTopicStatus(diagnostic_updater::DiagnosticStatusWrapper & stat); }; -} // namespace topic_state_monitor +} // namespace autoware::topic_state_monitor -#endif // TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_CORE_HPP_ +#endif // AUTOWARE__TOPIC_STATE_MONITOR__TOPIC_STATE_MONITOR_CORE_HPP_ diff --git a/system/topic_state_monitor/launch/topic_state_monitor.launch.xml b/system/autoware_topic_state_monitor/launch/topic_state_monitor.launch.xml similarity index 88% rename from system/topic_state_monitor/launch/topic_state_monitor.launch.xml rename to system/autoware_topic_state_monitor/launch/topic_state_monitor.launch.xml index 7304dc8c5a273..7df4b2b035944 100644 --- a/system/topic_state_monitor/launch/topic_state_monitor.launch.xml +++ b/system/autoware_topic_state_monitor/launch/topic_state_monitor.launch.xml @@ -10,7 +10,7 @@ - + diff --git a/system/topic_state_monitor/launch/topic_state_monitor_tf.launch.xml b/system/autoware_topic_state_monitor/launch/topic_state_monitor_tf.launch.xml similarity index 89% rename from system/topic_state_monitor/launch/topic_state_monitor_tf.launch.xml rename to system/autoware_topic_state_monitor/launch/topic_state_monitor_tf.launch.xml index 1a255a8a5859a..8a981d30969e4 100644 --- a/system/topic_state_monitor/launch/topic_state_monitor_tf.launch.xml +++ b/system/autoware_topic_state_monitor/launch/topic_state_monitor_tf.launch.xml @@ -11,7 +11,7 @@ - + diff --git a/system/topic_state_monitor/package.xml b/system/autoware_topic_state_monitor/package.xml similarity index 80% rename from system/topic_state_monitor/package.xml rename to system/autoware_topic_state_monitor/package.xml index 0468db6124666..d3a51620f336e 100644 --- a/system/topic_state_monitor/package.xml +++ b/system/autoware_topic_state_monitor/package.xml @@ -1,10 +1,11 @@ - topic_state_monitor + autoware_topic_state_monitor 0.40.0 - The topic_state_monitor package + The autoware_topic_state_monitor package Ryohsuke Mitsudome + Junya Sasaki Apache License 2.0 ament_cmake_auto diff --git a/system/topic_state_monitor/src/topic_state_monitor/topic_state_monitor.cpp b/system/autoware_topic_state_monitor/src/topic_state_monitor/topic_state_monitor.cpp similarity index 94% rename from system/topic_state_monitor/src/topic_state_monitor/topic_state_monitor.cpp rename to system/autoware_topic_state_monitor/src/topic_state_monitor/topic_state_monitor.cpp index ff6806e96fac9..a688bfe501960 100644 --- a/system/topic_state_monitor/src/topic_state_monitor/topic_state_monitor.cpp +++ b/system/autoware_topic_state_monitor/src/topic_state_monitor/topic_state_monitor.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "topic_state_monitor/topic_state_monitor.hpp" +#include "autoware/topic_state_monitor/topic_state_monitor.hpp" -namespace topic_state_monitor +namespace autoware::topic_state_monitor { TopicStateMonitor::TopicStateMonitor(rclcpp::Node & node) : clock_(node.get_clock()) { @@ -99,4 +99,4 @@ bool TopicStateMonitor::isTimeout() const return time_diff > param_.timeout; } -} // namespace topic_state_monitor +} // namespace autoware::topic_state_monitor diff --git a/system/topic_state_monitor/src/topic_state_monitor_core.cpp b/system/autoware_topic_state_monitor/src/topic_state_monitor_core.cpp similarity index 96% rename from system/topic_state_monitor/src/topic_state_monitor_core.cpp rename to system/autoware_topic_state_monitor/src/topic_state_monitor_core.cpp index ff58a0c6fd584..5947136b1cd57 100644 --- a/system/topic_state_monitor/src/topic_state_monitor_core.cpp +++ b/system/autoware_topic_state_monitor/src/topic_state_monitor_core.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "topic_state_monitor/topic_state_monitor_core.hpp" +#include "autoware/topic_state_monitor/topic_state_monitor_core.hpp" #include #include @@ -34,7 +34,7 @@ void update_param( } } // namespace -namespace topic_state_monitor +namespace autoware::topic_state_monitor { TopicStateMonitorNode::TopicStateMonitorNode(const rclcpp::NodeOptions & node_options) : Node("topic_state_monitor", node_options), updater_(this) @@ -205,7 +205,7 @@ void TopicStateMonitorNode::checkTopicStatus(diagnostic_updater::DiagnosticStatu stat.summary(level, msg); } -} // namespace topic_state_monitor +} // namespace autoware::topic_state_monitor #include -RCLCPP_COMPONENTS_REGISTER_NODE(topic_state_monitor::TopicStateMonitorNode) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::topic_state_monitor::TopicStateMonitorNode) diff --git a/system/diagnostic_graph_aggregator/example/example-edit.launch.xml b/system/diagnostic_graph_aggregator/example/example-edit.launch.xml deleted file mode 100644 index d56f76b1726cf..0000000000000 --- a/system/diagnostic_graph_aggregator/example/example-edit.launch.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/system/diagnostic_graph_aggregator/example/example-main.launch.xml b/system/diagnostic_graph_aggregator/example/example-main.launch.xml deleted file mode 100644 index b7019640e993c..0000000000000 --- a/system/diagnostic_graph_aggregator/example/example-main.launch.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/system/diagnostic_graph_aggregator/launch/aggregator.launch.xml b/system/diagnostic_graph_aggregator/launch/aggregator.launch.xml deleted file mode 100644 index c06c3d1d96cfa..0000000000000 --- a/system/diagnostic_graph_aggregator/launch/aggregator.launch.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/system/system_diagnostic_monitor/launch/system_diagnostic_monitor.launch.xml b/system/system_diagnostic_monitor/launch/system_diagnostic_monitor.launch.xml deleted file mode 100644 index 8e2566a747abf..0000000000000 --- a/system/system_diagnostic_monitor/launch/system_diagnostic_monitor.launch.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - -