Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r1a5efe97f5f39594b45797fded52cafce92afe80 -rd3819286869611f9c02add72a0f8e321598fdf42
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 1a5efe97f5f39594b45797fded52cafce92afe80)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision d3819286869611f9c02add72a0f8e321598fdf42)
@@ -52,7 +52,6 @@
 static U32 convertValveStateNameToValveState(VALVE_STATE_NAMES_T valveStateName);
 static U16 fromU32ArrayToU16( void );
 static void publishValvesStates( void );
-static U32 getPublishValvesStatesInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -147,54 +146,26 @@
     switch ( valveStateName )
     {
         case VALVE_STATE_OPEN:
-            if ( ( valveID == VPI ) || ( valveID == VBF ) || ( valveID == VSP ) )
+            if ( ( valveID == VPI ) || ( valveID == VBF ) || ( valveID == VSP ) || ( VRD1 == valveID ) || ( VRD2 == valveID ) )
             {
                 result = TRUE;
             }
-#ifndef V_2_SYSTEM
-            if ( ( VRD1 == valveID ) || ( VRD2 == valveID ) )
-            {
-                result = TRUE;
-            }
-#endif
             break;
 
         case VALVE_STATE_CLOSED:
-            if ( ( valveID == VPI ) || ( valveID == VBF ) || ( valveID == VSP ) )
+            if ( ( valveID == VPI ) || ( valveID == VBF ) || ( valveID == VSP ) || ( VRD1 == valveID ) || ( VRD2 == valveID ) )
             {
                 result = TRUE;
             }
-#ifndef V_2_SYSTEM
-            if ( ( VRD1 == valveID ) || ( VRD2 == valveID ) )
-            {
-                result = TRUE;
-            }
-#endif
             break;
 
-#ifndef V_2_SYSTEM
         case VALVE_STATE_OPEN_C_TO_NC:
             if ( VPD == valveID )
             {
                 result = TRUE;
             }
             break;
-#else
-        case VALVE_STATE_OPEN_C_TO_NO:
-            if ( VPD == valveID )
-            {
-                result = TRUE;
-            }
-            break;
 
-        case VALVE_STATE_DRAIN_C_TO_NC:
-            if ( VPD == valveID )
-            {
-                result = TRUE;
-            }
-            break;
-#endif
-
         case VALVE_STATE_NOFILL_C_TO_NO:
             if ( valveID == VPO )
             {
@@ -210,16 +181,10 @@
             break;
 
         case VALVE_STATE_DRAIN_C_TO_NO:
-            if ( ( valveID == VDR ) || ( valveID == VRC ) )
+            if ( ( valveID == VDR ) || ( valveID == VRC ) || ( VPD == valveID ) )
             {
                 result = TRUE;
             }
-#ifndef V_2_SYSTEM
-            if ( VPD == valveID )
-            {
-                result = TRUE;
-            }
-#endif
             break;
 
         case VALVE_STATE_RECIRC_C_TO_NC:
@@ -267,25 +232,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishValveStateInterval function gets the valves states publication interval.
- * @details Inputs: valvesStatesPublishInterval
- * @details Outputs: none
- * @return the current valves states publication interval (in task intervals)
- *************************************************************************/
-static U32 getPublishValvesStatesInterval( void )
-{
-    U32 result = valvesStatesPublishInterval.data;
-
-    if ( OVERRIDE_KEY == valvesStatesPublishInterval.override )
-    {
-        result = valvesStatesPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The fromU32ArrayToU16 function converts an array of U32 valve states
  * to U16 valvesStates that can be passed to FPGA for setting valves.
  * @details Inputs: valveStates[]
@@ -329,19 +275,9 @@
             vState = DEENERGIZED;
             break;
 
-#ifdef V_2_SYSTEM
-        case VALVE_STATE_OPEN_C_TO_NO:
-            vState = DEENERGIZED;
-            break;
-
-        case VALVE_STATE_DRAIN_C_TO_NC:
-            vState = ENERGIZED;
-            break;
-#else
         case VALVE_STATE_OPEN_C_TO_NC:
             vState = ENERGIZED;
             break;
-#endif
 
         case VALVE_STATE_NOFILL_C_TO_NO:
             vState = DEENERGIZED;
@@ -466,15 +402,8 @@
     U32 valveState = DEENERGIZED;
 
     if ( valveID < NUM_OF_VALVES )
-    {
-        if ( OVERRIDE_KEY == valveStates[ valveID ].override )
-        {
-            valveState = valveStates[ valveID ].ovData;
-        }
-        else
-        {
-            valveState = valveStates[ valveID ].data;
-        }
+    {
+        valveState = getU32OverrideValue( &valveStates[ valveID ] );
     }
     else
     {
@@ -494,7 +423,7 @@
 static void publishValvesStates( void )
 {
     // publish valve state on interval
-    if ( ++valvesStatesPublicationTimerCounter >= getPublishValvesStatesInterval() )
+    if ( ++valvesStatesPublicationTimerCounter >= getU32OverrideValue( &valvesStatesPublishInterval ) )
     {
         broadcastValvesStates( getFPGAValveStates() );
         valvesStatesPublicationTimerCounter = 0;