Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -re5c6383e93940c2722d3bf73beb1d13a6d3eae6e -r9a7aa0eb2e11048600d3a189859217a82a854ebc
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision e5c6383e93940c2722d3bf73beb1d13a6d3eae6e)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 9a7aa0eb2e11048600d3a189859217a82a854ebc)
@@ -244,10 +244,10 @@
 #define VBA_VALVE_CHECK ( VALVE_PID_CHECK << ( VBA_POS * VALVE_CHECK_BITS_PER_VALVE ) )
 #define VBV_VALVE_CHECK ( VALVE_PID_CHECK << ( VBV_POS * VALVE_CHECK_BITS_PER_VALVE ) )
 
-#define VDI_VALVE_CHECK_MASK ( ( VALVE_CHECK_MASK << ( 2 * VALVE_CHECK_BITS_PER_VALVE ) ) )
-#define VDO_VALVE_CHECK_MASK ( ( VALVE_CHECK_MASK << ( 3 * VALVE_CHECK_BITS_PER_VALVE ) ) )
-#define VBA_VALVE_CHECK_MASK ( ( VALVE_CHECK_MASK << ( 0 * VALVE_CHECK_BITS_PER_VALVE ) ) )
-#define VBV_VALVE_CHECK_MASK ( ( VALVE_CHECK_MASK << ( 1 * VALVE_CHECK_BITS_PER_VALVE ) ) )
+#define VDI_VALVE_CHECK_MASK ( ( VALVE_CHECK_MASK << ( VDI_POS * VALVE_CHECK_BITS_PER_VALVE ) ) )
+#define VDO_VALVE_CHECK_MASK ( ( VALVE_CHECK_MASK << ( VDO_POS * VALVE_CHECK_BITS_PER_VALVE ) ) )
+#define VBA_VALVE_CHECK_MASK ( ( VALVE_CHECK_MASK << ( VBA_POS * VALVE_CHECK_BITS_PER_VALVE ) ) )
+#define VBV_VALVE_CHECK_MASK ( ( VALVE_CHECK_MASK << ( VBV_POS * VALVE_CHECK_BITS_PER_VALVE ) ) )
 
 static const U16 VALVE_CHECK[ NUM_OF_VALVES ][ NUM_OF_VALVE_CHECK_ENTRIES ] =
 { { VDI_VALVE_CHECK, VDI_VALVE_CHECK_MASK },
@@ -1061,7 +1061,6 @@
     }
 
     return result;
-
 }
 
 /*********************************************************************//**