Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r0b36ae4b591ce21b1971e00a5c2102d68f68d0a6 -r46a2d238d6cf88ff3122b99080789ebc6d83069d
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 0b36ae4b591ce21b1971e00a5c2102d68f68d0a6)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 46a2d238d6cf88ff3122b99080789ebc6d83069d)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    DGInterface.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      19-Sep-2023
+* @author  (last)      Darren Cox
+* @date    (last)      31-Jan-2024
 *
 * @author  (original)  Sean
 * @date    (original)  08-Apr-2020
@@ -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.
@@ -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,18 +1262,16 @@
 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;
     BOOL isTDiTempBelowDialysateTarget = ( dgDialysateTemp <= TDiLow ? TRUE : FALSE );
     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
+    if ( getTargetDialInFlowRate() >  0 )
     {
         // check clear condition first
         if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP ) )
@@ -1295,6 +1292,12 @@
         }
         checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTempBelowTrigger, dgDialysateTemp, dgTrimmerTempSet );
     }
+    else
+    {
+        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, FALSE, dgDialysateTemp, dgTrimmerTempSet );
+        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, FALSE, dgDialysateTemp, dgTrimmerTempSet );
+        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, FALSE, dgDialysateTemp, dgTrimmerTempSet );
+    }
 }
 
 // ********** private functions **********