Index: firmware/App/Controllers/FluidLeak.c
===================================================================
diff -u -reb9e7f219b519e0ce02d00296ceb986f642b38fe -r7a7bf19d0cf16745566956f45cef57f8eb5df445
--- firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision eb9e7f219b519e0ce02d00296ceb986f642b38fe)
+++ firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
@@ -43,7 +43,6 @@
 // ********** private function prototypes **********
 
 static void publishFluidLeakState( void );
-static U32  getPublishFluidLeakStateInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -121,26 +120,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishFluidLeakStateInterval function gets the fluid leak state
- * publication interval.
- * @details Inputs: fluidLeakStatePublishInterval
- * @details Outputs: none
- * @return the current fluid leak state publication interval (in task intervals).
- *************************************************************************/
-static U32  getPublishFluidLeakStateInterval( void )
-{
-    U32 result = fluidLeakStatePublishInterval.data;
-
-    if ( OVERRIDE_KEY == fluidLeakStatePublishInterval.override )
-    {
-        result = fluidLeakStatePublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The publishFluidLeakState function publishes fluid leak state at the set interval.
  * @details Inputs: fluidLeakState
  * @details Outputs: if broadcast is due, send fluid leak state
@@ -149,7 +128,7 @@
 static void publishFluidLeakState( void )
 {
     // Publish fluid leak state on interval
-    if ( ++fluidLeakStatePublicationTimerCounter >= getPublishFluidLeakStateInterval() )
+    if ( ++fluidLeakStatePublicationTimerCounter >= getU32OverrideValue( &fluidLeakStatePublishInterval ) )
     {
         FLUID_LEAK_STATES_T state = getFluidLeakState();