Index: AlarmDefs.h
===================================================================
diff -u -r14e7863c876b2cce35020bc3f0690e41c20665e4 -r928da2fa03ce7e54df15553811caedc71ecebce1
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 14e7863c876b2cce35020bc3f0690e41c20665e4)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 928da2fa03ce7e54df15553811caedc71ecebce1)
@@ -132,7 +132,7 @@
     ALARM_ID____AVAILABLE_16 = 94,                                          ///< This alarm ID is available for use
     ALARM_ID____AVAILABLE_17 = 95,                                          ///< This alarm ID is available for use
     ALARM_ID____AVAILABLE_18 = 96,                                          ///< This alarm ID is available for use
-    ALARM_ID____AVAILABLE_19 = 97,                                          ///< This alarm ID is available for use
+    ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT = 97,                           ///< Wait for the DG to produce dialysate
     ALARM_ID_HD_BATTERY_COMM_FAULT = 98,                                    ///< HD battery communication fault
     ALARM_ID_HD_SYRINGE_PUMP_STALL = 99,                                    ///< HD syringe pump stall alarm
     ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 100,                            ///< HD no cartridge self-test timeout
@@ -542,7 +542,7 @@
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_16,                                  0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_17,                                  0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_18,                                  0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_19,                                  0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  FALSE, FALSE, TRUE , FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, TRUE,  FALSE, TRUE,  ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT,                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BATTERY_COMM_FAULT,                            0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_STALL,                            0,              ALARM_ID_NO_ALARM },
     //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck TxLog  ID                                                        Escalate In     Escalate To
@@ -734,8 +734,8 @@
     { ALARM_PRIORITY_HIGH,     3,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE,                                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , TRUE,  TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT,                      0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR,          0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME,                        0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME,                      0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE,  TRUE,  FALSE, FALSE, TRUE,  TRUE,  FALSE, FALSE, TRUE,  FALSE, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME,                        0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE,  TRUE,  FALSE, FALSE, TRUE,  TRUE,  FALSE, FALSE, TRUE,  FALSE, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME,                      0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE,  FALSE, TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE,                 0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE,   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING,              0,              ALARM_ID_NO_ALARM },
@@ -855,7 +855,7 @@
     {   3, ALARM_ID____AVAILABLE_16 },
     {   3, ALARM_ID____AVAILABLE_17 },
     {   3, ALARM_ID____AVAILABLE_18 },
-    {   3, ALARM_ID____AVAILABLE_19 },
+    {   3, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT },
     {   3, ALARM_ID_HD_BATTERY_COMM_FAULT },
     {   3, ALARM_ID_HD_SYRINGE_PUMP_STALL },
     {   3, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT },
Index: DGDefs.h
===================================================================
diff -u -rcaa8df5fd4176e83a4f14c07d9415fefee2042db -r928da2fa03ce7e54df15553811caedc71ecebce1
--- DGDefs.h	(.../DGDefs.h)	(revision caa8df5fd4176e83a4f14c07d9415fefee2042db)
+++ DGDefs.h	(.../DGDefs.h)	(revision 928da2fa03ce7e54df15553811caedc71ecebce1)
@@ -142,7 +142,6 @@
 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,                                 ///< 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