Index: DGDefs.h
===================================================================
diff -u -r817d546bfa851869a93f9983eb9fac026732a20d -rcaa8df5fd4176e83a4f14c07d9415fefee2042db
--- DGDefs.h	(.../DGDefs.h)	(revision 817d546bfa851869a93f9983eb9fac026732a20d)
+++ DGDefs.h	(.../DGDefs.h)	(revision caa8df5fd4176e83a4f14c07d9415fefee2042db)
@@ -142,12 +142,26 @@
 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_LINES,                                 ///< Handle normal fill state
+    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,
+    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
+
 /**@}*/
 
 /**