Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -rf8bb43e62a4d10b64d8b197e372a56adfcfb88b9 -re0fc678329b0cb25dd76fa5e23cc1f487851f0ec --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision f8bb43e62a4d10b64d8b197e372a56adfcfb88b9) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision e0fc678329b0cb25dd76fa5e23cc1f487851f0ec) @@ -589,6 +589,28 @@ /*********************************************************************//** * @brief + * The getConcentratePumpDosingStatus function returns the dosing status + * for a given concentrate pump. + * @details \b Inputs: concentratePumps + * @details \b Outputs: none + * @param pumpId concentrate pump id to get current dosing status + * @return the current doisng status/state for the given conecntrate pump. + *************************************************************************/ +BOOL getConcentratePumpDosingStatus( CONCENTRATE_PUMPS_T pumpId ) +{ + BOOL state = FALSE; + + //On dosing completion,state transition to off state + if ( CONCENTRATE_PUMP_OFF_STATE == concentratePumps[ pumpId ].execState ) + { + state = TRUE; + } + + return state; +} + +/*********************************************************************//** + * @brief * The getPumpTargetSpeed function gets the current target spped for the given * concentrate pump. * @details \b Inputs: pumpTargetSpeed @@ -698,28 +720,6 @@ /*********************************************************************//** * @brief - * The IsConcentratePumpDosingCompleted function gets the concentrate pump - * dosing completion status. - * @details \b Inputs: execState - * @details \b Outputs: none - * @return true when dosing completed,otherwise false. - *************************************************************************/ -BOOL IsConcentratePumpDosingCompleted( void ) -{ - BOOL result = FALSE; - - // Check doisng completed status - if ( ( concentratePumps[D11_PUMP].execState == CONCENTRATE_PUMP_OFF_STATE ) && - ( concentratePumps[D10_PUMP].execState == CONCENTRATE_PUMP_OFF_STATE ) ) - { - result = TRUE; - } - - return result; -} - -/*********************************************************************//** - * @brief * The getConcPumpCurrentMeasuredRevolutionCount function gets the concentrate pump * current measured revolution count. * @details \b Inputs: pumpMesauredRevCnt