Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r52ded7b22d4b413aa8182f1343e4fbb78e8c3b0a -r090cfb22a7c0b4738299c3fb411ca77aaba8d968
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 52ded7b22d4b413aa8182f1343e4fbb78e8c3b0a)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 090cfb22a7c0b4738299c3fb411ca77aaba8d968)
@@ -43,8 +43,8 @@
     SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER,
     SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER,
     SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER,
-    SW_FAULT_ID_FPGA_INVALID_IN_STATE,                                  // 15
-    SW_FAULT_ID_FPGA_INVALID_OUT_STATE,
+    SW_FAULT_ID_FPGA_INVALID_STATE,                                    // 15
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR_COND,
     SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA,
     SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA,
     SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA,
@@ -124,7 +124,7 @@
     SW_FAULT_ID_INVALID_TASK,
     SW_FAULT_ID_INVALID_VOLTAGE_MONITOR_STATE,
     SW_FAULT_ID_INVALID_MONITORED_VOLTAGE_ID,                           // 95
-    SW_FAULT_ID_AVAILABLE_2,
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS,
     SW_FAULT_ID_DD_CHEM_DISINFECT_INVALID_EXEC_STATE,
     SW_FAULT_ID_DD_INVALID_SWITCH_ID,
     SW_FAULT_ID_DD_PRESSURES_INVALID_SELF_TEST_STATE,
@@ -147,11 +147,12 @@
     SW_FAULT_ID_DG_CHEM_DISINFECT_FLUSH_INVALID_EXEC_STATE,
     SW_FAULT_ID_INVALID_PI_PROFILE_SELECTED,
     SW_FAULT_ID_PI_CTRL_INVALID_STEP_LIMIT,
-    SW_FAULT_ID_AVAILABLE_3,
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_RANK,
     SW_FAULT_ID_DD_INVALID_TEST_CONFIG_SELECTED,                        // 120
     SW_FAULT_ID_DD_INVALID_TEST_CONFIG_SELECTED1,
     SW_FAULT_ID_DD_INVALID_TEST_CONFIG_SELECTED2,
     SW_FAULT_ID_DD_INVALID_COND_SNSNR_CAL_TABLE_SELECTED,
+    SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED3,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;