Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -re654b368ff8f4d194678db88f1cda57b04e7d947 -r72ab02a2c5612b5ee178d682671b5e34d16ca3c3
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision e654b368ff8f4d194678db88f1cda57b04e7d947)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 72ab02a2c5612b5ee178d682671b5e34d16ca3c3)
@@ -8,7 +8,7 @@
 * @file    DGInterface.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      13-Jul-2022
+* @date    (last)      22-Sep-2022
 *
 * @author  (original)  Sean
 * @date    (original)  08-Apr-2020
@@ -126,30 +126,37 @@
 {
     U32 i, j;
 
-    dgStarted = FALSE;
-    dgTrimmerHeaterOn = FALSE;
-    dgTrimmerTempSet = 0.0;
-    dgDialysateTemp = 0.0;
-    dgActiveReservoirSet = DG_RESERVOIR_2;
-    dgReservoirFillVolumeTargetSet = 0;
+    dgStarted                       = FALSE;
+    dgTrimmerHeaterOn               = FALSE;
+    dgTrimmerTempSet                = 0.0F;
+    dgActiveReservoirSet            = DG_RESERVOIR_2;
+    dgActiveReservoir               = DG_RESERVOIR_2;
+    dgReservoirFillVolumeTargetSet  = 0;
     dgReservoirDrainVolumeTargetSet = 0;
+    dgDialysateTemp                 = 0.0F;
+    dgCurrentOpMode                 = DG_MODE_INIT;
+    dgSubMode                       = 0;
+    dgStartCommandSent              = FALSE;
+    dgDialysateFlowRateMlMin        = 0.0F;
+    dgDialysateFlowDataFreshFlag    = FALSE;
 
     // initialize load cell weights
     for ( i = 0; i < NUM_OF_LOAD_CELLS; i++ )
     {
-        loadCellWeightInGrams[ i ].data = 0.0;
-        loadCellWeightInGrams[ i ].ovInitData = 0.0;
-        loadCellWeightInGrams[ i ].ovData = 0.0;
-        loadCellWeightInGrams[ i ].override = 0;
+        loadCellWeightInGrams[ i ].data       = 0.0F;
+        loadCellWeightInGrams[ i ].ovInitData = 0.0F;
+        loadCellWeightInGrams[ i ].ovData     = 0.0F;
+        loadCellWeightInGrams[ i ].override   = 0;
     }
     // initialize reservoirs weights
     for ( i = 0; i < NUM_OF_DG_RESERVOIRS; i++ )
     {
-        lgFilteredReservoirWeightInGrams[ i ] = 0.0;
+        lgFilteredReservoirWeightInGrams[ i ] = 0.0F;
+
         for ( j = 0; j < SIZE_OF_LARGE_LOAD_CELL_AVG; j++ )
         {
-            lgLoadCellReadings[ i ][ j ] = 0.0;
-            lgLoadCellBackupReadings[ i ][ j ] = 0.0;
+            lgLoadCellReadings[ i ][ j ]       = 0.0F;
+            lgLoadCellBackupReadings[ i ][ j ] = 0.0F;
         }
     }
 
@@ -161,11 +168,11 @@
         dgCmdResp[ i ].rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
     }
 
-    lgLoadCellReadingsIdx = 0;
-    lgLoadCellReadingsTotal[ DG_RESERVOIR_1 ] = 0.0;
-    lgLoadCellReadingsTotal[ DG_RESERVOIR_2 ] = 0.0;
-    lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_1 ] = 0.0;
-    lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_2 ] = 0.0;
+    lgLoadCellReadingsIdx                           = 0;
+    lgLoadCellReadingsTotal[ DG_RESERVOIR_1 ]       = 0.0F;
+    lgLoadCellReadingsTotal[ DG_RESERVOIR_2 ]       = 0.0F;
+    lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_1 ] = 0.0F;
+    lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_2 ] = 0.0F;
 
     initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE, DIALYSATE_TEMP_HIGH_SAFETY_TIMEOUT_MS, DIALYSATE_TEMP_HIGH_SAFETY_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE, DIALYSATE_TEMP_LOW_SAFETY_TIMEOUT_MS, DIALYSATE_TEMP_LOW_SAFETY_TIMEOUT_MS );
@@ -942,6 +949,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The cmdSetDGToServiceMode function sends a request to DG to transition
+ * to service mode.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @return none
+ *************************************************************************/
+void cmdSetDGToServiceMode( void )
+{
+    sendDGServiceModeRequest();
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleDGCommandResponse function processes the latest DG command response.
  * @details Inputs: none
  * @details Outputs: process command response from DG
@@ -1007,43 +1027,28 @@
  * @brief
  * The checkDialysateTemperature function checks the dialysate temperature
  * reported by DG and alarm if temperature is out of range.
- * @details Inputs: dgTrimmerTempSet, dgDialysateTemp, dgRedundantDialysateTemp
- * @details Outputs: alarm if dialysate temperature is out of accepted range
+ * @details Inputs: dgTrimmerTempSet, dgDialysateTemp
+ * @details Outputs: none
  * @return none
  *************************************************************************/
 void checkDialysateTemperature( void )
 {
-    BOOL const dialysateHighTemp = ( ( ( dgDialysateTemp - dgTrimmerTempSet ) > DIALYSATE_TEMP_TOLERANCE_C ) ||
-                                     ( dgDialysateTemp > DIALYSATE_TEMP_HIGH_LIMIT_C ) );
+    BOOL isTDiTempAboveHighSafety      = ( dgDialysateTemp >= DIALYSATE_TEMP_HIGH_SAFETY_LIMIT_C ? TRUE : FALSE );
+    BOOL isTDiTempAboveLowSafety       = ( dgDialysateTemp >= DIALYSATE_TEMP_LOW_SAFETY_LIMIT_C ? TRUE : FALSE );
+    F32 TDiHigh                        = dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_TOL_C;
+    BOOL isTDiTempAboveDialysateTarget = ( TDiHigh >= dgDialysateTemp ? TRUE : FALSE );
+    F32 TDiLow                         = dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_TOL_C;
+    BOOL isTDiTempBelowDialysateTarget = ( TDiLow >= dgDialysateTemp ? TRUE : FALSE );
 
-    BOOL const dialysateLowTemp = ( ( ( dgTrimmerTempSet - dgDialysateTemp ) > DIALYSATE_TEMP_TOLERANCE_C ) ||
-                                    ( dgDialysateTemp < DIALYSATE_TEMP_LOW_LIMIT_C ) );
-
-    BOOL const dialysateTempRecovered = fabs( dgDialysateTemp - dgTrimmerTempSet ) < DIALYSATE_TEMP_RECOVERY_TOLERANCE_C ? TRUE : FALSE;
-
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
-        {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dgTrimmerTempSet, dgDialysateTemp );
-        }
+        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE, isTDiTempAboveHighSafety, dgDialysateTemp, DIALYSATE_TEMP_HIGH_SAFETY_LIMIT_C );
+        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE,  isTDiTempAboveLowSafety,  dgDialysateTemp, DIALYSATE_TEMP_LOW_SAFETY_LIMIT_C );
 
-        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_LOW, dialysateTempRecovered ) )
-        {
-            clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_LOW );
-        }
+        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTDiTempAboveDialysateTarget, dgDialysateTemp, TDiHigh );
+        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTDiTempBelowDialysateTarget, dgDialysateTemp, TDiLow );
     }
 }