Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r9c8b132dfff7ad0ef4973698e14d673b9d72a92b -r85e7d6f43d0d6f8fbf77a0894373c5003cf93c6e
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 9c8b132dfff7ad0ef4973698e14d673b9d72a92b)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 85e7d6f43d0d6f8fbf77a0894373c5003cf93c6e)
@@ -64,7 +64,7 @@
 
 // Flush drain path state defines
 #define FLUSH_DRAIN_WAIT_TIME_MS                   ( SEC_PER_MIN * MS_PER_SECOND )                             ///< Flush Drain path wait time in milliseconds.
-#define MIN_INLET_TEMPERATURE_C                    15.0F                                                       ///< Minimum water inlet temperature in C.      TODO original temperature was 25 C
+#define MIN_INLET_TEMPERATURE_C                    25.0F                                                       ///< Minimum water inlet temperature in C.
 #define MAX_INLET_CONDUCTIVITY_US_PER_CM           2000.0F                                                     ///< Maximum water inlet conductivity in us/cm
 
 // Flush circulation path state defines
@@ -82,7 +82,7 @@
 #define RSRVRS_PARTIAL_FILL_VOL_ML                 500.0F                                                      ///< Reservoirs 1 & 2 partial volume in mL.
 #define RSRVRS_FULL_STABLE_TIME_COUNT              ( ( 4 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )           ///< Reservoirs 1 & 2 full stable time in counts.
 #define RSRVRS_FILL_UP_TIMEOUT_MS                  ( 5 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 full fill up timeout in ms. TODO original value was 5 mins
-#define RSRVRS_500ML_FILL_UP_TIMEOUT_MS            ( 4 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 partial fill up timeout in ms. TODO original value was 2 mins
+#define RSRVRS_500ML_FILL_UP_TIMEOUT_MS            ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 partial fill up timeout in ms.
 #define RSRVRS_DRAIN_TIMEOUT_MS                    ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 drain timeout in ms.
 
 // Fill and heat water
@@ -95,7 +95,7 @@
 #define HEAT_DISINFECT_TARGET_DRAIN_PRES_PSI       12.0F                                                       ///< Heat disinfect target drain outlet pressure in psi.
 #define HEAT_DISINFECT_TIME_MS                     ( 10 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Heat disinfect time for each section in milliseconds.
 #define HEAT_DISINFECT_START_TEMP_TIMOUT_MS        ( 4 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND )          ///< Heat disinfect reaching to minimum temperature timeout in milliseconds.
-#define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 0.5F * SEC_PER_MIN * MS_PER_SECOND )                      ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect. TODO change this to 5 seconds
+#define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 10 * MS_PER_SECOND )                                      ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect.
 #define RSRVRS_MAX_TARGET_VOL_CHANGE_ML            100.0F                                                      ///< Reservoirs 1 & 2 maximum allowed volume change when full during heat disinfect.
 #define POST_HEAT_DISINFECT_WAIT_TIME_MS           ( 3 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Heat disinfect final wait time before flushing the system in milliseconds.
 #define HEAT_DISINFECT_MAX_TEMP_GRADIENT_C         15.0F                                                       ///< Heat disinfect maximum allowed temperature gradient in between hottest and coldest sensors.
@@ -628,7 +628,7 @@
         BOOL hasConductivityPassed = FALSE;
 
         // If the inlet temperature and conductivity are in range, move onto the next state
-        if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
+        if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) >= MIN_INLET_TEMPERATURE_C ) &&
              ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
         {
             hasConductivityPassed = TRUE;
@@ -1853,10 +1853,20 @@
     {
         if ( ++rsrvrFillStableTimeCounter >= RSRVRS_FULL_STABLE_TIME_COUNT )
         {
-            status                     = DG_RESERVOIR_REACHED_TARGET;
+            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 ( ( DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 == heatDisinfectState) && ( DG_RESERVOIR_2 == reservoir ) )
+            {
+                if ( rsrvr1Status == DG_RESERVOIR_REACHED_TARGET )
+                {
+                    stateTimer = getMSTimerCount();
+                }
+            }
+            else
+            {
+                stateTimer = getMSTimerCount();
+            }
         }
     }
     else if ( TRUE == didTimeout( stateTimer, timeout ) )
@@ -1899,8 +1909,18 @@
 
     if ( TRUE == isDrainComplete )
     {
-        // Set the state timer in case it needs to be used for another timeout check
-        stateTimer                   = getMSTimerCount();
+        if ( ( DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 == heatDisinfectState) && ( DG_RESERVOIR_1 == r) )
+        {
+            if ( ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status) && ( 0 == getDrainPumpTargetRPM() ) )
+            {
+                stateTimer = getMSTimerCount();
+            }
+        }
+        else
+        {
+            stateTimer = getMSTimerCount();
+        }
+
         haveDrainParamsBeenInit[ r ] = FALSE;
         status                       = DG_RESERVOIR_REACHED_TARGET;
     }
@@ -1941,11 +1961,11 @@
 
     // Check if the temperature gradient in between the coldest and the hottest spot is more than the specified temperature and
     // the timer has not started yet, start it
-    if ( ( TPoTemp - ThdTemp > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) && ( 0 == tempGradOutOfRangeTimer ) )
+    if ( ( fabs( TPoTemp - ThdTemp ) > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) && ( 0 == tempGradOutOfRangeTimer ) )
     {
         tempGradOutOfRangeTimer = getMSTimerCount();
     }
-    else if ( ( TPoTemp - ThdTemp > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) &&
+    else if ( ( fabs( TPoTemp - ThdTemp ) > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) &&
               ( TRUE == didTimeout( tempGradOutOfRangeTimer, HEAT_DISINFECT_TEMP_GRAD_OUT_RANGE_TIME_MS ) ) )
     {
         alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANAGE;