Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r8a4182663ef6b12e3fd6414c0c14158943cd4ce1 -r3f7d30b23906496854054949d4491f3bae6ef3c4
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 8a4182663ef6b12e3fd6414c0c14158943cd4ce1)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 3f7d30b23906496854054949d4491f3bae6ef3c4)
@@ -73,8 +73,8 @@
 #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     65.0                                                           ///< Heat disinfect target water temperature in C. TODO original temperature was 85.0
-#define HEAT_DISINFECT_START_TEMPERATURE_C      61.0                                                           ///< Heat disinfect minimum acceptable temperature in C. TODO original temperature was 81.0
+#define HEAT_DISINFECT_TARGET_TEMPERATURE_C     85.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
@@ -191,6 +191,7 @@
 {
     heatDisinfectState           = DG_HEAT_DISINFECT_STATE_START;
     prevHeatDisinfectState       = DG_HEAT_DISINFECT_STATE_START;
+    heatDisinfectUIState         = HEAT_DISINFECT_UI_STATE_START;
     stateTimer                   = 0;
     isThisLastDrain              = FALSE;
     stateTrialCounter            = 0;
@@ -417,6 +418,9 @@
     }
     else
     {
+        // Set the heat disinfect UI state
+        heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT;
+
         // Close VPi to prevent wasting water
         setValveState( VPI, VALVE_STATE_CLOSED );
         // Request a tare for reservoir 1
@@ -952,6 +956,9 @@
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER;
 
+    // Set the heat disinfect UI state
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER;
+
     // First reservoir 1 must be full
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr1Status )
     {
@@ -1050,6 +1057,8 @@
 
         default:
             // Do nothing, heat disinfect is in progress
+            // Set the heat disinfect UI state
+            heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_DISINFECT_DEVICE;
             break;
     }
 
@@ -1188,6 +1197,9 @@
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER;
 
+    // Set the heat disinfect UI state
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE;
+
     // TPo which is the temperature sensor after the heater is hottest spot
     // and this temperature is monitored until it is dropped below 45 C to be able
     // to run fluid through the RO filter
@@ -1229,6 +1241,9 @@
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1;
 
+    // Set the heat disinfect UI state
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT;
+
     if ( ( TRUE == didTimeout( stateTimer, DRAIN_PUMP_START_TIME_IN_MIX_DRAIN_MS ) ) && ( isDrainPumpInMixDrainOn == FALSE ) )
     {
         isDrainPumpInMixDrainOn = TRUE;
@@ -1512,6 +1527,9 @@
     // Go to state complete, we are done
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
 
+    // Set the heat disinfect UI state
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT;
+
     // Set the cancellation mode
     cancellationMode = CANCELLATION_MODE_BASIC;
 
@@ -1537,6 +1555,9 @@
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
 
+    // Set the heat disinfect UI state
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT;
+
     if ( CANCELLATION_MODE_NONE == cancellationMode )
     {
         U32 targetRPM = 0;
@@ -1628,6 +1649,9 @@
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_COMPLETE;
 
+    // Set the heat disinfect UI state
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_COMPLETE;
+
     stopDGHeatDisinfect();
 
     return state;
@@ -1829,21 +1853,24 @@
         MODE_HEAT_DISINFECT_DATA_T data;
         MODE_HEAT_DISINFECT_UI_DATA_T uiData;
 
-        data.heatDisinfectState = (U32)heatDisinfectState;
-        data.overallElapsedTime = calcTimeSince( overallHeatDisinfectTimer );
-        data.stateElapsedTime   = calcTimeSince( stateTimer );
-        data.cancellationMode   = (U32)cancellationMode;
+        data.heatDisinfectState   = (U32)heatDisinfectState;
+        data.overallElapsedTime   = calcTimeSince( overallHeatDisinfectTimer );
+        data.stateElapsedTime     = calcTimeSince( stateTimer );
+        data.cancellationMode     = (U32)cancellationMode;
+        data.heatDisinfectUIState = (U32)heatDisinfectUIState;
 
         // If the mode is in the actual heat disinfect states, publish the elapsed time, otherwise publish 0 to avoid confusion
         if ( ( DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2 == heatDisinfectState ) ||
              ( DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1 == heatDisinfectState ) )
         {
+            uiData.heatDisinfectTargetTime  = HEAT_DISINFECT_TIME_MS;
             uiData.heatDisinfectElapsedTime = calcTimeSince( heatDisinfectTimer );
             data.R1FillLevel                = R1HeatDisinfectVol;
             data.R2FillLevel                = R2HeatDisinfectVol;
         }
         else
         {
+            uiData.heatDisinfectTargetTime  = 0;
             uiData.heatDisinfectElapsedTime = 0;
             data.R1FillLevel                = 0.0;
             data.R2FillLevel                = 0.0;