Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r796d5732ae78870d15ac5c86feee82229626034c -r3d30c9829d316b8c5e632c0201a59c8d14b3486e
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 796d5732ae78870d15ac5c86feee82229626034c)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 3d30c9829d316b8c5e632c0201a59c8d14b3486e)
@@ -530,7 +530,7 @@
     // If retries for commands exceeds limit, fault
     if ( fpgaCommRetryCount > MAX_COMM_ERROR_RETRIES )
     {
-        activateAlarmNoData( ALARM_ID_FPGA_COMM_TIMEOUT );
+        activateAlarmNoData( ALARM_ID_HD_FPGA_COMM_TIMEOUT );
     }
 
     // Reset comm flags after processing incoming responses
@@ -874,7 +874,7 @@
     else
     {
         result = SELF_TEST_STATUS_FAILED;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId )
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId )
     }
 
     return result;
@@ -1736,15 +1736,17 @@
  * @details Outputs: none
  * @return noFPGABubbleDetected
  *************************************************************************/
-BOOL noFPGABubbleDetected( BUBBLES_T bubble )
+BOOL noFPGABubbleDetected( U32 bubble )
 {
+    U16 noFPGABubbleDetected;
+
     if ( bubble == ADA )
     {
-        U16 noFPGABubbleDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADA_BUBBLE_STATUS_MASK;
+        noFPGABubbleDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADA_BUBBLE_STATUS_MASK;
     }
     else if ( bubble == ADV )
     {
-        U16 noFPGABubbleDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADV_BUBBLE_STATUS_MASK;
+        noFPGABubbleDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADV_BUBBLE_STATUS_MASK;
     }
     else
     {
@@ -1762,15 +1764,17 @@
  * @details Outputs: none
  * @return FPGABubbleSelfTestDetected
  *************************************************************************/
-BOOL FPGABubbleSelfTestDetected( BUBBLES_T bubble )
+BOOL FPGABubbleSelfTestDetected( U32 bubble )
 {
+    U16 FPGABubbleSelfTestDetected;
+
     if ( bubble == ADA )
     {
-        U16 FPGABubbleSelfTestDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADA_BUBBLE_TEST_STATE_MASK;
+        FPGABubbleSelfTestDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADA_BUBBLE_TEST_STATE_MASK;
     }
     else if ( bubble == ADV )
     {
-        U16 FPGABubbleSelfTestDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADV_BUBBLE_TEST_STATE_MASK;
+        FPGABubbleSelfTestDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADV_BUBBLE_TEST_STATE_MASK;
     }
     else
     {
@@ -1788,7 +1792,7 @@
  * @details Outputs: none
  * @return FPGABubbleSelfTestDetected
  *************************************************************************/
-void setFPGABubbleSelfTest( BUBBLES_T bubble )
+void setFPGABubbleSelfTest( U32 bubble )
 {
     if ( bubble == ADA )
     {
@@ -1808,7 +1812,7 @@
  * @details Outputs: none
  * @return none
  *************************************************************************/
-void clearFPGABubbleSelfTest( BUBBLES_T bubble )
+void clearFPGABubbleSelfTest( U32 bubble )
 {
     if ( bubble == ADA )
     {