Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -r953879c2319ea70007bfc303422155dd162d87e5 -r7a7bf19d0cf16745566956f45cef57f8eb5df445
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 953879c2319ea70007bfc303422155dd162d87e5)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
@@ -60,7 +60,6 @@
 static BUBBLE_STATES_T handleBubbleSelfTestState( BUBBLES_T );
 
 static void publishBubblesData( void );
-static U32  getPublishBubblesDataInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -318,26 +317,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishBubblesDataInterval function gets the air bubbles data
- * publication interval.
- * @details Inputs: bubblesDataPublishInterval
- * @details Outputs: none
- * @return the current air bubbles data publication interval (in task intervals).
- *************************************************************************/
-static U32 getPublishBubblesDataInterval( void )
-{
-    U32 result = bubblesDataPublishInterval.data;
-
-    if ( OVERRIDE_KEY == bubblesDataPublishInterval.override )
-    {
-        result = bubblesDataPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The publishBubblesData function publishes air bubble detectors data at
  * the set interval.
  * @details Inputs: status, bubblesState
@@ -347,7 +326,7 @@
 static void publishBubblesData( void )
 {
     // Publish air bubble detectors data on interval
-    if ( ++bubblesDataPublicationTimerCounter >= getPublishBubblesDataInterval() )
+    if ( ++bubblesDataPublicationTimerCounter >= getU32OverrideValue( &bubblesDataPublishInterval ) )
     {
         BUBBLE_STATUS_T statusADA = getBubbleStatus( ADA );
         BUBBLE_STATUS_T statusADV = getBubbleStatus( ADV );