Index: firmware/App/Services/Reservoirs.h =================================================================== diff -u -rc71859467ae9ff4058d9fc4abeae23ee86a7cb69 -r84989e158824d6cc8d8747ca80c6419315cc951c --- firmware/App/Services/Reservoirs.h (.../Reservoirs.h) (revision c71859467ae9ff4058d9fc4abeae23ee86a7cb69) +++ firmware/App/Services/Reservoirs.h (.../Reservoirs.h) (revision 84989e158824d6cc8d8747ca80c6419315cc951c) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2024 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) Dara Navaei -* @date (last) 30-Mar-2023 +* @author (last) Darren Cox +* @date (last) 15-Feb-2024 * * @author (original) Sean * @date (original) 18-Mar-2020 @@ -84,9 +84,6 @@ 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 ********** @@ -108,6 +105,7 @@ DG_RESERVOIR_ID_T getInactiveReservoir( void ); F32 getReservoirWeight( DG_RESERVOIR_ID_T reservoirId ); +BOOL isReservoirTransferInProgress( void ); void setDialysateHeatingParameters( DG_CMD_DIALYSATE_HEATING_PARAMS_T params ); U32 getTargetFillVolumeML( void ); @@ -137,7 +135,9 @@ BOOL testSetReservoirDrainVolumeMlOverride( U32 value ); BOOL testResetReservoirDrainVolumeMlOverride( void ); BOOL testTareReservoir( U32 value ); -BOOL testSetDialysateMixingRatios( F32 acid, F32 bicarb ); +BOOL testSetDialysateMixingRatios( F32 acid, F32 bicarb ); +BOOL testSetReservoirDataPublishIntervalOverride( U32 value ); +BOOL testResetReservoirDataPublishIntervalOverride( void ); /**@}*/