Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r6c364ae181c63c1323b0a34ae0bbd99422e64580 -rbe5dde1cc2e93cc22ebed1fc4dfd6b6082cae8a3
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 6c364ae181c63c1323b0a34ae0bbd99422e64580)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision be5dde1cc2e93cc22ebed1fc4dfd6b6082cae8a3)
@@ -39,15 +39,15 @@
 
 @unique
 class DDValveNames(DialinEnum):
-    VDR = 0                                      # Valve Drain (D53)
+    VHO = 0                                      # Valve Hydraulics Outlet (D14)
     VTD = 1                                      # Valve Thermal Disinfect (D52)
     VHB = 2                                      # Valve Hydraulics Bypass (D8)
     VRP  = 3                                     # Valve Rinse Port (D54)
-    VHO = 4                                      # Valve Hydraulics Outlet (D14)
-    VDB1 = 5                                     # Valve DryBcarb Inlet (D65)
+    VDR = 4                                      # Valve Drain (D53)
+    VDB2 = 5                                     # Valve DryBcarb Inlet (D65)
     VP1 = 6                                      # Valve Purge 1 (D64)
     VPT = 7                                      # Valve Pressure Test (D31)
-    VDB2 = 8                                     # Valve Dialyzer Bypass (D34)
+    VDB1 = 8                                     # Valve Dialyzer Bypass (D34)
     VDI = 9                                      # Valve Dialyzer Inlet (D35)
     VDO = 10                                     # Valve Dialyzer Outlet (D40)
     VP2 = 11                                     # Valve Dialysate Out Purge 2 (D47)
@@ -253,15 +253,15 @@
 
         vst = struct.unpack('H', bytearray(message['message'][self.START_POS_VALVES_STATES:self.END_POS_VALVES_STATES]))
         # Extract each valve state from U16 valves states using bit-masking
-        self.valve_state_VDR["state"] = self._binary_to_valve_state(vst[0] & 1)
+        self.valve_state_VHO["state"] = self._binary_to_valve_state(vst[0] & 1)
         self.valve_state_VTD["state"] = self._binary_to_valve_state(vst[0] & 2)
         self.valve_state_VHB["state"] = self._binary_to_valve_state(vst[0] & 8)
         self.valve_state_VRP["state"] = self._binary_to_valve_state(vst[0] & 16)
-        self.valve_state_VHO["state"] = self._binary_to_valve_state(vst[0] & 32)
-        self.valve_state_VDB1["state"] = self._binary_to_valve_state(vst[0] & 64)
+        self.valve_state_VDR["state"] = self._binary_to_valve_state(vst[0] & 32)
+        self.valve_state_VDB2["state"] = self._binary_to_valve_state(vst[0] & 64)
         self.valve_state_VP1["state"] = self._binary_to_valve_state(vst[0] & 128)
         self.valve_state_VPT["state"] = self._binary_to_valve_state(vst[0] & 256)
-        self.valve_state_VDB2["state"] = self._binary_to_valve_state(vst[0] & 512)
+        self.valve_state_VDB1["state"] = self._binary_to_valve_state(vst[0] & 512)
         self.valve_state_VDI["state"] = self._binary_to_valve_state(vst[0] & 1024)
         self.valve_state_VDO["state"] = self._binary_to_valve_state(vst[0] & 2048)
         self.valve_state_VP2["state"] = self._binary_to_valve_state(vst[0] & 4096)