Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -re0c45c725884d780b76dd54a617ab6ed333d7ba2 -rae31b4c999dccae70fb40fb9d98a4380ce2c7415 --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision e0c45c725884d780b76dd54a617ab6ed333d7ba2) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision ae31b4c999dccae70fb40fb9d98a4380ce2c7415) @@ -734,13 +734,13 @@ * @param pumpId concentrate pump id to get target revolution count * @return the target revolution count for the given concentrate pump *************************************************************************/ -U16 getConcPumpTargetRevolutionCount( CONCENTRATE_PUMPS_T pumpId ) +U32 getConcPumpTargetRevolutionCount( CONCENTRATE_PUMPS_T pumpId ) { - U16 result = 0; + U32 result = 0; if ( pumpId < NUM_OF_CONCENTRATE_PUMPS ) { - result = (U16)getU32OverrideValue( &pumpTargetRevCnt[ pumpId ] ); + result = getU32OverrideValue( &pumpTargetRevCnt[ pumpId ] ); } else { @@ -760,13 +760,13 @@ * @param pumpId concentrate pump id to get current measured revolution count * @return the current revolution count for the given concentrate pump *************************************************************************/ -U16 getConcPumpCurrentMeasuredRevolutionCount( CONCENTRATE_PUMPS_T pumpId ) +U32 getConcPumpCurrentMeasuredRevolutionCount( CONCENTRATE_PUMPS_T pumpId ) { - BOOL result = FALSE; + U32 result = 0; if ( pumpId < NUM_OF_CONCENTRATE_PUMPS ) { - result = (U16)getU32OverrideValue( &pumpMesauredRevCnt[ pumpId ] ); + result = getU32OverrideValue( &pumpMesauredRevCnt[ pumpId ] ); } else { @@ -862,7 +862,7 @@ { setFPGAD76PumpSetStepSpeed( CONCENTRATE_PUMP_ZERO_FLOW_RATE ); } - +#if 0 // Park concentrate pump too if requested if ( TRUE == parkPump ) { @@ -883,6 +883,7 @@ } concentratePumps[ pumpId ].isConcPumpParkInProgress = TRUE; } +#endif } /*********************************************************************//** @@ -1255,10 +1256,10 @@ data.d10_PumpCurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == d10_PumpDirection ? d10_PumpSetSpeed * -1.0F : d10_PumpSetSpeed ); data.d10_PumpMeasuredSpeed = getMeasuredPumpSpeedMLPM( D10_PUMP ); data.d10_PumpTargetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == d10_PumpDirection ? d10_PumpTgtSpeed * -1.0F : d10_PumpTgtSpeed ); - data.d11_PumpTargetRevCount = (U32)getConcPumpTargetRevolutionCount( D11_PUMP ); - data.d11_PumpMeasuredRevCount= (U32)getConcPumpCurrentMeasuredRevolutionCount( D11_PUMP ); - data.d10_PumpTargetRevCount = (U32)getConcPumpTargetRevolutionCount( D10_PUMP ); - data.d10_PumpMeasuredRevCount= (U32)getConcPumpCurrentMeasuredRevolutionCount( D10_PUMP ); + data.d11_PumpTargetRevCount = getConcPumpTargetRevolutionCount( D11_PUMP ); + data.d11_PumpMeasuredRevCount= getConcPumpCurrentMeasuredRevolutionCount( D11_PUMP ); + data.d10_PumpTargetRevCount = getConcPumpTargetRevolutionCount( D10_PUMP ); + data.d10_PumpMeasuredRevCount= getConcPumpCurrentMeasuredRevolutionCount( D10_PUMP ); data.d11_PumpState = concentratePumps[ D11_PUMP ].execState; data.d10_PumpState = concentratePumps[ D10_PUMP ].execState; data.d11_PumpPulseUS = concentratePumps[ D11_PUMP ].pulseWidthUS;