Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r0b0c51179b65caa058354dd491441956432654bc -r30bc07a686b5d343c811c6fb75db5d7540d23afb
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 0b0c51179b65caa058354dd491441956432654bc)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 30bc07a686b5d343c811c6fb75db5d7540d23afb)
@@ -43,6 +43,7 @@
 
 #define SIZE_OF_LARGE_LOAD_CELL_AVG              32                         ///< Large load cell moving average has 32 samples.
 
+#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.
@@ -51,6 +52,7 @@
 #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,12 +174,12 @@
     lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_1 ] = 0.0F;
     lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_2 ] = 0.0F;
 
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_HIGH_SAFETY_RANGE, DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_LOW_SAFETY_RANGE, DIALYSATE_TEMP_UPPER_SAFETY_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_SAFETY_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_LOW_SAFETY_RANGE, DIALYSATE_TEMP_LOWER_SAFETY_TIMEOUT_MS, DIALYSATE_TEMP_LOWER_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 );
@@ -1115,10 +1117,39 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        // Per PRS 377 & PRS 124
+        // 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 );
+
+        // 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 );
+
     }
 }