Index: leahi_dialin/td/modules/alarms.py =================================================================== diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 --- leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) +++ leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) @@ -161,7 +161,9 @@ for x in range(500): self.alarm_states[x] = False - @publish(["msg_id_td_alarm_status_data", "td_alarm_status_timestamp", "alarms_priority_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"]) + @publish(["msg_id_td_alarm_status_data", "alarms_priority_state", "alarm_top", + "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags", + "td_alarm_status_timestamp"]) def _handler_alarms_status_sync(self, message, timestamp=0.0): """ Handles published alarms status messages. alarms status data are captured @@ -178,8 +180,9 @@ self.td_alarm_status_timestamp = timestamp - @publish(["msg_id_td_alarm_triggered", "td_alarm_triggered_timestamp", "alarm_states", "alarm_conditions", - "alarm_data", "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"]) + @publish(["msg_id_td_alarm_triggered", "alarm_states", "alarm_conditions", + "alarm_data", "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags", + "td_alarm_triggered_timestamp"]) def _handler_alarm_trigger(self, message, timestamp=0.0): """ Handles published TD alarm activation messages. @@ -218,7 +221,7 @@ self.last_alarm_data_2 = data_2[0] self.td_alarm_triggered_timestamp = timestamp - @publish(["msg_id_td_alarm_cleared", "TD_alarm_cleared_timestamp", "alarm_states", "alarm_conditions"]) + @publish(["msg_id_td_alarm_cleared", "alarm_states", "alarm_conditions", "TD_alarm_cleared_timestamp"]) def _handler_alarm_clear(self, message, timestamp=0.0): """ Handles published TD alarm clear messages. @@ -231,7 +234,7 @@ self.alarm_conditions[alarm_id[0]] = False self.td_alarm_cleared_timestamp = timestamp - @publish(["msg_id_td_alarm_condition_cleared", "td_alarm_clr_condition_timestamp", "alarm_conditions", "alarm_conditions"]) + @publish(["msg_id_td_alarm_condition_cleared", "alarm_conditions", "alarm_conditions", "td_alarm_clr_condition_timestamp"]) def _handler_alarm_condition_clear(self, message, timestamp=0.0): """ Handles published TD alarm clear alarm condition messages. @@ -243,9 +246,10 @@ self.alarm_conditions[alarm_id[0]] = False self.td_alarm_clr_condition_timestamp = timestamp - @publish(["msg_id_td_alarm_info_data", "td_alarm_information_timestamp", "alarm_volume", "alarm_audio_curr_hg", + @publish(["msg_id_td_alarm_info_data", "alarm_volume", "alarm_audio_curr_hg", "alarm_audio_curr_lg", "alarm_backup_audio_curr", "safety_shutdown_active", "ac_power_lost", - "alarm_table_button_blockers", "alarm_state_button_blockers"]) + "alarm_table_button_blockers", "alarm_state_button_blockers", + "td_alarm_information_timestamp"]) def _handler_alarm_information_sync(self, message, timestamp=0.0): """ Handles published TD alarm information broadcast messages.