Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -r3e9328290bdbc18a940935bd7f7c720ca8432b1d -r6ce44043f6a5fb452ca10c9eca4f081967656a7d --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 3e9328290bdbc18a940935bd7f7c720ca8432b1d) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 6ce44043f6a5fb452ca10c9eca4f081967656a7d) @@ -155,7 +155,7 @@ data.timeReservoirFill2SwitchMS = heatersTempCalc.timeReservoirFill2SwitchMS; data.timeUFDecayMS = heatersTempCalc.timeUFDecayMS; data.tempUFFill = heatersTempCalc.tempUFFill; - data.tempReservoirUseActual = getReservoirActualTemperature(); + data.tempReservoirUseActual = getReservoirCurrentTemperature(); data.tempReservoirEndFill = heatersTempCalc.tempReservoirEndFill; data.tempAvgFill = getAvgFillTemperature(); data.tempLastFill = getLastFillTemperature(); @@ -478,6 +478,19 @@ /*********************************************************************//** * @brief + * The getTrimmerHeaterTargetTemperature function returns the trimmer heater + * target temperature in C. + * @details Inputs: none + * @details Outputs: heatersTempCalc + * @return trimmer target temperature in C + *************************************************************************/ +F32 getTrimmerHeaterTargetTemperature( void ) +{ + return heatersTempCalc.tempTargetTrimmer; +} + +/*********************************************************************//** + * @brief * The getReservoirWeight function returns the small filtered weight * of the reservoir's associated load cell. * @details Inputs: none @@ -613,7 +626,6 @@ F32 tempTargetNumerator; F32 targetTempDenominator; F32 tempReservoirUse; - tempReservoirUse = heatersTempCalc.tempTargetTrimmer + RESERVOIR_EXTRA_TEMPERATURE; heatersTempCalc.tempReservoirEndFill = tempReservoirUse - ( heatersTempCalc.timeReservoirFill2SwitchMS * RsrvrTauCPerMS ); heatersTempCalc.tempReservoir0 = heatersTempCalc.tempReservoirEndFill - ( ( heatersTempCalc.timeReservoirFillMS * 0.5 ) * RsrvrTauCPerMS ); @@ -642,13 +654,13 @@ /*********************************************************************//** * @brief - * The getTrimmerHeaterTargetTemperature function calculates the trimmer - * heater target temperature and returns target temperature value. + * The getReservoirCurrentTemperature function calculates the reservoir's + * current temperature and returns target temperature value. * @details Inputs: heatingConstsCalRecord * @details Outputs: heatersTempCalc * @return primary heater target temperature *************************************************************************/ -F32 getTrimmerHeaterTargetTemperature( void ) +F32 getReservoirCurrentTemperature( void ) { F32 tempRsrvrActual = 0.0; F32 fillROAvgActual = getAvgFillTemperature();