Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r26cc08213fa34b2b2ec781dfb0768d8df1575abf -rec873d3a16603e9fbf636d471ca75473fb590bd8 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 26cc08213fa34b2b2ec781dfb0768d8df1575abf) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision ec873d3a16603e9fbf636d471ca75473fb590bd8) @@ -209,8 +209,20 @@ MSG_ID_TD_PRE_TREATMENT_STATES_DATA = 0xB7 # TD Pre-Treatment states broadcast data.. MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8 # UI vitals adjustment request MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9 # TD vitals adjustment response + MSG_ID_UI_ISO_UF_STATE_REQUEST = 0xBA + MSG_ID_TD_ISO_UF_STATE_RESPONSE = 0xBB + MSG_ID_TD_HEMODIAFILTRATION_DATA = 0xBC + MSG_ID_UI_PAUSE_SUB_FLOW_REQUEST = 0xBD + MSG_ID_TD_PAUSE_SUB_FLOW_RESPONSE = 0xBE + MSG_ID_UI_AUTO_SUBSTITUTION_REQUEST = 0xBF + MSG_ID_TD_AUTO_SUBSTITUTION_REPONSE = 0xC0 + MSG_ID_UI_HDF_ADJUSTMENT_REQUEST = 0xC1 + MSG_ID_TD_HDF_ADJUSTMENT_RESPONSE = 0xC2 - MSG_ID_TD_PRIME_PROGRESS_DATA = 0xC7 # + MSG_ID_TD_DRY_BICARD_DISCONNECT_DATA = 0xC4 + MSG_ID_UI_DRY_BICARD_DISCONNECT_REQUEST = 0xC5 + MSG_ID_TD_DRY_BICARD_DISCONNECT_RESPONSE = 0xC6 + MSG_ID_TD_PRIME_PROGRESS_DATA = 0xC7 MSG_ID_UI_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_REQUEST = 0xD6 # UI setup connection confirmation request MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE = 0xD7 # TD setup connection confirmation response Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r6caa49d072aceb2655d605de5d2eea52ab1a8911 -rec873d3a16603e9fbf636d471ca75473fb590bd8 --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 6caa49d072aceb2655d605de5d2eea52ab1a8911) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision ec873d3a16603e9fbf636d471ca75473fb590bd8) @@ -17,7 +17,6 @@ # Module imports from collections import OrderedDict from logging import Logger -import struct import time # Project imports @@ -187,10 +186,6 @@ @param message: published DD valves states message @return: none """ - start = time.perf_counter() - vsa = struct.unpack(DataTypes.U32.unpack_attrib(), bytearray(message['message'][self.START_POS_VALVES_STATES:self.END_POS_ALL_VALVES])) - self.valve_states_all = vsa[0] - valves = LocalVars('valves') bc_valves = LocalVars('bc_valves') spare_valves = LocalVars('spare_valves') @@ -203,40 +198,40 @@ self.process_into_vars(decoder_list = msg_list, message = message) # Extract each valve state from U16 valves states using bit-masking - self.d14_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 1) - self.d52_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 2) - self.d8_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 4) - self.d54_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 8) - self.d53_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 16) - self.d34_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 32) - self.d64_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 64) - self.d31_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 128) - self.d65_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 256) - self.d35_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 512) - self.d40_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 1024) - self.d47_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 2048) - self.d3_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 4096) - self.d80_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 8192) - self.d81_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 16384) - self.d85_valv["state"] = dd_enum_repository.DDValveStates(valves.value & 32768) + self.d14_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 0) & 1) + self.d52_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 1) & 1) + self.d8_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 2) & 1) + self.d54_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 3) & 1) + self.d53_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 4) & 1) + self.d34_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 5) & 1) + self.d64_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 6) & 1) + self.d31_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 7) & 1) + self.d65_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 8) & 1) + self.d35_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 9) & 1) + self.d40_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 10) & 1) + self.d47_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 11) & 1) + self.d3_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 12) & 1) + self.d80_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 13) & 1) + self.d81_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 14) & 1) + self.d85_valv["state"] = dd_enum_repository.DDValveStates((valves.value >> 15) & 1) - self.d23_valv["state"] = dd_enum_repository.DDValveStates(bc_valves.value & 1) - self.d19_valv["state"] = dd_enum_repository.DDValveStates(bc_valves.value & 2) - self.d25_valv["state"] = dd_enum_repository.DDValveStates(bc_valves.value & 4) - self.d21_valv["state"] = dd_enum_repository.DDValveStates(bc_valves.value & 8) - self.d24_valv["state"] = dd_enum_repository.DDValveStates(bc_valves.value & 16) - self.d20_valv["state"] = dd_enum_repository.DDValveStates(bc_valves.value & 32) - self.d26_valv["state"] = dd_enum_repository.DDValveStates(bc_valves.value & 64) - self.d22_valv["state"] = dd_enum_repository.DDValveStates(bc_valves.value & 128) + self.d23_valv["state"] = dd_enum_repository.DDValveStates((bc_valves.value >> 0) & 1) + self.d19_valv["state"] = dd_enum_repository.DDValveStates((bc_valves.value >> 1) & 1) + self.d25_valv["state"] = dd_enum_repository.DDValveStates((bc_valves.value >> 2) & 1) + self.d21_valv["state"] = dd_enum_repository.DDValveStates((bc_valves.value >> 3) & 1) + self.d24_valv["state"] = dd_enum_repository.DDValveStates((bc_valves.value >> 4) & 1) + self.d20_valv["state"] = dd_enum_repository.DDValveStates((bc_valves.value >> 5) & 1) + self.d26_valv["state"] = dd_enum_repository.DDValveStates((bc_valves.value >> 6) & 1) + self.d22_valv["state"] = dd_enum_repository.DDValveStates((bc_valves.value >> 7) & 1) - self.d88_d79_valv["state"] = dd_enum_repository.DDValveStates(spare_valves.value & 1) - self.d83_valv["state"] = dd_enum_repository.DDValveStates(spare_valves.value & 2) - self.d91_valv["state"] = dd_enum_repository.DDValveStates(spare_valves.value & 4) - self.d104_valv["state"] = dd_enum_repository.DDValveStates(spare_valves.value & 8) - self.d95_valv["state"] = dd_enum_repository.DDValveStates(spare_valves.value & 16) - self.spare5_valv["state"] = dd_enum_repository.DDValveStates(spare_valves.value & 32) - self.d100_valv["state"] = dd_enum_repository.DDValveStates(spare_valves.value & 64) - self.spare7_valv["state"] = dd_enum_repository.DDValveStates(spare_valves.value & 128) + self.d88_d79_valv["state"] = dd_enum_repository.DDValveStates((spare_valves.value >> 0) & 1) + self.d83_valv["state"] = dd_enum_repository.DDValveStates((spare_valves.value >> 1) & 1) + self.d91_valv["state"] = dd_enum_repository.DDValveStates((spare_valves.value >> 2) & 1) + self.d104_valv["state"] = dd_enum_repository.DDValveStates((spare_valves.value >> 3) & 1) + self.d95_valv["state"] = dd_enum_repository.DDValveStates((spare_valves.value >> 4) & 1) + self.spare5_valv["state"] = dd_enum_repository.DDValveStates((spare_valves.value >> 5) & 1) + self.d100_valv["state"] = dd_enum_repository.DDValveStates((spare_valves.value >> 6) & 1) + self.spare7_valv["state"] = dd_enum_repository.DDValveStates((spare_valves.value >> 7) & 1) # Updating Valve_states_enum for i in range(0, dd_enum_repository.DDValveNames.NUM_OF_DD_VALVES.value): Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -r27d9de42c0111c7f369cc335889fe6b988d09cc8 -rec873d3a16603e9fbf636d471ca75473fb590bd8 --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 27d9de42c0111c7f369cc335889fe6b988d09cc8) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision ec873d3a16603e9fbf636d471ca75473fb590bd8) @@ -123,17 +123,17 @@ self.process_into_vars(decoder_list = msg_list, message = message) # Extract each valve state from U08 valves states using bit-masking - self.m4_valv["state"] = fp_enum_repository.FPValveStates(io_valves.value & 1) - self.m12_valv["state"] = fp_enum_repository.FPValveStates(io_valves.value & 2) + self.m4_valv["state"] = fp_enum_repository.FPValveStates((io_valves.value >> 0) & 1) + self.m12_valv["state"] = fp_enum_repository.FPValveStates((io_valves.value >> 1) & 1) self.valve_states_all = io_valves[0] # Extract each valve state from U08 valves states using bit-masking - self.p11_valv["state"] = fp_enum_repository.FPValveStates(fp_valves.value & 1) - self.p33_valv["state"] = fp_enum_repository.FPValveStates(fp_valves.value & 2) - self.p34_valv["state"] = fp_enum_repository.FPValveStates(fp_valves.value & 4) - self.p37_valv["state"] = fp_enum_repository.FPValveStates(fp_valves.value & 8) - self.p39_valv["state"] = fp_enum_repository.FPValveStates(fp_valves.value & 16) - self.p6_valv["state"] = fp_enum_repository.FPValveStates(fp_valves.value & 32) + self.p11_valv["state"] = fp_enum_repository.FPValveStates((fp_valves.value >> 0) & 1) + self.p33_valv["state"] = fp_enum_repository.FPValveStates((fp_valves.value >> 1) & 1) + self.p34_valv["state"] = fp_enum_repository.FPValveStates((fp_valves.value >> 2) & 1) + self.p37_valv["state"] = fp_enum_repository.FPValveStates((fp_valves.value >> 3) & 1) + self.p39_valv["state"] = fp_enum_repository.FPValveStates((fp_valves.value >> 4) & 1) + self.p6_valv["state"] = fp_enum_repository.FPValveStates((fp_valves.value >> 5) & 1) self.valve_states_all += fp_valves[0] << 8 # Updating Valve_states_enum Index: leahi_dialin/td/modules/alarms.py =================================================================== diff -u -r0762e3a03157e5f3428387a6914a13ed38d3ddca -rec873d3a16603e9fbf636d471ca75473fb590bd8 --- leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision 0762e3a03157e5f3428387a6914a13ed38d3ddca) +++ leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision ec873d3a16603e9fbf636d471ca75473fb590bd8) @@ -670,7 +670,7 @@ key = integer_to_bytearray(-758926171) # 0xD2C3B4A5 payload = key - return cmd_generic_override( + resp = cmd_generic_override( payload = payload, reset = NO_RESET, channel_id = CanChannels.dialin_to_td_ch_id, @@ -680,7 +680,10 @@ logger = self.logger, can_interface = self.can_interface) + self.clear_dialin_alarms() + return resp + def cmd_alarm_time_override(self, alarm: int, time_ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the alarm time override command