Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r4942164d8713b74e5c8a64127a75c1da8b83169f -rf0a680bc56bab3bd8bb4f4187d8414cb6bfbf5c1 --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 4942164d8713b74e5c8a64127a75c1da8b83169f) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision f0a680bc56bab3bd8bb4f4187d8414cb6bfbf5c1) @@ -39,38 +39,38 @@ @unique class DDValveNames(DialinEnum): - VHO = 0 # Valve Hydraulics Outlet (D14) - VTD = 1 # Valve Thermal Disinfect (D52) - VHB = 2 # Valve Hydraulics Bypass (D8) - VRP = 3 # Valve Rinse Port (D54) - VDR = 4 # Valve Drain (D53) - VDB2 = 5 # Valve DryBcarb Inlet (D65) - VP1 = 6 # Valve Purge 1 (D64) - VPT = 7 # Valve Pressure Test (D31) - VDB1 = 8 # Valve Dialyzer Bypass (D34) - VDI = 9 # Valve Dialyzer Inlet (D35) - VDO = 10 # Valve Dialyzer Outlet (D40) - VP2 = 11 # Valve Dialysate Out Purge 2 (D47) - VHI = 12 # Valve Hydraulics Inlet (D3) - 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 - BCV1 = 16 # Balancing chamber Valve 1 (D23) - BCV2 = 17 # Balancing chamber Valve 2 (D19) - BCV3 = 18 # Balancing chamber Valve 3 (D25) - BCV7 = 19 # Balancing chamber Valve 7 (D26) - BCV5 = 20 # Balancing chamber Valve 5 (D24) - BCV6 = 21 # Balancing chamber Valve 6 (D20) - BCV4 = 22 # Balancing chamber Valve 4 (D21) - BCV8 = 23 # Balancing chamber Valve 8 (D22) - UFI1 = 24 # Ultrafiltration Valve 1 Inlet (D69) - UFI2 = 25 # Ultrafiltration Valve 2 Inlet (D71) - UFO1 = 26 # Ultrafiltration Valve 1 Outlet (D70) - 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): """ - Dialysate Delivery (DG) interface for valve related commands. + Dialysate Delivery (DD) interface for valve related commands. """ @@ -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.valve_state_VDR = {"id": DDValveNames.VDR.value, "state": DEENERGIZED} - self.valve_state_VTD = {"id": DDValveNames.VTD.value, "state": DEENERGIZED} - self.valve_state_VHB = {"id": DDValveNames.VHB.value, "state": DEENERGIZED} - self.valve_state_VRP = {"id": DDValveNames.VRP.value, "state": DEENERGIZED} - self.valve_state_VHO = {"id": DDValveNames.VHO.value, "state": DEENERGIZED} - self.valve_state_VDB1 = {"id": DDValveNames.VDB1.value, "state": DEENERGIZED} - self.valve_state_VP1 = {"id": DDValveNames.VP1.value, "state": DEENERGIZED} - self.valve_state_VPT = {"id": DDValveNames.VPT.value, "state": DEENERGIZED} - self.valve_state_VDB2 = {"id": DDValveNames.VDB2.value, "state": DEENERGIZED} - self.valve_state_VDI = {"id": DDValveNames.VDI.value, "state": DEENERGIZED} - self.valve_state_VDO = {"id": DDValveNames.VDO.value, "state": DEENERGIZED} - self.valve_state_VP2 = {"id": DDValveNames.VP2.value, "state": DEENERGIZED} - self.valve_state_VHI = {"id": DDValveNames.VHI.value, "state": DEENERGIZED} - self.valve_state_VWI = {"id": DDValveNames.VWI.value, "state": DEENERGIZED} - self.valve_state_rsvrd1 = {"id": DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED} - self.valve_state_rsvrd2 = {"id": DDValveNames.RSRVD_SPACE2.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.valve_state_BCV1 = {"id": DDValveNames.BCV1.value, "state": DEENERGIZED} - self.valve_state_BCV2 = {"id": DDValveNames.BCV2.value, "state": DEENERGIZED} - self.valve_state_BCV3 = {"id": DDValveNames.BCV3.value, "state": DEENERGIZED} - self.valve_state_BCV7 = {"id": DDValveNames.BCV4.value, "state": DEENERGIZED} - self.valve_state_BCV5 = {"id": DDValveNames.BCV5.value, "state": DEENERGIZED} - self.valve_state_BCV6 = {"id": DDValveNames.BCV6.value, "state": DEENERGIZED} - self.valve_state_BCV4 = {"id": DDValveNames.BCV7.value, "state": DEENERGIZED} - self.valve_state_BCV8 = {"id": DDValveNames.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.valve_state_UFI1 = {"id": DDValveNames.BCV1.value, "state": DEENERGIZED} - self.valve_state_UFI2 = {"id": DDValveNames.BCV1.value, "state": DEENERGIZED} - self.valve_state_UFI3 = {"id": DDValveNames.BCV1.value, "state": DEENERGIZED} - self.valve_state_UFI4 = {"id": DDValveNames.BCV1.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_VALV.value, "state": DEENERGIZED} + self.d72_valv = {"id": DDValveNames.D72_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.valve_state_VDR.get("state", None), - self.valve_state_VTD.get("state", None), - self.valve_state_VHB.get("state", None), - self.valve_state_VRP.get("state", None), - self.valve_state_VHO.get("state", None), - self.valve_state_VDB1.get("state", None), - self.valve_state_VP1.get("state", None), - self.valve_state_VPT.get("state", None), - self.valve_state_VDB2.get("state", None), - self.valve_state_VDI.get("state", None), - self.valve_state_VDO.get("state", None), - self.valve_state_VP2.get("state", None), - self.valve_state_VHI.get("state", None), - self.valve_state_VWI.get("state", None), - self.valve_state_rsvrd1.get("state", None), - self.valve_state_rsvrd2.get("state", None), - self.valve_state_BCV1.get("state", None), - self.valve_state_BCV2.get("state", None), - self.valve_state_BCV3.get("state", None), - self.valve_state_BCV7.get("state", None), - self.valve_state_BCV5.get("state", None), - self.valve_state_BCV6.get("state", None), - self.valve_state_BCV4.get("state", None), - self.valve_state_BCV8.get("state", None), - self.valve_state_UFI1.get("state", None), - self.valve_state_UFI2.get("state", None), - self.valve_state_UFI3.get("state", None), - self.valve_state_UFI4.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_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 @@ -208,43 +208,43 @@ return DEENERGIZED @publish([ - "dg_valves_states_timestamp", + "dd_valves_states_timestamp", "valve_states_all", - "valve_state_VDR", - "valve_state_VTD", - "valve_state_VHB", - "valve_state_VRP", - "valve_state_VHO", - "valve_state_VDB1", - "valve_state_VP1", - "valve_state_VPT", - "valve_state_VDB2", - "valve_state_VDI", - "valve_state_VDO", - "valve_state_VP2", - "valve_state_VHI", - "valve_state_VWI", - "valve_state_rsvrd1", - "valve_state_rsvrd2", - "valve_state_BCV1", - "valve_state_BCV2", - "valve_state_BCV3", - "valve_state_BCV4", - "valve_state_BCV5", - "valve_state_BCV6", - "valve_state_BCV7", - "valve_state_BCV8", - "valve_state_UFI1", - "valve_state_UFI2", - "valve_state_UFI3", - "valve_state_UFI4", + "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_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.valve_state_VHO["state"] = self._binary_to_valve_state(vst[0] & 1) - self.valve_state_VTD["state"] = self._binary_to_valve_state(vst[0] & 2) - self.valve_state_VHB["state"] = self._binary_to_valve_state(vst[0] & 4) - self.valve_state_VRP["state"] = self._binary_to_valve_state(vst[0] & 8) - self.valve_state_VDR["state"] = self._binary_to_valve_state(vst[0] & 16) - self.valve_state_VDB2["state"] = self._binary_to_valve_state(vst[0] & 32) - self.valve_state_VP1["state"] = self._binary_to_valve_state(vst[0] & 64) - self.valve_state_VPT["state"] = self._binary_to_valve_state(vst[0] & 128) - self.valve_state_VDB1["state"] = self._binary_to_valve_state(vst[0] & 256) - self.valve_state_VDI["state"] = self._binary_to_valve_state(vst[0] & 512) - self.valve_state_VDO["state"] = self._binary_to_valve_state(vst[0] & 1024) - self.valve_state_VP2["state"] = self._binary_to_valve_state(vst[0] & 2048) - self.valve_state_VHI["state"] = self._binary_to_valve_state(vst[0] & 4096) - self.valve_state_VWI["state"] = self._binary_to_valve_state(vst[0] & 8192) - self.valve_state_rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 16384) - self.valve_state_rsvrd2["state"] = self._binary_to_valve_state(vst[0] & 32768) + 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.valve_state_BCV1["state"] = self._binary_to_valve_state(bcv[0] & 1) - self.valve_state_BCV2["state"] = self._binary_to_valve_state(bcv[0] & 2) - self.valve_state_BCV3["state"] = self._binary_to_valve_state(bcv[0] & 4) - self.valve_state_BCV7["state"] = self._binary_to_valve_state(bcv[0] & 8) - self.valve_state_BCV5["state"] = self._binary_to_valve_state(bcv[0] & 16) - self.valve_state_BCV6["state"] = self._binary_to_valve_state(bcv[0] & 32) - self.valve_state_BCV4["state"] = self._binary_to_valve_state(bcv[0] & 64) - self.valve_state_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.valve_state_UFI1["state"] = self._binary_to_valve_state(ufi[0] & 1) - self.valve_state_UFI2["state"] = self._binary_to_valve_state(ufi[0] & 2) - self.valve_state_UFI3["state"] = self._binary_to_valve_state(ufi[0] & 4) - self.valve_state_UFI4["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 @@ -300,7 +300,7 @@ """ Constructs and sends the valve sensed state override command. Constraints: - Must be logged into DG. + Must be logged into DD. Given valve ID must be one of the valve IDs listed below. @param valve: unsigned int - valve ID @@ -335,7 +335,7 @@ """ Constructs and sends the valve state override command. Constraints: - Must be logged into DG. + Must be logged into DD. Given valve ID must be one of the valve IDs listed below. @param valve: unsigned int - valve ID @@ -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,9 +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: int - valve ID - @param state: int - valve state to command the valve to + @param valve: unsigned int - valve ID + @param state: int - value to command the valve @return: 1 if successful, zero otherwise """