Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r9047c6e1db73ac20849a63b8cbec33041c28b0d5 -raada74112204bc8e7c004510d0c86afb88cccc14
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 9047c6e1db73ac20849a63b8cbec33041c28b0d5)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision aada74112204bc8e7c004510d0c86afb88cccc14)
@@ -76,8 +76,9 @@
 #define HEAT_DISINFECT_TARGET_TEMPERATURE_C     88.0                        ///< Heat disinfect target water temperature in C.
 
 // R1 to R2 & R2 to R1 heat disinfect circulation
-#define HEAT_DISINFECT_TARGET_RO_FLOW_LPM        0.2                        ///< Heat disinfect target RO flow rate in L/min.
+#define HEAT_DISINFECT_TARGET_RO_FLOW_LPM        0.6                        ///< 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     1.0                        ///< Heat disinfect target drain outlet pressure in psi.
 #define HEAT_DISINFECT_START_TEMPERATURE_C      81.0                        ///< Heat disinfect minimum acceptable temperature in C.
 #define HEAT_DISINFECT_TIME_MS              ( 10 * 60 * MS_PER_SECOND )     ///< Heat disinfect time for each section in milliseconds.
 #define HEAT_DISINFECT_START_TEMP_TIMOUT_MS ( 30 * 60 * MS_PER_SECOND )     ///< Heat disinfect reaching to minimum temperature timeout in milliseconds.
@@ -171,7 +172,7 @@
     R1HeatDisinfectVol              = 0;
     R2HeatDisinfectVol              = 0;
     hasPostHeatDisinfectWaitStarted = FALSE;
-    overallHeatDisinfectTimer       = getMSTimerCount();
+    overallHeatDisinfectTimer       = 0;
 }
 
 /*********************************************************************//**
@@ -339,6 +340,9 @@
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_DRAIN_R1;
 
+    // Start overall heat disinfect timer
+    overallHeatDisinfectTimer = getMSTimerCount();
+
     // Set all the actuators to reset and deenergized state
     resetActuators();
 
@@ -745,20 +749,21 @@
             setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
             setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
 
+            // Set the drain pump to control mode
+            setDrainPumpTargetOutletPressure( HEAT_DISINFECT_TARGET_DRAIN_PRES_PSI );
+
             // Set the RO flow to maximum pressure of 25psi 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 );
 
-            //TODO add the new control api for the drain pump
-
             // Start the trimmer heater since we are recirculating water
-            setTrimmerHeaterTargetTemperature( HEAT_DISINFECT_TARGET_TEMPERATURE_C );
-            startTrimmerHeater();
+            //setTrimmerHeaterTargetTemperature( HEAT_DISINFECT_TARGET_TEMPERATURE_C );
+            //startTrimmerHeater(); TODO do we need this?
 
             // 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 = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
-            R2HeatDisinfectVol = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
+            R1HeatDisinfectVol = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
+            R2HeatDisinfectVol = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
 
             stateTimer = getMSTimerCount();
             rsrvrsVolMonitorTimer = getMSTimerCount();
@@ -1133,11 +1138,11 @@
 
     if ( r == DG_RESERVOIR_1 )
     {
-        volume = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
+        volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
     }
     else if ( r == DG_RESERVOIR_2 )
     {
-        volume = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
+        volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
     }
 
     // Check the volume of the reservoir against the target volume
@@ -1171,7 +1176,7 @@
 {
     BOOL isDrainComplete = FALSE;
 
-    isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout);
+    isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
 
     if ( TRUE == isDrainComplete )
     {
@@ -1202,8 +1207,8 @@
     F32 TPoTemp = getTemperatureValue( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
     F32 TPmTemp = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE ); //TODO change this to actual TPm sensor later
 
-    BOOL isR1OutOfRange = fabs( getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) - R1HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
-    BOOL isR2OutOfRange = fabs( getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ) - R2HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
+    BOOL isR1OutOfRange = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) - R1HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
+    BOOL isR2OutOfRange = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ) - R2HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
 
     // Check if either reservoir 1 or reservoir 2 are losing volume more than allowed volume
     if ( isR1OutOfRange || isR2OutOfRange )
@@ -1218,7 +1223,7 @@
         else if ( didTimeout( rsrvrsVolMonitorTimer, RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS ) )
         {
             areRsrvrsLeaking = FALSE;
-            setModeToFailed( state );
+            //setModeToFailed( state ); TODO uncomment
         }
     }
     // We are in range
@@ -1275,9 +1280,9 @@
         MODE_HEAT_DISINFECT_DATA_T data;
 
         data.heatDisinfectState       = (U32)heatDisinfectState;
-        // Get the time elapsed so far and convert them to minutes TODO remove the timings?
-        data.overallElapsedTime       = calcTimeSince( overallHeatDisinfectTimer ) / ( 60 * MS_PER_SECOND );
-        data.heatDisinfectElapsedTime = calcTimeSince( stateTimer ) / ( 60 * MS_PER_SECOND );
+        data.overallElapsedTime       = calcTimeSince( overallHeatDisinfectTimer );
+        data.stateElapsedTime         = calcTimeSince( stateTimer );
+        data.heatDisinfectElapsedTime = 0;
 
         broadcastHeatDisinfectData( &data );