Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r3eb7c2e62c727be195cd937d49957db9d4ba83b4 -r1a5efe97f5f39594b45797fded52cafce92afe80
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 3eb7c2e62c727be195cd937d49957db9d4ba83b4)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 1a5efe97f5f39594b45797fded52cafce92afe80)
@@ -33,17 +33,6 @@
 
 #include "AlarmDefs.h"
 
-/// 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_TYPES_T;
-
 #pragma pack(push,4)
 /// Record structure for unsigned integer alarm data.
 typedef struct
@@ -169,10 +158,14 @@
     SW_FAULT_ID_INVALID_DG_RESERVOIR_SELECTED,
     SW_FAULT_ID_STANDBY_MODE_INVALID_EXEC_STATE,
     SW_FAULT_ID_RECIRC_MODE_INVALID_EXEC_STATE,
-    SW_FAULT_ID_DRAIN_MODE_INVALID_EXEC_STATE,                          // 80
-    SW_FAULT_ID_FILL_MODE_INVALID_EXEC_STATE,
+    SW_FAULT_ID_DRAIN_MODE_INVALID_EXEC_STATE,
+    SW_FAULT_ID_FILL_MODE_INVALID_EXEC_STATE,                           // 80
     SW_FAULT_ID_PRESSURE_INVALID_EXEC_STATE,
     SW_FAULT_ID_INVALID_NVDATAMGMT_EXEC_CAL_STATE,
+    SW_FAULT_ID_INVALID_VOLTAGE_MONITOR_STATE,
+    SW_FAULT_ID_INVALID_MONITORED_VOLTAGE_ID,                           // 85
+    SW_FAULT_ID_INVALID_LOAD_CELL_ID,
+    SW_FAULT_ID_DG_CHEM_DISINFECT_INVALID_EXEC_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;