Index: leahi_dialin/ro/modules/valves.py =================================================================== diff -u -rabb4a5d8265656b4045fe456b24bdad67e02facb -r549707cc285704a3300b0eb06af2c3397fddad4c --- leahi_dialin/ro/modules/valves.py (.../valves.py) (revision abb4a5d8265656b4045fe456b24bdad67e02facb) +++ leahi_dialin/ro/modules/valves.py (.../valves.py) (revision 549707cc285704a3300b0eb06af2c3397fddad4c) @@ -104,11 +104,10 @@ self.valve_state_VFB.get("state", None), self.valve_state_VFF.get("state", None), self.valve_state_VPI.get("state", None), - self.valve_state_VCR.get("state", None), + self.valve_state_VROD.get("state", None), self.valve_state_VCB.get("state", None), self.valve_state_VCD.get("state", None), - self.valve_state_VROD.get("state", None), - + self.valve_state_VCR.get("state", None), ] @staticmethod @@ -148,10 +147,10 @@ "valve_state_VFB", "valve_state_VFF", "valve_state_VPI", - "valve_state_VCR", + "valve_state_VROD", "valve_state_VCB", "valve_state_VCD", - "valve_state_VROD", + "valve_state_VCR", "valve_states_enum" ]) def _handler_valves_sync(self, message, timestamp=0.0): @@ -168,10 +167,10 @@ self.valve_state_VFB["state"] = self._binary_to_valve_state(vst[0] & 2) self.valve_state_VFF["state"] = self._binary_to_valve_state(vst[0] & 8) self.valve_state_VPI["state"] = self._binary_to_valve_state(vst[0] & 16) - self.valve_state_VCR["state"] = self._binary_to_valve_state(vst[0] & 32) + self.valve_state_VROD["state"] = self._binary_to_valve_state(vst[0] & 32) self.valve_state_VCB["state"] = self._binary_to_valve_state(vst[0] & 64) self.valve_state_VCD["state"] = self._binary_to_valve_state(vst[0] & 128) - self.valve_state_VROD["state"] = self._binary_to_valve_state(vst[0] & 256) + self.valve_state_VCR["state"] = self._binary_to_valve_state(vst[0] & 256) start = self.END_POS_VALVES_STATES end = start + 1