Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r46ece7f3b8683d14151ca64a010b9d02846deab6 -r264e096770a7f93a93ffbe37c1fe84343230d13c
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 46ece7f3b8683d14151ca64a010b9d02846deab6)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 264e096770a7f93a93ffbe37c1fe84343230d13c)
@@ -168,7 +168,7 @@
 static U32 ROFCoolingTimer = 0;                                                                                ///< RO filter cooling timer.
 static BOOL hasROFCirculationBeenStarted = FALSE;                                                              ///< Flag to indicate the water in RO filter has been recirculated.
 static U32 targetDisinfectTime = 0;                                                                            ///< Target disinfect time.
-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.
 static U32 tempGradOutOfRangeTimer;                                                                            ///< Temperature gradient out of range start timer.
 
 // ********** private function prototypes **********
@@ -221,29 +221,30 @@
  *************************************************************************/
 void initHeatDisinfectMode( void )
 {
-    heatDisinfectState           = DG_HEAT_DISINFECT_STATE_START;
-    prevHeatDisinfectState       = DG_HEAT_DISINFECT_STATE_START;
-    heatDisinfectUIState         = HEAT_DISINFECT_UI_STATE_NOT_RUNNING;
-    stateTimer                   = 0;
-    isThisLastDrain              = FALSE;
-    stateTrialCounter            = 0;
-    areTempSensorsInRange        = FALSE;
-    rsrvr1Status                 = NUM_OF_DG_RESERVOIR_STATUS;
-    rsrvr2Status                 = NUM_OF_DG_RESERVOIR_STATUS;
-    R1HeatDisinfectVol           = 0.0;
-    R2HeatDisinfectVol           = 0.0;
-    overallHeatDisinfectTimer    = 0;
-    cancellationMode             = CANCELLATION_MODE_NONE;
-    rsrvrFillStableTimeCounter   = 0;
-    isPartialDisinfectInProgress = FALSE;
-    isDrainPumpInMixDrainOn      = FALSE;
-    ROFCirculationTimer          = 0;
-    ROFCoolingTimer              = 0;
-    hasROFCirculationBeenStarted = FALSE;
-    concentratePumpsPrimeTimer   = 0;
-    targetDisinfectTime          = 0;
-    haveDrainParamsBeenInit      = FALSE;
-    tempGradOutOfRangeTimer      = 0;
+    heatDisinfectState                          = DG_HEAT_DISINFECT_STATE_START;
+    prevHeatDisinfectState                      = DG_HEAT_DISINFECT_STATE_START;
+    heatDisinfectUIState                        = HEAT_DISINFECT_UI_STATE_NOT_RUNNING;
+    stateTimer                                  = 0;
+    isThisLastDrain                             = FALSE;
+    stateTrialCounter                           = 0;
+    areTempSensorsInRange                       = FALSE;
+    rsrvr1Status                                = NUM_OF_DG_RESERVOIR_STATUS;
+    rsrvr2Status                                = NUM_OF_DG_RESERVOIR_STATUS;
+    R1HeatDisinfectVol                          = 0.0;
+    R2HeatDisinfectVol                          = 0.0;
+    overallHeatDisinfectTimer                   = 0;
+    cancellationMode                            = CANCELLATION_MODE_NONE;
+    rsrvrFillStableTimeCounter                  = 0;
+    isPartialDisinfectInProgress                = FALSE;
+    isDrainPumpInMixDrainOn                     = FALSE;
+    ROFCirculationTimer                         = 0;
+    ROFCoolingTimer                             = 0;
+    hasROFCirculationBeenStarted                = FALSE;
+    concentratePumpsPrimeTimer                  = 0;
+    targetDisinfectTime                         = 0;
+    haveDrainParamsBeenInit[ DG_RESERVOIR_1 ]   = FALSE;
+    haveDrainParamsBeenInit[ DG_RESERVOIR_2 ]   = FALSE;
+    tempGradOutOfRangeTimer                     = 0;
 }
 
 /*********************************************************************//**
@@ -1891,28 +1892,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 heat disinfect state and transition to basic cancellation
-        prevHeatDisinfectState      = heatDisinfectState;
-        alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
-        haveDrainParamsBeenInit     = FALSE;
-        status                      = DG_RESERVOIR_NOT_REACHED_TARGET;
+        prevHeatDisinfectState           = heatDisinfectState;
+        alarmDetectedPendingTrigger      = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
+        haveDrainParamsBeenInit[ r ]     = FALSE;
+        status                           = DG_RESERVOIR_NOT_REACHED_TARGET;
     }
 
     return status;