Index: DGDefs.h
===================================================================
diff -u -rb9965ff34817dcd69c73c588c634e6d8abd3a4c3 -re9dd51d41fb34a23dce908557ad34799b857d241
--- DGDefs.h	(.../DGDefs.h)	(revision b9965ff34817dcd69c73c588c634e6d8abd3a4c3)
+++ DGDefs.h	(.../DGDefs.h)	(revision e9dd51d41fb34a23dce908557ad34799b857d241)
@@ -142,12 +142,25 @@
 enum DG_Generation_Idle_Mode_States
 {
     DG_GEN_IDLE_MODE_STATE_START = 0,                                   ///< Start generation idle mode state
-    DG_GEN_IDLE_MODE_STATE_FLUSH_LINES,                                 ///< Flush lines state
-    DG_GEN_IDLE_MODE_STATE_FLUSH_WATER,                                 ///< Flush water state
-    NUM_OF_DG_GEN_IDLE_MODE_STATES                                      ///< Number of fill mode states
+    DG_GEN_IDLE_MODE_STATE_FLUSH_WATER,                                 ///  Handle normal fill state              (idle 0.0)
+    DG_GEN_IDLE_MODE_STATE_HANDLE_BAD_FILL,                             ///< Handle bad fill state                 (idle 1.0)
+    NUM_OF_DG_GEN_IDLE_MODE_STATES                                      ///< Number of idle mode states
 };
 typedef enum DG_Generation_Idle_Mode_States DG_GEN_IDLE_MODE_STATE_T;   ///< Type for DG generation idle mode states enumeration
 
+/// Enumeration of generation idle mode states.
+enum DG_Generation_Idle_Mode_Bad_Fill_Substates
+{
+    DG_HANDLE_BAD_FILL_STATE_START = 0,                                   ///< Bad fill start state
+    DG_HANDLE_BAD_FILL_STATE_FIRST_DRAIN,                                 ///< First drain the dialysate                       (idle 1.0)
+    DG_HANDLE_BAD_FILL_STATE_FLUSH_FILL,                                  ///< Flush then fill the dialysate                   (idle 1.1)
+    DG_HANDLE_BAD_FILL_STATE_SECOND_DRAIN,                                ///< Second drain the dialysate                      (idle 1.2)
+    DG_HANDLE_BAD_FILL_STATE_REFILL,                                      ///< Refill the dialysate                            (idle 1.3)
+    DG_HANDLE_BAD_FILL_STATE_CLEAR_ALARM,                                 ///< Clear wait for dialysate alarm to allow resume  (idle 1.4)
+    NUM_OF_DG_HANDLE_BAD_FILL_STATES                                      ///< Number of bad fill states
+};
+typedef enum DG_Generation_Idle_Mode_Bad_Fill_Substates DG_GEN_IDLE_MODE_BAD_FILL_STATE_T;   ///< Type for DG generation idle mode bad fill sub-states enumeration
+
 /**@}*/
 
 /**
@@ -159,11 +172,13 @@
 enum DG_Fill_Mode_States
 {
     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
+    DG_FILL_MODE_STATE_TEST_INLET_WATER,                ///< Test inlet water quality state
+    DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES,         ///< Prime the acid and bicarb concentrate lines
+    DG_FILL_MODE_STATE_FLUSH_BUBBLES,                   ///< Flush the bubbles in the lines state
+    DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY,        ///< Test the conductivity range of the bicarb concentrate state
+    DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY,          ///< Test the conductivity range of the acid concentrate state
+    DG_FILL_MODE_STATE_PRODUCE_DIALYSATE,               ///< Dialysate production state
+    DG_FILL_MODE_STATE_DELIVER_DIALYSATE,               ///< Dialysate deliver state
     DG_FILL_MODE_STATE_PAUSED,                          ///< Dialysate generation pause state
     NUM_OF_DG_FILL_MODE_STATES                          ///< Number of fill mode states
 };