Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -rdc0d9b087c609e71cacdb7f0395cccf29d749c00 -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision dc0d9b087c609e71cacdb7f0395cccf29d749c00)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
@@ -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,7 @@
     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,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
@@ -162,7 +162,5 @@
 BOOL testResetAlarmStateOverride( U32 alarmID );
 
 /**@}*/
-
-/**@}*/
 
 #endif