Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -rf308cc4c35eab630ebbbde405cfe47d049afeafb -r1943944469d5a9f841f366ef9d8969c3072bd7ab
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision f308cc4c35eab630ebbbde405cfe47d049afeafb)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 1943944469d5a9f841f366ef9d8969c3072bd7ab)
@@ -8,7 +8,7 @@
 * @file AlarmMgmt.h
 *
 * @author (last) Quang Nguyen
-* @date (last) 13-Aug-2020
+* @date (last) 24-Aug-2020
 *
 * @author (original) Sean
 * @date (original) 04-Feb-2020
@@ -22,9 +22,8 @@
 
 /**
  *  @defgroup AlarmManagement AlarmManagement
- *  @brief Alarm Management service module.  Provides general alarm management \n
- *  functionality including support functions for triggering and clearing \n
- *  specific alarms.
+ *  @brief Alarm management service module. Provides general alarm management functionality
+ *  including support functions for triggering and clearing specific alarms.
  *
  *  @addtogroup AlarmManagement
  *  @{
@@ -37,53 +36,53 @@
 /// Alarm data types list.
 typedef enum Alarm_Data_Types
 {
-    ALARM_DATA_TYPE_NONE = 0,                                       ///< No data given.
-    ALARM_DATA_TYPE_U32 = 1,                                        ///< Alarm data is unsigned 32-bit integer type.
-    ALARM_DATA_TYPE_S32 = 2,                                        ///< Alarm data is signed 32-bit integer type.
-    ALARM_DATA_TYPE_F32 = 3,                                        ///< Alarm data is 32-bit floating point type.
-    ALARM_DATA_TYPE_BOOL = 4,                                       ///< Alarm data is 32-bit boolean type.
-    NUM_OF_ALARM_DATA_TYPES                                         ///< Total number of alarm data types.
+    ALARM_DATA_TYPE_NONE = 0,                                       ///< No data given
+    ALARM_DATA_TYPE_U32 = 1,                                        ///< Alarm data is unsigned 32-bit integer type
+    ALARM_DATA_TYPE_S32 = 2,                                        ///< Alarm data is signed 32-bit integer type
+    ALARM_DATA_TYPE_F32 = 3,                                        ///< Alarm data is 32-bit floating point type
+    ALARM_DATA_TYPE_BOOL = 4,                                       ///< Alarm data is 32-bit boolean type
+    NUM_OF_ALARM_DATA_TYPES                                         ///< Total number of alarm data types
 } ALARM_DATA_TYPES_T;
 
 #pragma pack(push,4)
 /// Record structure for unsigned integer alarm data.
 typedef struct
 {
-    U32 data;                       ///< Alarm data of unsigned integer type.
+    U32 data;                       ///< Alarm data of unsigned integer type
 } ALARM_DATA_U32_T;
 
 /// Record structure for signed integer alarm data.
 typedef struct
 {
-    S32 data;                       ///< Alarm data of signed integer type.
+    S32 data;                       ///< Alarm data of signed integer type
 } ALARM_DATA_S32_T;
 
 /// Record structure for floating point alarm data.
 typedef struct
 {
-    F32 data;                       ///< Alarm data of floating point type.
+    F32 data;                       ///< Alarm data of floating point type
 } ALARM_DATA_F32_T;
 
 /// Record structure for boolean alarm data.
 typedef struct
 {
-    BOOL data;                      ///< Alarm data of boolean type.
+    BOOL data;                      ///< Alarm data of boolean type
 } ALARM_DATA_BOOL_T;
 
 /// Record structure for alarm data of any supported type.
 typedef union
 {
-    ALARM_DATA_U32_T    uInt;       ///< Alarm data of unsigned integer type.
-    ALARM_DATA_S32_T    sInt;       ///< Alarm data of signed integer type.
-    ALARM_DATA_F32_T    flt;        ///< Alarm data of floating point type.
-    ALARM_DATA_BOOL_T   bln;        ///< Alarm data of boolean type.
+    ALARM_DATA_U32_T    uInt;       ///< Alarm data of unsigned integer type
+    ALARM_DATA_S32_T    sInt;       ///< Alarm data of signed integer type
+    ALARM_DATA_F32_T    flt;        ///< Alarm data of floating point type
+    ALARM_DATA_BOOL_T   bln;        ///< Alarm data of boolean type
 } ALARM_DATAS_T;
 
 /// Record structure for alarm data including the data type to aid in interpretation.
 typedef struct
 {
-    ALARM_DATA_TYPES_T  dataType;   ///< The type of alarm data provided.
-    ALARM_DATAS_T       data;       ///< The alarm data of specified type.
+    ALARM_DATA_TYPES_T  dataType;   ///< The type of alarm data provided
+    ALARM_DATAS_T       data;       ///< The alarm data of specified type
 } ALARM_DATA_T;
 #pragma pack(pop)
 
@@ -144,6 +143,25 @@
     SW_FAULT_ID_ACCEL_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_UTIL_INVALID_WIN_COUNT,
     SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT,
+    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_UV_REACTORS_INVALID_EXEC_STATE,
+    SW_FAULT_ID_UV_REACTORS_INVALID_SELF_TEST_STATE,
+    SW_FAULT_ID_THERMISTORS_INVALID_EXEC_STATE,                         // 60
+    SW_FAULT_ID_THERMISTORS_INVALID_SELF_TEST_STATE,
+    SW_FAULT_ID_INVALID_THERMISTOR_SELECTED,
+    SW_FAULT_ID_FAN_INVALID_EXEC_STATE,
+    SW_FAULT_ID_FAN_INVALID_SELF_TEST_STATE,
+    SW_FAULT_ID_INVALID_FAN_SELECTED,                                   // 65
+    SW_FAULT_ID_RO_PUMP_INVALID_EXEC_STATE,
+    SW_FAULT_ID_RO_PUMP_INVALID_FLOW_RATE_SET,
+    SW_FAULT_ID_DRAIN_PUMP_INVALID_EXEC_STATE,
+    SW_FAULT_ID_UV_REACTORS_INVALID_REACTOR_SELECTD,
+    SW_FAULT_ID_RO_PUMP_INVALID_PRESSURE_SELECTED,                      // 70
+    SW_FAULT_ID_DRAIN_PUMP_INVALID_DELTA_PRESSURE_SELECTED,
+    SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
@@ -162,7 +180,5 @@
 BOOL testResetAlarmStateOverride( U32 alarmID );
 
 /**@}*/
-
-/**@}*/
 
 #endif