Index: leahi_dialin/ro/modules/valves.py =================================================================== diff -u -r1ad88aeeeed4db45b614481317a0e97019ec500e -rf0908acaa26a09db7add1d655ec553c1f199c339 --- leahi_dialin/ro/modules/valves.py (.../valves.py) (revision 1ad88aeeeed4db45b614481317a0e97019ec500e) +++ leahi_dialin/ro/modules/valves.py (.../valves.py) (revision f0908acaa26a09db7add1d655ec553c1f199c339) @@ -102,13 +102,13 @@ """ return [ self.valve_state_VWI.get("state"), - self.valve_state_VFB.get("state"), + self.valve_state_VROD.get("state"), self.valve_state_VFF.get("state"), self.valve_state_VPI.get("state"), self.valve_state_VCR.get("state"), self.valve_state_VCB.get("state"), self.valve_state_VCD.get("state"), - self.valve_state_VROD.get("state"), + self.valve_state_VFB.get("state"), self.valve_state_SPP.get("state") ] @@ -152,8 +152,8 @@ "valve_state_VCR", "valve_state_VCB", "valve_state_VCD", - "valve_state_VROD", - "valve_state_SPP" + "valve_state_VFB", + "valve_state_SPP", "valve_states_enum" ]) def _handler_valves_sync(self, message, timestamp=0.0): @@ -168,13 +168,13 @@ self.valve_states_all = vst[0] # Extract each valve state from U16 valves states using bit-masking self.valve_state_VWI["state"] = self._binary_to_valve_state(vst[0] & 1) - self.valve_state_VFB["state"] = self._binary_to_valve_state(vst[0] & 2) + self.valve_state_VROD["state"] = self._binary_to_valve_state(vst[0] & 2) self.valve_state_VFF["state"] = self._binary_to_valve_state(vst[0] & 4) self.valve_state_VPI["state"] = self._binary_to_valve_state(vst[0] & 8) self.valve_state_VCR["state"] = self._binary_to_valve_state(vst[0] & 16) self.valve_state_VCB["state"] = self._binary_to_valve_state(vst[0] & 32) self.valve_state_VCD["state"] = self._binary_to_valve_state(vst[0] & 64) - self.valve_state_VROD["state"] = self._binary_to_valve_state(vst[0] & 128) + self.valve_state_VFB["state"] = self._binary_to_valve_state(vst[0] & 128) self.valve_state_SPP["state"] = self._binary_to_valve_state(vst[0] & 256) start = self.END_POS_VALVES_STATES