Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r27e2d12e453375d3595368ec25a0ff3a6aba2d09 -r7cc77947d23e4be589753ea3bae781a5e15cc898
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 27e2d12e453375d3595368ec25a0ff3a6aba2d09)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 7cc77947d23e4be589753ea3bae781a5e15cc898)
@@ -85,7 +85,7 @@
 
 // Fill and heat water
 #define HEAT_DISINFECT_TARGET_TEMPERATURE_C        82.0F                                                       ///< Heat disinfect target water temperature in C.
-#define HEAT_DISINFECT_START_TEMPERATURE_C         38.0F      // TODO target is 81.0                                                 ///< Heat disinfect minimum acceptable temperature in C.
+#define HEAT_DISINFECT_START_TEMPERATURE_C         81.0F                                                       ///< Heat disinfect minimum acceptable temperature in C.
 
 // R1 to R2 & R2 to R1 heat disinfect circulation
 #define HEAT_DISINFECT_TARGET_RO_FLOW_LPM          1.3F                                                        ///< Heat disinfect target RO flow rate in L/min.
@@ -98,7 +98,7 @@
 #define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 0.5F * SEC_PER_MIN * MS_PER_SECOND )                      ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect. TODO change this to 5 seconds
 #define RSRVRS_MAX_TARGET_VOL_CHANGE_ML            100.0F                                                      ///< Reservoirs 1 & 2 maximum allowed volume change when full during heat disinfect.
 #define POST_HEAT_DISINFECT_WAIT_TIME_MS           ( 3 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Heat disinfect final wait time before flushing the system in milliseconds.
-#define HEAT_DISINFECT_MAX_TEMP_GRADIENT_C         80.0F      // TODo it was 15                                                 ///< Heat disinfect maximum allowed temperature gradient in between hottest and coldest sensors.
+#define HEAT_DISINFECT_MAX_TEMP_GRADIENT_C         15.0F                                                       ///< Heat disinfect maximum allowed temperature gradient in between hottest and coldest sensors.
 #define HEAT_DISINFECT_TEMP_GRAD_OUT_RANGE_TIME_MS ( 0.16 * SEC_PER_MIN * MS_PER_SECOND )                      ///< Heat disinfect temperature gradient out of range timeout in milliseconds.
 
 // Cool down RO filter
@@ -1065,16 +1065,12 @@
             setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
             setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
 
-            // TODO for testing only
-            signalROPumpHardStop();
-            setDrainPumpTargetRPM(1200);
             // Set the drain pump to control mode
-            //setDrainPumpTargetOutletPressure( HEAT_DISINFECT_TARGET_DRAIN_PRES_PSI );
+            setDrainPumpTargetOutletPressure( HEAT_DISINFECT_TARGET_DRAIN_PRES_PSI );
 
             // Set the RO flow to maximum pressure of 30psi since it is the maximum pressure on the RO filter
             // at inlet temperature > 45 C
-            //setROPumpTargetFlowRateLPM( HEAT_DISINFECT_TARGET_RO_FLOW_LPM, HEAT_DISINFECT_MAX_RO_PRESSURE_PSI );
-            // TODO for testing only
+            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 );
@@ -1144,14 +1140,12 @@
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
 
-            // TODO remove
             // Set the RO flow to maximum pressure of 30psi since it is the maximum pressure on the RO filter
             // at inlet temperature > 45 C
-            //setROPumpTargetFlowRateLPM( HEAT_DISINFECT_TARGET_RO_FLOW_TRANSFER_LPM, HEAT_DISINFECT_MAX_RO_PRESSURE_PSI );
+            setROPumpTargetFlowRateLPM( HEAT_DISINFECT_TARGET_RO_FLOW_TRANSFER_LPM, HEAT_DISINFECT_MAX_RO_PRESSURE_PSI );
 
-             // Set the drain pump to control mode
-            //setDrainPumpTargetOutletPressure( HEAT_DISINFECT_TARGET_DRAIN_FILL_R2_PSI );
-            // TODO remove
+            // Set the drain pump to control mode
+            setDrainPumpTargetOutletPressure( HEAT_DISINFECT_TARGET_DRAIN_FILL_R2_PSI );
 
             // Although there is fluid in both reservoirs, but they are set to empty
             // to begin the transition of hot water from R1 to R2.
@@ -1207,16 +1201,14 @@
             R1HeatDisinfectVol = getLoadCellLargeFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
             R2HeatDisinfectVol = getLoadCellLargeFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
 
-            // TODO remove
-            //setROPumpTargetFlowRateLPM( 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 );
 
             // Set the drain pump to control mode
             //setDrainPumpTargetOutletPressure( HEAT_DISINFECT_TARGET_DRAIN_PRES_PSI );
 
             // Set the RO flow to maximum pressure of 30psi since it is the maximum pressure on the RO filter
             // at inlet temperature > 45 C
-            //setROPumpTargetFlowRateLPM( HEAT_DISINFECT_TARGET_RO_FLOW_LPM, HEAT_DISINFECT_MAX_RO_PRESSURE_PSI );
-            // TODO remove
+            setROPumpTargetFlowRateLPM( HEAT_DISINFECT_TARGET_RO_FLOW_LPM, HEAT_DISINFECT_MAX_RO_PRESSURE_PSI );
 
             state = DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1;
         }