Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rd475f49bbf29a6825f2b7c18d094c8b9593334bc -rd5bc7b9005512603474007d97d55a24b24d59be9
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision d475f49bbf29a6825f2b7c18d094c8b9593334bc)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision d5bc7b9005512603474007d97d55a24b24d59be9)
@@ -198,9 +198,11 @@
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectCoolDownROFilterState( void );
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectMixDrainR1State( void );
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectMixDrainR2State( void );
+#if 0 //wjb
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectRinseR1ToR2State( void );
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectRinseR2ToR1AndDrainR1State( void );
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectRinseCirculationState( void );
+#endif
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectCancelModeBasicPathState( void );
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectCancelModeWaterPathState( void );
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectCompleteState( void );
@@ -357,6 +359,7 @@
             heatDisinfectState = handleHeatDisinfectMixDrainR2State();
             break;
 
+#if 0 //wjb
         case DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2:
             heatDisinfectState = handleHeatDisinfectRinseR1ToR2State();
             break;
@@ -368,7 +371,7 @@
         case DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION:
             heatDisinfectState = handleHeatDisinfectRinseCirculationState();
             break;
-
+#endif
         case DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH:
             heatDisinfectState = handleHeatDisinfectCancelModeBasicPathState();
             break;
@@ -1477,6 +1480,7 @@
     return state;
 }
 
+#if 0 //wjb
 /*********************************************************************//**
  * @brief
  * The handleHeatDisinfectRinseR1ToR2State function handles the heat
@@ -1539,7 +1543,9 @@
 
     return state;
 }
+#endif
 
+#if 0 //wjb
 /*********************************************************************//**
  * @brief
  * The handleHeatDisinfectRinseR2ToR1AndDrainR1State function handles the
@@ -1646,7 +1652,9 @@
 
     return state;
 }
+#endif
 
+#if 0 //wjb
 /*********************************************************************//**
  * @brief
  * The handleHeatDisinfectRinseCirculationState function handles the
@@ -1668,6 +1676,7 @@
 
     return state;
 }
+#endif
 
 /*********************************************************************//**
  * @brief
@@ -1958,14 +1967,19 @@
 /*********************************************************************//**
  * @brief
  * The getHeatDisinfectStatus function monitors and returns the current
- * stage of heat disinfect cycle. If the level of the reservoirs is drifted
- * consecutively for the define period of time, it sets the reservoir leak
- * time out alarm. If the target temperature is not reached within the
- * defined period of time, it set the temperature out of range alarm.
- * If the heat disinfect has started or has elapsed, it set the status of
- * heat disinfect accordingly.
- * @details Inputs: areRsrvrsLeaking, areRsrvrsLeaking
- * @details Outputs: areRsrvrsLeaking, areRsrvrsLeaking, heatDisinfectState
+ * stage of heat disinfect cycle. It monitors
+ *  1) The temperature gradient betweeen TPo and Thd
+ *  2) Reservoir 1 or Reservoir 2 have lost more than allowed loss volume
+ *  3) THd must be above the minimum target disinfect temp for the
+ *     target disinfect time
+ *  4) The overall heat disinfect time
+ *
+ * @details Inputs:  tempGradOutOfRangeTimer,      areRsrvrsLeaking,
+ *                   isPartialDisinfectInProgress, heatDisinfectTimer,
+ *                   targetDisinfectTime
+ * @details Outputs: tempGradOutOfRangeTimer, alarmDetectedPendingTrigger,
+ *                   areRsrvrsLeaking,        isPartialDisinfectInProgress,
+ *                   heatDisinfectTimer,      targetDisinfectTime
  * @return status of the heat disinfect (i.e in progress, complete)
  *************************************************************************/
 static HEAT_DISINFECT_STATUS_T getHeatDisinfectStatus( void )
@@ -1996,17 +2010,6 @@
         status                      = HEAT_DISINFECT_TEMP_GRADIENT_OUT_OF_RANGE;
     }
 
-    if ( ( fabs( TPoTemp - ThdTemp ) > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) && ( 0 == tempGradOutOfRangeTimer ) )
-    {
-        tempGradOutOfRangeTimer = getMSTimerCount();
-    }
-    else if ( ( fabs( TPoTemp - ThdTemp ) > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) &&
-              ( 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 ) )
     {