Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r98543f7e5ff638ae6ad2741237a05f8cc4f10814 -r54abf84364e737dd350153d5fab7dd652f917ef4
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 98543f7e5ff638ae6ad2741237a05f8cc4f10814)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 54abf84364e737dd350153d5fab7dd652f917ef4)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModeChemicalDisinfect.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      15-Sep-2023
+* @date    (last)      09-Sep-2024
 *
 * @author  (original)  Sean
 * @date    (original)  04-Apr-2020
@@ -803,13 +803,14 @@
  * @details Inputs: stateTimer, primeAcidSteadyStateCounter
  * @details Outputs: stateTimer, prevChemDisinfectState,
  * primeAcidSteadyStateCounter, maxTemperatureOutOfRangeStartTimeMS,
- * maxCondOutOfRangeStartTimeMS
+ * maxCondOutOfRangeStartTimeMS, disinfectNVOps
  * @return next state of the chemical disinfect state machine
  *************************************************************************/
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectPrimeDisinfectantState( void )
 {
     DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_PRIME_DISINFECTANT;
 
+    writeDisinfectDataToNV( USAGE_INFO_CHEM_DIS_START );
     handleDisinfectantMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, disinfectantMixRatio );
 
     if ( TRUE == didTimeout( stateTimer, PRIME_ACID_MINIMUM_PRIME_TIME_MS ) )
@@ -834,12 +835,13 @@
             setROPumpTargetFlowRateLPM( CHEM_DISINFECT_TARGET_RO_FLOW_LPM, MAX_RO_PUMP_FILL_DISINFECTANT_PRESSURE_PSI );
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, DISINFECTANT_PUMP_FILL_SPEED_ML_PER_MIN );
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
-            stateTrialCounter                   = 0;
-            disinfectantMixRatio                = DISINFECTANT_MIX_RATIO_FILL;
-            stateTimer                          = getMSTimerCount();
-            maxTemperatureOutOfRangeStartTimeMS = getMSTimerCount();
-            maxCondOutOfRangeStartTimeMS        = getMSTimerCount();
-            state                               = DG_CHEM_DISINFECT_STATE_DISINFECTANT_FLUSH;
+            stateTrialCounter                          = 0;
+            disinfectantMixRatio                       = DISINFECTANT_MIX_RATIO_FILL;
+            stateTimer                                 = getMSTimerCount();
+            maxTemperatureOutOfRangeStartTimeMS        = getMSTimerCount();
+            maxCondOutOfRangeStartTimeMS               = getMSTimerCount();
+            disinfectNVOps.hasDisStatusBeenWrittenToNV = FALSE;
+            state                                      = DG_CHEM_DISINFECT_STATE_DISINFECTANT_FLUSH;
         }
         else if ( TRUE == didTimeout( stateTimer, PRIME_ACID_LINE_TIMEOUT_MS ) )
         {
@@ -864,14 +866,12 @@
  * @details Inputs: stateTimer, disinfectantMixRatio, stateTrialCounter
  * @details Outputs: stateTimer, stateTrialCounter, rsrvr1Status, rsrvr2Status,
  * chemDisinfectReservoirTime, rsrvrFillStableTimeCounter, isChemDisinfectTempAboveTarget,
- * disinfectNVOps
  * @return next state of the chemical disinfect state machine
  *************************************************************************/
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectDisinfectantFlushState( void )
 {
     DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_DISINFECTANT_FLUSH;
 
-    writeDisinfectDataToNV( USAGE_INFO_CHEM_DIS_START );
     handleDisinfectantMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, disinfectantMixRatio );
 
     if ( TRUE == didTimeout( stateTimer, FLUSH_DISINFECTANT_TIMEOUT_MS ) )
@@ -904,14 +904,13 @@
             setValveState( VRD1, VALVE_STATE_CLOSED );
             setValveState( VRD2, VALVE_STATE_CLOSED );
             turnOffUVReactor( OUTLET_UV_REACTOR );
-            rsrvr1Status                               = DG_RESERVOIR_BELOW_TARGET;
-            rsrvr2Status                               = DG_RESERVOIR_BELOW_TARGET;
-            chemDisinfectReservoirTime                 = 0;
-            rsrvrFillStableTimeCounter                 = 0;
-            isChemDisinfectTempAboveTarget             = FALSE;
-            stateTimer                                 = getMSTimerCount();
-            disinfectNVOps.hasDisStatusBeenWrittenToNV = FALSE;
-            state                                      = DG_CHEM_DISINFECT_STATE_FILL_WITH_DISINFECTANT;
+            rsrvr1Status                   = DG_RESERVOIR_BELOW_TARGET;
+            rsrvr2Status                   = DG_RESERVOIR_BELOW_TARGET;
+            chemDisinfectReservoirTime     = 0;
+            rsrvrFillStableTimeCounter     = 0;
+            isChemDisinfectTempAboveTarget = FALSE;
+            stateTimer                     = getMSTimerCount();
+            state                          = DG_CHEM_DISINFECT_STATE_FILL_WITH_DISINFECTANT;
         }
     }
 
@@ -1254,7 +1253,8 @@
  * chemical disinfect cancel mode cold water path state. It drains the reservoirs
  * before the cancel basic path mode is entered.
  * @details Inputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer
- * @details Outputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer
+ * @details Outputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer,
+ * haveDrainParamsBeenInit
  * @return next state of the chemical disinfect state machine
  *************************************************************************/
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCancelModeWaterPathState( void )
@@ -1266,10 +1266,12 @@
         // Stop all the actuators first then decide who should run next
         deenergizeActuators( NO_PARK_CONC_PUMPS );
 
-        cancellationMode = CANCELLATION_MODE_WATER;
-        rsrvr1Status     = DG_RESERVOIR_ABOVE_TARGET;
-        rsrvr2Status     = DG_RESERVOIR_ABOVE_TARGET;
-        stateTimer       = getMSTimerCount();
+        haveDrainParamsBeenInit[ DG_RESERVOIR_1 ] = FALSE;
+        haveDrainParamsBeenInit[ DG_RESERVOIR_2 ] = FALSE;
+        cancellationMode                          = CANCELLATION_MODE_WATER;
+        rsrvr1Status                              = DG_RESERVOIR_ABOVE_TARGET;
+        rsrvr2Status                              = DG_RESERVOIR_ABOVE_TARGET;
+        stateTimer                                = getMSTimerCount();
         // The drain is set to start from reservoir 2
         setValveState( VRD2, VALVE_STATE_OPEN );
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
@@ -1782,17 +1784,20 @@
         if ( ( ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) ) ) &&
              ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_START ) )
         {
-            prevChemDisinfectState = chemDisinfectState;
-            chemDisinfectState     = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
-
-            if ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) )
+            if ( ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH ) && ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH ) )
             {
-                alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+                prevChemDisinfectState = chemDisinfectState;
+                chemDisinfectState     = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+
+                if ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) )
+                {
+                    alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+                }
+                if ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) )
+                {
+                    alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
+                }
             }
-            if ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) )
-            {
-                alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
-            }
         }
     }