Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r54e58f64179ea382d2e2c403c8c3b9a15a612636 -r79bf3d1f0df93b3fffd1d0136db9275544b76112
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 54e58f64179ea382d2e2c403c8c3b9a15a612636)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 79bf3d1f0df93b3fffd1d0136db9275544b76112)
@@ -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
@@ -445,8 +445,7 @@
 
         // Close VPi to prevent wasting water
         setValveState( VPI, VALVE_STATE_CLOSED );
-        // Request a tare for reservoir 1
-        tareReservoir();
+
         // Set the actuators to drain R1
         setValveState( VRD1, VALVE_STATE_OPEN );
         setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
@@ -506,9 +505,11 @@
         {
             // Assume reservoir 2 is full and drain it
             rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
-            // Request a tare for reservoir 2
-            tareReservoir();
 
+            // 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.
@@ -559,6 +560,9 @@
         }
         else
         {
+            tareLoadCell( LOAD_CELL_RESERVOIR_2_PRIMARY );
+            tareLoadCell( LOAD_CELL_RESERVOIR_2_BACKUP );
+
             signalDrainPumpHardStop();
 
             // Done with draining R2, close it