Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r766e65a173747dd60a9faae1cac228cd5f8a55a6 -r3b3713c0d5445b83f339021972728ff58bd3e6e5
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 766e65a173747dd60a9faae1cac228cd5f8a55a6)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 3b3713c0d5445b83f339021972728ff58bd3e6e5)
@@ -88,19 +88,17 @@
     SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX = 57,
     SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED = 58,
     SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE = 59,
-    SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED1 = 60,
-    SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED2 = 61,
-    SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT = 62,
-    SW_FAULT_ID_UTIL_INVALID_WIN_COUNT = 63,
-    SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR = 64,
-    SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT = 65,
-    SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE = 66,
-    SW_FAULT_ID_WATCHDOG_INVALID_TASK = 67,
-    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_FOR_START_TIME = 68,
-    SW_FAULT_ID_INT_ADC_DATA_OVERRUN = 69,
-    SW_FAULT_ID_INT_ADC_INVALID_CHANNEL_REQUESTED1 = 70,
-    SW_FAULT_ID_INT_ADC_INVALID_CHANNEL_REQUESTED2 = 71,
-    SW_FAULT_ID_SAFETY_SHUTDOWN_INVALID_SELF_TEST_STATE = 72,
+    SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT = 60,
+    SW_FAULT_ID_UTIL_INVALID_WIN_COUNT = 61,
+    SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR = 62,
+    SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT = 63,
+    SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE = 64,
+    SW_FAULT_ID_WATCHDOG_INVALID_TASK = 65,
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_FOR_START_TIME = 66,
+    SW_FAULT_ID_INT_ADC_DATA_OVERRUN = 67,
+    SW_FAULT_ID_INT_ADC_INVALID_CHANNEL_REQUESTED1 = 68,
+    SW_FAULT_ID_INT_ADC_INVALID_CHANNEL_REQUESTED2 = 69,
+    SW_FAULT_ID_SAFETY_SHUTDOWN_INVALID_SELF_TEST_STATE = 70,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;