chore(diagnostic_graph_aggregator): move MOT, signage and voice to ha… (

#633) chore(diagnostic_graph_aggregator): move MOT, signage and voice to hardware Signed-off-by: Tomohito Ando <[email protected]>
tier4 · Jun 25, 2024 · 110ac58 · 110ac58
1 parent d9f71f5
commit 110ac58
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/autoware_launch/config/system/diagnostic_graph_aggregator/hardware.yaml b/autoware_launch/config/system/diagnostic_graph_aggregator/hardware.yaml
@@ -43,6 +43,9 @@ nodes:
     type: and
     list:
       - { type: link, link: /hardware/hdd/002-usage-error }
+      - { type: link, link: /hardware/mot/001-connection }
+      - { type: link, link: /hardware/signage/001-connection }
+      - { type: link, link: /hardware/voice/001-connection }
 
   - path: /hardware/comfortable_stop
     type: and
@@ -334,3 +337,19 @@ nodes:
     diag: "voltage_monitor: CMOS Battery Status"
     type: diag
     timeout: 3.0
+
+  # We assume these diagnostics become only OK or STALE
+  - path: /hardware/mot/001-connection
+    diag: "mot: /system/mot_connection : mot heartbeat"
+    type: diag
+    timeout: 5.0
+
+  - path: /hardware/signage/001-connection
+    diag: "signage: /system/signage_connection : signage heartbeat"
+    type: diag
+    timeout: 5.0
+
+  - path: /hardware/voice/001-connection
+    diag: "vehicle_voice_alert_system: /system/voice_alert_system_connection : voirce alert system heartbeat"
+    type: diag
+    timeout: 5.0
diff --git a/autoware_launch/config/system/diagnostic_graph_aggregator/others.yaml b/autoware_launch/config/system/diagnostic_graph_aggregator/others.yaml
@@ -36,9 +36,6 @@ nodes:
     type: and
     list:
       - { type: link, link: /others/011-daytime_monitor }
-      - { type: link, link: /others/012-mot_hearbeat }
-      - { type: link, link: /others/013-signage_heartbeat }
-      - { type: link, link: /others/014-vehicle_voice_heartbeat }
 
   - path: /others/none
     type: and
@@ -129,19 +126,3 @@ nodes:
     diag: "daytime_monitor: daytime_status"
     type: diag
     timeout: 1.0
-
-  # We assume these diagnostics become only OK or STALE
-  - path: /others/012-mot_hearbeat
-    diag: "mot: /system/mot_connection : mot heartbeat"
-    type: diag
-    timeout: 5.0
-
-  - path: /others/013-signage_heartbeat
-    diag: "signage: /system/signage_connection : signage heartbeat"
-    type: diag
-    timeout: 5.0
-
-  - path: /others/014-vehicle_voice_heartbeat
-    diag: "vehicle_voice_alert_system: /system/voice_alert_system_connection : voirce alert system heartbeat"
-    type: diag
-    timeout: 5.0