Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rf91baac9704a90ab0fea1dd05e11833ffc5a5a4e -r9c8b132dfff7ad0ef4973698e14d673b9d72a92b
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision f91baac9704a90ab0fea1dd05e11833ffc5a5a4e)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 9c8b132dfff7ad0ef4973698e14d673b9d72a92b)
@@ -7,8 +7,8 @@
 *
 * @file    ModeChemicalDisinfect.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      23-May-2022
+* @author  (last)      Bill Bracken
+* @date    (last)      22-Aug-2022
 *
 * @author  (original)  Sean
 * @date    (original)  04-Apr-2020
@@ -36,6 +36,7 @@
 #include "Timers.h"
 #include "UVReactors.h"
 #include "Valves.h"
+#include "CPLD.h"
 
 /**
  *  @addtogroup DGChemicalDisinfectMode
@@ -145,11 +146,11 @@
 static BOOL areRsrvrsLeaking = FALSE;                                                                          ///< Reservoir 1 & 2 leak check flag during chemical disinfect.
 static U32 dataPublishCounter = 0;                                                                             ///< Chemical Disinfect data publish counter.
 static CANCELLATION_MODE_T cancellationMode = CANCELLATION_MODE_NONE;                                          ///< Cancellation mode.
-static U32 rsrvrFillStableTimeCounter = 0;                                                                     ///< Reservoirs fill stable time counter.
+static U32 rsrvrFillStableTimeCounter;                                                                         ///< Reservoirs fill stable time counter.
 static ALARM_ID_T alarmDetectedPendingTrigger;                                                                 ///< Chemical disinfect alarm to raise.
 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;                                                                           ///< Boolean flag to indicate whether the drain parameters have been reset or not.
+static BOOL haveDrainParamsBeenInit[ NUM_OF_DG_RESERVOIRS ];                                                   ///< Boolean flag to indicate whether the drain parameters have been reset or not.
 
 // ********** private function prototypes **********
 
@@ -201,24 +202,25 @@
  *************************************************************************/
 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      = 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;
 }
 
 /*********************************************************************//**
@@ -235,6 +237,8 @@
 
     initChemicalDisinfectMode();
 
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_YELLOW );
+
     return chemDisinfectState;
 }
 
@@ -854,7 +858,7 @@
         // until reservoir 1 is filled up and the tubing might expand or leak.
         // Before checking whether reservoir 1 is filled pre-maturely, we have to make sure reservoir 1 is drained completely to make
         // sure the extra volume that is read is not because of previous water that is being drained currently and it is above 500 mL
-        if ( ( volume > RSRVRS_PARTIAL_FILL_VOL_ML ) && ( 0 == drainPumpRPM ) )
+        if ( ( volume >= RSRVRS_PARTIAL_FILL_VOL_ML ) && ( 0 == drainPumpRPM ) )
         {
             prevChemDisinfectState      = state;
             alarmDetectedPendingTrigger = ALARM_ID_DG_INVALID_LOAD_CELL_VALUE;
@@ -1298,7 +1302,7 @@
 
             // Set the disinfect flags
             setDisinfectStatus( TRUE );
-            setLastDisinfectDate( getRTCTimestamp() );
+            setLastDisinfectDate( USAGE_INFO_CHEMICAL_DISINFECT, getRTCTimestamp() );
             break;
     }
 
@@ -1548,7 +1552,7 @@
         // until reservoir 1 is filled up and the tubing might expand or leak.
         // Before checking whether reservoir 1 is filled pre-maturely, we have to make sure reservoir 1 is drained completely to make
         // sure the extra volume that is read is not because of previous water that is being drained currently and it is above 500 mL
-        if ( ( volume > RSRVRS_PARTIAL_FILL_VOL_ML ) && ( 0 == drainPumpRPM ) )
+        if ( ( volume >= RSRVRS_PARTIAL_FILL_VOL_ML ) && ( 0 == drainPumpRPM ) )
         {
             prevChemDisinfectState      = state;
             alarmDetectedPendingTrigger = ALARM_ID_DG_INVALID_LOAD_CELL_VALUE;
@@ -1640,7 +1644,7 @@
         // until reservoir 1 is filled up and the tubing might expand or leak.
         // Before checking whether reservoir 1 is filled pre-maturely, we have to make sure reservoir 1 is drained completely to make
         // sure the extra volume that is read is not because of previous water that is being drained currently and it is above 500 mL
-        if ( ( volume > RSRVRS_PARTIAL_FILL_VOL_ML ) && ( 0 == drainPumpRPM ) )
+        if ( ( volume >= RSRVRS_PARTIAL_FILL_VOL_ML ) && ( 0 == drainPumpRPM ) )
         {
             prevChemDisinfectState      = state;
             alarmDetectedPendingTrigger = ALARM_ID_DG_INVALID_LOAD_CELL_VALUE;
@@ -1933,28 +1937,28 @@
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_ABOVE_TARGET;
 
     // If the drain parameters of the reservoir is not initialized, initialize them
-    if ( FALSE == haveDrainParamsBeenInit )
+    if ( FALSE == haveDrainParamsBeenInit[ r ] )
     {
         initDrainParameters( r );
-        haveDrainParamsBeenInit = TRUE;
+        haveDrainParamsBeenInit[ r ] = TRUE;
     }
 
     BOOL isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
 
     if ( TRUE == isDrainComplete )
     {
         // Set the state timer in case it needs to be used for another timeout check
-        stateTimer              = getMSTimerCount();
-        haveDrainParamsBeenInit = FALSE;
-        status                  = DG_RESERVOIR_REACHED_TARGET;
+        stateTimer                   = getMSTimerCount();
+        haveDrainParamsBeenInit[ r ] = FALSE;
+        status                       = DG_RESERVOIR_REACHED_TARGET;
     }
     else if ( TRUE == didTimeout( stateTimer, timeout ) )
     {
         // Failed to drain on time. Update the previous chemical disinfect state and transition to basic cancellation
-        prevChemDisinfectState      = chemDisinfectState;
-        haveDrainParamsBeenInit     = FALSE;
-        alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
-        status                      = DG_RESERVOIR_NOT_REACHED_TARGET;
+        prevChemDisinfectState          = chemDisinfectState;
+        haveDrainParamsBeenInit[ r ]    = FALSE;
+        alarmDetectedPendingTrigger     = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
+        status                          = DG_RESERVOIR_NOT_REACHED_TARGET;
     }
 
     return status;
@@ -2046,7 +2050,7 @@
  *************************************************************************/
 static void publishChemicalDisinfectData( void )
 {
-    if ( ++dataPublishCounter > CHEM_DISINFECT_DATA_PUB_INTERVAL )
+    if ( ++dataPublishCounter >= CHEM_DISINFECT_DATA_PUB_INTERVAL )
     {
         MODE_CHEMICAL_DISINFECT_DATA_T data;
         MODE_CHEMICAL_DISINFECT_UI_DATA_T uiData;