Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r9a915d188a0e77cc68e9d5a91de66bacbd1da96f -r7a827f82f5866f5780a0a679920b1e7b75280efd
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 9a915d188a0e77cc68e9d5a91de66bacbd1da96f)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 7a827f82f5866f5780a0a679920b1e7b75280efd)
@@ -255,36 +255,36 @@
         # Extract each valve state from U16 valves states using bit-masking
         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_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_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)
-        self.valve_state_VHI["state"] = self._binary_to_valve_state(vst[0] & 8192)
-        self.valve_state_VWI["state"] = self._binary_to_valve_state(vst[0] & 16384)
-        self.valve_state_rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 32768)
-        self.valve_state_rsvrd2["state"] = self._binary_to_valve_state(vst[0] & 65536)
+        self.valve_state_VHB["state"] = self._binary_to_valve_state(vst[0] & 4)
+        self.valve_state_VRP["state"] = self._binary_to_valve_state(vst[0] & 8)
+        self.valve_state_VDR["state"] = self._binary_to_valve_state(vst[0] & 16)
+        self.valve_state_VDB2["state"] = self._binary_to_valve_state(vst[0] & 32)
+        self.valve_state_VP1["state"] = self._binary_to_valve_state(vst[0] & 64)
+        self.valve_state_VPT["state"] = self._binary_to_valve_state(vst[0] & 128)
+        self.valve_state_VDB1["state"] = self._binary_to_valve_state(vst[0] & 256)
+        self.valve_state_VDI["state"] = self._binary_to_valve_state(vst[0] & 512)
+        self.valve_state_VDO["state"] = self._binary_to_valve_state(vst[0] & 1024)
+        self.valve_state_VP2["state"] = self._binary_to_valve_state(vst[0] & 2048)
+        self.valve_state_VHI["state"] = self._binary_to_valve_state(vst[0] & 4096)
+        self.valve_state_VWI["state"] = self._binary_to_valve_state(vst[0] & 8192)
+        self.valve_state_rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 16384)
+        self.valve_state_rsvrd2["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.valve_state_BCV1["state"] = self._binary_to_valve_state(bcv[0] & 1)
         self.valve_state_BCV2["state"] = self._binary_to_valve_state(bcv[0] & 2)
-        self.valve_state_BCV3["state"] = self._binary_to_valve_state(bcv[0] & 8)
-        self.valve_state_BCV7["state"] = self._binary_to_valve_state(bcv[0] & 16)
-        self.valve_state_BCV5["state"] = self._binary_to_valve_state(bcv[0] & 32)
-        self.valve_state_BCV6["state"] = self._binary_to_valve_state(bcv[0] & 64)
-        self.valve_state_BCV4["state"] = self._binary_to_valve_state(bcv[0] & 128)
-        self.valve_state_BCV8["state"] = self._binary_to_valve_state(bcv[0] & 256)
+        self.valve_state_BCV3["state"] = self._binary_to_valve_state(bcv[0] & 4)
+        self.valve_state_BCV7["state"] = self._binary_to_valve_state(bcv[0] & 8)
+        self.valve_state_BCV5["state"] = self._binary_to_valve_state(bcv[0] & 16)
+        self.valve_state_BCV6["state"] = self._binary_to_valve_state(bcv[0] & 32)
+        self.valve_state_BCV4["state"] = self._binary_to_valve_state(bcv[0] & 64)
+        self.valve_state_BCV8["state"] = self._binary_to_valve_state(bcv[0] & 128)
 
         ufi = struct.unpack('B', bytearray(message['message'][self.START_POS_UFI_VALVES_STATES:self.END_POS_UFI_VALVES_STATES]))
         self.valve_state_UFI1["state"] = self._binary_to_valve_state(ufi[0] & 1)
         self.valve_state_UFI2["state"] = self._binary_to_valve_state(ufi[0] & 2)
-        self.valve_state_UFI3["state"] = self._binary_to_valve_state(ufi[0] & 8)
-        self.valve_state_UFI4["state"] = self._binary_to_valve_state(ufi[0] & 16)
+        self.valve_state_UFI3["state"] = self._binary_to_valve_state(ufi[0] & 4)
+        self.valve_state_UFI4["state"] = self._binary_to_valve_state(ufi[0] & 8)
 
         start = self.END_POS_UFI_VALVES_STATES
         end = start + 1
@@ -408,9 +408,8 @@
         """
         Constructs and sends the valve open close command
 
-        @param valve: unsigned int - dialysate pump ID
-        @param command:  int - value to command the dialysate pump
-        @param speed:  integer - rpm to set the speed to
+        @param valve:  int - valve ID
+        @param state:  int - valve state to command the valve to
         @return: 1 if successful, zero otherwise
 
         """