Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -re9a1b8796610fd165c45a0a2c9c2034e00a77546 -r6a5bc5eee873a4317b720a8e5bf85cdce22eb85a --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision e9a1b8796610fd165c45a0a2c9c2034e00a77546) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 6a5bc5eee873a4317b720a8e5bf85cdce22eb85a) @@ -347,23 +347,23 @@ D3_VALV = 12 # Valve Hydraulics Inlet (D3) D80_VALV = 13 # Valve Dry Bicarb (D80) D81_VALV = 14 # Valve De-scaler (D81) - D83_VALV = 15 # Valve De-scaler (D83) - D88_VALV = 16 # Valve De-scaler (D88) - D91_VALV = 17 # Valve De-scaler (D91) - D95_VALV = 18 # Valve De-scaler (D95) - D100_VALV = 19 # Valve De-scaler (D100) - RSRVD_SPACE1 = 20 # This space has been reserved - D23_VALV = 21 # Balancing chamber Valve 1 (D23) - D19_VALV = 22 # Balancing chamber Valve 2 (D19) - D25_VALV = 23 # Balancing chamber Valve 3 (D25) - D21_VALV = 24 # Balancing chamber Valve 4 (D21) - D24_VALV = 25 # Balancing chamber Valve 5 (D24) - D20_VALV = 26 # Balancing chamber Valve 6 (D20) - D26_VALV = 27 # Balancing chamber Valve 7 (D26) - D22_VALV = 28 # Balancing chamber Valve 8 (D22) - D79_PMP_VALV = 29 # D79 pump mapped to spare valve 0 - SPARE1_VALV = 30 # Spare Valve 1 - SPARE2_VALV = 31 # Spare Valve 2 + RSRVD_SPACE1 = 15 # This space has been reserved + D23_VALV = 16 # Balancing chamber Valve 1 (D23) + D19_VALV = 17 # Balancing chamber Valve 2 (D19) + D25_VALV = 18 # Balancing chamber Valve 3 (D25) + D21_VALV = 19 # Balancing chamber Valve 4 (D21) + D24_VALV = 20 # Balancing chamber Valve 5 (D24) + D20_VALV = 21 # Balancing chamber Valve 6 (D20) + D26_VALV = 22 # Balancing chamber Valve 7 (D26) + D22_VALV = 23 # Balancing chamber Valve 8 (D22) + D79_PMP_VALV = 24 # D79 pump mapped to spare valve 0 + D83_VALV = 25 # Valve De-scaler (D83) + D91_VALV = 26 # Valve De-scaler (D91) + SPARE1_VALV = 27 # Spare Valve 1 + SPARE2_VALV = 28 # Spare Valve 2 + SPARE3_VALV = 29 # Spare Valve 3 + D100_VALV = 30 # Valve De-scaler (D100) + SPARE4_VALV = 31 # Spare Valve 4 NUM_OF_DD_VALVES = 32 # Number of Valves for the DD @unique Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -rbcad8857918d610b1d27917d54addc9523011f31 -r6a5bc5eee873a4317b720a8e5bf85cdce22eb85a --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision bcad8857918d610b1d27917d54addc9523011f31) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 6a5bc5eee873a4317b720a8e5bf85cdce22eb85a) @@ -98,6 +98,8 @@ self.d79_pmp_valv = {"id": DDValveNames.D79_PMP_VALV.value, "state": DEENERGIZED} self.spare1_valv = {"id": DDValveNames.SPARE1_VALV.value, "state": DEENERGIZED} self.spare2_valv = {"id": DDValveNames.SPARE2_VALV.value, "state": DEENERGIZED} + self.spare3_valv = {"id": DDValveNames.SPARE3_VALV.value, "state": DEENERGIZED} + self.spare4_valv = {"id": DDValveNames.SPARE4_VALV.value, "state": DEENERGIZED} # 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. @@ -128,11 +130,6 @@ self.d3_valv.get("state", None), self.d80_valv.get("state", None), self.d81_valv.get("state", None), - self.d83_valv.get("state", None), - self.d88_valv.get("state", None), - self.d91_valv.get("state", None), - self.d95_valv.get("state", None), - self.d100_valv.get("state", None), self.rsvrd1.get("state", None), self.d23_valv.get("state", None), @@ -145,8 +142,13 @@ self.d22_valv.get("state", None), self.d79_pmp_valv.get("state", None), + self.d83_valv.get("state", None), + self.d91_valv.get("state", None), self.spare1_valv.get("state", None), - self.spare2_valv.get("state", None) + self.spare2_valv.get("state", None), + self.spare3_valv.get("state", None), + self.d100_valv.get("state", None), + self.spare4_valv.get("state", None) ] @staticmethod @@ -196,11 +198,6 @@ "d3_valv", "d80_valv", "d81_valv", - "D83_valv", - "D88_valv", - "D91_valv", - "D95_valv", - "D100_valv", "rsvrd1", "d23_valv", "d19_valv", @@ -211,8 +208,13 @@ "d26_valv", "d22_valv", "d79_pmp_valv", + "D83_valv", + "D91_valv", "spare1_valv", "spare2_valv", + "spare3_valv", + "D100_valv", + "spare4_valv", "valve_states_enum", "valves_sensed_states", "dd_valves_states_timestamp" @@ -260,12 +262,12 @@ spv = struct.unpack('B', bytearray(message['message'][self.START_POS_SPARE_VALVES_STATES:self.END_POS_SPARE_VALVES_STATES])) self.d79_pmp_valv["state"] = self._binary_to_valve_state(spv[0] & 1) self.d83_valv["state"] = self._binary_to_valve_state(spv[0] & 2) - self.d88_valv["state"] = self._binary_to_valve_state(spv[0] & 4) - self.d91_valv["state"] = self._binary_to_valve_state(spv[0] & 8) - self.d95_valv["state"] = self._binary_to_valve_state(spv[0] & 16) - self.d100_valv["state"] = self._binary_to_valve_state(spv[0] & 32) - self.spare1_valv["state"] = self._binary_to_valve_state(spv[0] & 64) - self.spare2_valv["state"] = self._binary_to_valve_state(spv[0] & 128) + self.d91_valv["state"] = self._binary_to_valve_state(spv[0] & 4) + self.spare1_valv["state"] = self._binary_to_valve_state(spv[0] & 8) + self.spare2_valv["state"] = self._binary_to_valve_state(spv[0] & 16) + self.spare3_valv["state"] = self._binary_to_valve_state(spv[0] & 32) + self.d100_valv["state"] = self._binary_to_valve_state(spv[0] & 64) + self.spare4_valv["state"] = self._binary_to_valve_state(spv[0] & 128) start = self.END_POS_SPARE_VALVES_STATES end = start + 1