Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r8e3ce4e082f70e12b48d796c518994662f7668b3 -rb58eb26e4481c8c2ae3a7978d3564eaaee037ecd --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 8e3ce4e082f70e12b48d796c518994662f7668b3) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision b58eb26e4481c8c2ae3a7978d3564eaaee037ecd) @@ -312,7 +312,7 @@ D3_VALV = 12 # Valve Hydraulics Inlet (D3) D80_VALV = 13 # Valve Dry Bicarb (D80) D81_VALV = 14 # Valve De-scaler (D81) - RSRVD_SPACE1 = 15 # This space has been reserved + D85_VALV = 15 # Valve DryBicart vent (D85) D23_VALV = 16 # Balancing chamber Valve 1 (D23) D19_VALV = 17 # Balancing chamber Valve 2 (D19) D25_VALV = 18 # Balancing chamber Valve 3 (D25) Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -rfa63b92d3d3a3f2870833583bff12729e180e2d1 -rb58eb26e4481c8c2ae3a7978d3564eaaee037ecd --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision fa63b92d3d3a3f2870833583bff12729e180e2d1) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision b58eb26e4481c8c2ae3a7978d3564eaaee037ecd) @@ -80,7 +80,7 @@ self.d3_valv = {"id": DDValveNames.D3_VALV.value, "state": DEENERGIZED} self.d80_valv = {"id": DDValveNames.D80_VALV.value, "state": DEENERGIZED} self.d81_valv = {"id": DDValveNames.D81_VALV.value, "state": DEENERGIZED} - self.rsvrd1 = {"id": DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED} + self.d85_valv = {"id": DDValveNames.D85_VALV.value, "state": DEENERGIZED} self.d23_valv = {"id": DDValveNames.D23_VALV.value, "state": DEENERGIZED} self.d19_valv = {"id": DDValveNames.D19_VALV.value, "state": DEENERGIZED} @@ -129,7 +129,7 @@ self.d3_valv.get("state", None), self.d80_valv.get("state", None), self.d81_valv.get("state", None), - self.rsvrd1.get("state", None), + self.d85_valv.get("state", None), self.d23_valv.get("state", None), self.d19_valv.get("state", None), @@ -197,7 +197,7 @@ "d3_valv", "d80_valv", "d81_valv", - "rsvrd1", + "d85_valv", "d23_valv", "d19_valv", "d25_valv", @@ -246,7 +246,7 @@ self.d3_valv["state"] = self._binary_to_valve_state(vst[0] & 4096) self.d80_valv["state"] = self._binary_to_valve_state(vst[0] & 8192) self.d81_valv["state"] = self._binary_to_valve_state(vst[0] & 16384) - self.rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 32768) + self.d85_valv["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_valv["state"] = self._binary_to_valve_state(bcv[0] & 1)