Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r046d700d72ecc928b59450556c4d49d1290e7df8 -r4f5933d8140837732d697e8a00bd92aa7ecc50fb
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 046d700d72ecc928b59450556c4d49d1290e7df8)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 4f5933d8140837732d697e8a00bd92aa7ecc50fb)
@@ -180,8 +180,8 @@
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCompleteState( void );
 
 static void failChemicalDisinfect( void );
-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 );
+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, BOOL resetStateTimer );
 static CHEM_DISINFECT_STATUS_T getChemicalDisinfectStatus( void );
 static void publishChemicalDisinfectData( void );
 static void monitorModeChemicalDisinfect( void );
@@ -478,7 +478,7 @@
 
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS, TRUE );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
@@ -551,7 +551,7 @@
 
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
     {
-        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS, TRUE );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {
@@ -756,10 +756,10 @@
     // If R1 is not full, keep monitoring for R1 level and timeout
     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 at the same time
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_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.
@@ -773,7 +773,7 @@
     // Once R1 is full, keep monitoring for R2 level and timeout
     else if( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS, TRUE );
 
         // Once R2 is full (to 500mL in this case), transition to the next state
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
@@ -827,7 +827,7 @@
     // If reservoir 1 is empty, turn off the drain pump
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS, FALSE );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
@@ -845,7 +845,7 @@
     // First reservoir 2 must be completely full
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr2Status )
     {
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS, FALSE );
 
         U32 drainPumpRPM = getDrainPumpTargetRPM();
         // Keep monitoring the status of reservoir 1 as the same time
@@ -865,7 +865,7 @@
     // Once R2 is full, R1 must be partially full
     else if( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {
-        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS, FALSE );
 
         // Once R1 is partially full, transition to the next state
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
@@ -919,7 +919,7 @@
     // If reservoir 2 is empty, set the drain valve to drain R1
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
     {
-        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS, TRUE );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {
@@ -958,7 +958,7 @@
     // If reservoir 1 is empty, set the state to fill water state
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS, TRUE );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
@@ -1089,12 +1089,12 @@
     // First reservoir 1 must be full
     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 );
     }
     // Once reservoir 1 is full, check the status of reservoir 2 since the water overflows to reservoir 2
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS, TRUE );
 
         // Once reservoir 2 is full, set the actuators for recirculation
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
@@ -1239,11 +1239,11 @@
     // First reservoir 1 must be partially full
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS, TRUE );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS, TRUE );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
@@ -1366,7 +1366,7 @@
 
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS, TRUE );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
@@ -1405,7 +1405,7 @@
 
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
     {
-        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS, TRUE );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {
@@ -1455,10 +1455,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 at the same time
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_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.
@@ -1471,7 +1471,7 @@
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS, TRUE );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
@@ -1522,7 +1522,7 @@
 
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS, TRUE );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
@@ -1539,7 +1539,7 @@
     // First reservoir 2 must be completely full
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr2Status )
     {
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS, TRUE );
 
         U32 drainPumpRPM = getDrainPumpTargetRPM();
         // Keep monitoring the status of reservoir 1 as the same time
@@ -1559,7 +1559,7 @@
     // Once reservoir 2 is completely full, monitor reservoir 1
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {
-        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS, TRUE );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
@@ -1614,7 +1614,7 @@
 
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
     {
-        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS, TRUE );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {
@@ -1631,7 +1631,7 @@
     // First reservoir 1 must be completely full
     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 );
 
         U32 drainPumpRPM = getDrainPumpTargetRPM();
         // Keep monitoring the status of reservoir 2 as the same time
@@ -1651,7 +1651,7 @@
     // Once reservoir 1 is completely full, monitor reservoir 2
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS, TRUE );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
@@ -1792,7 +1792,7 @@
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
     {
         // If the cancellation water path cannot be done, got to basic cancellation path
-        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS, TRUE );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
@@ -1812,7 +1812,7 @@
     if ( ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status ) && ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status ) )
     {
         // If the cancellation water path cannot be done, got to basic cancellation path
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS, TRUE );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
@@ -1875,7 +1875,7 @@
  * @param timeout is the fill up timeout
  * @return the status of the reservoirs during filling
  *************************************************************************/
-static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout )
+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;
@@ -1900,8 +1900,11 @@
         {
             status                     = DG_RESERVOIR_REACHED_TARGET;
             rsrvrFillStableTimeCounter = 0;
-            // Set the state timer in case it needs to be used for another timeout check
-            stateTimer                 = getMSTimerCount();
+            if (resetStateTimer)
+            {
+                // Set the state timer in case it needs to be used for another timeout check
+                stateTimer                 = getMSTimerCount();
+            }
         }
     }
     else if ( TRUE == didTimeout( stateTimer, timeout ) )
@@ -1929,7 +1932,7 @@
  * then
  * @return the status of the reservoirs during draining
  *************************************************************************/
-static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout )
+static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout, BOOL resetStateTimer )
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_ABOVE_TARGET;
 
@@ -1944,8 +1947,11 @@
 
     if ( TRUE == isDrainComplete )
     {
-        // Set the state timer in case it needs to be used for another timeout check
-        stateTimer                   = getMSTimerCount();
+        if (resetStateTimer)
+        {
+            // Set the state timer in case it needs to be used for another timeout check
+            stateTimer                   = getMSTimerCount();
+        }
         haveDrainParamsBeenInit[ r ] = FALSE;
         status                       = DG_RESERVOIR_REACHED_TARGET;
     }