Index: DGDefs.h
===================================================================
diff -u -r8439ed29c90fdbdd61928a03d56efc3e4d3f3429 -r386455fd48135203d13d7e99a31b9eda01655b89
--- DGDefs.h	(.../DGDefs.h)	(revision 8439ed29c90fdbdd61928a03d56efc3e4d3f3429)
+++ DGDefs.h	(.../DGDefs.h)	(revision 386455fd48135203d13d7e99a31b9eda01655b89)
@@ -65,6 +65,7 @@
     DG_POST_STATE_THERMISTORS,                  ///< Thermistors POST state
     DG_POST_STATE_FANS,                         ///< Fans POST state
     DG_POST_DRAIN_PUMP,                         ///< Drain pump POST state
+    DG_POST_STATE_NVDATAMGMT,                   ///< Non-volatile data management POST state
     DG_POST_STATE_WATCHDOG,                     ///< Watchdog POST test state
     DG_POST_STATE_COMPLETED,                    ///< POST completed successfully state
     DG_POST_STATE_FAILED,                       ///< POST failed state
@@ -237,22 +238,85 @@
     NUM_OF_DG_CHEM_DISINFECT_STATES                     ///< Number of chemical disinfect mode states
 };
 typedef enum DG_Chem_States DG_CHEM_DISINFECT_STATE_T;  ///< Type for DG chemical disinfect states enumeration
+
+/**@}*/
+
+/**
+ *  @addtogroup DGServiceMode
+ *  @{
+ */
+
+/// Enumeration of service mode states.
+enum DG_Service_States
+{
+    DG_SERVICE_STATE_START = 0,                     ///< Start service mode state
+    NUM_OF_DG_SERVICE_STATES                        ///< Number of service mode states
+};
+typedef enum DG_Service_States DG_SERVICE_STATE_T;  ///< Type for DG service states enumeration
+
+/**@}*/
+
+/**
+ *  @addtogroup DGCommand
+ *  @{
+ */
+
+/// Enumeration of available DG commands.
+enum DG_Command
+{
+    DG_CMD_NONE = 0,                    ///< Not a command
+    DG_CMD_SWITCH_RESERVOIR = 1,        ///< Command to request DG switch reservoirs
+    DG_CMD_START_DRAIN = 2,             ///< Command to request DG to start drain
+    DG_CMD_STOP_DRAIN = 3,              ///< Command to request DG to stop drain
+    DG_CMD_START_FILL = 4,              ///< Command to request DG to start fill
+    DG_CMD_STOP_FILL = 5,               ///< Command to request DG to stop fill
+    DG_CMD_START_TRIMMER_HEATER = 6,    ///< Command to request DG to start trimmer heater
+    DG_CMD_STOP_TRIMMER_HEATER = 7,     ///< Command to request DG to stop trimmer heater
+    DG_CMD_VALVE_SETTING = 8,           ///< Command to request DG to change valve settings
+    NUM_OF_DG_COMMANDS                  ///< Number of DG commands
+};
+typedef enum DG_Command DG_COMMAND_T;   ///< Type for DG commands enumeration
+
+/**@}*/
+
+/**
+ *  @addtogroup Reservoirs
+ *  @{
+ */
+
+/// Enumeration of DG reservoirs.
+typedef enum DG_Reservoirs
+{
+    DG_RESERVOIR_1 = 0,        ///< Reservoir number 1
+    DG_RESERVOIR_2,            ///< Reservoir number 2
+    NUM_OF_DG_RESERVOIRS          ///< Number of reservoirs
+} DG_RESERVOIR_ID_T;
+
+/// Enumeration of DG valve settings.
+typedef enum DG_Valve_Setting
+{
+    DG_VALVE_SETTING_R1_TO_R2 = 0,         ///< Valve setting for displacement from reservoir 1 to reservoir 2
+    DG_VALVE_SETTING_R2_TO_R1,             ///< Valve setting for displacement from reservoir 2 to reservoir 1
+    NUM_OF_DG_VALVE_SETTTINGS              ///< Number of valve settings
+} DG_VALVE_SETTING_ID_T;
+
+/**@}*/
+
+/**
+ *  @addtogroup LoadCells
+ *  @{
+ */
+
+/// Enumeration of DG load cell sensors.
+typedef enum Load_Cells
+{
+    LOAD_CELL_RESERVOIR_1_PRIMARY = 0,              ///< Primary load cell for reservoir 1.
+    LOAD_CELL_RESERVOIR_1_BACKUP,                   ///< Backup load cell for reservoir 1.
+    LOAD_CELL_RESERVOIR_2_PRIMARY,                  ///< Primary load cell for reservoir 2.
+    LOAD_CELL_RESERVOIR_2_BACKUP,                   ///< Backup load cell for reservoir 2.
+    NUM_OF_LOAD_CELLS                               ///< Number of load cell sensors.
+} LOAD_CELL_ID_T;
+
+/**@}*/
 
-/**@}*/
-
-/**
- *  @addtogroup DGServiceMode
- *  @{
- */
-
-/// Enumeration of service mode states.
-enum DG_Service_States
-{
-    DG_SERVICE_STATE_START = 0,                     ///< Start service mode state
-    NUM_OF_DG_SERVICE_STATES                        ///< Number of service mode statesS
-};
-typedef enum DG_Service_States DG_SERVICE_STATE_T;  ///< Type for DG service states enumeration
-
-/**@}*/
-
 #endif