Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7 -r37a9fd8f15e413db5337371a7d1a1cb65567af7c
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 37a9fd8f15e413db5337371a7d1a1cb65567af7c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2022 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)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Darren Cox
+* @date    (last)      10-Mar-2022
 *
 * @author  (original)  Sean
 * @date    (original)  08-Apr-2020
@@ -71,25 +71,23 @@
 static F32 lgFilteredReservoirWeightInGrams[ NUM_OF_DG_RESERVOIRS ];
 
 // Load cell filtering data
-/// Holds load cell samples for large load cell moving average.
-static F32 lgLoadCellReadings[ NUM_OF_DG_RESERVOIRS ][ SIZE_OF_LARGE_LOAD_CELL_AVG ];
-static U32 lgLoadCellReadingsIdx = 0;                               ///< Index for next sample in large load cell rolling average sample array.
-static F32 lgLoadCellReadingsTotal[ NUM_OF_DG_RESERVOIRS ];         ///< Rolling total - used to calc large load cell moving average.
+static F32 lgLoadCellReadings[ NUM_OF_DG_RESERVOIRS ][ SIZE_OF_LARGE_LOAD_CELL_AVG ];  ///< Holds load cell samples for large load cell moving average.
+static U32 lgLoadCellReadingsIdx = 0;                           ///< Index for next sample in large load cell rolling average sample array.
+static F32 lgLoadCellReadingsTotal[ NUM_OF_DG_RESERVOIRS ];     ///< Rolling total - used to calc large load cell moving average.
 
 // DG Dialysate flow rate
-static F32 dgDialysateFlowRateMlMin = 0.0;                          ///< Latest dialysate flow rate reported by the DG.
-static BOOL dgDialysateFlowDataFreshFlag = FALSE;                   ///< Flag to signal the execDialInFlowMonitor() to process fresh flow rate data
+static F32  dgDialysateFlowRateMlMin = 0.0;                     ///< Latest dialysate flow rate reported by the DG.
+static BOOL dgDialysateFlowDataFreshFlag = FALSE;               ///< Flag to signal the execDialInFlowMonitor() to process fresh flow rate data
 
 // Reservoir data
 static DG_RESERVOIR_ID_T dgActiveReservoir = DG_RESERVOIR_2;    ///< Latest active reservoir reported by the DG.
 static DG_RESERVOIR_ID_T dgActiveReservoirSet = DG_RESERVOIR_2; ///< Active reservoir commanded.
 
-// TODO remove below variables
+// TODO remove below variables
 static U32 dgReservoirFillVolumeTarget = 0;                     ///< Latest fill-to volume reported by the DG.
 static U32 dgReservoirFillVolumeTargetSet = 0;                  ///< Fill-to volume commanded.
 static U32 dgReservoirDrainVolumeTarget = 0;                    ///< Latest drain-to volume reported by the DG.
 static U32 dgReservoirDrainVolumeTargetSet = 0;                 ///< Drain-to volume commanded.
-
 
 static DG_DISINFECT_UI_STATES_T disinfectsStatus;               ///< DG disinfects status.
 static DG_MIXING_RATIOS_T dgMixingRatios;                       ///< DG mixing ratios.
@@ -912,27 +910,30 @@
 
     BOOL const dialysateTempRecovered = fabs( dgDialysateTemp - dgTrimmerTempSet ) < DIALYSATE_TEMP_RECOVERY_TOLERANCE_C ? TRUE : FALSE;
 
-#ifndef DISABLE_DIALYSATE_TEMP_CHECK
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dgTrimmerTempSet, dgDialysateTemp );
-    }
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dgTrimmerTempSet, dgDialysateTemp );
+        }
 
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateLowTemp ) )
-    {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dgTrimmerTempSet, dgDialysateTemp );
-    }
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateLowTemp ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dgTrimmerTempSet, dgDialysateTemp );
+        }
 
-    if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
-    {
-        clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH );
-    }
+        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
+        {
+            clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH );
+        }
 
-    if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateTempRecovered ) )
-    {
-        clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_LOW );
+        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateTempRecovered ) )
+        {
+            clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_LOW );
+        }
     }
-#endif
 }
 
 // ********** private functions **********