Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -rc68065fe2cfcfee46eae9d8a8af68b42b662661c -re01f7b4be218971dafea65aa21e3ae4d3b4ab610 --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision c68065fe2cfcfee46eae9d8a8af68b42b662661c) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision e01f7b4be218971dafea65aa21e3ae4d3b4ab610) @@ -7,8 +7,8 @@ * * @file Reservoirs.c * -* @author (last) Dara Navaei -* @date (last) 12-Jul-2023 +* @author (last) Sean Nash +* @date (last) 18-Jul-2023 * * @author (original) Dara Navaei * @date (original) 21-Nov-2021 @@ -192,17 +192,10 @@ // Calculate volume used from active reservoir - do not accumulate if not performing dialysis or saline bolus is in progress if ( ( TREATMENT_DIALYSIS_STATE == getTreatmentState() ) && ( getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) ) { -#ifdef DIALYZER_REPRIME_ENABLED - if ( getDialysisState() != DIALYSIS_DIALYZER_REPRIME_STATE ) - { -#endif - volSpentML += ( flowRateMLPerMS * msSinceLastVolumeCalc ); - timeReservoirInUse++; - // Check the recirculation level - recirculationLevelPct = volSpentML / (F32)FILL_RESERVOIR_TO_VOLUME_ML; -#ifdef DIALYZER_REPRIME_ENABLED - } -#endif + volSpentML += ( flowRateMLPerMS * msSinceLastVolumeCalc ); + timeReservoirInUse++; + // Check the recirculation level + recirculationLevelPct = volSpentML / (F32)FILL_RESERVOIR_TO_VOLUME_ML; } // Update the reservoir start time @@ -245,20 +238,6 @@ /*********************************************************************//** * @brief - * The setDialysateHeatingParams function is an API to call other internal - * functions to set the trimmer's heater target temperature and times that are - * required to calculated the heaters target temperature in DG. - * @details Inputs: none - * @details Outputs: none - * @return none - *************************************************************************/ -void setDialysateHeatingParams( void ) -{ - calculateActiveReservoirCycleTime(); -} - -/*********************************************************************//** - * @brief * The getLastReservoirUFTimeInMs function returns the reservoir ultrafiltration * time (in ms) for the last reservoir used in treatment. * @details Inputs: none