Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
@@ -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 ) )
         {
@@ -204,23 +204,13 @@
                     case TREATMENT_BLOOD_PRIME_STATE:
                     case TREATMENT_DIALYSIS_STATE:
                     case TREATMENT_END_STATE:
-                        // TODO: Enable if ADA is ever used to detect air bubble on arterial line during treatment
-                        //if ( bubble == ADA )
-                        //{
-                        //    activateAlarmNoData( ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED );
-                        //}
                         if ( bubble == ADV )
                         {
                             activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
                         }
                         break;
 
                     case TREATMENT_RINSEBACK_STATE:
-                        // TODO: Enable if ADA is ever used to detect air bubble on arterial line during rinseback
-                        //if ( bubble == ADA )
-                        //{
-                        //    activateAlarmNoData( ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED_RINSEBACK );
-                        //}
                         if ( bubble == ADV )
                         {
                             activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK );
@@ -235,11 +225,6 @@
         }
         else // Air bubble not detected
         {
-            if ( bubble == ADA )
-            {
-                clearAlarmCondition( ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED );
-            }
-
             if ( bubble == ADV )
             {
                 clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
@@ -278,7 +263,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 +284,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 +319,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 ) );