Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r2f76ff28df47f13c880c954f1a1b57cc3c99f0c2 -r6ac22bfc2a2e490af2fe0025dbb3a8b05e1c90ac
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 2f76ff28df47f13c880c954f1a1b57cc3c99f0c2)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 6ac22bfc2a2e490af2fe0025dbb3a8b05e1c90ac)
@@ -45,7 +45,7 @@
 
 #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_OUT_OF_TARGET_TIMEOUT_MS         ( 90 * 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.
@@ -1263,8 +1263,8 @@
 void checkDialysateTemperature( void )
 {
     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 );
+    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 = ( dgDialysateTemp >= TDiHigh ? TRUE : FALSE );
     F32 TDiLow                         = dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_TOL_C;