Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r66cdf75b43ccb1288b1b7b5664c1876ebefc43b6 -rd4f6af7415f1fa6c149386121c6836fc6ef276e9
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 66cdf75b43ccb1288b1b7b5664c1876ebefc43b6)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision d4f6af7415f1fa6c149386121c6836fc6ef276e9)
@@ -1183,67 +1183,31 @@
     BOOL isTDiTempAboveDialysateTarget = ( dgDialysateTemp >= TDiHigh ? TRUE : FALSE );
     F32 TDiLow                         = dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_TOL_C;
     BOOL isTDiTempBelowDialysateTarget = ( dgDialysateTemp <= TDiLow ? TRUE : FALSE );
-    BOOL isTempBelowTrigger            = TRUE;
-    BOOL isTempAboveTrigger            = TRUE;
+    BOOL isTempBelowTrigger            = (BOOL)( isTDITempBelowLowSafety || isTDiTempBelowDialysateTarget );
+    BOOL isTempAboveTrigger            = (BOOL)( isTDiTempAboveLowSafety || isTDiTempAboveDialysateTarget );
 
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-
-
+        // check clear condition first
         if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP ) )
         {
             isTDiTempAboveHighSafety = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
         }
         checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, isTDiTempAboveHighSafety, dgDialysateTemp, dgTrimmerTempSet );
 
-        // check clear condition first
         if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP ) )
         {
-            isTempBelowTrigger = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
-            checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTempBelowTrigger, dgDialysateTemp, dgTrimmerTempSet );
+            isTempAboveTrigger = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
         }
+        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTempAboveTrigger, dgDialysateTemp, dgTrimmerTempSet );
 
-        // We have to check the condition before calling the persistence check for
-        // both triggers so they don't to cancel each other out.
-        // Low safety does not to check false conditions since
-        // max target temp will not be higher than low safety
-        if ( TRUE == isTDiTempAboveLowSafety )
-        {
-            checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTDiTempAboveLowSafety, dgDialysateTemp, dgTrimmerTempSet );
-        }
-
-        if ( TRUE == isTDiTempAboveDialysateTarget )
-        {
-            checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTDiTempAboveDialysateTarget, dgDialysateTemp, TDiHigh );
-        }
-        else
-        {
-            checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTDiTempAboveDialysateTarget, dgDialysateTemp, TDiHigh );
-        }
-
-        // check clear condition first
         if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP ) )
         {
-            isTempAboveTrigger = ( dgDialysateTemp <= ( dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
-            checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTempAboveTrigger, dgDialysateTemp, dgTrimmerTempSet );
+            isTempBelowTrigger = ( dgDialysateTemp >= ( dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
         }
-
-        // Below temp checks are reverse since min target temp can be lower than safety
-        if ( TRUE == isTDiTempBelowDialysateTarget )
-        {
-            checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTDiTempBelowDialysateTarget, dgDialysateTemp, TDiLow );
-        }
-
-        if ( TRUE == isTDITempBelowLowSafety )
-        {
-            checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTDITempBelowLowSafety, dgDialysateTemp, dgTrimmerTempSet );
-        }
-        else
-        {
-            checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTDITempBelowLowSafety, dgDialysateTemp, dgTrimmerTempSet );
-        }
+        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTempBelowTrigger, dgDialysateTemp, dgTrimmerTempSet );
     }
 }