Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -rb6d1f4e5f0a7e7f1172d4bb95af412624404c049
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision b6d1f4e5f0a7e7f1172d4bb95af412624404c049)
@@ -42,7 +42,7 @@
 
 #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_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_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.
@@ -172,9 +172,6 @@
     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_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_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 );
     initPersistentAlarm( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
@@ -1099,20 +1096,39 @@
     BOOL isTDiTempAboveHighSafety      = ( dgDialysateTemp >= DIALYSATE_TEMP_HIGH_SAFETY_LIMIT_C ? TRUE : FALSE );
     BOOL isTDiTempAboveLowSafety       = ( dgDialysateTemp >= DIALYSATE_TEMP_LOW_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 );
 
-        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 == isTDiTempAboveDialysateTarget )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, dgDialysateTemp, TDiHigh );
+        }
+
+        else
+        {
+            clearAlarmCondition( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP );
+        }
+
+        // Per PRS 124
+        if ( TRUE == isTDiTempBelowDialysateTarget )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, dgDialysateTemp, TDiLow );
+        }
+
+        else
+        {
+            clearAlarmCondition( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP );
+        }
+
     }
 }