Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -rf007d2e06b612caed19e9c044fede4a100d2fc2f -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision f007d2e06b612caed19e9c044fede4a100d2fc2f)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -60,7 +60,6 @@
 static BUBBLE_STATES_T handleBubbleSelfTestState( BUBBLES_T );
 
 static void publishBubblesData( void );
-static U32  getPublishBubblesDataInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -194,6 +193,7 @@
             bubblesStatus[ bubble ].data = BUBBLE_DETECTED;
         }
 
+#ifndef DISABLE_BUBBLE_ALARMS
         // Check status reading and act upon
         if ( BUBBLE_DETECTED == getBubbleStatus( bubble ) )
         {
@@ -246,6 +246,7 @@
                 clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK );
             }
         }
+#endif
 
         if ( TRUE == bubblesSelfTestRequested[ bubble ] )
         {
@@ -302,7 +303,7 @@
                 {
                     activateAlarmNoData( ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE );
                 }
-                else if ( bubble == ADV )
+                else // ADV
                 {
                     activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE );
                 }
@@ -327,26 +328,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
@@ -356,7 +337,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 );