Index: firmware/App/Modes/FPModes/FlushConcentrate.c =================================================================== diff -u -rfd21e08ba076054488aa112641e0db4191ee0b35 -recb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e --- firmware/App/Modes/FPModes/FlushConcentrate.c (.../FlushConcentrate.c) (revision fd21e08ba076054488aa112641e0db4191ee0b35) +++ firmware/App/Modes/FPModes/FlushConcentrate.c (.../FlushConcentrate.c) (revision ecb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e) @@ -48,7 +48,6 @@ #define CONCENTRATE_FLUSH_WAIT_FOR_TANK_FULL_TIMEOUT ( 60 * MS_PER_SECOND ) ///< Concentrate flush wait for tank full timer (in ms) #define CONCENTRATE_FLUSH_WAIT_FOR_TANK_FULL_TGT_FLOW 700 ///< target flow rate for waiting for tank state - // ********** private data ********** static const F32 CONCENTRATE_FLOW_INTEGRATOR = 1.0F / (F32)( SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ); ///< Multiplier to convert flow (mL/min) into volume (mL) for period of general task interval. @@ -142,8 +141,8 @@ /*********************************************************************//** * @brief * The handleConcentrateFlushProgressState handles the in progress state of Concentrate flush - * @details \b Inputs: none - * @details \b Outputs: none + * @details \b Inputs: concentrateFlushTimer + * @details \b Outputs: isFlushComplete * @return the next state of Concentrate flush state *************************************************************************/ static FP_CONC_FLUSH_STATE_T handleConcentrateFlushProgressState( void ) @@ -166,8 +165,9 @@ /*********************************************************************//** * @brief - * The handleConcentrateFlushWaitForTankFullState handles the in progress state of Concentrate flush - * @details \b Inputs: none + * The handleConcentrateFlushWaitForTankFullState handles the wait for + * tank full state of Concentrate flush + * @details \b Inputs: concentrateFlushTankFullTimer * @details \b Outputs: none * @return the next state of Concentrate flush state *************************************************************************/ @@ -193,9 +193,9 @@ /*********************************************************************//** * @brief - * The handleConcentrateFlushProgressState handles the in progress state of Concentrate flush - * @details \b Inputs: none - * @details \b Outputs: none + * The handleConcentrateFlushPausedState handles the paused state of Concentrate flush + * @details \b Inputs: pendingStartConcentrateFlushRequest + * @details \b Outputs: isFlushComplete, pendingStartConcentrateFlushRequest * @return the next state of Concentrate flush state *************************************************************************/ static FP_CONC_FLUSH_STATE_T handleConcentrateFlushPausedState( void ) @@ -272,10 +272,10 @@ setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - if ( TRUE == isBoostPumpInstalled() ) { - signalBoostPumpHardStop(); + F32 currentDutyCyclePct = getCurrentBoostPumpDutyCyclePCT(); + setBoostPumpTargetDutyCycle( currentDutyCyclePct ); } signalROPumpHardStop(); }