Index: DGDefs.h
===================================================================
diff -u -r81ceae0e4d2c112902748fa454ca8761493188af -rc60379bd921582b689c873dc6b94077654b801b2
--- DGDefs.h	(.../DGDefs.h)	(revision 81ceae0e4d2c112902748fa454ca8761493188af)
+++ DGDefs.h	(.../DGDefs.h)	(revision c60379bd921582b689c873dc6b94077654b801b2)
@@ -303,15 +303,15 @@
     DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER,             ///< Heat disinfect, fill R2 with hot water state
     DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1,                 ///< Heat disinfect, disinfect R2 to R1 state
     DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS,                  ///< Heat disinfect, cool down heaters state
-    DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_IDLE,                ///< Heat disinfect, nocturnal cool idle state
-    DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_CHECK_WATER_TEMP,    ///< Heat disinfect, nocturnal cool check water temperature state
-    DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_DRAIN_R1,            ///< Heat disinfect, nocturnal cool drain R1 state
-    DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_DRAIN_R2,            ///< Heat disinfect, nocturnal cool drain R2 state
     DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1,                       ///< Heat disinfect, mix drain R1 state
     DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2,                       ///< Heat disinfect, mix drain R2 state
     DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH,                  ///< Heat disinfect, cancel mode basic path state
     DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH,                  ///< Heat disinfect, cancel mode water path state
     DG_HEAT_DISINFECT_STATE_COMPLETE,                           ///< Heat disinfect, complete state
+    DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_IDLE,                ///< Heat disinfect, nocturnal cool idle state
+    DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_CHECK_WATER_TEMP,    ///< Heat disinfect, nocturnal cool check water temperature state
+    DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_DRAIN_R1,            ///< Heat disinfect, nocturnal cool drain R1 state
+    DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_DRAIN_R2,            ///< Heat disinfect, nocturnal cool drain R2 state
 #ifndef _RELEASE_
     DG_NELSON_HEAT_DISINFECT_STATE_FILL_R1_WITH_WATER,
 #endif
@@ -347,7 +347,6 @@
     F32 R1FillLevel;                                            ///< Reservoir 1 level upon starting the heat disinfect.
     F32 R2FillLevel;                                            ///< Reservoir 2 level upon starting the heat disinfect.
     U32 heatDisinfectUIState;                                   ///< Heat disinfect UI state.
-    U32 noctHeatDisinfectStatus;                                ///< Nocturnal heat disinfect status
 } MODE_HEAT_DISINFECT_DATA_T;
 #endif
 
@@ -676,6 +675,7 @@
     DG_EVENT_BICARB_CHECK_RESULT,                                       ///< DG bicarb check result
     DG_EVENT_ACID_CHECK_RESULT,                                         ///< DG acid check result
     DG_EVENT_COND1_VS_COND2_DIFF_RESULT,                                ///< DG CD1 (acid) vs. CD2 (bicarb) different result
+    DG_EVENT_NOCTURNAL_HEAT_DISINFECT_STAUS,                            ///< DG nocturnal heat disinfect status
     NUM_OF_DG_EVENT_IDS                                                 ///< Total number of DG events
 };
 typedef enum DG_Event_List DG_EVENT_ID_T;                               ///< Type for DG event list enumeration