Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7 -rcd9254008b61520e5c62059329f80a84efc0366d
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision cd9254008b61520e5c62059329f80a84efc0366d)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2022 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)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Dong Nguyen
+* @date    (last)      27-Sep-2022
 *
 * @author  (original)  Sean
 * @date    (original)  08-Apr-2020
@@ -32,8 +32,10 @@
 
 // ********** public definitions **********
 
-#define DEFAULT_TARGET_FILL_FLOW_RATE_LPM   0.8     ///< Default target fill flow rate in L/min.
+#define DEFAULT_TARGET_FILL_FLOW_RATE_LPM   0.8F    ///< Default target fill flow rate in L/min.
 #define DRAIN_RESERVOIR_TO_VOLUME_ML        0       ///< Drain reservoir to this volume (in mL) during treatment.
+#define LOAD_CELL_PRIMARY_BACKUP_MAX_ALLOWED_DRIFT_GRAMS  10.0F  ///< Reservoir load cell drift difference allowed
+#define LOAD_CELL_ILLEGAL_WEIGHT_VALUE     -10000.0F ///< Initial value for Load Cells, known bad value
 
 /// DG Concentrate ratios data structure.
 typedef struct
@@ -64,37 +66,11 @@
     F32 tempAvgFill;                                ///< Average fill temperature in C
     F32 tempLastFill;                               ///< Last fill temperature in C
     F32 timereservoirFillMS;                        ///< Reservoir fill time in milliseconds
+    F32 tempRsrvr0ActualTrimmer;                    ///< Temperature actual reservoir in C.
+    F32 tempFillMixAvgTrimmer;                      ///< Temperature fill mix average trimmer in C.
+    F32 tempRsrvrEndFillTrimmer;                    ///< Temperature reservoir end fill trimmer in C.
 } DG_RESERVOIRS_DATA_PAYLOAD_T;
 
-/// 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
-} TEMPERATURE_SENSORS_DATA_T;
-
 /// Payload record structure for a drain reservoir command message.
 typedef struct
 {
@@ -148,6 +124,7 @@
 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 );
 DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void );
 DG_MIXING_RATIOS_T getDGMixingRatios( void );
@@ -178,6 +155,7 @@
 void cmdStartDGChemicalDisinfect( void );
 void cmdStopDGChemicalDisinfect( void );
 void cmdRequestDGMixingRatios( void );
+void cmdSetDGToServiceMode( void );
 
 void handleDGCommandResponse( DG_CMD_RESPONSE_T *dgCmdRespPtr );
 BOOL getDGCommandResponse( U32 commandID, DG_CMD_RESPONSE_T *cmdRespPtr );