Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r19f13e67288117e7f81c1245a75cc6b5f8aaf899 -r6e23d627c3f5a1ef3f7cca5d4e48eb478b0eef4c
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 19f13e67288117e7f81c1245a75cc6b5f8aaf899)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 6e23d627c3f5a1ef3f7cca5d4e48eb478b0eef4c)
@@ -43,13 +43,17 @@
 
 #define SIZE_OF_LARGE_LOAD_CELL_AVG              32                         ///< Large load cell moving average has 32 samples.
 
-#define DIALYSATE_TEMP_OUT_OF_TARGET_TOL_C       2.0F                       ///< Dialysate temperature out of target tolerance C.
-#define DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS  ( 300 * MS_PER_SECOND )    ///< Dialysate temperature out of target timeout in milliseconds.
-#define DIALYSATE_TEMP_HIGH_SAFETY_LIMIT_C       46.0F                      ///< Dialysate high safety temperature limit in C.
-#define DIALYSATE_TEMP_HIGH_SAFETY_TIMEOUT_MS    ( 1 * MS_PER_SECOND )      ///< Dialysate temperature high safety timeout in milliseconds.
-#define DIALYSATE_TEMP_LOW_SAFETY_LIMIT_C        42.0F                      ///< Dialysate low safety temperature limit in C.
-#define DIALYSATE_TEMP_LOW_SAFETY_TIMEOUT_MS     ( 10 * MS_PER_SECOND )     ///< Dialysate temperature low safety timeout in milliseconds.
-#define DG_DATA_FRESHNESS_TIMEOUT_MS             ( 3 * MS_PER_SECOND )      ///< DG data freshness timeout (in ms).
+#define DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C        2.0F                        ///< Dialysate temperature clear alarm tolerance C
+#define DIALYSATE_TEMP_OUT_OF_TARGET_TOL_C              4.0F                        ///< Dialysate temperature out of target tolerance C.
+#define DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS         ( 300 * MS_PER_SECOND )     ///< Dialysate temperature out of target timeout in milliseconds.
+#define DIALYSATE_TEMP_UPPER_MAX_SAFETY_LIMIT_C         46.0F                       ///< Dialysate upper bound maximum temperature limit in C.
+#define DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS      ( 1 * MS_PER_SECOND )       ///< Dialysate temperature upper bound maximum safety timeout in milliseconds.
+#define DIALYSATE_TEMP_UPPER_SAFETY_LIMIT_C             42.0F                       ///< Dialysate upper bound safety temperature limit in C.
+#define DIALYSATE_TEMP_UPPER_SAFETY_TIMEOUT_MS          ( 300 * MS_PER_SECOND )     ///< Dialysate temperature upper bound timeout in milliseconds.
+#define DIALYSATE_TEMP_LOWER_SAFETY_LIMIT_C             33.0F                       ///< Dialysate lower bound safety temperature limit in C.
+#define DIALYSATE_TEMP_LOWER_SAFETY_TIMEOUT_MS          ( 300 * MS_PER_SECOND )     ///< Dialysate temperature lower bound timeout in milliseconds.
+#define DIALYSATE_TEMP_CLEAR_TIMEOUT_MS                 ( 30 * MS_PER_SECOND )      ///< Dialysate temperature clear persistence timeout.
+#define DG_DATA_FRESHNESS_TIMEOUT_MS                    ( 3 * MS_PER_SECOND )       ///< DG data freshness timeout (in ms).
 
 // ********** private data **********
 
@@ -172,11 +176,12 @@
     lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_1 ] = 0.0F;
     lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_2 ] = 0.0F;
 
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE, DIALYSATE_TEMP_HIGH_SAFETY_TIMEOUT_MS, DIALYSATE_TEMP_HIGH_SAFETY_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE, DIALYSATE_TEMP_LOW_SAFETY_TIMEOUT_MS, DIALYSATE_TEMP_LOW_SAFETY_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_HIGH_SAFETY_RANGE, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_LOW_SAFETY_RANGE, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_SAFETY_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_LOW_SAFETY_RANGE, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_LOWER_SAFETY_TIMEOUT_MS );
 
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
 
     initPersistentAlarm( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_HD_NEW_DIALYSATE_TEMPERATURE_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
@@ -449,14 +454,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDialysateTemperature function gets the latest dialysate temperature.
- * @details Inputs: dgDialysateTemp
+ * The getDGDisinfectsStates function returns the DG disinfects readings.
+ * @details Inputs: none
  * @details Outputs: none
- * @return the current dialysate temperature
+ * @return the current DG disinfects readings
  *************************************************************************/
-F32 getDialysateTemperature( void )
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
 {
-    return dgDialysateTemp;
+    return disinfectsStatus;
 }
 
 /*********************************************************************//**
@@ -477,11 +482,11 @@
  * The getDGDisinfectsStates function returns the DG disinfects readings.
  * @details Inputs: none
  * @details Outputs: none
- * @return the current DG disinfects readings
+ * @return the current dialysate temperature
  *************************************************************************/
-DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
+F32 getDialysateTemperature( void )
 {
-    return disinfectsStatus;
+    return dgDialysateTemp;
 }
 
 /*********************************************************************//**
@@ -1152,23 +1157,51 @@
  *************************************************************************/
 void checkDialysateTemperature( void )
 {
-    BOOL isTDiTempAboveHighSafety      = ( dgDialysateTemp >= DIALYSATE_TEMP_HIGH_SAFETY_LIMIT_C ? TRUE : FALSE );
-    BOOL isTDiTempAboveLowSafety       = ( dgDialysateTemp >= DIALYSATE_TEMP_LOW_SAFETY_LIMIT_C ? TRUE : FALSE );
+    BOOL isTDiTempAboveHighSafety      = ( dgDialysateTemp >= DIALYSATE_TEMP_UPPER_MAX_SAFETY_LIMIT_C ? TRUE : FALSE );
+    BOOL isTDiTempAboveLowSafety       = ( dgDialysateTemp >= DIALYSATE_TEMP_UPPER_SAFETY_LIMIT_C ? TRUE : FALSE );
+    BOOL isTDITempBelowLowSafety       = ( dgDialysateTemp <= DIALYSATE_TEMP_LOWER_SAFETY_LIMIT_C ? TRUE : FALSE );
     F32 TDiHigh                        = dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_TOL_C;
-    BOOL isTDiTempAboveDialysateTarget = ( TDiHigh >= dgDialysateTemp ? TRUE : FALSE );
+    BOOL isTDiTempAboveDialysateTarget = ( dgDialysateTemp >= TDiHigh ? TRUE : FALSE );
     F32 TDiLow                         = dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_TOL_C;
-    BOOL isTDiTempBelowDialysateTarget = ( TDiLow >= dgDialysateTemp ? TRUE : FALSE );
+    BOOL isTDiTempBelowDialysateTarget = ( dgDialysateTemp <= TDiLow ? TRUE : FALSE );
 
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        // Per PRS 377, PRS 124
-        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE, isTDiTempAboveHighSafety, dgDialysateTemp, DIALYSATE_TEMP_HIGH_SAFETY_LIMIT_C );
-        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE,  isTDiTempAboveLowSafety,  dgDialysateTemp, DIALYSATE_TEMP_LOW_SAFETY_LIMIT_C );
+        // Per PRS 866
+        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_HIGH_SAFETY_RANGE ) )
+        {
+            isTDiTempAboveHighSafety = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
+        }
+        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_HIGH_SAFETY_RANGE, isTDiTempAboveHighSafety, dgDialysateTemp, DIALYSATE_TEMP_UPPER_MAX_SAFETY_LIMIT_C );
 
-        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTDiTempAboveDialysateTarget, dgDialysateTemp, TDiHigh );
-        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTDiTempBelowDialysateTarget, dgDialysateTemp, TDiLow );
+        // Per PRS 377
+        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP ) )
+        {
+            isTDiTempAboveDialysateTarget = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
+        }
+        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTDiTempAboveDialysateTarget, dgDialysateTemp, TDiHigh );
+
+        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_LOW_SAFETY_RANGE ) )
+        {
+            isTDiTempAboveLowSafety = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
+        }
+        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_LOW_SAFETY_RANGE,  isTDiTempAboveLowSafety,  dgDialysateTemp, DIALYSATE_TEMP_UPPER_SAFETY_LIMIT_C );
+
+        // Per PRS 124
+        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP ) )
+        {
+            isTDiTempBelowDialysateTarget = ( dgDialysateTemp >= ( dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
+        }
+        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTDiTempBelowDialysateTarget, dgDialysateTemp, TDiLow );
+
+        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_LOW_SAFETY_RANGE ) )
+        {
+            isTDITempBelowLowSafety = ( dgDialysateTemp >= ( dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
+        }
+        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_LOW_SAFETY_RANGE,  isTDITempBelowLowSafety,  dgDialysateTemp, DIALYSATE_TEMP_LOWER_SAFETY_LIMIT_C );
+
     }
 }