Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -r954107454f4c5d4cfbdfaefda5cc1cd15b1e18ac -rea0ed778cde80abbb042a8a0a8ef56b3a434dfb2
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 954107454f4c5d4cfbdfaefda5cc1cd15b1e18ac)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision ea0ed778cde80abbb042a8a0a8ef56b3a434dfb2)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 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
+* @file    DGInterface.h
 *
-* @author (last) Sean Nash
-* @date (last) 05-Oct-2020
+* @author  (last)      Quang Nguyen
+* @date    (last)      09-Aug-2021
 *
-* @author (original) Sean
-* @date (original) 08-Apr-2020
+* @author  (original)  Sean
+* @date    (original)  08-Apr-2020
 *
 ***************************************************************************/
 
@@ -54,30 +54,30 @@
 /// Payload record structure for DG temperature sensors data message.
 typedef struct
 {
-    F32 inletPrimaryHeater;                     ///< Inlet primary heater temperature sensor
-    F32 outletPrimaryHeater;                    ///< Outlet primary heater temperature sensor
-    F32 conductivitySensor1;                    ///< Conductivity sensor 1 temperature sensor
-    F32 conductivitySensor2;                    ///< Conductivity sensor 2 temperature sensor
-    F32 outletRedundant;                        ///< Outlet redundant temperature sensor
-    F32 inletDialysate;                         ///< Inlet dialysate temperature sensor
-    F32 primaryHeaterThermocouple;              ///< Primary heaters thermocouple sensor
-    F32 trimmerHeaterThermocouple;              ///< Trimmer heater thermocouple sensor
-    F32 priamyHeaterColdjunction;               ///< Primary heaters cold junction temperature sensor
-    F32 trimmerHeaterColdjunction;              ///< Trimmer heater cold junction temperature sensor
-    F32 primaryHeaterInternal;                  ///< Primary heaters internal temperature (calculated from thermocouple and cold junction)
-    F32 trimmerHeaterInternal;                  ///< Trimmer heater internal temperature (calculated from thermocouple and cold junction)
-    F32 fpgaBoard;                              ///< FPGA board temperature sensor
-    F32 loadCellA1B1;                           ///< Load cell A1/B1 temperature sensor
-    F32 loadCellA2B2;                           ///< Load cell A2/B2 temperature sensor
-    F32 internalTHDORTD;                        ///< THDo RTD channel temperature sensor
-    F32 internalTDIRTD;                         ///< TDI RTD channel temperature sensor
-    F32 internalCondSnsrTemp;                   ///< Conductivity Sensor internal temperature sensor
-    U32 primaryThermoCoupleRaw;                 ///< Primary heaters thermocouple raw ADC value
-    U32 primaryColdjuncRaw;                     ///< Primary heaters cold junction raw ADC value
-    U32 trimmerThermoCoupleRaw;                 ///< Trimmer heater thermocouple raw ADC value
-    U32 trimmerColdjuncRaw;                     ///< Trimmer heater cold junction raw ADC value
-    S32 cond1Raw;                               ///< Conductivity sensor 1 raw temperature ADC value
-    S32 cond2Raw;                               ///< Conductivity sensor 2 raw temperature ADC value
+    F32 TPi;                                        ///< Inlet primary heaters temperature sensor
+    F32 TPo;                                        ///< Outlet primary heaters temperature sensor
+    F32 TD1;                                        ///< Conductivity sensor 1 temperature sensor
+    F32 TD2;                                        ///< Conductivity sensor 2 temperature sensor
+    F32 TRo;                                        ///< Outlet redundant temperature sensor
+    F32 TDi;                                        ///< Inlet dialysate temperature sensor
+    F32 HtrPrimThermo;                              ///< Primary heaters internal temperature sensor
+    F32 HtrTrimThermo;                              ///< Trimmer heater internal temperature sensor
+    F32 HtrPrimColdJunc;                            ///< Primary heaters cold junction temperature sensor
+    F32 HtrTrimColdJunc;                            ///< Trimmer heater cold junction temperature sensor
+    F32 HtrPrimInternal;                            ///< Primary heaters internal temperature
+    F32 HtrTrimInternal;                            ///< Trimmer heater internal temperature
+    F32 DGBoardTemp;                                ///< DG board temperature
+    F32 ResOneLoadCellTemp;                         ///< Reservoir 1 load cell sensor temperature
+    F32 ResTwoLoadCellTemp;                         ///< Reservoir 2 load cell sensor temperature
+    F32 THDoInternalTemp;                           ///< THDo RTD channel temperature sensor
+    F32 TDiInternalTemp;                            ///< TDI RTD channel temperature sensor
+    F32 internalCondSnsrTemp;                       ///< Conductivity Sensor internal temperature sensor
+    U32 primaryThermoCoupleRaw;                     ///< Primary heaters thermocouple raw ADC value
+    U32 primaryColdjuncRaw;                         ///< Primary heaters cold junction raw ADC value
+    U32 trimmerThermoCoupleRaw;                     ///< Trimmer heater thermocouple raw ADC value
+    U32 trimmerColdjuncRaw;                         ///< Trimmer heater cold junction raw ADC value
+    S32 cond1Raw;                                   ///< Conductivity sensor 1 raw temperature ADC value
+    S32 cond2Raw;                                   ///< Conductivity sensor 2 raw temperature ADC value
 } TEMPERATURE_SENSORS_DATA_T;
 
 /// Payload record structure for a drain reservoir command message.
@@ -124,8 +124,8 @@
 F32 getLoadCellWeight( LOAD_CELL_ID_T loadCellID );
 F32 getReservoirWeight( DG_RESERVOIR_ID_T resID );
 F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID );
-F32 getDialysateTemperature( void );
 DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void );
+F32 getDialysateTemperature( void );
 
 void setDGOpMode( U32 opMode, U32 subMode );
 void setDialysateTemperatureReadings( F32 temp1, F32 temp2 );
@@ -156,6 +156,8 @@
 void handleDGCommandResponse( DG_CMD_RESPONSE_T *dgCmdRespPtr );
 BOOL getDGCommandResponse( U32 commandID, DG_CMD_RESPONSE_T *cmdRespPtr );
 
+void checkDialysateTemperature( void );
+
 BOOL testSetDialOutLoadCellWeightOverride( U32 sensor, F32 value );
 BOOL testResetDialOutLoadCellWeightOverride( U32 sensor );