Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r4e605862b7ae972bad2191c2215509dab6baa63e -rf548bc89ceec8f10b42db24129f5a2f7b0eb84d5
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 4e605862b7ae972bad2191c2215509dab6baa63e)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision f548bc89ceec8f10b42db24129f5a2f7b0eb84d5)
@@ -114,7 +114,7 @@
 static DG_FLUSH_STATE_T handleFlushModeComplete( void );
 
 static void failFlushMode( void );
-static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout, BOOL resetStateTimer );
+static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout );
 static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout, BOOL resetStateTimer );
 static void publishFlushData( void );
 static void monitorModeFlush( void );
@@ -544,10 +544,10 @@
 
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS, TRUE);
+        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
 
         // Keep monitoring the status of reservoir 2 as the same time
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_PARTIAL_FILL_TIMEOUT_MS , TRUE);
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_PARTIAL_FILL_TIMEOUT_MS );
         // Reservoir 2 cannot be filled before reservoir 1 is filled and is overflowing to reservoir 2. If reservoir 2 has already
         // reached to target volume, it means reservoir 1's load cell might be reading incorrect values. This situation might continue
         // until reservoir 2 is filled up and the tubing might expand or leak.
@@ -562,7 +562,7 @@
     {
         if ( DG_RESERVOIR_BELOW_TARGET == rsrvr2Status )
         {
-            rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_PARTIAL_FILL_TIMEOUT_MS, TRUE );
+            rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_PARTIAL_FILL_TIMEOUT_MS );
         }
         else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
@@ -632,7 +632,7 @@
     // First reservoir 2 must be completely full but if reservoir 1 is filled before reservoir 2 is full, alarm
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr2Status )
     {
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS, FALSE);
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
 
         U32 drainPumpRPM = getDrainPumpTargetRPM();
         // Keep monitoring the status of reservoir 1 as the same time
@@ -652,7 +652,7 @@
     // Once reservoir 2 is full, reservoir 1 must be partially full
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {
-        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_PARTIAL_FILL_TIMEOUT_MS, TRUE );
+        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_PARTIAL_FILL_TIMEOUT_MS );
 
         // Once R1 is partially full, transition to the next state
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
@@ -941,7 +941,7 @@
  * @param timeout is the fill up time out that is checked against
  * @return the status of the reservoirs during filling
  *************************************************************************/
-static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout, BOOL resetStateTimer)
+static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout )
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_BELOW_TARGET;
     F32 volume = 0.0;
@@ -963,8 +963,7 @@
             status = DG_RESERVOIR_REACHED_TARGET;
             rsrvrFillStableTimeCounter = 0;
             // Set the state timer in case it needs to be used for another timeout check
-            if (resetStateTimer)
-                stateTimerStart = getMSTimerCount();
+            stateTimerStart = getMSTimerCount();
         }
     }
     else if ( TRUE == didTimeout( stateTimerStart, timeout ) )