Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rc25d707f6f5f2463639425e2efd6876bed974304 -r7a1c1fe89abb13803db1961146b7b0d97574de16
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision c25d707f6f5f2463639425e2efd6876bed974304)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 7a1c1fe89abb13803db1961146b7b0d97574de16)
@@ -7,8 +7,8 @@
 *
 * @file    DGInterface.c
 *
-* @author  (last)      Dong Nguyen
-* @date    (last)      27-Sep-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      19-Oct-2022
 *
 * @author  (original)  Sean
 * @date    (original)  08-Apr-2020
@@ -24,7 +24,7 @@
 #include "ModeInitPOST.h"
 #include "ModeTreatment.h"
 #include "ModeTreatmentParams.h"
-#include "OperationModes.h"
+#include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
@@ -57,13 +57,15 @@
 static const U32 DIP_RESERVOIRS_DATA_MESSAGE_ALARM_THRESHOLD = ((2 * MS_PER_SECOND) / TASK_GENERAL_INTERVAL);
 static const U32 DIP_DG_OP_MODE_DATA_MESSAGE_ALARM_THRESHOLD = ((2 * MS_PER_SECOND) / TASK_GENERAL_INTERVAL);
 
-// DG status
-static DG_OP_MODE_T dgCurrentOpMode = DG_MODE_INIT;             ///< Current DG operation mode.
-static U32 dgSubMode = 0;                                       ///< Current state (sub-mode) of current DG operation mode.
-static BOOL dgStartCommandSent = FALSE;                         ///< Flag indicates command to start DG has been sent.
-static BOOL dgStarted = FALSE;                                  ///< Flag indicates whether we have commanded the DG to start or stop.
-static BOOL dgTrimmerHeaterOn = FALSE;                          ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
+// ********** private data **********
 
+// DG status
+static DG_OP_MODE_T dgCurrentOpMode;                                        ///< Current DG operation mode.
+static U32 dgSubMode;                                                       ///< Current state (sub-mode) of current DG operation mode.
+static BOOL dgStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
+static BOOL dgStarted;                                                      ///< Flag indicates whether we have commanded the DG to start or stop.
+static BOOL dgTrimmerHeaterOn;                                              ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
+
 // State machine states
 static U32 timeStartMS = 0; // TODO is this needed?
 
@@ -107,13 +109,17 @@
 
 static DG_DISINFECT_UI_STATES_T disinfectsStatus;               ///< DG disinfects status.
 static DG_MIXING_RATIOS_T dgMixingRatios;                       ///< DG mixing ratios.
+static HEATERS_DATA_T dgHeatersData;                            ///< DG heaters data.
+static DG_SERVICE_AND_USAGE_DATA_T dgServiceAndUsageData;       ///< DG service and usage data.
 
 // DG command response
 static DG_CMD_RESPONSE_T dgCmdResp[ NUM_OF_DG_COMMANDS ];       ///< Keep the latest DG command response for each command.
 
 // ********** private function prototypes **********
 
 static void checkDGRestart( void );
+static void checkDGTrimmerHeaterStatus( void );
+static void checkDGDataFreshness( ALARM_ID_T alarmID, BOOL *dgFreshDataFlag );
 
 /*********************************************************************//**
  * @brief
@@ -196,7 +202,7 @@
  * @param flag to signal the fresh data processing
  * @return None
  *************************************************************************/
-void checkDGDataFreshness( ALARM_ID_T alarmID, BOOL *dgFreshDataFlag )
+static void checkDGDataFreshness( ALARM_ID_T alarmID, BOOL *dgFreshDataFlag )
 {
     if ( TRUE == *dgFreshDataFlag )
     {
@@ -229,7 +235,7 @@
 void execDGInterfaceMonitor( void )
 {
     // Trigger alarm if not receiving new load cell data message in timely manner
-    checkDGDataFreshness( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag );
+    /*checkDGDataFreshness( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag );
 
     // Trigger alarm if not receiving new dialysate temperature data message in timely manner
     checkDGDataFreshness( ALARM_ID_HD_NEW_DIALYSATE_TEMPERATURE_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag );
@@ -240,8 +246,19 @@
     // Trigger alarm if not receiving new DG op mode message in timely manner
     checkDGDataFreshness( ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag );
 
+<<<<<<< HEAD
+    // Check to see if DG has restarted*/
+
+    // Trigger alarm if not receiving new DG op mode message in timely manner
+    //checkDGDataFreshness( ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE, &dgDialysateFlowDataFreshFlag ); // DN-31OCT2022 - TODO: Will remove this line???
+
+=======
+>>>>>>> DEN-14150-hd-dialysate-flow-estimation
     // Check to see if DG has restarted
     checkDGRestart();
+
+    // Check the status of the trimmer heater
+    checkDGTrimmerHeaterStatus();
 }
 
 /*********************************************************************//**
@@ -406,6 +423,22 @@
 
 /*********************************************************************//**
  * @brief
+ * The getReservoirWeight function gets the load cell weight of a given reservoir.
+ * @details Inputs: loadCellWeightInGrams[]
+ * @details Outputs: none
+ * @param resID ID of reservoir to get weight for
+ * @return the current weight of the given reservoir in grams
+ *************************************************************************/
+F32 getReservoirWeight( DG_RESERVOIR_ID_T resID )
+{
+    LOAD_CELL_ID_T lc = ( DG_RESERVOIR_1 == resID ? LOAD_CELL_RESERVOIR_1_PRIMARY : LOAD_CELL_RESERVOIR_2_PRIMARY );
+    F32 wt = getLoadCellWeight( lc );
+
+    return wt;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getReservoirBackupWeightLargeFilter function gets the backup load cell weight
  * of the given reservoir after large (32 sample) filter applied.
  * @details Inputs: lgFilteredReservoirWeightInGrams[]
@@ -427,26 +460,26 @@
 
 /*********************************************************************//**
  * @brief
- * The getDialysateTemperature function gets the latest dialysate temperature.
- * @details Inputs: dgDialysateTemp
+ * The getDGDisinfectsStates function returns the DG disinfects readings.
+ * @details Inputs: none
  * @details Outputs: none
- * @return the current dialysate temperature
+ * @return the current DG disinfects readings
  *************************************************************************/
-F32 getDialysateTemperature( void )
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
 {
-    return dgDialysateTemp;
+    return disinfectsStatus;
 }
 
 /*********************************************************************//**
  * @brief
- * The getDGDisinfectsStates function returns the DG disinfects readings.
- * @details Inputs: none
+ * The getDialysateTemperature function gets the latest dialysate temperature.
+ * @details Inputs: dgDialysateTemp
  * @details Outputs: none
- * @return the current DG disinfects readings
+ * @return the current dialysate temperature
  *************************************************************************/
-DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
+F32 getDialysateTemperature( void )
 {
-    return disinfectsStatus;
+    return dgDialysateTemp;
 }
 
 /*********************************************************************//**
@@ -464,26 +497,25 @@
 
 /*********************************************************************//**
  * @brief
- * The getReservoirWeight function gets the load cell weight of a given reservoir.
- * @details Inputs: loadCellWeightInGrams[]
+ * The getHDVersionDGServiceAndUsageData function copies the HD version of
+ * the DG service and usage data into the provided buffer.
+ * @details Inputs: dgServiceAndUsageData
  * @details Outputs: none
- * @param resID ID of reservoir to get weight for
- * @return the current weight of the given reservoir in grams
+ * @param data which is a pointer of type DG_SERVICE_AND_USAGE_DATA_T that
+ * is the provided buffer
+ * @return none
  *************************************************************************/
-F32 getReservoirWeight( DG_RESERVOIR_ID_T resID )
+void getHDVersionDGServiceAndUsageData( DG_SERVICE_AND_USAGE_DATA_T* data )
 {
-    LOAD_CELL_ID_T lc = ( DG_RESERVOIR_1 == resID ? LOAD_CELL_RESERVOIR_1_PRIMARY : LOAD_CELL_RESERVOIR_2_PRIMARY );
-    F32 wt = getLoadCellWeight( lc );
-
-    return wt;
+    memcpy( data, &dgServiceAndUsageData, sizeof( DG_SERVICE_AND_USAGE_DATA_T ) );
 }
 
 /*********************************************************************//**
  * @brief
  * The setDGOpMode function sets the latest DG operating mode reported by
  * the DG.
  * @details Inputs: none
- * @details Outputs: dgCurrentOpMode, dgSubMode
+ * @details Outputs: dgCurrentOpMode, dgSubMode, dgOpModeDataFreshFlag
  * @param opMode operating mode reported by DG
  * @param subMode sub-mode (current state) of operating mode reported by DG
  * @return none
@@ -508,7 +540,8 @@
  * The setDialysateTemperatureReadings function sets the latest dialysate
  * temperatures reported by the DG.
  * @details Inputs: none
- * @details Outputs: dgDialysateTemp, dgRedundantDialysateTemp
+ * @details Outputs: dgDialysateTemp, dgRedundantDialysateTemp,
+ * dgDialysateTemperatureDataFreshFlag
  * @param temp1 dialysate temperature reported by DG
  * @param temp2 redundant dialysate temperature reported by DG
  * @return none
@@ -526,7 +559,8 @@
  * The setDGReservoirsData function sets the latest reservoir data
  * reported by the DG.
  * @details Inputs: none
- * @details Outputs: dgActiveReservoir, dgReservoirFillVolumeTarget, dgReservoirDrainVolumeTarget
+ * @details Outputs: dgActiveReservoir, dgReservoirFillVolumeTarget,
+ * dgReservoirDrainVolumeTarget, dgReservoirsDataFreshFlag
  * @param resID ID of active reservoir
  * @param fillVol Reservoir fill to volume reported by DG
  * @param drainVol Reservoir drain to volume reported by DG
@@ -553,7 +587,7 @@
  * The setDialysateFlowData function sets the latest dialysate flow rate
  * and its freshness status. The dialysate flow data is reported by the DG.
  * @details Inputs: none
- * @details Outputs: dgDialysateFlowRateMlMin
+ * @details Outputs: dgDialysateFlowRateMlMin, dgDialysateFlowDataFreshFlag
  * @param flowRate latest dialysate flow rate (mL/min) reported by DG
  * @return none
  *************************************************************************/
@@ -576,7 +610,8 @@
  * every 100 ms.
  * @details Inputs: none
  * @details Outputs: loadCellWeightInGrams[], smFilteredReservoirWeightInGrams[],
- * lgFilteredReservoirWeightInGrams[]
+ * lgFilteredReservoirWeightInGrams[], lgLoadCellReadingsTotal[],
+ * lgLoadCellBackupReadingsTotal[], lgLoadCellReadingsIdx, dgLoadCellDataFreshFlag
  * @param res1Primary New weight from primary load cell of reservoir 1
  * @param res1Backup New weight from backup load cell of reservoir 1
  * @param res2Primary New weight from primary load cell of reservoir 2
@@ -642,11 +677,56 @@
  *************************************************************************/
 void setDGMixingRatios( DG_MIXING_RATIOS_T ratios )
 {
-    memcpy( &dgMixingRatios, &ratios, sizeof(DG_MIXING_RATIOS_T) );
+    memcpy( &dgMixingRatios, &ratios, sizeof( DG_MIXING_RATIOS_T ) );
 }
 
 /*********************************************************************//**
  * @brief
+ * The setDGHeatersData function sets heaters data that has been read from DG.
+ * @details Inputs: none
+ * @details Outputs: dgHeatersData
+ * @param data which is a pointer to the received heaters data
+ * @return none
+ *************************************************************************/
+void setDGHeatersData( HEATERS_DATA_T *data )
+{
+    memcpy( &dgHeatersData, data, sizeof( HEATERS_DATA_T ) );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The setHDVersionDGServiceRecord function sets the HD version of the DG
+ * service record.
+ * @details Inputs: none
+ * @details Outputs: dgServiceAndUsageData
+ * @param data which is a pointer to the received HD version of the DG service
+ * record
+ * @return none
+ *************************************************************************/
+void setHDVersionDGServiceRecord( HD_VERSION_DG_SERVICE_RECORD_T* data )
+{
+    dgServiceAndUsageData.isDGServiceRecordAvailable = TRUE;
+    memcpy( &dgServiceAndUsageData.dgServiceRecord, data, sizeof( HD_VERSION_DG_SERVICE_RECORD_T ) );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The setHDVersionDGUsageInfo function sets the HD version of the DG
+ * usage information.
+ * @details Inputs: none
+ * @details Outputs: dgServiceAndUsageData
+ * @param data which is a pointer to the received HD version of the DG usage
+ * info
+ * @return none
+ *************************************************************************/
+void setHDVersionDGUsageInfo( HD_VERSION_DG_USAGE_INFO_T* data )
+{
+    dgServiceAndUsageData.isDGUsageInfoAviable = TRUE;
+    memcpy( &dgServiceAndUsageData.dgUsageInfo, data, sizeof( HD_VERSION_DG_USAGE_INFO_T ) );
+}
+
+/*********************************************************************//**
+ * @brief
  * The cmdSetDGDialysateHeatingParams function sends the dialysate heating
  * parameters to DG.
  * @details Inputs: none
@@ -1044,6 +1124,7 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
+        // Per PRS 377, PRS 124
         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 );
 
@@ -1080,7 +1161,35 @@
     }
 }
 
+/*********************************************************************//**
+ * @brief
+ * The checkDGTrimmerHeaterStatus function checks to see the status of the
+ * trimmer heater and set them according to the status of the trimmer heater flag.
+ * @details Inputs: dgTrimmerHeaterOn, dgHeatersData
+ * @details Outputs: none
+ * @return none
+ *************************************************************************/
+static void checkDGTrimmerHeaterStatus( void )
+{
+    U32 trimmerState  = dgHeatersData.trimmerHeaterState;
+    DG_OP_MODE_T dgOp = getDGOpMode();
 
+    if ( ( DG_MODE_GENE == dgOp ) || ( DG_MODE_FILL == dgOp ) || ( DG_MODE_DRAI == dgOp ) )
+    {
+        // In heat disinfect and chemical disinfect, the trimmer heater is controlled by the DG itself so no commands from HD should be sent
+        // regarding the trimmer heater.
+        if ( ( TRUE == dgTrimmerHeaterOn ) && ( HEATER_EXEC_STATE_OFF == trimmerState ) )
+        {
+            cmdStartDGTrimmerHeater();
+        }
+        else if ( ( FALSE == dgTrimmerHeaterOn ) && ( trimmerState != HEATER_EXEC_STATE_OFF ) )
+        {
+            cmdStopDGTrimmerHeater();
+        }
+    }
+}
+
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/