Index: leahi_dialin/dd/modules/alarms.py =================================================================== diff -u -r5bfe41cf9e45edebc1682c1d7af27b08ee0eb5ff -r20c821bd230fc7689a0275a2918981669ff5cc19 --- leahi_dialin/dd/modules/alarms.py (.../alarms.py) (revision 5bfe41cf9e45edebc1682c1d7af27b08ee0eb5ff) +++ leahi_dialin/dd/modules/alarms.py (.../alarms.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) @@ -19,7 +19,7 @@ from leahi_dialin.common.alarm_defs import AlarmList from leahi_dialin.common.constants import NO_RESET -from leahi_dialin.common.dd_defs import dd_enum_repository +from leahi_dialin.common import dd_enum_repository 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.protocols.CAN import DenaliMessage, DenaliChannels @@ -48,31 +48,26 @@ self.msg_id_dd_alarm_triggered = MsgIds.MSG_ID_ALARM_TRIGGERED.value self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_alarm_triggered, self._handler_alarm_triggered) - self.alarm_safety_shutdown_status = 0.0 + self.alarm_safety_shutdown_status = 0.0 #: The Alarm's Safety Shutdown status value - self.dd_alarm_info_timestamp = 0.0 - self.dd_alarm_triggered_timestamp = 0.0 - self.dd_alarm_cleared_timestamp = 0.0 - self.dd_alarm_condition_cleared_timestamp = 0.0 - # 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.dd_alarm_info_timestamp = 0.0 #: The timestamp of the last Alarm Information message + self.dd_alarm_triggered_timestamp = 0.0 #: The timestamp of the last Alarm Triggered message + self.dd_alarm_cleared_timestamp = 0.0 #: The timestamp of the last Alarm Cleared message + self.dd_alarm_condition_cleared_timestamp = 0.0 #: The timestamp of the last Alarm Condition Cleared message - self.last_alarm_triggered = 0 - self.last_alarm_data_1 = 0.0 - self.last_alarm_data_2 = 0.0 + 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 #: 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_data_type = dict() #: The Alarm's Data type in dict format # Loop through the list of the event data type enum and update the dictionary for data_type in dd_enum_repository.DDEventDataTypes: