Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r173e5908bada098006b85c1267147a187d2eaef4 -r0689f5bf7e9d057b610a3cba3c3c729c357d9f1d
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 173e5908bada098006b85c1267147a187d2eaef4)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 0689f5bf7e9d057b610a3cba3c3c729c357d9f1d)
@@ -84,6 +84,7 @@
 static BOOL fillReservoirOneStartRequested;                             ///< Flag indicates fill reservoir one has been requested.
 static BOOL reservoirFilledStatus[ NUM_OF_DG_RESERVOIRS ];              ///< Flag indicates a reservoir has been filled.
 static BOOL reservoirFlushedStatus[ NUM_OF_DG_RESERVOIRS ];             ///< Flag indicates a reservoir has been flushed.
+static PRE_TREATMENT_RESERVOIR_FLAGS_T reservoirFlags[ NUM_OF_DG_RESERVOIRS ]; ///< Set of Flags that signal if the DG should wait to fill.
 
 // ********** private function prototypes **********
 
@@ -109,6 +110,7 @@
 static PRE_TREATMENT_RESERVOIR_MGMT_STATE_T handlePreTreatmentReservoirMgmtFillCmdRespState( void );
 static PRE_TREATMENT_RESERVOIR_MGMT_STATE_T handlePreTreatmentReservoirMgmtFillCompleteState( void );
 static PRE_TREATMENT_RESERVOIR_MGMT_STATE_T handlePreTreatmentReservoirMgmtWaitReservoirSwitchState( void );
+static U32 getPreTreatmentFillVolume( DG_RESERVOIR_ID_T inactiveRes );
 
 /*********************************************************************//**
  * @brief
@@ -129,6 +131,11 @@
     reservoirFilledStatus[ DG_RESERVOIR_1 ] = FALSE;
     reservoirFilledStatus[ DG_RESERVOIR_2 ] = FALSE;
 
+    reservoirFlags[ DG_RESERVOIR_1 ].startFlushFill = FALSE;
+    reservoirFlags[ DG_RESERVOIR_1 ].startNormalFill = FALSE;
+    reservoirFlags[ DG_RESERVOIR_2 ].startFlushFill = FALSE;
+    reservoirFlags[ DG_RESERVOIR_2 ].startNormalFill = FALSE;
+
     initSampleWater();
     initConsumableSelfTest();
     initPrime();
@@ -474,6 +481,21 @@
 
 /*********************************************************************//**
  * @brief
+ * The signalActionToResumeFill function sets the remaining reservior fill
+ * flags to resume filling while in PreTreatment Mode.
+ * @details Inputs: none
+ * @details Outputs: reservoirFlags
+ * @return none
+ *************************************************************************/
+void signalActionToResumeFill( void )
+{
+    reservoirFlags[ DG_RESERVOIR_1 ].startNormalFill = TRUE;
+    reservoirFlags[ DG_RESERVOIR_2 ].startFlushFill = TRUE;
+    reservoirFlags[ DG_RESERVOIR_2 ].startNormalFill = TRUE;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getReservoirFillStatus function returns the fill complete status for
  * given reservoir.
  * @details Inputs: reservoirFilledStatus
@@ -667,6 +689,7 @@
             submodeCompleteTransitionTimeCounter = 0;
             state = HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
             fillReservoirOneStartRequested = TRUE;
+            reservoirFlags[ DG_RESERVOIR_1 ].startFlushFill = TRUE;
             transitionToNoCartSelfTests();
         }
     }
@@ -997,7 +1020,8 @@
  * @brief
  * The handlePreTreatmentReservoirMgmtFillCmdState function sends fill
  * command to DG when DG is in re-circulate mode.
- * @details Inputs: DG operation mode and operation sub-mode
+ * @details Inputs: DG operation mode, DG operation sub-mode,
+ * reservoirFlushedStatus, reservoirFlags
  * @details Outputs: sent fill command to DG
  * @return current state of pre-treatment reservoir management
  *************************************************************************/
@@ -1006,52 +1030,27 @@
     PRE_TREATMENT_RESERVOIR_MGMT_STATE_T state = PRE_TREATMENT_RESERVOIR_MGMT_START_FILL_STATE;
     DG_OP_MODE_T dgOpMode = getDGOpMode();
     U32 dgSubMode = getDGSubMode();
+    U32 volume = 0;
+    DG_RESERVOIR_ID_T inactiveReservoir = getDGInactiveReservoir();
 
     if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
     {
-        state = PRE_TREATMENT_RESERVOIR_MGMT_FILL_CMD_RESP_STATE;
+        volume = getPreTreatmentFillVolume( inactiveReservoir );
 
-        if ( ( TRUE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] ) && ( TRUE == reservoirFlushedStatus[ DG_RESERVOIR_2 ] ) )
+        // not flushed and need to fill
+        if ( ( FALSE == reservoirFlushedStatus[ inactiveReservoir ] ) &&
+           ( TRUE == reservoirFlags[ inactiveReservoir ].startFlushFill ) )
         {
-            if ( DG_RESERVOIR_1 == getDGInactiveReservoir() )
-            {
-                U32 volume = FILL_RESERVOIR_TO_VOLUME_ML;
-
-#ifndef _RELEASE_
-                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE )
-                {
-                    volume = PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML;
-                }
-#endif
-
-                cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
-            }
-            else
-            {
-                U32 volume = FILL_RESERVOIR_TO_VOLUME_ML;
-
-#ifndef _RELEASE_
-                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE )
-                {
-                    volume = PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML;
-                }
-#endif
-
-                cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
-            }
+            cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
+            state = PRE_TREATMENT_RESERVOIR_MGMT_FILL_CMD_RESP_STATE;
         }
-        else
-        {
-            U32 volume = PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML;
 
-#ifndef _RELEASE_
-            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
-            {
-                volume = FILL_RESERVOIR_TO_VOLUME_ML;
-            }
-#endif
-
+        // flushed and need to fill
+        if ( ( TRUE == reservoirFlushedStatus[ inactiveReservoir ] ) &&
+           ( TRUE == reservoirFlags[ inactiveReservoir ].startNormalFill ) )
+        {
             cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
+            state = PRE_TREATMENT_RESERVOIR_MGMT_FILL_CMD_RESP_STATE;
         }
     }
 
@@ -1186,7 +1185,55 @@
     return state;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getPreTreatmentFillVolume function determines which volume to fill
+ * the inactive reservoir.
+ * @details Inputs: reservoirFlushedStatus
+ * @details Outputs: none
+ * @param DG inactive Reservoir
+ * @return volume to fill
+ *************************************************************************/
+static U32 getPreTreatmentFillVolume( DG_RESERVOIR_ID_T inactiveRes )
+{
+    U32 volume = 0;
 
+    // Fill volumes after flushing
+    if ( TRUE == reservoirFlushedStatus[ inactiveRes ] )
+    {
+        if ( DG_RESERVOIR_1 == inactiveRes )
+            volume = FILL_RESERVOIR_TO_VOLUME_ML;
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE )
+            {
+                volume = PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML;
+            }
+#endif
+        // Reservoir 2
+        else
+            volume = FILL_RESERVOIR_TO_VOLUME_ML;
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE )
+            {
+                volume = PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML;
+            }
+#endif
+    }
+    // Flush fill volumes
+    else
+    {
+        volume = PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML;
+#ifndef _RELEASE_
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
+        {
+            volume = FILL_RESERVOIR_TO_VOLUME_ML;
+        }
+#endif
+    }
+    return volume;
+}
+
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/