Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -rc914eb443ee2679eb9fe3668119058ccc578437d -rd3819286869611f9c02add72a0f8e321598fdf42 --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision c914eb443ee2679eb9fe3668119058ccc578437d) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision d3819286869611f9c02add72a0f8e321598fdf42) @@ -99,7 +99,6 @@ static void stepConcentratePumpToTargetSpeed( CONCENTRATE_PUMPS_T pumpId ); static CONCENTRATE_PUMP_STATE_T handleConcentratePumpOnState( CONCENTRATE_PUMPS_T pumpId ); -static U32 getPublishConcentratePumpDataInterval( void ); static void calcMeasuredPumpsSpeed( CONCENTRATE_PUMPS_T pumpId, U16 pulseWidthCount ); static BOOL processCalibrationData( void ); @@ -153,7 +152,7 @@ processCalibrationData(); } - if ( ++concentratePumpMonitorTimerCounter >= getPublishConcentratePumpDataInterval() ) + if ( ++concentratePumpMonitorTimerCounter >= getU32OverrideValue( &concentratePumpDataPublishInterval ) ) { CONCENTRATE_PUMP_DATA_T data; U08 const fpgaConcentratePumpsFault = getFPGAConcentratePumpsFault(); @@ -504,26 +503,6 @@ /*********************************************************************//** * @brief - * The getPublishConcentratePumpDataInterval function gets the concentrate pump - * data publication interval. - * @details Inputs: concentratePumpDataPublishInterval - * @details Outputs: none - * @return the current concentrate pump data publication interval (in ms). - *************************************************************************/ -static U32 getPublishConcentratePumpDataInterval( void ) -{ - U32 result = concentratePumpDataPublishInterval.data; - - if ( OVERRIDE_KEY == concentratePumpDataPublishInterval.override ) - { - result = concentratePumpDataPublishInterval.ovData; - } - - return result; -} - -/*********************************************************************//** - * @brief * The calcMeasuredPumpsSpeed function calculates the concentrate pump flow * rate using the hall sense pulse width count. * @details Inputs: none