Index: firmware/App/Services/Reservoirs.h =================================================================== diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -r3b70632c04247a6973960e1f37ae73eb4384a6b7 --- firmware/App/Services/Reservoirs.h (.../Reservoirs.h) (revision 22176ce95e49213c48454f34ddf5d29b8109f2cb) +++ firmware/App/Services/Reservoirs.h (.../Reservoirs.h) (revision 3b70632c04247a6973960e1f37ae73eb4384a6b7) @@ -7,8 +7,8 @@ * * @file Reservoirs.h * -* @author (last) Dara Navaei -* @date (last) 07-Mar-2022 +* @author (last) Michael Garthwaite +* @date (last) 08-Aug-2022 * * @author (original) Sean * @date (original) 18-Mar-2020 @@ -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 ********** @@ -109,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 ); @@ -124,7 +128,8 @@ BOOL testSetReservoirFillVolumeMlOverride( U32 value ); BOOL testResetReservoirFillVolumeMlOverride( void ); BOOL testSetReservoirDrainVolumeMlOverride( U32 value ); -BOOL testResetReservoirDrainVolumeMlOverride( void ); +BOOL testResetReservoirDrainVolumeMlOverride( void ); +BOOL testTareReservoir( U32 value ); /**@}*/