Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r3f7d30b23906496854054949d4491f3bae6ef3c4 -rb63e03ba8b2568afbbd314e9ba6c59c16db29f42
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 3f7d30b23906496854054949d4491f3bae6ef3c4)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision b63e03ba8b2568afbbd314e9ba6c59c16db29f42)
@@ -73,11 +73,11 @@
 #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     85.0                                                           ///< Heat disinfect target water temperature in C. TODO original temperature was 85.0
+#define HEAT_DISINFECT_TARGET_TEMPERATURE_C     83.0                                                           ///< Heat disinfect target water temperature in C. TODO original temperature was 85.0
 #define HEAT_DISINFECT_START_TEMPERATURE_C      81.0                                                           ///< Heat disinfect minimum acceptable temperature in C. TODO original temperature was 81.0
 
 // R1 to R2 & R2 to R1 heat disinfect circulation
-#define HEAT_DISINFECT_TARGET_RO_FLOW_LPM        0.9                                                           ///< Heat disinfect target RO flow rate in L/min. TODO original value was 0.8
+#define HEAT_DISINFECT_TARGET_RO_FLOW_LPM        1.0                                                           ///< Heat disinfect target RO flow rate in L/min. TODO original value was 0.8
 #define HEAT_DISINFECT_MAX_RO_PRESSURE_PSI        30                                                           ///< Heat disinfect maximum RO pressure in psi.
 #define HEAT_DISINFECT_TARGET_DRAIN_PRES_PSI    10.0                                                           ///< Heat disinfect target drain outlet pressure in psi.
 #define HEAT_DISINFECT_TIME_MS                     ( 5 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Heat disinfect time for each section in milliseconds.  TODO original time was 10 minutes
@@ -122,7 +122,7 @@
 
 static DG_HEAT_DISINFECT_STATE_T heatDisinfectState = DG_HEAT_DISINFECT_STATE_START;       ///< Current active heat disinfect state.
 static DG_HEAT_DISINFECT_STATE_T prevHeatDisinfectState = DG_HEAT_DISINFECT_STATE_START;   ///< Previous active heat disinfect state before alarm.
-static DG_HEAT_DISINFECT_UI_STATE_T heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_START;  ///< Current active heat disinfect UI state.
+static DG_HEAT_DISINFECT_UI_STATE_T heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_NOT_RUNNING;  ///< Current active heat disinfect UI state.
 static U32 overallHeatDisinfectTimer = 0;                                                  ///< Heat disinfect cycle total timer.
 static U32 stateTimer = 0;                                                                 ///< Heat disinfect state timer to be used in different states.
 static U32 stateTrialCounter = 0;                                                          ///< Heat disinfect state trial counter to be used for retries in different states.
@@ -191,7 +191,7 @@
 {
     heatDisinfectState           = DG_HEAT_DISINFECT_STATE_START;
     prevHeatDisinfectState       = DG_HEAT_DISINFECT_STATE_START;
-    heatDisinfectUIState         = HEAT_DISINFECT_UI_STATE_START;
+    heatDisinfectUIState         = HEAT_DISINFECT_UI_STATE_NOT_RUNNING;
     stateTimer                   = 0;
     isThisLastDrain              = FALSE;
     stateTrialCounter            = 0;
@@ -1052,6 +1052,11 @@
             rsrvr2Status = DG_RESERVOIR_BELOW_TARGET;
             rsrvr1Status = DG_RESERVOIR_BELOW_TARGET;
             stateTimer = getMSTimerCount();
+
+            // TODO for testing remove
+            setROPumpTargetFlowRate( 0.8, HEAT_DISINFECT_MAX_RO_PRESSURE_PSI );
+            // TODO for testing remove
+
             state = DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER;
             break;