Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rde91824d9790638e0a17fa0278d22a3f57ed28c3 -rf215311725c002c9b9f2915e3502b89ae6a93c91
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision de91824d9790638e0a17fa0278d22a3f57ed28c3)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision f215311725c002c9b9f2915e3502b89ae6a93c91)
@@ -72,12 +72,12 @@
 #define RSRVRS_FULL_VOL_ML                         1750.0                                                      ///< Reservoirs 1 & 2 full volume in mL. TODo original value was 1900
 #define RSRVRS_PARTIAL_FILL_VOL_ML                 500.0                                                       ///< 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            ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 partial fill up timeout in ms.
+#define RSRVRS_FILL_UP_TIMEOUT_MS                  ( 8 * 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_DRAIN_TIMEOUT_MS                    ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 drain timeout in ms.
 
 // Fill and heat water
-#define HEAT_DISINFECT_TARGET_TEMPERATURE_C        83.0                                                        ///< Heat disinfect target water temperature in C.
+#define HEAT_DISINFECT_TARGET_TEMPERATURE_C        82.0                                                        ///< Heat disinfect target water temperature in C.
 #define HEAT_DISINFECT_START_TEMPERATURE_C         81.0                                                        ///< Heat disinfect minimum acceptable temperature in C.
 
 // R1 to R2 & R2 to R1 heat disinfect circulation
@@ -235,13 +235,15 @@
  * heat disinfect mode.
  * @details Inputs: none
  * @details Outputs: none
- * @return none
+ * @return initial state
  *************************************************************************/
-void transitionToHeatDisinfectMode( void )
+U32 transitionToHeatDisinfectMode( void )
 {
     deenergizeActuators();
 
     initHeatDisinfectMode();
+
+    return heatDisinfectState;
 }
 
 /*********************************************************************//**
@@ -509,6 +511,10 @@
             // Assume reservoir 2 is full and drain it
             rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
 
+            // Request a tare for reservoir 1
+            tareLoadCell( LOAD_CELL_RESERVOIR_1_PRIMARY );
+            tareLoadCell( LOAD_CELL_RESERVOIR_1_BACKUP );
+
             // Done with draining R1, close it
             setValveState( VRD1, VALVE_STATE_CLOSED );
             // Set the actuators to drain R2.
@@ -1029,7 +1035,7 @@
 
             // Get the current volumes of R1 & R2. These values will be used to make sure the reservoirs'
             // volume does not change more than a certain amount during the actual heat disinfect cycle
-            R1HeatDisinfectVol = getLoadCellLargeFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ); // TODO remove
+            R1HeatDisinfectVol = getLoadCellLargeFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
             R2HeatDisinfectVol = getLoadCellLargeFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
 
             stateTimer = getMSTimerCount();