Index: DGDefs.h
===================================================================
diff -u -r37f2d43f442ac79529206795bc2fd598abdd6801 -ra1162deed63c9b2d4b5f756495ebc0aea09b0ef0
--- DGDefs.h	(.../DGDefs.h)	(revision 37f2d43f442ac79529206795bc2fd598abdd6801)
+++ DGDefs.h	(.../DGDefs.h)	(revision a1162deed63c9b2d4b5f756495ebc0aea09b0ef0)
@@ -153,6 +153,8 @@
 {
     DG_FILL_MODE_STATE_START = 0,                       ///< Start fill mode state
     DG_FILL_MODE_STATE_CHECK_INLET_WATER,               ///< Check inlet water quality state
+    DG_FILL_MODE_STATE_BICARB_PUMP_CHECK,               ///< Run bicarb concentrate pump and check conductivity range
+    DG_FILL_MODE_STATE_ACID_PUMP_CHECK,                 ///< Run acid concentrate pump and check conductivity range
     DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION,            ///< Dialysate production state
     DG_FILL_MODE_STATE_DELIVER_DIALYSATE,               ///< Deliver dialysate state
     NUM_OF_DG_FILL_MODE_STATES                          ///< Number of fill mode states
@@ -219,9 +221,8 @@
     DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2,                     ///< Heat disinfect, rinse R1 to R2
     DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1,        ///< Heat disinfect, rinse R2 to R1 and drain R1
     DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION,                  ///< Heat disinfect, rinse circulation
-    DG_HEAT_DISINFECT_STATE_CANCEL_MODE_BASIC_PATH,             ///< Heat disinfect, cancel mode basic path
-    DG_HEAT_DISINFECT_STATE_CANCEL_MODE_COLD_WATER_PATH,        ///< Heat disinfect, cancel mode cold water path
-    DG_HEAT_DISINFECT_STATE_CANCEL_MODE_HOT_WATER_PATH,         ///< Heat disinfect, cancel mode hot water path
+    DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH,                  ///< Heat disinfect, cancel mode basic path
+    DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH,                  ///< Heat disinfect, cancel mode water path
     DG_HEAT_DISINFECT_STATE_COMPLETE,                           ///< Heat disinfect, complete
     NUM_OF_DG_HEAT_DISINFECT_STATES                             ///< Number of heat disinfect mode states
 };
@@ -292,6 +293,15 @@
 };
 typedef enum Sample_Water_Commands SAMPLE_WATER_CMD_T;              ///< Type for sample water enum.
 
+/// Enumeration of sample water command parameters.
+enum DG_General_Commands
+{
+    DG_CMD_STOP = 0,                                    ///< DG general stop command
+    DG_CMD_START = 1,                                   ///< DG general start command
+    NUM_OF_DG_CMDS                                      ///< Number of DG general commands
+};
+typedef enum DG_General_Commands DG_GENERAL_COMMAND_T;  ///< Type for DG general command enum.
+
 /**@}*/
 
 /**