Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -rdc7d3658ccc03992b4f093e36d05cfc8bf5e0598 -r60fc5c7ec72369efa1efc8f3afce85ef8c87e931
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision dc7d3658ccc03992b4f093e36d05cfc8bf5e0598)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 60fc5c7ec72369efa1efc8f3afce85ef8c87e931)
@@ -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
@@ -164,12 +153,15 @@
     SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED,
     SW_FAULT_ID_DRAIN_PUMP_INVALID_RPM_SELECTED,
     SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID,
-    SW_FAULT_ID_HEAT_DISINFECT_INVALID_EXEC_STATE,                      // 75
+    SW_FAULT_ID_DG_FLUSH_INVALID_EXEC_STATE,                            // 75
+    SW_FAULT_ID_HEAT_DISINFECT_INVALID_EXEC_STATE,
+    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,
+    SW_FAULT_ID_DRAIN_MODE_INVALID_EXEC_STATE,                          // 80
     SW_FAULT_ID_FILL_MODE_INVALID_EXEC_STATE,
-    SW_FAULT_ID_PRESSURE_INVALID_EXEC_STATE,                            // 80
+    SW_FAULT_ID_PRESSURE_INVALID_EXEC_STATE,
+    SW_FAULT_ID_INVALID_NVDATAMGMT_EXEC_CAL_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;