Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rb07b1a4480583d607bd6ba878cbf2edc5fd4054e -r2b51189ca65c8ed9416d118b03fa7962c4a04370
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision b07b1a4480583d607bd6ba878cbf2edc5fd4054e)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 2b51189ca65c8ed9416d118b03fa7962c4a04370)
@@ -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, BOOL resetStateTimer);
 static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout );
 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 );
+        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS, TRUE );
 
         // 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 );
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_PARTIAL_FILL_TIMEOUT_MS , TRUE);
         // 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 );
+            rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_PARTIAL_FILL_TIMEOUT_MS, TRUE );
         }
         else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
@@ -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 );
+        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_PARTIAL_FILL_TIMEOUT_MS, TRUE );
 
         // 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 = TRUE)
+static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout, BOOL resetStateTimer)
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_BELOW_TARGET;
     F32 volume = 0.0;