Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r46ece7f3b8683d14151ca64a010b9d02846deab6 -r264e096770a7f93a93ffbe37c1fe84343230d13c
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 46ece7f3b8683d14151ca64a010b9d02846deab6)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 264e096770a7f93a93ffbe37c1fe84343230d13c)
@@ -149,7 +149,7 @@
 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 +201,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;
 }
 
 /*********************************************************************//**
@@ -1933,28 +1934,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;