Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -raa7b1f5f68aae23c1c52b32658fcb625c29accfb -rd0e6b55d2fed933caec5ca8f5b8f19c7f4d7ecea
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision aa7b1f5f68aae23c1c52b32658fcb625c29accfb)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision d0e6b55d2fed933caec5ca8f5b8f19c7f4d7ecea)
@@ -100,28 +100,13 @@
     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 isDGUsageInfoAviable;                                               ///< Flag to indicate DG usage info is available.
 } DG_SERVICE_AND_USAGE_DATA_T;
 
 // ********** public function prototypes **********
@@ -144,20 +129,21 @@
 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 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 );