Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r1aeab08c1baf6445514b81fe51fc60a3e536e782 -r353d01d31bc69d4d1901ff09097ee610bb1c9dbc
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 1aeab08c1baf6445514b81fe51fc60a3e536e782)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 353d01d31bc69d4d1901ff09097ee610bb1c9dbc)
@@ -500,7 +500,7 @@
             // TODO turn on the concentrate pumps
 
             // Set the RO pump to run at full pressure
-            setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
+            setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
 
             // Done with final draining
             isThisLastDrain = FALSE;
@@ -514,10 +514,6 @@
             // 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.
@@ -611,11 +607,12 @@
     if ( TRUE == didTimeout( stateTimer, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
         // 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 ) )
+        //if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
+        //     ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
+        if ( TRUE ) // DEBUG_DENALI enable the conductivity check
         {
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
-            setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
+            setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
             stateTimer = getMSTimerCount();
             stateTrialCounter = 0;
             state = DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION;
@@ -962,7 +959,7 @@
         setValveState( VRD2, VALVE_STATE_OPEN );
 
         // Turn on the RO pump
-        setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
+        setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
 
         // Start heating the water while we are filling up the reservoirs
         setHeaterTargetTemperature( DG_PRIMARY_HEATER, HEAT_DISINFECT_TARGET_TEMPERATURE_C );
@@ -1030,7 +1027,7 @@
 
             // Set the RO flow to maximum pressure of 30psi since it is the maximum pressure on the RO filter
             // at inlet temperature > 45 C
-            setROPumpTargetFlowRate( HEAT_DISINFECT_TARGET_RO_FLOW_LPM, HEAT_DISINFECT_MAX_RO_PRESSURE_PSI );
+            setROPumpTargetFlowRateLPM( HEAT_DISINFECT_TARGET_RO_FLOW_LPM, HEAT_DISINFECT_MAX_RO_PRESSURE_PSI );
 
             // Start the trimmer heater since we are recirculating water and there is flow in the shunt line
             setHeaterTargetTemperature( DG_TRIMMER_HEATER, HEAT_DISINFECT_TARGET_TEMPERATURE_C );
@@ -1301,7 +1298,7 @@
 
             // Set the RO flow to maximum pressure of 30psi since it is the maximum pressure on the RO filter
             // at inlet temperature > 45 C
-            setROPumpTargetFlowRate( ROF_COOL_DOWN_TARGET_FLOW_LPM, HEAT_DISINFECT_MAX_RO_PRESSURE_PSI );
+            setROPumpTargetFlowRateLPM( ROF_COOL_DOWN_TARGET_FLOW_LPM, HEAT_DISINFECT_MAX_RO_PRESSURE_PSI );
 
             hasROFCirculationBeenStarted = TRUE;
             ROFCirculationTimer = getMSTimerCount();
@@ -1406,7 +1403,7 @@
         setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
         setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
         setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
-        setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
+        setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
 
         rsrvr1Status = DG_RESERVOIR_BELOW_TARGET;
         rsrvr2Status = DG_RESERVOIR_BELOW_TARGET;