Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd -rab57180655892575252175a4310d97a1c8c46e74
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision ab57180655892575252175a4310d97a1c8c46e74)
@@ -211,11 +211,15 @@
 static const U16 VALVE_CONTROL_MODES_RESET_BITS[ NUM_OF_VALVES ] = { VDI_RESET_CONTROL_BIT_MASK, VDO_RESET_CONTROL_BIT_MASK,
                                                                      VBA_RESET_CONTROL_BIT_MASK, VBV_RESET_CONTROL_BIT_MASK };     ///< Valves control modes rest bits
 
+#ifndef DISABLE_3WAY_VALVES
+#ifndef DISABLE_VALVE_ALARMS
 static const U16 VALVE_CONTROL_STATUS_BITS[ NUM_OF_VALVES ][ NUM_OF_VALVE_CONTROL_STATUS ] =
   { { VDI_INIT_STATUS_BIT_MASK, VDI_ENABLE_PID_STATUS_BIT_MASK, VDI_ENABLE_BYPASS_STATUS_BIT_MASK, VDI_RESET_CONTROL_BIT_MASK },
     { VDO_INIT_STATUS_BIT_MASK, VDO_ENABLE_PID_STATUS_BIT_MASK, VDO_ENABLE_BYPASS_STATUS_BIT_MASK, VDO_RESET_CONTROL_BIT_MASK },
     { VBA_INIT_STATUS_BIT_MASK, VBA_ENABLE_PID_STATUS_BIT_MASK, VBA_ENABLE_BYPASS_STATUS_BIT_MASK, VBA_RESET_CONTROL_BIT_MASK },
     { VBV_INIT_STATUS_BIT_MASK, VBV_ENABLE_PID_STATUS_BIT_MASK, VBV_ENABLE_BYPASS_STATUS_BIT_MASK, VBV_RESET_CONTROL_BIT_MASK } }; ///< Valves control status bits
+#endif
+#endif
 
 static U16 valvesControlSetBits = 0x0000;                                                                                          ///< Valves control set bit
 static OPN_CLS_STATE_T valveAirTrapStatus;                                                                                         ///< Air trap valve status (open/close)
@@ -987,12 +991,12 @@
  *************************************************************************/
 static BOOL areValvesFunctional( void )
 {
-    VALVE_T valve;
-    VALVE_MODE_T mode;
     BOOL result = TRUE;
-
 #ifndef DISABLE_3WAY_VALVES
 #ifndef DISABLE_VALVE_ALARMS
+    VALVE_T valve;
+    VALVE_MODE_T mode;
+
     // Get the status of the valves from FPGA
     U16 status = getFPGAValvesStatus();