Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -78,7 +78,7 @@ self.d3_valv = {"id": dd_enum_repository.DDValveNames.D3_VALV.value, "state": DEENERGIZED} self.d80_valv = {"id": dd_enum_repository.DDValveNames.D80_VALV.value, "state": DEENERGIZED} self.d81_valv = {"id": dd_enum_repository.DDValveNames.D81_VALV.value, "state": DEENERGIZED} - self.rsvrd1 = {"id": dd_enum_repository.DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED} + self.d85_valv = {"id": dd_enum_repository.DDValveNames.D85_VALV.value, "state": DEENERGIZED} self.d23_valv = {"id": dd_enum_repository.DDValveNames.D23_VALV.value, "state": DEENERGIZED} self.d19_valv = {"id": dd_enum_repository.DDValveNames.D19_VALV.value, "state": DEENERGIZED} @@ -128,7 +128,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", @@ -207,7 +207,7 @@ "d26_valv", "d22_valv", "d79_pmp_valv", - "D83_valv", + "d83_valv", "d91_valv", "spare3_valv", "spare4_valv", @@ -245,7 +245,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) @@ -258,14 +258,14 @@ self.d22_valv["state"] = self._binary_to_valve_state(bcv[0] & 128) 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(bcv[0] & 1) - self.d83_valv["state"] = self._binary_to_valve_state(bcv[0] & 2) - self.d91_valv["state"] = self._binary_to_valve_state(bcv[0] & 4) - self.spare3_valv["state"] = self._binary_to_valve_state(bcv[0] & 8) - self.spare4_valv["state"] = self._binary_to_valve_state(bcv[0] & 16) - self.spare5_valv["state"] = self._binary_to_valve_state(bcv[0] & 32) - self.d100_valv["state"] = self._binary_to_valve_state(bcv[0] & 64) - self.spare7_valv["state"] = self._binary_to_valve_state(bcv[0] & 128) + 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.d91_valv["state"] = self._binary_to_valve_state(spv[0] & 4) + self.spare3_valv["state"] = self._binary_to_valve_state(spv[0] & 8) + self.spare4_valv["state"] = self._binary_to_valve_state(spv[0] & 16) + self.spare5_valv["state"] = self._binary_to_valve_state(spv[0] & 32) + self.d100_valv["state"] = self._binary_to_valve_state(spv[0] & 64) + self.spare7_valv["state"] = self._binary_to_valve_state(spv[0] & 128) start = self.END_POS_SPARE_VALVES_STATES end = start + 1