Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -ref6283257df7c1f993d58fb934da57ea3e0a7067 -r22bb2aeb8ba0702aba894f928dbaf751fa6dcfe6
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ef6283257df7c1f993d58fb934da57ea3e0a7067)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 22bb2aeb8ba0702aba894f928dbaf751fa6dcfe6)
@@ -84,7 +84,9 @@
 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 ];
 
+
 // ********** private function prototypes **********
 
 static void publishPreTreatmentState( void );
@@ -119,6 +121,7 @@
 *************************************************************************/
 void initPreTreatmentMode( void )
 {
+
     currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE;
     currentReservoirMgmtState = PRE_TREATMENT_RESERVOIR_MGMT_START_STATE;
     setUFVolStatus = FALSE;
@@ -129,6 +132,12 @@
     reservoirFilledStatus[ DG_RESERVOIR_1 ] = FALSE;
     reservoirFilledStatus[ DG_RESERVOIR_2 ] = FALSE;
 
+    for( U32 i = DG_RESERVOIR_1; i < NUM_OF_DG_RESERVOIRS; ++i )
+    {
+        reservoirFlags[ i ].startFlushFill = FALSE;
+        reservoirFlags[ i ].startNormalFill = FALSE;
+    }
+
     initSampleWater();
     initConsumableSelfTest();
     initPrime();
@@ -154,6 +163,13 @@
 {
     F32 trimmerHeaterTemp = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
 
+
+    for( U32 i = DG_RESERVOIR_1; i < NUM_OF_DG_RESERVOIRS; ++i )
+    {
+        reservoirFlags[ i ].startFlushFill = FALSE;
+        reservoirFlags[ i ].startNormalFill = FALSE;
+    }
+
     initPreTreatmentMode();
 
     // Set the heaters specs to start heating up the water
@@ -474,6 +490,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
@@ -668,6 +699,7 @@
             submodeCompleteTransitionTimeCounter = 0;
             state = HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
             fillReservoirOneStartRequested = TRUE;
+            reservoirFlags[ DG_RESERVOIR_1 ].startFlushFill = TRUE;
             transitionToNoCartSelfTests();
         }
     }
@@ -1007,52 +1039,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;
+        U32 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;
         }
     }
 
@@ -1187,7 +1194,55 @@
     return state;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getPreTreatmentFillVolume function
+ * @details Inputs: DG intactive reservoir
+ * @details Outputs: start filling next reservoir
+ * @return current state of pre-treatment reservoir management
+ *************************************************************************/
+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
  *************************************************************************/