Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r00412d78bda4176d5c45a3778cb90ad907928965 -r98579cec744881b6fc6d368c0fb1b43932393447 --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 98579cec744881b6fc6d368c0fb1b43932393447) @@ -83,10 +83,10 @@ 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.d21_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.d26_valv = {"id": DDValveNames.D21_VALV.value, "state": DEENERGIZED} self.d22_valv = {"id": DDValveNames.D22_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 @@ -123,10 +123,10 @@ 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.d21_valv.get("state", None), self.d24_valv.get("state", None), self.d20_valv.get("state", None), - self.d21_valv.get("state", None), + self.d26_valv.get("state", None), self.d22_valv.get("state", None) ] @@ -181,10 +181,10 @@ "d23_valv", "d19_valv", "d25_valv", - "d26_valv", + "d21_valv", "d24_valv", "d20_valv", - "d21_valv", + "d26_valv", "d22_valv", "valve_states_enum", "dd_valves_states_timestamp" @@ -223,10 +223,10 @@ 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.d21_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.d26_valv["state"] = self._binary_to_valve_state(bcv[0] & 64) self.d22_valv["state"] = self._binary_to_valve_state(bcv[0] & 128) start = self.END_POS_BCV_VALVES_STATES