Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rab57180655892575252175a4310d97a1c8c46e74 -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision ab57180655892575252175a4310d97a1c8c46e74)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -244,7 +244,6 @@
 static void setFPGAValveSetPoint( VALVE_T valve, S16 position, BOOL enableCurrentRelaxation );
 static void convertAndMonitorValvesCurrent( void );
 static void getAndMonitorValvesCurrentFPGAPosition( void );
-static U32  getPublishValvesDataInterval( void );
 static void publishValvesData( VALVE_T valve );
 static void setValveNextStep( VALVE_T valve, U32 stepChange );
 static S16 getValvePositionCounts( VALVE_T valve );
@@ -568,7 +567,7 @@
 {
     VALVE_SELF_TEST_STATE_T state = VALVE_SELF_TEST_COMPLETE;
 
-    if ( areValvesFunctional() )
+    if ( TRUE == areValvesFunctional() )
     {
         valvesSelfTestResult = SELF_TEST_STATUS_PASSED;
     }
@@ -1213,26 +1212,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
@@ -1243,7 +1222,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;