Skip to content

Commit 25fb891

Browse files
committed
✨ publishing component status as ERROR
1 parent 9d1c677 commit 25fb891

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

suave_monitor/suave_monitor/battery_monitor.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def publish_battery_level(self):
8181

8282
status_msg = DiagnosticStatus()
8383
status_msg.level = DiagnosticStatus.OK
84-
status_msg.name = ""
84+
status_msg.name = "battery_monitor: Battery level"
8585
status_msg.message = "QA status"
8686
status_msg.values.append(key_value)
8787

suave_monitor/suave_monitor/thruster_monitor.py

+15-3
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,24 @@ def change_thruster_status(self, thruster, value):
7575
parameter.name = 'SERVO' + thruster + '_FUNCTION'
7676
parameter.value.type = ParameterType.PARAMETER_INTEGER
7777

78+
status_msg = DiagnosticStatus()
79+
7880
print_status = ''
81+
# Publishing two values for backward compability
7982
diagnostic_value = ''
83+
diagnostic_value_2 = ''
8084
if value == 'failure':
8185
parameter.value.integer_value = 0
8286
print_status = 'failed'
8387
diagnostic_value = 'FALSE'
88+
diagnostic_value_2 = 'ERROR'
89+
status_msg.level = DiagnosticStatus.ERROR
8490
elif value == 'recovery':
8591
parameter.value.integer_value = int(thruster) + 32
8692
print_status = 'recovered'
8793
diagnostic_value = 'RECOVERED'
94+
diagnostic_value_2 = 'OK'
95+
status_msg.level = DiagnosticStatus.OK
8896
else:
8997
self.get_logger().info(
9098
'Wrong event value: {}. '.format(value) +
@@ -101,11 +109,15 @@ def change_thruster_status(self, thruster, value):
101109
key_value.key = 'c_thruster_{}'.format(thruster)
102110
key_value.value = diagnostic_value
103111

104-
status_msg = DiagnosticStatus()
105-
status_msg.level = DiagnosticStatus.OK
106-
status_msg.name = ''
112+
key_value_2 = KeyValue()
113+
key_value_2.key = 'c_thruster_{}'.format(thruster)
114+
key_value_2.value = diagnostic_value_2
115+
116+
117+
status_msg.name = 'thruster_monitor: Thruster status'
107118
status_msg.message = 'Component status'
108119
status_msg.values.append(key_value)
120+
status_msg.values.append(key_value_2)
109121

110122
diag_msg = DiagnosticArray()
111123
diag_msg.header.stamp = self.get_clock().now().to_msg()

suave_monitor/suave_monitor/water_visibility_observer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def qa_publisher_cb(self):
6464

6565
status_msg = DiagnosticStatus()
6666
status_msg.level = DiagnosticStatus.OK
67-
status_msg.name = ""
67+
status_msg.name = "water_visibility_observer: Water visibility measurement"
6868
status_msg.message = "QA status"
6969
status_msg.values.append(key_value)
7070

0 commit comments

Comments
 (0)