Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r9c8b132dfff7ad0ef4973698e14d673b9d72a92b -rcb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 9c8b132dfff7ad0ef4973698e14d673b9d72a92b)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision cb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d)
@@ -47,7 +47,7 @@
 
 // General defines
 #define MAX_ALLOWED_STATE_TRIALS                    1                                                          ///< Max allowed trials on a state. This is general among all the states.
-#define CHEM_DISINFECT_DATA_PUB_INTERVAL            ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )                  ///< Mode chem Disinfect data publish interval in counts.
+#define CHEM_DISINFECT_DATA_PUB_INTERVAL            ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )                  ///< Mode chem disinfect data publish interval in counts.
 
 // Start state defines
 #define MIN_INLET_PRESSURE_PSI                      30.0F                                                      ///< Minimum water inlet pressure in psi.
@@ -125,6 +125,13 @@
     NUM_OF_CHEM_DISINFECT_STATUS                                                                               ///< Number of chemical disinfect status.
 } CHEM_DISINFECT_STATUS_T;
 
+/// Non-volatile write structure
+typedef struct
+{
+    BOOL hasDisStatusBeenWrittenToNV;                                                                          ///< Boolean flag to indicate whether the disinfect status been written to NV or not.
+    BOOL hasDisCompleteDateBeenWrittenToNV;                                                                    ///< Boolean flag to indicate whether the disinfect complete date been written to NV or not.
+} DISINFECT_NV_OPS_T;
+
 // ********** private data **********
 
 static DG_CHEM_DISINFECT_STATE_T chemDisinfectState = DG_CHEM_DISINFECT_STATE_START;                           ///< Currently active chemical disinfect state.
@@ -151,6 +158,7 @@
 static U32 numberOfPostDisinfectRinses;                                                                        ///< Number of times to rinse the fluid path after chemical disinfect.
 static U32 primeAcidSteadyStateCounter = 0;                                                                    ///< Prime acid steady state counter.
 static BOOL haveDrainParamsBeenInit[ NUM_OF_DG_RESERVOIRS ];                                                   ///< Boolean flag to indicate whether the drain parameters have been reset or not.
+static DISINFECT_NV_OPS_T disinfectNVOps;                                                                      ///< Disinfect non-volatile memory operations.
 
 // ********** private function prototypes **********
 
@@ -186,6 +194,7 @@
 static CHEM_DISINFECT_STATUS_T getChemicalDisinfectStatus( void );
 static void publishChemicalDisinfectData( void );
 static void monitorModeChemicalDisinfect( void );
+static void writeDisinfectDataToNV( void );
 
 /*********************************************************************//**
  * @brief
@@ -197,30 +206,33 @@
  * R1ChemDisinfectVol, R2ChemDisinfectVol, overallChemDisinfectTimer,
  * cancellationMode, rsrvrFillStableTimeCounter, prevChemDisinfectState
  * isPartialDisinfectInProgress, numberOfPostDisinfectRinses,
- * primeAcidSteadyStateCounter, chemDisinfectUIState, haveDrainParamsBeenInit
+ * primeAcidSteadyStateCounter, chemDisinfectUIState, haveDrainParamsBeenInit,
+ * disinfectNVOps
  * @return none
  *************************************************************************/
 void initChemicalDisinfectMode( void )
 {
-    chemDisinfectState                        = DG_CHEM_DISINFECT_STATE_START;
-    prevChemDisinfectState                    = DG_CHEM_DISINFECT_STATE_START;
-    stateTimer                                = 0;
-    isThisLastDrain                           = FALSE;
-    stateTrialCounter                         = 0;
-    areTempSensorsInRange                     = FALSE;
-    rsrvr1Status                              = NUM_OF_DG_RESERVOIR_STATUS;
-    rsrvr2Status                              = NUM_OF_DG_RESERVOIR_STATUS;
-    R1ChemDisinfectVol                        = 0.0;
-    R2ChemDisinfectVol                        = 0.0;
-    overallChemDisinfectTimer                 = 0;
-    cancellationMode                          = CANCELLATION_MODE_NONE;
-    rsrvrFillStableTimeCounter                = 0;
-    isPartialDisinfectInProgress              = FALSE;
-    numberOfPostDisinfectRinses               = 0;
-    primeAcidSteadyStateCounter               = 0;
-    chemDisinfectUIState                      = CHEM_DISINFECT_UI_STATE_NOT_RUNNING;
-    haveDrainParamsBeenInit[ DG_RESERVOIR_1 ] = FALSE;
-    haveDrainParamsBeenInit[ DG_RESERVOIR_2 ] = FALSE;
+    chemDisinfectState                               = DG_CHEM_DISINFECT_STATE_START;
+    prevChemDisinfectState                           = DG_CHEM_DISINFECT_STATE_START;
+    stateTimer                                       = 0;
+    isThisLastDrain                                  = FALSE;
+    stateTrialCounter                                = 0;
+    areTempSensorsInRange                            = FALSE;
+    rsrvr1Status                                     = NUM_OF_DG_RESERVOIR_STATUS;
+    rsrvr2Status                                     = NUM_OF_DG_RESERVOIR_STATUS;
+    R1ChemDisinfectVol                               = 0.0;
+    R2ChemDisinfectVol                               = 0.0;
+    overallChemDisinfectTimer                        = 0;
+    cancellationMode                                 = CANCELLATION_MODE_NONE;
+    rsrvrFillStableTimeCounter                       = 0;
+    isPartialDisinfectInProgress                     = FALSE;
+    numberOfPostDisinfectRinses                      = 0;
+    primeAcidSteadyStateCounter                      = 0;
+    chemDisinfectUIState                             = CHEM_DISINFECT_UI_STATE_NOT_RUNNING;
+    haveDrainParamsBeenInit[ DG_RESERVOIR_1 ]        = FALSE;
+    haveDrainParamsBeenInit[ DG_RESERVOIR_2 ]        = FALSE;
+    disinfectNVOps.hasDisCompleteDateBeenWrittenToNV = FALSE;
+    disinfectNVOps.hasDisStatusBeenWrittenToNV       = FALSE;
 }
 
 /*********************************************************************//**
@@ -1299,10 +1311,6 @@
             stopHeater( DG_PRIMARY_HEATER );
             stateTimer = getMSTimerCount();
             state      = DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS;
-
-            // Set the disinfect flags
-            setDisinfectStatus( TRUE );
-            setLastDisinfectDate( USAGE_INFO_CHEMICAL_DISINFECT, getRTCTimestamp() );
             break;
     }
 
@@ -1322,6 +1330,9 @@
 {
     DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS;
 
+    // Done with chemical disinfect, write the data to NV memory
+    writeDisinfectDataToNV();
+
     if ( TRUE == didTimeout( stateTimer, POST_CHEM_DISINFECT_WAIT_TIME_MS ) )
     {
         // Stop the drain pump and the RO pump to exit the closed loop
@@ -2163,4 +2174,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_CHEMICAL_DISINFECT, getRTCTimestamp() );
+    }
+}
+
 /**@}*/