Index: DGDefs.h
===================================================================
diff -u -r3a8be92b72adc11e5b5045bf8921446d2d5e8e8a -rd82c9506c6d4993b087bb3baecd4ad50367d60f1
--- DGDefs.h	(.../DGDefs.h)	(revision 3a8be92b72adc11e5b5045bf8921446d2d5e8e8a)
+++ DGDefs.h	(.../DGDefs.h)	(revision d82c9506c6d4993b087bb3baecd4ad50367d60f1)
@@ -115,8 +115,10 @@
 enum DG_Standby_Mode_States
 {
     DG_STANDBY_MODE_STATE_START = 0,                            ///< Start standby mode state
-    DG_STANDBY_MODE_STATE_IDLE,                                 ///< Idle standby mode state
-    DG_STANDBY_MODE_STATE_SAMPLE_WATER,                         ///< Sample water standby mode state
+    DG_STANDBY_MODE_STATE_IDLE,                                 ///< 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
     NUM_OF_DG_STANDBY_MODE_STATES                               ///< Number of standby mode states
 };
 typedef enum DG_Standby_Mode_States DG_STANDBY_MODE_STATE_T;    ///< Type for DG standby mode states enumeration
@@ -273,10 +275,22 @@
     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
+    DG_CMD_SAMPLE_WATER = 9,            ///< Command to request DG to sample water
     NUM_OF_DG_COMMANDS                  ///< Number of DG commands
 };
 typedef enum DG_Command DG_COMMAND_T;   ///< Type for DG commands enumeration
 
+/// Enumeration of sample water command parameters.
+enum Sample_Water_Commands
+{
+    SAMPLE_WATER_CMD_STOP = 0,                          ///< Stop sample water command
+    SAMPLE_WATER_CMD_START,                             ///< Start sample water command
+    SAMPLE_WATER_CMD_FLUSH,                             ///< Flush the filter sample water command
+    SAMPLE_WATER_CMD_END,                               ///< End sample water command
+    NUM_OF_SAMPLE_WATER_CMDS                            ///< Number of sample water command parameters
+};
+typedef enum Sample_Water_Commands SAMPLE_WATER_CMD_T;              ///< Type for sample water enum.
+
 /**@}*/
 
 /**