Merge pull request #1551 from tier4/feat/delete-system-error-monitor

feat(system_error_monitor): remove system error monitor (autowarefoundation#8929)
tier4 · Sep 24, 2024 · 554ce6d · 554ce6d
2 parents d288f06 + 1f966da
commit 554ce6d
Show file tree

Hide file tree

Showing 24 changed files with 1 addition and 1,949 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -236,7 +236,6 @@ system/mrm_comfortable_stop_operator/** [email protected] tomohito.ando@t
 system/mrm_emergency_stop_operator/** [email protected] [email protected]
 system/mrm_handler/** [email protected] [email protected] [email protected]
 system/system_diagnostic_monitor/** [email protected]
-system/system_error_monitor/** [email protected]
 system/system_monitor/** [email protected] [email protected]
 system/topic_state_monitor/** [email protected]
 system/velodyne_monitor/** [email protected]

diff --git a/common/tier4_system_rviz_plugin/src/mrm_summary_overlay_display.cpp b/common/tier4_system_rviz_plugin/src/mrm_summary_overlay_display.cpp
@@ -74,7 +74,7 @@ void insertNewlines(std::string & str, const size_t max_line_length)
 
 std::optional<std::string> generateMrmMessage(diagnostic_msgs::msg::DiagnosticStatus diag_status)
 {
-  if (diag_status.hardware_id == "" || diag_status.hardware_id == "system_error_monitor") {
+  if (diag_status.hardware_id == "") {
     return std::nullopt;
   } else if (diag_status.level == diagnostic_msgs::msg::DiagnosticStatus::ERROR) {
     std::string msg = "- ERROR: " + diag_status.name + " (" + diag_status.message + ")";

diff --git a/launch/tier4_system_launch/README.md b/launch/tier4_system_launch/README.md
@@ -23,5 +23,3 @@ Note that you should provide parameter paths as `PACKAGE_param_path`. The list o
     ...
   </include>
 ```
-
-The sensing configuration parameters used in system_error_monitor are loaded from "config/diagnostic_aggregator/sensor_kit.param.yaml" in the "`SENSOR_MODEL`\_description" package.
diff --git a/launch/tier4_system_launch/launch/system.launch.xml b/launch/tier4_system_launch/launch/system.launch.xml
@@ -6,10 +6,6 @@
   <arg name="processing_time_checker_param_path"/>
   <arg name="mrm_comfortable_stop_operator_param_path"/>
   <arg name="mrm_emergency_stop_operator_param_path"/>
-  <arg name="system_error_monitor_param_path"/>
-  <arg name="system_error_monitor_planning_simulator_param_path"/>
-  <arg name="diagnostic_aggregator_system_param_path"/>
-  <arg name="diagnostic_aggregator_vehicle_param_path"/>
   <arg name="dummy_diag_publisher_param_path"/>
   <arg name="system_monitor_cpu_monitor_param_path"/>
   <arg name="system_monitor_gpu_monitor_param_path"/>

diff --git a/launch/tier4_system_launch/package.xml b/launch/tier4_system_launch/package.xml
@@ -12,7 +12,6 @@
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
   <exec_depend>component_state_monitor</exec_depend>
-  <exec_depend>system_error_monitor</exec_depend>
   <exec_depend>system_monitor</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>

diff --git a/system/system_error_monitor/CMakeLists.txt b/system/system_error_monitor/CMakeLists.txt
diff --git a/system/system_error_monitor/README.md b/system/system_error_monitor/README.md
diff --git a/system/system_error_monitor/config/diagnostic_aggregator/_empty.param.yaml b/system/system_error_monitor/config/diagnostic_aggregator/_empty.param.yaml
diff --git a/system/system_error_monitor/config/diagnostic_aggregator/control.param.yaml b/system/system_error_monitor/config/diagnostic_aggregator/control.param.yaml
diff --git a/system/system_error_monitor/config/diagnostic_aggregator/localization.param.yaml b/system/system_error_monitor/config/diagnostic_aggregator/localization.param.yaml
diff --git a/system/system_error_monitor/config/diagnostic_aggregator/map.param.yaml b/system/system_error_monitor/config/diagnostic_aggregator/map.param.yaml
-Original file line number
+Diff line change
@@ Expand Up @@
         ...
       </include>
     ```
-    The sensing configuration parameters used in system_error_monitor are loaded from "config/diagnostic_aggregator/sensor_kit.param.yaml" in the "`SENSOR_MODEL`\_description" package.