Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -re5ca0f1169fc78f5a753c9ca487e30db41d65484 -reb67b89430884617a0762dea8bdd4eec859809e2 --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision e5ca0f1169fc78f5a753c9ca487e30db41d65484) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision eb67b89430884617a0762dea8bdd4eec859809e2) @@ -40,12 +40,16 @@ @unique class FPValveNames(DialinEnum): M4_VALV = 0 # Valve (M4 VWi) - P39_VALV = 1 # Valve (P39 VROd) + M7_VALV = 1 # Valve (M7) P6_VALV = 2 # Valve (P6 VFF) P11_VALV = 3 # Valve (P11 VPi) P33_VALV = 4 # Valve (P33 VCr) P34_VALV = 5 # Valve (P34 VCb) P37_VALV = 6 # Valve (P37 VCd) + P39_VALV = 7 # Valve (P39 VROd) + P20_VALV = 8 # Valve (P20) + P43_VALV = 9 # Valve (P43) + NUM_OF_VALVES = 10 # Number of valves class FPValves(AbstractSubSystem): """ @@ -75,15 +79,17 @@ self.valve_states_all = 0x0000 self.m4_valv = {"id": FPValveNames.M4_VALV.value, "state": DEENERGIZED} - self.p39_valv = {"id": FPValveNames.P39_VALV.value, "state": DEENERGIZED} + self.m7_valv = {"id": FPValveNames.M7_VALV.value, "state": DEENERGIZED} self.p6_valv = {"id": FPValveNames.P6_VALV.value, "state": DEENERGIZED} self.p11_valv = {"id": FPValveNames.P11_VALV.value, "state": DEENERGIZED} self.p33_valv = {"id": FPValveNames.P33_VALV.value, "state": DEENERGIZED} self.p34_valv = {"id": FPValveNames.P34_VALV.value, "state": DEENERGIZED} self.p37_valv = {"id": FPValveNames.P37_VALV.value, "state": DEENERGIZED} + self.p39_valv = {"id": FPValveNames.P39_VALV.value, "state": DEENERGIZED} + self.p20_valv = {"id": FPValveNames.P20_VALV.value, "state": DEENERGIZED} + self.p43_valv = {"id": FPValveNames.P43_VALV.value, "state": DEENERGIZED} - # NOTE: The len function counts the enums with the same number only once. This is not the case in the DG valves - # class because each valve must have a unique ID. + # NOTE: The len function counts the enums with the same number only once. self.valve_states_enum = [0 for _ in range(len(FPValveNames))] for valve in FPValveNames.__members__: @@ -97,12 +103,15 @@ """ return [ self.m4_valv.get("state"), - self.p39_valv.get("state"), + self.m7_valv.get("state"), self.p6_valv.get("state"), self.p11_valv.get("state"), self.p33_valv.get("state"), self.p34_valv.get("state"), self.p37_valv.get("state"), + self.p39_valv.get("state"), + self.p20_valv.get("state"), + self.p43_valv.get("state") ] @staticmethod @@ -139,12 +148,15 @@ "fp_valves_states_timestamp", "valve_states_all", "m4_valv", - "p39_valv", + "m7_valv", "p6_valv", "p11_valv", "p33_valv", "p34_valv", "p37_valv", + "p39_valv", + "p20_valv", + "p43_valv", "valve_states_enum" ]) def _handler_valves_sync(self, message, timestamp=0.0): @@ -159,13 +171,17 @@ self.valve_states_all = vst[0] # Extract each valve state from U16 valves states using bit-masking self.m4_valv["state"] = self._binary_to_valve_state(vst[0] & 1) - self.p39_valv["state"] = self._binary_to_valve_state(vst[0] & 2) + self.m7_valv["state"] = self._binary_to_valve_state(vst[0] & 2) self.p6_valv["state"] = self._binary_to_valve_state(vst[0] & 4) self.p11_valv["state"] = self._binary_to_valve_state(vst[0] & 8) self.p33_valv["state"] = self._binary_to_valve_state(vst[0] & 16) self.p34_valv["state"] = self._binary_to_valve_state(vst[0] & 32) self.p37_valv["state"] = self._binary_to_valve_state(vst[0] & 64) + self.p39_valv["state"] = self._binary_to_valve_state(vst[0] & 128) + self.p20_valv["state"] = self._binary_to_valve_state(vst[0] & 256) + self.p43_valv["state"] = self._binary_to_valve_state(vst[0] & 512) + start = self.END_POS_VALVES_STATES end = start + 1 for valve_id in self.valves_sensed_states: Index: leahi_dialin/td/proxies/ui_proxy.py =================================================================== diff -u -r028086f4e594e25b8e693242fdce1cc41c8b0312 -reb67b89430884617a0762dea8bdd4eec859809e2 --- leahi_dialin/td/proxies/ui_proxy.py (.../ui_proxy.py) (revision 028086f4e594e25b8e693242fdce1cc41c8b0312) +++ leahi_dialin/td/proxies/ui_proxy.py (.../ui_proxy.py) (revision eb67b89430884617a0762dea8bdd4eec859809e2) @@ -189,7 +189,7 @@ self.uf_pause_resume_timestamp = timestamp def cmd_send_ui_treatment_param_data(self, blood_flow_rate: int, - dialyate_flow_rate: int, + dialysate_flow_rate: int, treatment_duration: int, saline_bolus_volume: int, heparin_stop_time: int, @@ -199,6 +199,7 @@ dialyzer_type: int, bp_interval: int, rinseback_flow_rate: int, + rinseback_volume: int, arterial_pressure_limit: int, venous_pressure_limit: int, venous_pressure_asymmetric: int, @@ -211,7 +212,7 @@ :param blood_flow_rate: (int) blood flow rate (in mL/min) - :param dialyate_flow_rate: (int) dialysate flow rate (in mL/min) + :param dialysate_flow_rate: (int) dialysate flow rate (in mL/min) :param treatment_duration: (int) treatment duration (in min) :param saline_bolus_volume: (int) saline bolus volume (in mL) :param heparin_stop_time: (int) heparin stop time (in minutes) @@ -221,6 +222,7 @@ :param dialyzer_type: (int) dialyzer type :param bp_interval: (int) blood pressure measurement interval (in min) :param rinseback_flow_rate: (int) rinse back flow rate (in mL/min) + :param rinseback_volume: (int) rinse back volume (in mL) :param arterial_pressure_limit: (int) arterial pressure alarm limit window (in mmHg) :param venous_pressure_limit: (int) venous pressure alarm limit window (in mmHg) :param venous_pressure_asymmetric: (int) venous pressure alarm limit asymmetric (in mmHg) @@ -233,7 +235,7 @@ """ bld = integer_to_bytearray(blood_flow_rate) - dia = integer_to_bytearray(dialyate_flow_rate) + dia = integer_to_bytearray(dialysate_flow_rate) dur = integer_to_bytearray(treatment_duration) sal = integer_to_bytearray(saline_bolus_volume) hst = integer_to_bytearray(heparin_stop_time) @@ -243,6 +245,7 @@ dzr = integer_to_bytearray(dialyzer_type) bpi = integer_to_bytearray(bp_interval) rbf = integer_to_bytearray(rinseback_flow_rate) + rbv = integer_to_bytearray(rinseback_volume) apw = integer_to_bytearray(arterial_pressure_limit) vpw = integer_to_bytearray(venous_pressure_limit) vpa = integer_to_bytearray(venous_pressure_asymmetric) @@ -251,7 +254,7 @@ hdr = float_to_bytearray(heparin_dispense_rate) hbv = float_to_bytearray(heparin_bolus_volume) - payload = bld + dia + dur + sal + hst + het + acc + bic + dzr + bpi + rbf + apw + vpw + vpa + tmp + dtp + hdr + hbv + payload = bld + dia + dur + sal + hst + het + acc + bic + dzr + bpi + rbf + rbv + apw + vpw + vpa + tmp + dtp + hdr + hbv message = DenaliMessage.build_message(channel_id=DenaliChannels.ui_to_td_ch_id, message_id=MsgIds.MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE.value, payload=payload)