Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -rb5aa0da384c5cc177f83d59aa221ae28881cd26a -r9466b5c6b5867f392104a42608aa9542a7ff0358 --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision b5aa0da384c5cc177f83d59aa221ae28881cd26a) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 9466b5c6b5867f392104a42608aa9542a7ff0358) @@ -39,34 +39,34 @@ @unique class DDValveNames(DialinEnum): - D14_VHO = 0 # Valve Hydraulics Outlet (D14) - D52_VTD = 1 # Valve Thermal Disinfect (D52) - D8_VHB = 2 # Valve Hydraulics Bypass (D8) - D54_VRP = 3 # Valve Rinse Port (D54) - D53_VDR = 4 # Valve Drain (D53) - D65_VDB2 = 5 # Valve DryBcarb Inlet (D65) - D64_VP1 = 6 # Valve Purge 1 (D64) - D31_VPT = 7 # Valve Pressure Test (D31) - D34_VDB1 = 8 # Valve Dialyzer Bypass (D34) - D35_VDI = 9 # Valve Dialyzer Inlet (D35) - D40_VDO = 10 # Valve Dialyzer Outlet (D40) - D47_VP2 = 11 # Valve Dialysate Out Purge 2 (D47) - D3_VHI = 12 # Valve Hydraulics Inlet (D3) - M4_VWI = 13 # Valve Water Inlet (M4) + D14_VALV = 0 # Valve Hydraulics Outlet (D14) + D52_VALV = 1 # Valve Thermal Disinfect (D52) + D8_VALV = 2 # Valve Hydraulics Bypass (D8) + D54_VALV = 3 # Valve Rinse Port (D54) + D53_VALV = 4 # Valve Drain (D53) + D65_VALV = 5 # Valve DryBcarb Inlet (D65) + D64_VALV = 6 # Valve Purge 1 (D64) + D31_VALV = 7 # Valve Pressure Test (D31) + D34_VALV = 8 # Valve Dialyzer Bypass (D34) + D35_VALV = 9 # Valve Dialyzer Inlet (D35) + D40_VALV = 10 # Valve Dialyzer Outlet (D40) + D47_VALV = 11 # Valve Dialysate Out Purge 2 (D47) + D3_VALV = 12 # Valve Hydraulics Inlet (D3) + M4_VALV = 13 # Valve Water Inlet (M4) RSRVD_SPACE1 = 14 # This space has been reserved RSRVD_SPACE2 = 15 # This space has been reserved - D23_BCV1 = 16 # Balancing chamber Valve 1 (D23) - D19_BCV2 = 17 # Balancing chamber Valve 2 (D19) - D25_BCV3 = 18 # Balancing chamber Valve 3 (D25) - D26_BCV7 = 19 # Balancing chamber Valve 7 (D26) - D24_BCV5 = 20 # Balancing chamber Valve 5 (D24) - D20_BCV6 = 21 # Balancing chamber Valve 6 (D20) - D21_BCV4 = 22 # Balancing chamber Valve 4 (D21) - D22_BCV8 = 23 # Balancing chamber Valve 8 (D22) - D69_UFI1 = 24 # Ultrafiltration Valve 1 Inlet (D69) - D71_UFI2 = 25 # Ultrafiltration Valve 2 Inlet (D71) - D70_UFO1 = 26 # Ultrafiltration Valve 1 Outlet (D70) - D72_UFO2 = 27 # Ultrafiltration Valve 2 Outlet (D72) + D23_VALV = 16 # Balancing chamber Valve 1 (D23) + D19_VALV = 17 # Balancing chamber Valve 2 (D19) + D25_VALV = 18 # Balancing chamber Valve 3 (D25) + D26_VALV = 19 # Balancing chamber Valve 7 (D26) + D24_VALV = 20 # Balancing chamber Valve 5 (D24) + D20_VALV = 21 # Balancing chamber Valve 6 (D20) + D21_VALV = 22 # Balancing chamber Valve 4 (D21) + D22_VALV = 23 # Balancing chamber Valve 8 (D22) + D69_VALV = 24 # Ultrafiltration Valve 1 Inlet (D69) + D71_VALV = 25 # Ultrafiltration Valve 2 Inlet (D71) + D70_VALV = 26 # Ultrafiltration Valve 1 Outlet (D70) + D72_VALV = 27 # Ultrafiltration Valve 2 Outlet (D72) class DDValves(AbstractSubSystem): """ @@ -101,39 +101,39 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync) self.valve_states_all = 0x00000000 - self.d14_vho = {"id": DDValveNames.D14_VHO.value, "state": DEENERGIZED} - self.d52_vtd = {"id": DDValveNames.D52_VTD.value, "state": DEENERGIZED} - self.d8_vhb = {"id": DDValveNames.D8_VHB.value, "state": DEENERGIZED} - self.d54_vrp = {"id": DDValveNames.D54_VRP.value, "state": DEENERGIZED} - self.d53_vdr = {"id": DDValveNames.D53_VDR.value, "state": DEENERGIZED} - self.d65_vdb2 = {"id": DDValveNames.D65_VDB2.value, "state": DEENERGIZED} - self.d64_vp1 = {"id": DDValveNames.D64_VP1.value, "state": DEENERGIZED} - self.d31_vpt = {"id": DDValveNames.D31_VPT.value, "state": DEENERGIZED} - self.d34_vdb1 = {"id": DDValveNames.D34_VDB1.value, "state": DEENERGIZED} - self.d35_vdi = {"id": DDValveNames.D35_VDI.value, "state": DEENERGIZED} - self.d40_vdo = {"id": DDValveNames.D40_VDO.value, "state": DEENERGIZED} - self.d47_vp2 = {"id": DDValveNames.D47_VP2.value, "state": DEENERGIZED} - self.d3_vhi = {"id": DDValveNames.D3_VHI.value, "state": DEENERGIZED} - self.m4_vwi = {"id": DDValveNames.M4_VWI.value, "state": DEENERGIZED} + self.d14_valv = {"id": DDValveNames.D14_VALV.value, "state": DEENERGIZED} + self.d52_valv = {"id": DDValveNames.D52_VALV.value, "state": DEENERGIZED} + self.d8_valv = {"id": DDValveNames.D8_VALV.value, "state": DEENERGIZED} + self.d54_valv = {"id": DDValveNames.D54_VALV.value, "state": DEENERGIZED} + self.d53_valv = {"id": DDValveNames.D53_VALV.value, "state": DEENERGIZED} + self.d65_valv = {"id": DDValveNames.D65_VALV.value, "state": DEENERGIZED} + self.d64_valv = {"id": DDValveNames.D64_VALV.value, "state": DEENERGIZED} + self.d31_valv = {"id": DDValveNames.D31_VALV.value, "state": DEENERGIZED} + self.d34_valv = {"id": DDValveNames.D34_VALV.value, "state": DEENERGIZED} + self.d35_valv = {"id": DDValveNames.D35_VALV.value, "state": DEENERGIZED} + self.d40_valv = {"id": DDValveNames.D40_VALV.value, "state": DEENERGIZED} + self.d47_valv = {"id": DDValveNames.D47_VALV.value, "state": DEENERGIZED} + self.d3_valv = {"id": DDValveNames.D3_VALV.value, "state": DEENERGIZED} + self.m4_valv = {"id": DDValveNames.M4_VALV.value, "state": DEENERGIZED} self.rsvrd1 = {"id": DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED} self.rsvrd2 = {"id": DDValveNames.RSRVD_SPACE2.value, "state": DEENERGIZED} - self.d23_bcv1 = {"id": DDValveNames.D23_BCV1.value, "state": DEENERGIZED} - self.d19_bcv2 = {"id": DDValveNames.D19_BCV2.value, "state": DEENERGIZED} - self.d25_bcv3 = {"id": DDValveNames.D25_BCV3.value, "state": DEENERGIZED} - self.d26_bcv7 = {"id": DDValveNames.D26_BCV7.value, "state": DEENERGIZED} - self.d24_bcv5 = {"id": DDValveNames.D24_BCV5.value, "state": DEENERGIZED} - self.d20_bcv6 = {"id": DDValveNames.D20_BCV6.value, "state": DEENERGIZED} - self.d21_bcv4 = {"id": DDValveNames.D21_BCV4.value, "state": DEENERGIZED} - self.d22_bcv8 = {"id": DDValveNames.D22_BCV8.value, "state": DEENERGIZED} + self.d23_valv = {"id": DDValveNames.D23_VALV.value, "state": DEENERGIZED} + self.d19_valv = {"id": DDValveNames.D19_VALV.value, "state": DEENERGIZED} + self.d25_valv = {"id": DDValveNames.D25_VALV.value, "state": DEENERGIZED} + self.d26_valv = {"id": DDValveNames.D26_VALV.value, "state": DEENERGIZED} + self.d24_valv = {"id": DDValveNames.D24_VALV.value, "state": DEENERGIZED} + self.d20_valv = {"id": DDValveNames.D20_VALV.value, "state": DEENERGIZED} + self.d21_valv = {"id": DDValveNames.D21_VALV.value, "state": DEENERGIZED} + self.d22_valv = {"id": DDValveNames.D22_VALV.value, "state": DEENERGIZED} - self.d69_ufi1 = {"id": DDValveNames.D69_UFI1.value, "state": DEENERGIZED} - self.d71_ufi2 = {"id": DDValveNames.D71_UFI2.value, "state": DEENERGIZED} - self.d70_ufo1 = {"id": DDValveNames.D70_UFO1.value, "state": DEENERGIZED} - self.d72_ufo2 = {"id": DDValveNames.D72_UFO2.value, "state": DEENERGIZED} + self.d69_valv = {"id": DDValveNames.D69_VALV.value, "state": DEENERGIZED} + self.d69_valv = {"id": DDValveNames.D71_VALV.value, "state": DEENERGIZED} + self.d70_valv = {"id": DDValveNames.D70_UFO1.value, "state": DEENERGIZED} + self.d72_valv = {"id": DDValveNames.D70_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 + # NOTE: The len function counts the enums with the same number only once. This is not the case in the DD valves # class because each valve must have a unique ID. self.valve_states_enum = [0 for _ in range(len(DDValveNames))] @@ -147,34 +147,34 @@ @return: All valve states """ return [ - self.d14_vho.get("state", None), - self.d52_vtd.get("state", None), - self.d8_vhb.get("state", None), - self.d54_vrp.get("state", None), - self.d53_vdr.get("state", None), - self.d65_vdb2.get("state", None), - self.d64_vp1.get("state", None), - self.d31_vpt.get("state", None), - self.d34_vdb1.get("state", None), - self.d35_vdi.get("state", None), - self.d40_vdo.get("state", None), - self.d47_vp2.get("state", None), - self.d3_vhi.get("state", None), - self.m4_vwi.get("state", None), + self.d14_valv.get("state", None), + self.d52_valv.get("state", None), + self.d8_valv.get("state", None), + self.d54_valv.get("state", None), + self.d53_valv.get("state", None), + self.d65_valv.get("state", None), + self.d64_valv.get("state", None), + self.d31_valv.get("state", None), + self.d34_valv.get("state", None), + self.d35_valv.get("state", None), + self.d40_valv.get("state", None), + self.d47_valv.get("state", None), + self.d3_valv.get("state", None), + self.m4_valv.get("state", None), self.rsvrd1.get("state", None), self.rsvrd2.get("state", None), - self.d23_bcv1.get("state", None), - self.d19_bcv2.get("state", None), - self.d25_bcv3.get("state", None), - self.d26_bcv7.get("state", None), - self.d24_bcv5.get("state", None), - self.d20_bcv6.get("state", None), - self.d21_bcv4.get("state", None), - self.d22_bcv8.get("state", None), - self.d69_ufi1.get("state", None), - self.d71_ufi2.get("state", None), - self.d70_ufo1.get("state", None), - self.d72_ufo2.get("state", None) + self.d23_valv.get("state", None), + self.d19_valv.get("state", None), + self.d25_valv.get("state", None), + self.d26_valv.get("state", None), + self.d24_valv.get("state", None), + self.d20_valv.get("state", None), + self.d21_valv.get("state", None), + self.d22_valv.get("state", None), + self.d69_valv.get("state", None), + self.d71_valv.get("state", None), + self.d70_valv.get("state", None), + self.d72_valv.get("state", None) ] @staticmethod @@ -210,41 +210,41 @@ @publish([ "dd_valves_states_timestamp", "valve_states_all", - "d14_vho", - "d52_vtd", - "d8_vhb", - "d54_vrp", - "d53_vdr", - "d65_vdb2", - "d64_vp1", - "d31_vpt", - "d34_vdb1", - "d35_vdi", - "d40_vdo", - "d47_vp2", - "d3_vhi", - "m4_vwi", + "d14_valv", + "d52_valv", + "d8_valv", + "d54_valv", + "d53_valv", + "d65_valv", + "d64_valv", + "d31_valv", + "d34_valv", + "d35_valv", + "d40_valv", + "d47_valv", + "d3_valv", + "m4_valv", "rsvrd1", "rsvrd2", - "d23_bcv1", - "d19_bcv2", - "d25_bcv3", - "d26_bcv7", - "d24_bcv5", - "d20_bcv6", - "d21_bcv4", - "d22_bcv8", - "d69_ufi1", - "d71_ufi2", - "d70_ufo1", - "d72_ufo2", + "d23_valv", + "d19_valv", + "d25_valv", + "d26_valv", + "d24_valv", + "d20_valv", + "d21_valv", + "d22_valv", + "d69_valv", + "d71_valv", + "d70_valv", + "d72_valv", "valve_states_enum" ]) def _handler_valves_sync(self, message, timestamp=0.0): """ - Handles published valves states message. + Handles published DD valves states message. - @param message: published valves states message + @param message: published DD valves states message @return: none """ vsa = struct.unpack('I', bytearray(message['message'][self.START_POS_VALVES_STATES:self.END_POS_ALL_VALVES])) @@ -253,38 +253,38 @@ vst = struct.unpack('H', bytearray(message['message'][self.START_POS_VALVES_STATES:self.END_POS_VALVES_STATES])) # Extract each valve state from U16 valves states using bit-masking - self.d14_vho["state"] = self._binary_to_valve_state(vst[0] & 1) - self.d52_vtd["state"] = self._binary_to_valve_state(vst[0] & 2) - self.d8_vhb["state"] = self._binary_to_valve_state(vst[0] & 4) - self.d54_vrp["state"] = self._binary_to_valve_state(vst[0] & 8) - self.d53_vdr["state"] = self._binary_to_valve_state(vst[0] & 16) - self.d65_vdb2["state"] = self._binary_to_valve_state(vst[0] & 32) - self.d64_vp1["state"] = self._binary_to_valve_state(vst[0] & 64) - self.d31_vpt["state"] = self._binary_to_valve_state(vst[0] & 128) - self.d34_vdb1["state"] = self._binary_to_valve_state(vst[0] & 256) - self.d35_vdi["state"] = self._binary_to_valve_state(vst[0] & 512) - self.d40_vdo["state"] = self._binary_to_valve_state(vst[0] & 1024) - self.d47_vp2["state"] = self._binary_to_valve_state(vst[0] & 2048) - self.d3_vhi["state"] = self._binary_to_valve_state(vst[0] & 4096) - self.m4_vwi["state"] = self._binary_to_valve_state(vst[0] & 8192) + self.d14_valv["state"] = self._binary_to_valve_state(vst[0] & 1) + self.d52_valv["state"] = self._binary_to_valve_state(vst[0] & 2) + self.d8_valv["state"] = self._binary_to_valve_state(vst[0] & 4) + self.d54_valv["state"] = self._binary_to_valve_state(vst[0] & 8) + self.d53_valv["state"] = self._binary_to_valve_state(vst[0] & 16) + self.d65_valv["state"] = self._binary_to_valve_state(vst[0] & 32) + self.d64_valv["state"] = self._binary_to_valve_state(vst[0] & 64) + self.d31_valv["state"] = self._binary_to_valve_state(vst[0] & 128) + self.d34_valv["state"] = self._binary_to_valve_state(vst[0] & 256) + self.d35_valv["state"] = self._binary_to_valve_state(vst[0] & 512) + self.d40_valv["state"] = self._binary_to_valve_state(vst[0] & 1024) + self.d47_valv["state"] = self._binary_to_valve_state(vst[0] & 2048) + self.d3_valv["state"] = self._binary_to_valve_state(vst[0] & 4096) + self.m4_valv["state"] = self._binary_to_valve_state(vst[0] & 8192) self.rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 16384) self.rsvrd2["state"] = self._binary_to_valve_state(vst[0] & 32768) bcv = struct.unpack('B', bytearray(message['message'][self.START_POS_BCV_VALVES_STATES:self.END_POS_BCV_VALVES_STATES])) - self.d23_bcv1["state"] = self._binary_to_valve_state(bcv[0] & 1) - self.d19_bcv2["state"] = self._binary_to_valve_state(bcv[0] & 2) - self.d25_bcv3["state"] = self._binary_to_valve_state(bcv[0] & 4) - self.d26_bcv7["state"] = self._binary_to_valve_state(bcv[0] & 8) - self.d24_bcv5["state"] = self._binary_to_valve_state(bcv[0] & 16) - self.d20_bcv6["state"] = self._binary_to_valve_state(bcv[0] & 32) - self.d21_bcv4["state"] = self._binary_to_valve_state(bcv[0] & 64) - self.d22_bcv8["state"] = self._binary_to_valve_state(bcv[0] & 128) + self.d23_valv["state"] = self._binary_to_valve_state(bcv[0] & 1) + self.d19_valv["state"] = self._binary_to_valve_state(bcv[0] & 2) + self.d25_valv["state"] = self._binary_to_valve_state(bcv[0] & 4) + self.d26_valv["state"] = self._binary_to_valve_state(bcv[0] & 8) + self.d24_valv["state"] = self._binary_to_valve_state(bcv[0] & 16) + self.d20_valv["state"] = self._binary_to_valve_state(bcv[0] & 32) + self.d21_valv["state"] = self._binary_to_valve_state(bcv[0] & 64) + self.d22_valv["state"] = self._binary_to_valve_state(bcv[0] & 128) ufi = struct.unpack('B', bytearray(message['message'][self.START_POS_UFI_VALVES_STATES:self.END_POS_UFI_VALVES_STATES])) - self.d69_ufi1["state"] = self._binary_to_valve_state(ufi[0] & 1) - self.d71_ufi2["state"] = self._binary_to_valve_state(ufi[0] & 2) - self.d70_ufo1["state"] = self._binary_to_valve_state(ufi[0] & 4) - self.d72_ufo2["state"] = self._binary_to_valve_state(ufi[0] & 8) + self.d69_valv["state"] = self._binary_to_valve_state(ufi[0] & 1) + self.d69_valv["state"] = self._binary_to_valve_state(ufi[0] & 2) + self.d70_valv["state"] = self._binary_to_valve_state(ufi[0] & 4) + self.d72_valv["state"] = self._binary_to_valve_state(ufi[0] & 8) start = self.END_POS_UFI_VALVES_STATES end = start + 1 @@ -373,14 +373,14 @@ Must be logged into DD. Given valve ID must be one of the valve IDs listed below. - @param bcv1: bool - valve state for BCV1 (true=open, false=closed) - @param bcv2: bool - valve state for BCV2 (true=open, false=closed) - @param bcv3: bool - valve state for BCV3 (true=open, false=closed) - @param bcv4: bool - valve state for BCV4 (true=open, false=closed) - @param bcv5: bool - valve state for BCV5 (true=open, false=closed) - @param bcv6: bool - valve state for BCV6 (true=open, false=closed) - @param bcv7: bool - valve state for BCV7 (true=open, false=closed) - @param bcv8: bool - valve state for BCV8 (true=open, false=closed) + @param bcv1: bool - valve state for D23_VALV (true=open, false=closed) + @param bcv2: bool - valve state for D19_VALV (true=open, false=closed) + @param bcv3: bool - valve state for D25_VALV (true=open, false=closed) + @param bcv4: bool - valve state for D26_VALV (true=open, false=closed) + @param bcv5: bool - valve state for D24_VALV (true=open, false=closed) + @param bcv6: bool - valve state for D20_VALV (true=open, false=closed) + @param bcv7: bool - valve state for D21_VALV (true=open, false=closed) + @param bcv8: bool - valve state for D22_VALV (true=open, false=closed) @return: 1 if successful, zero otherwise """ @@ -425,8 +425,8 @@ """ Constructs and sends the valve state override command. Constraints: - Must be logged into DG. - Given interval must be non-zero and a multiple of the DG general task interval (50 ms). + Must be logged into DD. + Given interval must be non-zero and a multiple of the DD general task interval (50 ms). @param ms: unsigned int - broadcast interval (in ms) @param reset: integer - 1 to reset a previous override, 0 to override @@ -462,10 +462,11 @@ def cmd_valve_set_open_close(self, valve: int, state: int) -> int: """ Constructs and sends the valve open close command + Constraints: + Must be logged into DD. - @param valve: unsigned int - dialysate pump ID - @param command: int - value to command the dialysate pump - @param speed: integer - rpm to set the speed to + @param valve: unsigned int - valve ID + @param state: int - value to command the valve @return: 1 if successful, zero otherwise """