Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rcef6b0392becf60c69cf4e517701ba22642f072a -rc407a98464658e38b527e35da368764bfeb4b8d7
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision cef6b0392becf60c69cf4e517701ba22642f072a)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision c407a98464658e38b527e35da368764bfeb4b8d7)
@@ -88,10 +88,8 @@
 #define FPGA_BLOOD_LEAK_ZERO_CMD        0x02                    ///< Bit for blood leak detector zero command.
 #define FPGA_BLOOD_LEAK_SELF_TEST_CMD   0x01                    ///< Bit for blood leak detector self test command.
 
-#define FPGA_ADA_BUBBLE_STATUS_MASK      0x0001                 ///< Bit mask for arterial air bubble detector input status.
-#define FPGA_ADV_BUBBLE_STATUS_MASK      0x0002                 ///< Bit mask for venous air bubble detector input status.
-#define FPGA_ADA_BUBBLE_TEST_STATE_MASK 0x2000                  ///< Bit mask for arterial air bubble detector self-test state.
-#define FPGA_ADV_BUBBLE_TEST_STATE_MASK 0x4000                  ///< Bit mask for venous air bubble detector self-test state.
+#define FPGA_ADA_BUBBLE_STATUS_MASK     0x0001                  ///< Bit mask for arterial air bubble detector input status.
+#define FPGA_ADV_BUBBLE_STATUS_MASK     0x0002                  ///< Bit mask for venous air bubble detector input status.
 #define FPGA_ADA_BUBBLE_SELF_TEST_CMD   0x04                    ///< Bit for arterial air bubble detector self-test command.
 #define FPGA_ADV_BUBBLE_SELF_TEST_CMD   0x08                    ///< Bit for venous air bubble detector self-test command.
 
@@ -1750,7 +1748,7 @@
     }
     else
     {
-        // TODO: Should never reach here
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_BUBBLE_ID, bubble )
     }
 
     return ( 0 == noFPGABubbleDetected ? TRUE : FALSE );
@@ -1770,11 +1768,11 @@
 
     if ( bubble == ADA )
     {
-        FPGABubbleSelfTestDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADA_BUBBLE_TEST_STATE_MASK;
+        FPGABubbleSelfTestDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADA_BUBBLE_STATUS_MASK;
     }
     else if ( bubble == ADV )
     {
-        FPGABubbleSelfTestDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADV_BUBBLE_TEST_STATE_MASK;
+        FPGABubbleSelfTestDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADV_BUBBLE_STATUS_MASK;
     }
     else
     {