Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r1c4e4a00190abdfa7da30e184ba00e1a92009a71 -r25cf37f4d5b14032df202f99fad30af5be192e8d
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 1c4e4a00190abdfa7da30e184ba00e1a92009a71)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 25cf37f4d5b14032df202f99fad30af5be192e8d)
@@ -249,6 +249,7 @@
     tempGradOutOfRangeTimer                          = 0;
     disinfectNVOps.hasDisCompleteDateBeenWrittenToNV = FALSE;
     disinfectNVOps.hasDisStatusBeenWrittenToNV       = FALSE;
+    alarmDetectedPendingTrigger                      = ALARM_ID_NO_ALARM;
 }
 
 /*********************************************************************//**
@@ -1722,90 +1723,106 @@
     // the timer has not started yet, start it
     BOOL gradientOutOfRange = ( fabs( TPoTemp - ThdTemp ) > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) ? TRUE : FALSE;
 
-    if ( TRUE != gradientOutOfRange  )
+    // Perform check if no pending alarm
+    if (ALARM_ID_NO_ALARM == alarmDetectedPendingTrigger)
     {
-        tempGradOutOfRangeTimer = 0;
-    }
-    else if ( 0 == tempGradOutOfRangeTimer )
-    {
-        tempGradOutOfRangeTimer = getMSTimerCount();
-    }
-    else if ( TRUE == didTimeout( tempGradOutOfRangeTimer, HEAT_DISINFECT_TEMP_GRAD_OUT_RANGE_TIME_MS ) )
-    {
-        alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANGE;
-        status                      = HEAT_DISINFECT_TEMP_GRADIENT_OUT_OF_RANGE;
-    }
-
-    // Check if either reservoir 1 or reservoir 2 are losing volume more than allowed volume
-    if ( ( TRUE == isR1OutOfRange ) || ( TRUE == isR2OutOfRange ) )
-    {
-        // If the leak is the first time after a while, set the flag and start the timer
-        if ( FALSE == areRsrvrsLeaking )
+        if ( TRUE != gradientOutOfRange  )
         {
-            areRsrvrsLeaking      = TRUE;
-            rsrvrsVolMonitorTimer = getMSTimerCount();
+            tempGradOutOfRangeTimer = 0;
         }
-        // If the volume is out of range and it has timed out, exit
-        else if ( TRUE == didTimeout( rsrvrsVolMonitorTimer, RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS ) )
+        else if ( 0 == tempGradOutOfRangeTimer )
         {
-            areRsrvrsLeaking            = FALSE;
-            alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT;
-            status                      = HEAT_DISINFECT_RSRVRS_LEAK_TIMEOUT;
+            tempGradOutOfRangeTimer = getMSTimerCount();
         }
+        else if ( TRUE == didTimeout( tempGradOutOfRangeTimer, HEAT_DISINFECT_TEMP_GRAD_OUT_RANGE_TIME_MS ) )
+        {
+            alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANGE;
+            status                      = HEAT_DISINFECT_TEMP_GRADIENT_OUT_OF_RANGE;
+        }
     }
-    // Reservoirs are in range
-    else
-    {
-        areRsrvrsLeaking = FALSE;
-    }
 
-    // If the coldest spot which is THd is less than minimum heat disinfect temperature,
-    // reset the heat disinfect timers and check whether heating up has timed out
-    if ( ThdTemp < HEAT_DISINFECT_START_TEMPERATURE_C )
+    // Perform check if no pending alarm
+    if (ALARM_ID_NO_ALARM == alarmDetectedPendingTrigger)
     {
-        // Keep reseting the disinfect timer so the elapsed time is always 0 until disinfect truly starts
-        heatDisinfectTimer           = getMSTimerCount();
-        isPartialDisinfectInProgress = FALSE;
-        targetDisinfectTime          = 0;
-
-        if ( TRUE == didTimeout( stateTimer, HEAT_DISINFECT_START_TEMP_TIMOUT_MS ) )
+        // Check if either reservoir 1 or reservoir 2 are losing volume more than allowed volume
+        if ( ( TRUE == isR1OutOfRange ) || ( TRUE == isR2OutOfRange ) )
         {
-            // Heating up to minimum temperature for heat disinfect failed
-            alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT;
-            status                      = HEAT_DISINFECT_HEAT_UP_TIMEOUT;
+            // If the leak is the first time after a while, set the flag and start the timer
+            if ( FALSE == areRsrvrsLeaking )
+            {
+                areRsrvrsLeaking      = TRUE;
+                rsrvrsVolMonitorTimer = getMSTimerCount();
+            }
+            // If the volume is out of range and it has timed out, exit
+            else if ( TRUE == didTimeout( rsrvrsVolMonitorTimer, RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS ) )
+            {
+                areRsrvrsLeaking            = FALSE;
+                alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT;
+                status                      = HEAT_DISINFECT_RSRVRS_LEAK_TIMEOUT;
+            }
         }
+        // Reservoirs are in range
+        else
+        {
+            areRsrvrsLeaking = FALSE;
+        }
     }
-    else if ( ( isPartialDisinfectInProgress != TRUE ) && ( ThdTemp > HEAT_DISINFECT_START_TEMPERATURE_C ) )
+
+    // Perform check if no pending alarm
+    if (ALARM_ID_NO_ALARM == alarmDetectedPendingTrigger)
     {
-        // The temperature of the coldest spot is in range to start the disinfect timer
-        heatDisinfectTimer           = getMSTimerCount();
-        isPartialDisinfectInProgress = TRUE;
-        targetDisinfectTime          = HEAT_DISINFECT_TIME_MS;
-        status = HEAT_DISINFECT_DISINFECT_IN_PROGRESS;
+        // If the coldest spot which is THd is less than minimum heat disinfect temperature,
+        // reset the heat disinfect timers and check whether heating up has timed out
+        if ( ThdTemp < HEAT_DISINFECT_START_TEMPERATURE_C )
+        {
+            // Keep reseting the disinfect timer so the elapsed time is always 0 until disinfect truly starts
+            heatDisinfectTimer           = getMSTimerCount();
+            isPartialDisinfectInProgress = FALSE;
+            targetDisinfectTime          = 0;
 
-        // In disinfect R1 to R2, concentrate pumps are also run
-        if ( DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2 == heatDisinfectState )
+            if ( TRUE == didTimeout( stateTimer, HEAT_DISINFECT_START_TEMP_TIMOUT_MS ) )
+            {
+                // Heating up to minimum temperature for heat disinfect failed
+                alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT;
+                status                      = HEAT_DISINFECT_HEAT_UP_TIMEOUT;
+            }
+        }
+        else if ( ( isPartialDisinfectInProgress != TRUE ) && ( ThdTemp > HEAT_DISINFECT_START_TEMPERATURE_C ) )
         {
-            // Turn the pumps on in reverse
-            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID,   ACID_PUMP_SPEED_ML_PER_MIN );
-            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN );
+            // The temperature of the coldest spot is in range to start the disinfect timer
+            heatDisinfectTimer           = getMSTimerCount();
+            isPartialDisinfectInProgress = TRUE;
+            targetDisinfectTime          = HEAT_DISINFECT_TIME_MS;
+            status = HEAT_DISINFECT_DISINFECT_IN_PROGRESS;
 
-            // During R1 to R2 disinfect, the concentrate pumps turn on
-            requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
-            requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
+            // In disinfect R1 to R2, concentrate pumps are also run
+            if ( DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2 == heatDisinfectState )
+            {
+                // Turn the pumps on in reverse
+                setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID,   ACID_PUMP_SPEED_ML_PER_MIN );
+                setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN );
+
+                // During R1 to R2 disinfect, the concentrate pumps turn on
+                requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
+                requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
+            }
         }
     }
 
-    // If heat disinfect temperature has been reached, check if this stage of heat disinfect is done
-    if ( ( TRUE == isPartialDisinfectInProgress ) && ( TRUE == didTimeout( heatDisinfectTimer, HEAT_DISINFECT_TIME_MS ) ) )
+    // Perform check if no pending alarm
+    if (ALARM_ID_NO_ALARM == alarmDetectedPendingTrigger)
     {
-        // Done with this stage of heat disnfect. Reset the variables
-        // Target disinfect time is the time that is published to the UI and when there is
-        // no disinfect count down, this variable is set to 0. When the target time is 0, the UI
-        // hides the timer on the UI disinfect screen
-        targetDisinfectTime          = 0;
-        status                       = HEAT_DISINFECT_COMPLETE;
-        isPartialDisinfectInProgress = FALSE;
+        // If heat disinfect temperature has been reached, check if this stage of heat disinfect is done
+        if ( ( TRUE == isPartialDisinfectInProgress ) && ( TRUE == didTimeout( heatDisinfectTimer, HEAT_DISINFECT_TIME_MS ) ) )
+        {
+            // Done with this stage of heat disnfect. Reset the variables
+            // Target disinfect time is the time that is published to the UI and when there is
+            // no disinfect count down, this variable is set to 0. When the target time is 0, the UI
+            // hides the timer on the UI disinfect screen
+            targetDisinfectTime          = 0;
+            status                       = HEAT_DISINFECT_COMPLETE;
+            isPartialDisinfectInProgress = FALSE;
+        }
     }
 
     return status;