Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -re6f3a632890f96a5aa282922d11df148bdd06587 -rd3819286869611f9c02add72a0f8e321598fdf42
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision e6f3a632890f96a5aa282922d11df148bdd06587)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision d3819286869611f9c02add72a0f8e321598fdf42)
@@ -146,7 +146,6 @@
 static void setROPumpControlSignalDutyCycle( F32 dutyCycle );
 static void stopROPump( void );
 static void publishROPumpData( void );
-static U32  getPublishROPumpDataInterval( void );
 static BOOL processCalibrationData( void );
 
 /*********************************************************************//**
@@ -528,14 +527,7 @@
  *************************************************************************/
 F32 getMeasuredROFlowRate( void )
 {
-    F32 result = measuredROFlowRateLPM.data;
-
-    if ( OVERRIDE_KEY == measuredROFlowRateLPM.override )
-    {
-        result = measuredROFlowRateLPM.ovData;
-    }
-
-    return result;
+    return getF32OverrideValue( &measuredROFlowRateLPM );
 }
 
 /*********************************************************************//**
@@ -788,26 +780,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishROPumpDataInterval function gets the RO pump data publish
- * interval.
- * @details Inputs: roPumpDataPublishInterval
- * @details Outputs: roPumpDataPublishInterval
- * @return the current RO pump data publication interval (in ms).
- *************************************************************************/
-static U32 getPublishROPumpDataInterval( void )
-{
-    U32 result = roPumpDataPublishInterval.data;
-
-    if ( OVERRIDE_KEY == roPumpDataPublishInterval.override )
-    {
-        result = roPumpDataPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The processCalibrationData function gets the calibration data and makes
  * sure it is valid by checking the calibration date. The calibration date
  * should not be 0.
@@ -858,7 +830,7 @@
 static void publishROPumpData( void )
 {
     // publish RO pump data on interval
-    if ( ++roPumpDataPublicationTimerCounter >= getPublishROPumpDataInterval() )
+    if ( ++roPumpDataPublicationTimerCounter >= getU32OverrideValue( &roPumpDataPublishInterval ) )
     {
         RO_PUMP_DATA_T pumpData;