Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r7ed011e79e1338f614cbcc7d3cedf07d359196b7 -rd3819286869611f9c02add72a0f8e321598fdf42
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 7ed011e79e1338f614cbcc7d3cedf07d359196b7)
+++ 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
@@ -233,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[]
@@ -422,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
     {
@@ -450,7 +423,7 @@
 static void publishValvesStates( void )
 {
     // publish valve state on interval
-    if ( ++valvesStatesPublicationTimerCounter >= getPublishValvesStatesInterval() )
+    if ( ++valvesStatesPublicationTimerCounter >= getU32OverrideValue( &valvesStatesPublishInterval ) )
     {
         broadcastValvesStates( getFPGAValveStates() );
         valvesStatesPublicationTimerCounter = 0;