Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rbbded7df1d8e6087c5c7dc82d26294c0e0b1a2ef -r670bc3f32071a7f884970e106d506cd210129bc9
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision bbded7df1d8e6087c5c7dc82d26294c0e0b1a2ef)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 670bc3f32071a7f884970e106d506cd210129bc9)
@@ -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.
@@ -130,7 +130,7 @@
     dgTrimmerTempSet                = 0.0F;
     dgTrimmerTempCheckTimerCtr      = 0;
     dgActiveReservoirSet            = DG_RESERVOIR_2;
-    dgActiveReservoir               = DG_RESERVOIR_2;
+    dgActiveReservoir               = DG_RESERVOIR_2;
     dgDialysateTemp                 = 0.0F;
     dgCurrentOpMode                 = DG_MODE_INIT;
     dgSubMode                       = 0;
@@ -178,7 +178,6 @@
     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_SAFETY_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_MAX_SAFETY_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_TEMP_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 );
@@ -1263,8 +1262,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;