Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r025612ad77fe630889a364586de54bffe5262d56 -r97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 025612ad77fe630889a364586de54bffe5262d56)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c)
@@ -86,9 +86,9 @@
 #define HEAT_DISINFECT_START_TEMPERATURE_C         81.0                                                        ///< Heat disinfect minimum acceptable temperature in C.
 
 // R1 to R2 & R2 to R1 heat disinfect circulation
-#define HEAT_DISINFECT_TARGET_RO_FLOW_LPM          1.3                                                         ///< Heat disinfect target RO flow rate in L/min.
-#define HEAT_DISINFECT_MAX_RO_PRESSURE_PSI         30                                                          ///< Heat disinfect maximum RO pressure in psi.
-#define HEAT_DISINFECT_TARGET_DRAIN_PRES_PSI       12.0                                                        ///< Heat disinfect target drain outlet pressure in psi.
+#define HEAT_DISINFECT_TARGET_RO_FLOW_LPM          1.5   // TODO this was 1.3                                                      ///< Heat disinfect target RO flow rate in L/min.
+#define HEAT_DISINFECT_MAX_RO_PRESSURE_PSI         45    // TODO this was 30                                                      ///< Heat disinfect maximum RO pressure in psi.
+#define HEAT_DISINFECT_TARGET_DRAIN_PRES_PSI       15.0   // TOD was 12                                                     ///< 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.5 * SEC_PER_MIN * MS_PER_SECOND )                       ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect. TODO change this to 5 seconds
@@ -162,6 +162,7 @@
 static U32 ROFCoolingTimer = 0;                                                                                ///< RO filter cooling timer.
 static BOOL hasROFCirculationBeenStarted = FALSE;                                                              ///< Flag to indicate the water in RO filter has been recirculated.
 static U32 targetDisinfectTime = 0;                                                                            ///< Target disinfect time.
+static BOOL haveDrainParamsBeenInit;                                                                           ///< Boolean flag to indicate whether the drain parameters have been reset or not.
 
 // ********** private function prototypes **********
 
@@ -207,6 +208,7 @@
  * isPartialDisinfectInProgress, isDrainPumpOnInMixDrain,
  * hasROFCirculationBeenStarted, ROFCirculationTimer, targetDisinfectTime
  * ROFCirculationCoolingCounter, concentratePumpsPrimeTimer,
+ * haveDrainParamsBeenInit
  * @return none
  *************************************************************************/
 void initHeatDisinfectMode( void )
@@ -232,6 +234,7 @@
     hasROFCirculationBeenStarted = FALSE;
     concentratePumpsPrimeTimer   = 0;
     targetDisinfectTime          = 0;
+    haveDrainParamsBeenInit      = FALSE;
 }
 
 /*********************************************************************//**
@@ -430,9 +433,6 @@
     // Set all the actuators to reset and de-energized state
     deenergizeActuators();
 
-    // Reset the load cells lowest weight prior to starting the run
-    resetReservoirsLowestWeight();
-
     F32 ppiPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
     F32 TDiTemp     = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
     F32 TRoTemp     = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
@@ -608,9 +608,13 @@
     // Check if flush time has elapsed
     if ( TRUE == didTimeout( stateTimer, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
+#ifndef DISABLE_HEAT_DISINFECT_CONDUCTIVITY
         // If the inlet temperature and conductivity are in range, move onto the next state
         if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
              ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
+#else
+        if ( TRUE )
+#endif
         {
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
             setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
@@ -1853,20 +1857,29 @@
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_ABOVE_TARGET;
 
+    // If the drain parameters of the reservoir is not initialized, initialize them
+    if ( FALSE == haveDrainParamsBeenInit )
+    {
+        initDrainParameters( r );
+        haveDrainParamsBeenInit = TRUE;
+    }
+
     BOOL isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
 
     if ( TRUE == isDrainComplete )
     {
         // Set the state timer in case it needs to be used for another timeout check
-        stateTimer = getMSTimerCount();
-        status = DG_RESERVOIR_REACHED_TARGET;
+        stateTimer              = getMSTimerCount();
+        haveDrainParamsBeenInit = FALSE;
+        status                  = DG_RESERVOIR_REACHED_TARGET;
     }
     else if ( TRUE == didTimeout( stateTimer, timeout ) )
     {
         // Failed to drain on time. Update the previous heat disinfect state and transition to basic cancellation
-        prevHeatDisinfectState = heatDisinfectState;
+        prevHeatDisinfectState      = heatDisinfectState;
         alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
-        status = DG_RESERVOIR_NOT_REACHED_TARGET;
+        haveDrainParamsBeenInit     = FALSE;
+        status                      = DG_RESERVOIR_NOT_REACHED_TARGET;
     }
 
     return status;