Index: leahi_dialin/td/modules/alarms.py =================================================================== diff -u -rb167367cb2256f8b4a35bc2c9cde6cde2129d05d -r3f4937e339925dde0b95f08e49969f8983c5cba4 --- leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision b167367cb2256f8b4a35bc2c9cde6cde2129d05d) +++ leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision 3f4937e339925dde0b95f08e49969f8983c5cba4) @@ -17,12 +17,13 @@ # Module imports from functools import partial from logging import Logger +from typing import List # Project imports from leahi_dialin.common import td_enum_repository, AlarmList from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.generic_defs import DataTypes -from leahi_dialin.common.msg_defs import MsgIds +from leahi_dialin.common.msg_ids import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem, LocalVars @@ -126,9 +127,10 @@ self.alarm_states[x] = False + # ============================================================ Properties ============================================================ @property - def alarms_priority_state(self): + def alarms_priority_state(self) -> int: """ The current Top Alarm's priority value """ @@ -140,7 +142,7 @@ @property - def alarm_top(self): + def alarm_top(self) -> int: """ The current Top Alarm's value """ @@ -152,7 +154,7 @@ @property - def alarms_silence_expires_in(self): + def alarms_silence_expires_in(self) -> int: """ How many seconds the silence for the alarms expires in """ @@ -164,7 +166,7 @@ @property - def alarms_escalates_in(self): + def alarms_escalates_in(self) -> int: """ How many seconds the current Alarm escalates to the next priority """ @@ -176,7 +178,7 @@ @property - def alarms_flags(self): + def alarms_flags(self) -> int: """ The Alarm flag's value """ @@ -188,7 +190,7 @@ @property - def alarm_volume(self): + def alarm_volume(self) -> int: """ The Alarm's Volume level """ @@ -200,7 +202,7 @@ @property - def alarm_audio_curr_hg(self): + def alarm_audio_curr_hg(self) -> float: """ The Alarm's Audio high current """ @@ -212,7 +214,7 @@ @property - def alarm_audio_curr_lg(self): + def alarm_audio_curr_lg(self) -> float: """ The Alarm's Audio low current """ @@ -224,7 +226,7 @@ @property - def alarm_backup_audio_curr(self): + def alarm_backup_audio_curr(self) -> float: """ The Alarm's Audio backup current """ @@ -236,7 +238,7 @@ @property - def safety_shutdown_active(self): + def safety_shutdown_active(self) -> bool: """ The Safety Shutdown is active or not """ @@ -248,7 +250,7 @@ @property - def ac_power_lost(self): + def ac_power_lost(self) -> bool: """ The AC Power is lost or not """ @@ -260,7 +262,7 @@ @property - def alarm_table_button_blockers(self): + def alarm_table_button_blockers(self) -> List[bool]: """ The Alarm Table's Button blocker data """ @@ -272,7 +274,7 @@ @property - def ui_alarm_list_accepted(self): + def ui_alarm_list_accepted(self) -> bool: """ The UI Alarm List request accepted """ @@ -284,7 +286,7 @@ @property - def ui_alarm_list_reject_reason(self): + def ui_alarm_list_reject_reason(self) -> int: """ The UI Alarm List request reject reason """ @@ -296,7 +298,7 @@ @property - def ui_alarm_list(self): + def ui_alarm_list(self) -> List[int]: """ The UI Alarm List content """ @@ -308,7 +310,7 @@ @property - def alarm_table(self): + def alarm_table(self) -> dict: """ The Alarm Table with Alarm Property details """ @@ -320,8 +322,6 @@ - - # ============================================================ Handlers ============================================================ @publish(["msg_id_td_alarm_status_data", "alarms_priority_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags", @@ -341,7 +341,7 @@ msg_list.append((type(self).alarms_silence_expires_in, DataTypes.U32)) msg_list.append((type(self).alarms_flags, DataTypes.U16)) - self.process_into_vars_2(decoder_list = msg_list, message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.td_alarm_status_timestamp = timestamp @@ -375,7 +375,7 @@ msg_list.append((rank, DataTypes.U32)) msg_list.append((clr_top_only, DataTypes.U32)) - self.process_into_vars_2(decoder_list = msg_list, message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.logger.debug("Alarm ID: %d %d %d" % (alarm_id.value, data_1.value, data_2.value)) self.alarm_states[alarm_id.value] = True @@ -403,7 +403,7 @@ msg_list = [] msg_list.append((alarm_id, DataTypes.U32)) - self.process_into_vars_2(decoder_list = msg_list, message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.alarm_states[alarm_id.value] = False self.alarm_conditions[alarm_id.value] = False @@ -423,7 +423,7 @@ msg_list = [] msg_list.append((alarm_id, DataTypes.U32)) - self.process_into_vars_2(decoder_list = msg_list, message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.alarm_conditions[alarm_id.value] = False self.td_alarm_clr_condition_timestamp = timestamp @@ -454,7 +454,7 @@ msg_list.append((self.alarm_table_button_blockers, td_enum_repository.AlarmResponseButtons.RINSEBACK.value, DataTypes.BOOL_U08)) msg_list.append((self.alarm_table_button_blockers, td_enum_repository.AlarmResponseButtons.END_TREATMENT.value, DataTypes.BOOL_U08)) - self.process_into_vars_2(decoder_list = msg_list, message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.td_alarm_information_timestamp = timestamp @@ -481,7 +481,7 @@ msg_list.append((self.ui_alarm_list, DataTypes.U32)) # UI Alarm #9 msg_list.append((self.ui_alarm_list, DataTypes.U32)) # UI Alarm #10 - self.process_into_vars_2(decoder_list = msg_list, message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.ui_alarm_list_timestamp = timestamp @@ -535,7 +535,7 @@ properties_list.append((treatment_log, DataTypes.BOOL_U08)) properties_list.append((alarm_id, DataTypes.U16)) - self.process_into_vars_2(decoder_list = properties_list, message = message) + self.process_into_vars(decoder_list = properties_list, message = message) # Save the result in the table for prop, _ in properties_list: @@ -547,6 +547,7 @@ self.alarm_table_timestamp = timestamp + # ============================================================ Overrides and Requests ============================================================ def cmd_alarm_status_broadcast_interval_override(self, ms: int = 250, reset: int = NO_RESET): """