Skip to content

Commit 554ce6d

Browse files
authored
Merge pull request #1551 from tier4/feat/delete-system-error-monitor
feat(system_error_monitor): remove system error monitor (autowarefoundation#8929)
2 parents d288f06 + 1f966da commit 554ce6d

24 files changed

+1
-1949
lines changed

.github/CODEOWNERS

-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ system/mrm_comfortable_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@t
236236
system/mrm_emergency_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@tier4.jp
237237
system/mrm_handler/** makoto.kurihara@tier4.jp ryuta.kambe@tier4.jp tetsuhiro.kawaguchi@tier4.jp
238238
system/system_diagnostic_monitor/** isamu.takagi@tier4.jp
239-
system/system_error_monitor/** fumihito.ito@tier4.jp
240239
system/system_monitor/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp
241240
system/topic_state_monitor/** ryohsuke.mitsudome@tier4.jp
242241
system/velodyne_monitor/** fumihito.ito@tier4.jp

common/tier4_system_rviz_plugin/src/mrm_summary_overlay_display.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void insertNewlines(std::string & str, const size_t max_line_length)
7474

7575
std::optional<std::string> generateMrmMessage(diagnostic_msgs::msg::DiagnosticStatus diag_status)
7676
{
77-
if (diag_status.hardware_id == "" || diag_status.hardware_id == "system_error_monitor") {
77+
if (diag_status.hardware_id == "") {
7878
return std::nullopt;
7979
} else if (diag_status.level == diagnostic_msgs::msg::DiagnosticStatus::ERROR) {
8080
std::string msg = "- ERROR: " + diag_status.name + " (" + diag_status.message + ")";

launch/tier4_system_launch/README.md

-2
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,3 @@ Note that you should provide parameter paths as `PACKAGE_param_path`. The list o
2323
...
2424
</include>
2525
```
26-
27-
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.

launch/tier4_system_launch/launch/system.launch.xml

-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
<arg name="processing_time_checker_param_path"/>
77
<arg name="mrm_comfortable_stop_operator_param_path"/>
88
<arg name="mrm_emergency_stop_operator_param_path"/>
9-
<arg name="system_error_monitor_param_path"/>
10-
<arg name="system_error_monitor_planning_simulator_param_path"/>
11-
<arg name="diagnostic_aggregator_system_param_path"/>
12-
<arg name="diagnostic_aggregator_vehicle_param_path"/>
139
<arg name="dummy_diag_publisher_param_path"/>
1410
<arg name="system_monitor_cpu_monitor_param_path"/>
1511
<arg name="system_monitor_gpu_monitor_param_path"/>

launch/tier4_system_launch/package.xml

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<buildtool_depend>autoware_cmake</buildtool_depend>
1313

1414
<exec_depend>component_state_monitor</exec_depend>
15-
<exec_depend>system_error_monitor</exec_depend>
1615
<exec_depend>system_monitor</exec_depend>
1716

1817
<test_depend>ament_lint_auto</test_depend>

system/system_error_monitor/CMakeLists.txt

-18
This file was deleted.

system/system_error_monitor/README.md

-145
This file was deleted.

system/system_error_monitor/config/diagnostic_aggregator/_empty.param.yaml

Whitespace-only changes.

system/system_error_monitor/config/diagnostic_aggregator/control.param.yaml

-121
This file was deleted.

system/system_error_monitor/config/diagnostic_aggregator/localization.param.yaml

-47
This file was deleted.

system/system_error_monitor/config/diagnostic_aggregator/map.param.yaml

-22
This file was deleted.

0 commit comments

Comments
 (0)