Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -red1a04a2c13f2d9ab200064f7290aaf8bd8d5fb8 -r6fc89c7410983d22f642edd22eef5b59068069ad
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision ed1a04a2c13f2d9ab200064f7290aaf8bd8d5fb8)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 6fc89c7410983d22f642edd22eef5b59068069ad)
@@ -632,10 +632,10 @@
 BOOL testBCValveStatesOverride( MESSAGE_T *message )
 {
     DD_BC_VALVE_OVERRIDE_PAYLOAD_T payload;
-    DD_VALVES_T valve           = FIRST_BC_VALVE;
+    DD_VALVES_T valve;
+    U32 mask;
+    VALVE_STATE_NAMES_T pos;
     OVERRIDE_TYPE_T ovType      = OVERRIDE_INVALID;
-    U32 mask                    = 0;
-    VALVE_STATE_NAMES_T pos     = VALVE_STATE_OPEN;
     BOOL result                 = FALSE;
 
     memcpy( (U08*)(&payload), message->payload, sizeof( DD_BC_VALVE_OVERRIDE_PAYLOAD_T ) );