Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -r402885eda2ed755a079c854d1228ac5f76cbec7c -r0a61f7fa5ff6945ebc2e507d8ecb71a652c38eaa
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 402885eda2ed755a079c854d1228ac5f76cbec7c)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 0a61f7fa5ff6945ebc2e507d8ecb71a652c38eaa)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2023 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.h
 *
-* @author  (last)      Dong Nguyen
-* @date    (last)      27-Sep-2022
+* @author  (last)      Sean Nash
+* @date    (last)      08-Mar-2023
 *
 * @author  (original)  Sean
 * @date    (original)  08-Apr-2020
@@ -90,38 +90,13 @@
     U32 flushUIState;                                                        ///< DG flush UI state
 } DG_DISINFECT_UI_STATES_T;
 
-/// Dialysate heating parameters
-typedef struct
-{
-    F32 trimmerTargetTemperature;                                            ///< Trimmer target temperature
-    U32 timeReservoirCycleMS;                                                ///< Reservoir cycle time in milliseconds
-    F32 timeReservoirFillMS;                                                 ///< Reservoir fill time in milliseconds
-    U32 timeReservoirWait2SwitchMS;                                          ///< Reservoir wait to switch time in milliseconds
-    F32 dialysateFlowLPM;                                                    ///< Dialysate flow in L/min
-} DG_CMD_DIALYSATE_HEATING_PARAMS_T;
-
-/// HD version of DG service record
-typedef struct
-{
-    U32 lastServiceDateEpoch;                                                ///< Last service date in epoch
-    U32 serviceIntervalSeconds;                                              ///< Service interval in seconds
-} HD_VERSION_DG_SERVICE_RECORD_T ;
-
-/// HD version of DG usage info
-typedef struct
-{
-    U32 lastHeatDisDateEpoch;                                                ///< Last heat disinfect date in epoch
-    U32 lastChemicalDisDateEpoch;                                            ///< Last chemical disinfect date in epoch
-    BOOL isDisinfected;                                                      ///< Flag to indicate whether DG is disinfected or not
-} HD_VERSION_DG_USAGE_INFO_T;
-
 /// HD version of the DG service record
 typedef struct
 {
-    HD_VERSION_DG_SERVICE_RECORD_T dgServiceRecord;                         ///< HD version of the DG service record.
-    HD_VERSION_DG_USAGE_INFO_T dgUsageInfo;                                 ///< HD version of the DG usage info.
-    BOOL isDGServiceRecordAvailable;                                        ///< Flag to indicate DG service record is available.
-    BOOL isDGUsageInfoAviable;                                              ///< Flag to indicate DG usage info is available.
+    DG_SERVICE_RECORD_T dgServiceRecord;                                     ///< HD version of the DG service record.
+    DG_USAGE_INFO_RECORD_T dgUsageInfo;                                      ///< HD version of the DG usage info.
+    BOOL isDGServiceRecordAvailable;                                         ///< Flag to indicate DG service record is available.
+    BOOL isDGUsageInfoAvailable;                                             ///< Flag to indicate DG usage info is available.
 } DG_SERVICE_AND_USAGE_DATA_T;
 
 // ********** public function prototypes **********
@@ -130,39 +105,39 @@
 
 void execDGInterfaceMonitor( void );
 
-void dialysisResumed( void );
-
 DG_OP_MODE_T getDGOpMode( void );
 U32 getDGSubMode( void );
 DG_RESERVOIR_ID_T getDGActiveReservoir( void );
 DG_RESERVOIR_ID_T getDGInactiveReservoir( void );
 BOOL hasDGCompletedReservoirSwitch( void );
 BOOL getDialysateFlowDataFreshFlag( void );
-F32 getDGDialysateFlowRateLMin( void );
+F32 getDGDialysateFlowRateLMin( void );
+F32 getDGRawDialysateFlowRateLMin( void );
 F32 getLoadCellWeight( LOAD_CELL_ID_T loadCellID );
 F32 getReservoirWeight( DG_RESERVOIR_ID_T resID );
 F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID );
 F32 getReservoirBackupWeightLargeFilter( DG_RESERVOIR_ID_T resID );
 F32 getDialysateTemperature( void );
+F32 getHeatDisinfectTemperatureSensorValue( void );
 DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void );
 DG_MIXING_RATIOS_T getDGMixingRatios( void );
 void getHDVersionDGServiceAndUsageData( DG_SERVICE_AND_USAGE_DATA_T* data );
 
 void setDGOpMode( U32 opMode, U32 subMode );
-void setDialysateTemperatureReadings( F32 temp1, F32 temp2 );
+void setDialysateTemperatureReadings( F32 tdi, F32 tro, F32 thd );
 void setDGReservoirsData( DG_RESERVOIR_ID_T resID, U32 fillVol, U32 drainVol );
-void setDialysateFlowData( F32 flowRate );
+void setDialysateFlowData( FLOW_SENSORS_DATA_T flowRates );
 void setNewLoadCellReadings( F32 res1Primary, F32 res1Backup, F32 res2Primary, F32 res2Backup );
 void setDGDisinfectsStates( DG_DISINFECT_UI_STATES_T states );
 void setDGMixingRatios( DG_MIXING_RATIOS_T ratios );
 void setDGHeatersData( HEATERS_DATA_T *data );
-void setHDVersionDGServiceRecord( HD_VERSION_DG_SERVICE_RECORD_T* data );
-void setHDVersionDGUsageInfo( HD_VERSION_DG_USAGE_INFO_T* data );
+void setHDVersionDGServiceRecord( DG_SERVICE_RECORD_T* data );
+void setHDVersionDGUsageInfo( DG_USAGE_INFO_RECORD_T* data );
 
 void cmdSetDGDialysateHeatingParams( DG_CMD_DIALYSATE_HEATING_PARAMS_T heatingParams );
 void cmdStartDG( void );
 void cmdStopDG( void );
-void cmdSetDGActiveReservoir( DG_RESERVOIR_ID_T resID );
+void cmdSetDGActiveReservoir( DG_SWITCH_RSRVRS_CMD_T *cmd );
 void cmdChangeDGValveSetting( DG_VALVE_SETTING_ID_T valveSettingID );
 void cmdStartDGFill( U32 fillToVolMl, F32 targetFlowLPM );
 void cmdStopDGFill( void );