Index: DGDefs.h
===================================================================
diff -u -r84538b9f07bd56583796c0150c5c76e9426cb912 -r1c89aebf8dc382b17637f6a81da3b7c50a881780
--- DGDefs.h	(.../DGDefs.h)	(revision 84538b9f07bd56583796c0150c5c76e9426cb912)
+++ DGDefs.h	(.../DGDefs.h)	(revision 1c89aebf8dc382b17637f6a81da3b7c50a881780)
@@ -7,8 +7,8 @@
 *
 * @file    DGDefs.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      02-May-2022
+* @author  (last)      Dong Nguyen
+* @date    (last)      08-Sep-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -91,7 +91,9 @@
 /// Enumeration of fault mode states.
 enum DG_Fault_States
 {
-    DG_FAULT_STATE_START = 0,                   ///< Start fault state
+    DG_FAULT_STATE_START = 0,                   ///< DG fault start state
+    DG_FAULT_STATE_RUN_NV_POSTS,                ///< DG fault run RTC and NV data management posts
+    DG_FAULT_STATE_COMPLETE,                    ///< DG fault complete
     NUM_OF_DG_FAULT_STATES                      ///< Number of fault mode states
 };
 typedef enum DG_Fault_States DG_FAULT_STATE_T;  ///< Type for DG fault states enumeration
@@ -122,8 +124,7 @@
 /// Enumeration of standby mode states.
 enum DG_Standby_Mode_States
 {
-    DG_STANDBY_MODE_STATE_START = 0,                            ///< Start standby mode state
-    DG_STANDBY_MODE_STATE_IDLE,                                 ///< Idle standby mode state  // TODO remove when DEN-12931 merged
+    DG_STANDBY_MODE_STATE_IDLE = 0,                             ///< Idle standby mode state
     DG_STANDBY_MODE_STATE_FLUSH_FILTER,                         ///< Sample water flush filter state
     DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE,                    ///< Sample water flush filter idle state
     DG_STANDBY_MODE_STATE_SAMPLE_WATER,                         ///< Sample water state
@@ -544,10 +545,32 @@
     DG_EVENT_SUB_MODE_CHANGE,                                           ///< DG Op sub-mode change event
     DG_EVENT_CONCENTRATE_CAP_SWITCH_CHANGE,                             ///< DG concentrate cap switch change
     DG_EVENT_DIALYSATE_CAP_SWITCH_CHANGE,                               ///< DG dialysate cap switch change
+    DG_EVENT_CPU_RAM_ERROR_STATUS,                                      ///< DG processor RAM error
     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
 
 /**@}*/
 
+/**@}*/
+
+/**
+ *  @addtogroup HeatersState
+ *  @{
+ */
+
+/// Heaters exec states
+typedef enum Heaters_Exec_States
+{
+    HEATER_EXEC_STATE_OFF = 0,                                          ///< Heater exec state off.
+    HEATER_EXEC_STATE_PRIMARY_RAMP_TO_TARGET,                           ///< Heater exec state primary ramp to target.
+    HEATER_EXEC_STATE_PRIMARY_CONTROL_TO_TARGET,                        ///< Heater exec state primary control to target.
+    HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET,                      ///< Heater exec state control to disinfect (heat or chemical) target.
+    HEATER_EXEC_STATE_TRIMMER_RAMP_TO_TARGET,                           ///< Heater exec state trimmer ramp to target.
+    HEATER_EXEC_STATE_TRIMMER_CONTROL_TO_TARGET,                        ///< Heater exec state trimmer control to target.
+    NUM_OF_HEATERS_STATE,                                               ///< Number of heaters state.
+} HEATERS_STATE_T;
+
+/**@}*/
+
 #endif