Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rebd9aed9d273db8635bc1dd6db189f2a9f591450 -r5738118966dd400f3d985329cf5a521dfe41c703
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision ebd9aed9d273db8635bc1dd6db189f2a9f591450)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 5738118966dd400f3d985329cf5a521dfe41c703)
@@ -7,8 +7,8 @@
 *
 * @file    ModeHeatDisinfect.c
 *
-* @author  (last)      Bill Bracken
-* @date    (last)      22-Aug-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      27-Sep-2022
 *
 * @author  (original)  Sean
 * @date    (original)  20-Apr-2020
@@ -45,8 +45,6 @@
  *  @{
  */
 
-// TODO add the cooling, test the higher target flow to reduce the gradient
-
 // ********** private definitions **********
 
 // General defines
@@ -64,7 +62,7 @@
 
 // Flush drain path state defines
 #define FLUSH_DRAIN_WAIT_TIME_MS                   ( SEC_PER_MIN * MS_PER_SECOND )                             ///< Flush Drain path wait time in milliseconds.
-#define MIN_INLET_TEMPERATURE_C                    25.0F                                                       ///< Minimum water inlet temperature in C.
+#define MIN_INLET_TEMPERATURE_C                    15.0F                                                       ///< Minimum water inlet temperature in C.      TODO original temperature was 25 C
 #define MAX_INLET_CONDUCTIVITY_US_PER_CM           2000.0F                                                     ///< Maximum water inlet conductivity in us/cm
 
 // Flush circulation path state defines
@@ -82,7 +80,7 @@
 #define RSRVRS_PARTIAL_FILL_VOL_ML                 500.0F                                                      ///< Reservoirs 1 & 2 partial volume in mL.
 #define RSRVRS_FULL_STABLE_TIME_COUNT              ( ( 4 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )           ///< Reservoirs 1 & 2 full stable time in counts.
 #define RSRVRS_FILL_UP_TIMEOUT_MS                  ( 5 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 full fill up timeout in ms. TODO original value was 5 mins
-#define RSRVRS_500ML_FILL_UP_TIMEOUT_MS            ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 partial fill up timeout in ms.
+#define RSRVRS_500ML_FILL_UP_TIMEOUT_MS            ( 4 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 partial fill up timeout in ms. TODO original value was 2 mins
 #define RSRVRS_DRAIN_TIMEOUT_MS                    ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 drain timeout in ms.
 
 // Fill and heat water
@@ -97,7 +95,7 @@
 #define HEAT_DISINFECT_TARGET_DRAIN_FILL_R2_PSI    9.0F                                                        ///< Heat disinfect target drain R2 fill outplet pressure in PSI
 #define HEAT_DISINFECT_TIME_MS                     ( 10 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Heat disinfect time for each section in milliseconds.
 #define HEAT_DISINFECT_START_TEMP_TIMOUT_MS        ( 4 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND )          ///< Heat disinfect reaching to minimum temperature timeout in milliseconds.
-#define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 10 * MS_PER_SECOND )                                      ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect.
+#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         15.0F                                                       ///< Heat disinfect maximum allowed temperature gradient in between hottest and coldest sensors.
@@ -2213,4 +2211,25 @@
     }
 }
 
+/*********************************************************************//**
+ * @brief
+ * The writeDisinfectDataToNV function writes the disinfection data to the
+ * non-volatile memory.
+ * @details Inputs: disinfectNVOps
+ * @details Outputs: disinfectNVOps
+ * @return: none
+ *************************************************************************/
+static void writeDisinfectDataToNV( void )
+{
+    if ( FALSE == disinfectNVOps.hasDisCompleteDateBeenWrittenToNV )
+    {
+        disinfectNVOps.hasDisCompleteDateBeenWrittenToNV = setDisinfectStatus( TRUE );
+    }
+
+    if ( FALSE == disinfectNVOps.hasDisStatusBeenWrittenToNV )
+    {
+        disinfectNVOps.hasDisStatusBeenWrittenToNV = setLastDisinfectDate( USAGE_INFO_HEAT_DISINFECT, getRTCTimestamp() );
+    }
+}
+
 /**@}*/