Index: leahi_dialin/td/modules/alarms.py =================================================================== diff -u -r41de945f9c773e54e965e80d9e46def828beb732 -r20c821bd230fc7689a0275a2918981669ff5cc19 --- leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision 41de945f9c773e54e965e80d9e46def828beb732) +++ leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) @@ -22,7 +22,7 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.common.td_defs import td_enum_repository +from leahi_dialin.common import td_enum_repository from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, DialinEnum, publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -98,45 +98,39 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_alarm_info_data, self._handler_alarm_information_sync) - self.td_alarm_status_timestamp = 0.0 - self.td_alarm_triggered_timestamp = 0.0 - self.td_alarm_cleared_timestamp = 0.0 - self.td_alarm_clr_condition_timestamp = 0.0 - self.td_alarm_information_timestamp = 0.0 + self.td_alarm_status_timestamp = 0.0 #: The timestamp of the last Alarm Status message + self.td_alarm_triggered_timestamp = 0.0 #: The timestamp of the last Alarm Triggered message + self.td_alarm_cleared_timestamp = 0.0 #: The timestamp of the last Alarm Cleared message + self.td_alarm_clr_condition_timestamp = 0.0 #: The timestamp of the last Alarm Clear Condition message + self.td_alarm_information_timestamp = 0.0 #: The timestamp of the last Alarm Information message # composite alarm status based on latest TD alarm status broadcast message - self.alarms_priority_state = 0 - self.alarm_top = 0 - self.alarms_silence_expires_in = 0 - self.alarms_escalates_in = 0 - self.alarms_flags = 0 + self.alarms_priority_state = 0 #: The current Top Alarm's priority value + self.alarm_top = 0 #: The current Top Alarm's value + self.alarms_silence_expires_in = 0 #: How many seconds the silence for the alarms expires in + self.alarms_escalates_in = 0 #: How many seconds the current Alarm escalates to the next priority + self.alarms_flags = 0 #: The Alarm flag's value - # alarm states based on received TD alarm activation and alarm clear messages - self.alarm_states = [False] * 500 - # alarm condition states based on received TD alarm activation and clear condition messages - self.alarm_conditions = [False] * 500 - # alarm priorities based on received TD alarm activation messages - self.alarm_priorities = [0] * 500 - # alarm ranks based on received TD alarm activation messages - self.alarm_ranks = [0] * 500 - # alarm clear top only flags based on received TD alarm activation messages - self.alarm_clear_top_only_flags = [False] * 500 - # alarm debug data on alarm triggered message - self.alarm_data = [0, 0] * 500 + self.alarm_states = [False] * 500 #: The States of all Alarms data in list format + self.alarm_conditions = [False] * 500 #: The Conditions of all Alarms data in list format + self.alarm_priorities = [0] * 500 #: The Priorities of all Alarms data in list format + self.alarm_ranks = [0] * 500 #: The Ranks of all Alarms data in list format + self.alarm_clear_top_only_flags = [False] * 500 #: The Clear Top only flags of all Alarms data in list format + self.alarm_data = [0, 0] * 500 #: The all Alarms data in list format - self.last_alarm_triggered = 0 - self.last_alarm_data_1 = 0.0 - self.last_alarm_data_2 = 0.0 + self.last_alarm_triggered = 0 #: The timestamp when did the last alarm triggered + self.last_alarm_data_1 = 0.0 #: The last Alarm's data part 1 + self.last_alarm_data_2 = 0.0 #: The last Alarm's data part 2 # alarm information - self.alarm_data_type = dict() - self.alarm_volume = 0 - self.alarm_audio_curr_hg = 0.0 - self.alarm_audio_curr_lg = 0.0 - self.alarm_backup_audio_curr = 0.0 - self.safety_shutdown_active = False - self.ac_power_lost = False - self.alarm_table_button_blockers = [False] * self.AlarmResponseButtons.NUM_OF_TD_ALARM_RESPONSE_BUTTONS.value - self.alarm_state_button_blockers = [False] * self.AlarmResponseButtons.NUM_OF_TD_ALARM_RESPONSE_BUTTONS.value + self.alarm_data_type = dict() #: The Alarm's Data type in dict format + self.alarm_volume = 0 #: The Alarm's Volume level + self.alarm_audio_curr_hg = 0.0 #: The Alarm's Audio high current + self.alarm_audio_curr_lg = 0.0 #: The Alarm's Audio low current + self.alarm_backup_audio_curr = 0.0 #: The Alarm's Audio backup current + self.safety_shutdown_active = False #: The Safety Shutdown is active or not + self.ac_power_lost = False #: The AC Power is lost or not + self.alarm_table_button_blockers = [False] * self.AlarmResponseButtons.NUM_OF_TD_ALARM_RESPONSE_BUTTONS.value #: The Alarm Table's Button blocker data + self.alarm_state_button_blockers = [False] * self.AlarmResponseButtons.NUM_OF_TD_ALARM_RESPONSE_BUTTONS.value #: The Alarm State's Button blocker data # Loop through the list of the event data type enum and update the dictionary for data_type in td_enum_repository.TDEventDataTypes: