Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r953879c2319ea70007bfc303422155dd162d87e5 -r7a7bf19d0cf16745566956f45cef57f8eb5df445
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 953879c2319ea70007bfc303422155dd162d87e5)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
@@ -240,7 +240,6 @@
 static void setFPGAValveSetPoint( VALVE_T valve, S16 position, BOOL enableCurrentRelaxation );
 static void convertAndMonitorValvesCurrent( void );
 static void getAndMonitorValvesCurrentPosition( void );
-static U32  getPublishValvesDataInterval( void );
 static void publishValvesData( VALVE_T valve );
 static void setValveNextStep( VALVE_T valve, U32 stepChange );
 
@@ -1186,26 +1185,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishValvesDataInterval function gets the valves data publish
- * interval.
- * @details Inputs: valvesDataPublishInterval
- * @details Outputs: none
- * @return data publish time interval
- *************************************************************************/
-U32 getPublishValvesDataInterval( void )
-{
-    U32 result = valvesDataPublishInterval.data;
-
-    if ( OVERRIDE_KEY == valvesDataPublishInterval.override )
-    {
-        result = valvesDataPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The publishValvesData function publishes the data of the valves at the
  * specified time interval.
  * @details Inputs: valvesStatus
@@ -1216,7 +1195,7 @@
 static void publishValvesData( VALVE_T valve )
 {
     // Check the counter
-    if ( ++valvesStatus[ valve ].dataPublishCounter >= getPublishValvesDataInterval() )
+    if ( ++valvesStatus[ valve ].dataPublishCounter >= getU32OverrideValue( &valvesDataPublishInterval ) )
     {
         HD_VALVE_DATA_T valveData;
         valveData.valveID      = (U32)valve;