Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r45902a43cf8d9d066b314418d78a3ff1d1895006 -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 45902a43cf8d9d066b314418d78a3ff1d1895006)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file AlarmMgmt.h
+* @file    AlarmMgmtSWFaults.h
 *
-* @author (last) Quang Nguyen
-* @date (last) 24-Aug-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      21-Sep-2022
 *
-* @author (original) Sean
-* @date (original) 04-Feb-2020
+* @author  (original)  Quang Nguyen
+* @date    (original)  20-May-2021
 *
 ***************************************************************************/
 
@@ -67,7 +67,7 @@
     SW_FAULT_ID_TEMPERATURE_SENSORS_EXEC_INVALID_STATE,
     SW_FAULT_ID_HEATERS_INVALID_HEATER_ID_SELECTED,
     SW_FAULT_ID_HEATERS_INVALID_EXEC_STATE,
-    SW_FAULT_ID______AVAILABLE,
+    SW_FAULT_ID_INVALID_EMSTAT_CONDUCTIVITY_BOARD_SELECTED,
     SW_FAULT_ID_VALVES_INVALID_VALVE_STATE_NAME,                        // 40
     SW_FAULT_ID_VALVES_INVALID_VALVE_ID,
     SW_FAULT_ID_CAN_PARITY_ERROR,
@@ -85,7 +85,8 @@
     SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX,
     SW_FAULT_ID_CONCENTRATE_PUMP_EXEC_INVALID_STATE,                    // 55
     SW_FAULT_ID_CONCENTRATE_PUMP_INVALID_PUMP_ID,
-    SW_FAULT_ID_CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE,
+    SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT,
+    SW_FAULT_ID_SERVICE_MODE_INVALID_EXEC_STATE,
     SW_FAULT_ID_UV_REACTORS_INVALID_EXEC_STATE,
     SW_FAULT_ID_UV_REACTORS_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_THERMISTORS_INVALID_EXEC_STATE,                         // 60
@@ -129,6 +130,11 @@
     SW_FAULT_ID_DG_PRESSURES_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_SAFETY_SHUTDOWN_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_PHANTOM_INTERRUPT,                                      // 100
+    SW_FAULT_ID_ILLEGAL_MEM_ACCESS,
+    SW_FAULT_ID_INVALID_CHEMICAL_BOTTLE_SELECTED,
+    SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED,
+    SW_FAULT_ID_INVALID_FPGA_ERROR_GROUP_SELECTED,
+    SW_FAULT_ID_INVALID_LED_COLOR_SELECTED,                             // 105
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;