Index: firmware/App/Controllers/DrainPump.c =================================================================== diff -u -rd3819286869611f9c02add72a0f8e321598fdf42 -r24e8fcb5744724be72ea26bebd95ec594c2c26fe --- firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision d3819286869611f9c02add72a0f8e321598fdf42) +++ firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision 24e8fcb5744724be72ea26bebd95ec594c2c26fe) @@ -116,7 +116,7 @@ static DRAIN_PUMP_STATE_T pendingDrainPumpCmd = DRAIN_PUMP_OFF_STATE; ///< Delayed (pending) drain pump command. static F32 pendingDrainPumpCmdTarget = 0.0; ///< Delayed (pending) drain pump command target (rpm or PSI depending on command). static U32 pendingDrainPumpCmdCountDown = 0; ///< Delayed (pending) drain pump command count down timer (in task intervals). -static F32 modeRecircTargetFlushVolL = 0.0; ///< Mode recirculation target flush volume in liters. +static F32 targetFlushLineVolume_L = 0.0; ///< Target flush volume in liters. /// ADC to RPM conversion coefficient or RPM to ADC conversion. static const F32 CONVERSION_COEFF = SEC_PER_MIN / ( 2 * TOGGLE_PERIOD_RESOLUTION_SECONDS * ROTATIONAL_TO_TOGGLE_PERIOD_CONVERSION ); @@ -142,7 +142,7 @@ stopDrainPump(); hasClosedLoopBeenRequested = FALSE; - modeRecircTargetFlushVolL = 0.0; + targetFlushLineVolume_L = 0.0; // Initialize the drain pump PI controller initializePIController( PI_CONTROLLER_ID_DRAIN_PUMP, DRAIN_PUMP_MIN_DAC, @@ -485,15 +485,14 @@ /*********************************************************************//** * @brief - * The getRecirculationDrainVol function returns the mode recirculation - * target flush volume. - * @details Inputs: modeRecircTargetFlushVolL + * The getFlushLineVolume function returns the target flush line volume. + * @details Inputs: targetFlushLineVolume_L * @details Outputs: none - * @return modeRecircTargetFlushVolL which is a float + * @return the target flush line volume in Liter *************************************************************************/ -F32 getRecirculationDrainVol( void ) +F32 getFlushLineVolume( void ) { - return modeRecircTargetFlushVolL; + return targetFlushLineVolume_L; } /*********************************************************************//** @@ -661,7 +660,7 @@ } // The calibration data was valid, update the local copy - modeRecircTargetFlushVolL = calData.volume; + targetFlushLineVolume_L = calData.volume; return status; }