Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -ra0aca1a4d87df989303b4f7f41208a4916861afa -r1f3647830e9de0a1f0a4e445ce8d72d5525f51fb
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision a0aca1a4d87df989303b4f7f41208a4916861afa)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 1f3647830e9de0a1f0a4e445ce8d72d5525f51fb)
@@ -23,6 +23,9 @@
 {
     ALARM_ID_NO_ALARM = 0,
     ALARM_ID_SOFTWARE_FAULT,
+    ALARM_ID_STUCK_BUTTON_TEST_FAILED,
+    ALARM_ID_FPGA_POST_TEST_FAILED,
+    ALARM_ID_WATCHDOG_POST_TEST_FAILED,
     NUM_OF_ALARM_IDS
 } ALARM_ID_T;
 
@@ -98,9 +101,9 @@
     SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE,
     SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED,
     SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO,
-    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE,
-    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE1,
-    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE2,
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE_NO_DATA,
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE_1_DATA,
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE_2_DATA,
     SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR,
     SW_FAULT_ID_ALARM_MGMT_LAMP_INVALID_ALARM_STATE,
     SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA,