Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -rdc5fda9a9930d6e1a33c4da0b509b3545acb947d
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision dc5fda9a9930d6e1a33c4da0b509b3545acb947d)
@@ -72,7 +72,7 @@
 {
     BUBBLES_T bubble;
 
-    for (bubble = ADA; bubble < NUM_OF_BUBBLES; bubble++)
+    for (bubble = ADV; bubble < NUM_OF_BUBBLES; bubble++)
     {
         bubblesState[ bubble ] = BUBBLE_NORMAL_STATE;
         bubblesStatus[ bubble ].data = BUBBLE_NOT_DETECTED;
@@ -99,7 +99,7 @@
     if ( getCurrentOperationMode() != MODE_INIT )
     {
         // Loop through all of the air bubble detectors
-        for ( bubble = ADA; bubble < NUM_OF_BUBBLES; bubble++ )
+        for ( bubble = ADV; bubble < NUM_OF_BUBBLES; bubble++ )
         {
             // Execute the air bubble detector state machine
             switch( bubblesState[ bubble ] )
@@ -182,7 +182,7 @@
     BUBBLE_STATES_T state = BUBBLE_NORMAL_STATE;
     TREATMENT_STATE_T treatmentState = getTreatmentState();
 
-    if ( ( bubble == ADA ) || ( bubble == ADV) )
+    if ( bubble < NUM_OF_BUBBLES )
     {
         if ( TRUE == noFPGABubbleDetected( bubble ) )
         {
@@ -278,7 +278,7 @@
 {
     BUBBLE_STATES_T state = BUBBLE_SELF_TEST_STATE;
 
-    if ( ( bubble == ADA ) || ( bubble == ADV) )
+    if ( bubble < NUM_OF_BUBBLES )
     {
         if ( TRUE == noFPGABubbleDetected( bubble ) )
         {
@@ -299,14 +299,7 @@
             else if ( TRUE == didTimeout( bubblesSelfTestStartTime[ bubble ], BUBBLE_TIMEOUT_MS ) )
             {
                 bubblesSelfTestStatus[ bubble ] = SELF_TEST_STATUS_FAILED;
-                if ( bubble == ADA )
-                {
-                    activateAlarmNoData( ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE );
-                }
-                else // ADV
-                {
-                    activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE );
-                }
+                activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE );
             }
         }
         else
@@ -341,8 +334,6 @@
     {
         BUBBLES_DATA_T bubbleData;
 
-        bubbleData.statusADA = (U32)getBubbleStatus( ADA );
-        bubbleData.stateADA  = (U32)bubblesState[ ADA ];
         bubbleData.statusADV = (U32)getBubbleStatus( ADV );
         bubbleData.stateADV  = (U32)bubblesState[ ADV ];
         broadcastData( MSG_ID_HD_BUBBLES_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&bubbleData, sizeof( BUBBLES_DATA_T ) );
Index: firmware/App/Controllers/Bubble.h
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -rdc5fda9a9930d6e1a33c4da0b509b3545acb947d
--- firmware/App/Controllers/Bubble.h	(.../Bubble.h)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Controllers/Bubble.h	(.../Bubble.h)	(revision dc5fda9a9930d6e1a33c4da0b509b3545acb947d)
@@ -45,16 +45,13 @@
 /// Air bubble detectors names
 typedef enum bubblesNames
 {
-    ADA = 0,                                ///< Arterial air bubble detector
-    ADV,                                    ///< Venous air bubble detector
+    ADV = 0,                                ///< Venous air bubble detector
     NUM_OF_BUBBLES                          ///< Number of air bubble detectors
 } BUBBLES_T;
 
 /// Bubble detectors data publish
 typedef struct
 {
-    U32 statusADA;                          ///< Arterial bubble detector status
-    U32 stateADA;                           ///< Arterial bubble detector state
     U32 statusADV;                          ///< Venous bubble detector status
     U32 stateADV;                           ///< Venous bubble detector state
 } BUBBLES_DATA_T;