Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r5315092604c1a6f4ec8ba1339809bd0099f921da -re5713fcc4511a625434a4748f7dded3d237acdf8
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 5315092604c1a6f4ec8ba1339809bd0099f921da)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision e5713fcc4511a625434a4748f7dded3d237acdf8)
@@ -7,8 +7,8 @@
 *
 * @file    ModeChemicalDisinfectFlush.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      04-May-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  15-Nov-2022
@@ -197,9 +197,14 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initChemicalDisinfectFlushMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_YELLOW );
 
+    // Upon transition to mode chemical flush set CD1 and CD2 calibration records to be picked to the normal
+    // table. If the chemical disinfect is successful, mode chemical disinfect flush is automatically started
+    setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD1_SENSOR, CAL_DATA_CD1_COND_SENSOR );
+    setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR );
+
     activateAlarmNoData( ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID );
 
     return chemDisinfectFlushState;
@@ -945,7 +950,7 @@
 
     // NOTE: the drain status should be checked once the reservoirs parameters are initialized. This is to make sure the
     // the timers for stable drain time are initialized prior to using them again
-    isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
+    isDrainComplete = hasTargetDrainToZeroBeenReached( r, drainSteadyStateTimeout );
 
     if ( TRUE == isDrainComplete )
     {