Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -reeb4e9c7c8ca2bc41168353c3d30f311080972b2 -r3b70632c04247a6973960e1f37ae73eb4384a6b7
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision eeb4e9c7c8ca2bc41168353c3d30f311080972b2)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 3b70632c04247a6973960e1f37ae73eb4384a6b7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 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    Reservoirs.h
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Michael Garthwaite
+* @date    (last)      08-Aug-2022
 *
 * @author  (original)  Sean
 * @date    (original)  18-Mar-2020
@@ -33,7 +33,7 @@
 // ********** public definitions **********
 
 #define MAX_RESERVOIR_VOLUME_ML         2000            ///< Maximum reservoir volume in mL.
-#define RESERVOIR_EXTRA_TEMPERATURE     2.0             ///< Reservoirs extra margin temperature.
+#define RESERVOIR_EXTRA_TEMPERATURE     2.0F            ///< Reservoirs extra margin temperature.
 
 /// Fill command data structure.
 typedef struct
@@ -85,6 +85,9 @@
     F32 tempAvgFill;                                    ///< Average fill temperature
     F32 tempLastFill;                                   ///< Last fill temperature
     F32 timereservoirFill;                              ///< 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.
 } RESERVOIR_DATA_T;
 
 // ********** public function prototypes **********
@@ -101,9 +104,6 @@
 void startDrainCmd( DRAIN_CMD_T drainCmd );                         // handle drain command from HD
 void stopDrainCmd( void );                                          // handle stop drain command from HD
 
-void tareReservoir( void );
-void resetReservoirsLowestWeight( void );
-
 DG_RESERVOIR_ID_T getInactiveReservoir( void );
 F32  getReservoirWeight( DG_RESERVOIR_ID_T reservoirId );
 
@@ -112,6 +112,7 @@
 F32  getTargetFillFlowRateLPM( void );
 F32  getReservoirActualTemperature( void );
 F32  getPrimaryHeaterTargetTemperature( void );
+F32  getTrimmerHeaterTargetTemperature( void );
 F32  getTargetDialysateFlowLPM( void );
 
 DG_RESERVOIR_VOLUME_RECORD_T getReservoirsCalRecord( void );
@@ -120,13 +121,15 @@
 BOOL hasTargetDrainVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId, U32 timeout );
 void tareLoadCellsAtEmpty( DG_RESERVOIR_ID_T reservoirId );
 BOOL isReservoirTarePending( void );
+void initDrainParameters( DG_RESERVOIR_ID_T reservoirId );
 
 BOOL testSetDGActiveReservoirOverride( DG_RESERVOIR_ID_T value );
 BOOL testResetDGActiveReservoirOverride( void );
 BOOL testSetReservoirFillVolumeMlOverride( U32 value );
 BOOL testResetReservoirFillVolumeMlOverride( void );
 BOOL testSetReservoirDrainVolumeMlOverride( U32 value );
-BOOL testResetReservoirDrainVolumeMlOverride( void );
+BOOL testResetReservoirDrainVolumeMlOverride( void );
+BOOL testTareReservoir( U32 value );
 
 /**@}*/