Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -rbe5dde1cc2e93cc22ebed1fc4dfd6b6082cae8a3 -r9a915d188a0e77cc68e9d5a91de66bacbd1da96f --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision be5dde1cc2e93cc22ebed1fc4dfd6b6082cae8a3) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 9a915d188a0e77cc68e9d5a91de66bacbd1da96f) @@ -58,10 +58,10 @@ BCV1 = 16 # Balancing chamber Valve 1 (D23) BCV2 = 17 # Balancing chamber Valve 2 (D19) BCV3 = 18 # Balancing chamber Valve 3 (D25) - BCV4 = 19 # Balancing chamber Valve 4 (D21) + BCV7 = 19 # Balancing chamber Valve 7 (D26) BCV5 = 20 # Balancing chamber Valve 5 (D24) BCV6 = 21 # Balancing chamber Valve 6 (D20) - BCV7 = 22 # Balancing chamber Valve 7 (D26) + 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) @@ -121,10 +121,10 @@ 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_BCV4 = {"id": DDValveNames.BCV4.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_BCV7 = {"id": DDValveNames.BCV7.value, "state": DEENERGIZED} + self.valve_state_BCV4 = {"id": DDValveNames.BCV7.value, "state": DEENERGIZED} self.valve_state_BCV8 = {"id": DDValveNames.BCV8.value, "state": DEENERGIZED} self.valve_state_UFI1 = {"id": DDValveNames.BCV1.value, "state": DEENERGIZED} @@ -166,10 +166,10 @@ self.valve_state_BCV1.get("state", None), self.valve_state_BCV2.get("state", None), self.valve_state_BCV3.get("state", None), - self.valve_state_BCV4.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_BCV7.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), @@ -274,10 +274,10 @@ 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] & 8) - self.valve_state_BCV4["state"] = self._binary_to_valve_state(bcv[0] & 16) + self.valve_state_BCV7["state"] = self._binary_to_valve_state(bcv[0] & 16) self.valve_state_BCV5["state"] = self._binary_to_valve_state(bcv[0] & 32) self.valve_state_BCV6["state"] = self._binary_to_valve_state(bcv[0] & 64) - self.valve_state_BCV7["state"] = self._binary_to_valve_state(bcv[0] & 128) + self.valve_state_BCV4["state"] = self._binary_to_valve_state(bcv[0] & 128) self.valve_state_BCV8["state"] = self._binary_to_valve_state(bcv[0] & 256) ufi = struct.unpack('B', bytearray(message['message'][self.START_POS_UFI_VALVES_STATES:self.END_POS_UFI_VALVES_STATES]))