Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -reb9e7f219b519e0ce02d00296ceb986f642b38fe -r7a7bf19d0cf16745566956f45cef57f8eb5df445
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision eb9e7f219b519e0ce02d00296ceb986f642b38fe)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
@@ -65,7 +65,6 @@
 static BLOOD_LEAK_STATES_T handleBloodLeakNormalState( void );
 
 static void publishBloodLeakData( void );
-static U32  getPublishBloodLeakDataInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -318,26 +317,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishBloodLeakDataInterval function gets the blood leak data
- * publication interval.
- * @details Inputs: bloodLeakDataPublishInterval
- * @details Outputs: none
- * @return the current blood leak data publication interval (in task intervals).
- *************************************************************************/
-static U32  getPublishBloodLeakDataInterval( void )
-{
-    U32 result = bloodLeakDataPublishInterval.data;
-
-    if ( OVERRIDE_KEY == bloodLeakDataPublishInterval.override )
-    {
-        result = bloodLeakDataPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The publishBloodLeakData function publishes blood leak data at the set interval.
  * @details Inputs: bloodLeakStatus, bloodLeakState
  * @details Outputs: if broadcast is due, send blood leak data
@@ -346,7 +325,7 @@
 static void publishBloodLeakData( void )
 {
     // Publish blood leak data on interval
-    if ( ++bloodLeakDataPublicationTimerCounter >= getPublishBloodLeakDataInterval() )
+    if ( ++bloodLeakDataPublicationTimerCounter >= getU32OverrideValue( &bloodLeakDataPublishInterval ) )
     {
         BLOOD_LEAK_STATUS_T status = getBloodLeakStatus();