Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -rd27dcf1fbbc9651636f211028917a1c0702bb56a -r7a7bf19d0cf16745566956f45cef57f8eb5df445 --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision d27dcf1fbbc9651636f211028917a1c0702bb56a) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 7a7bf19d0cf16745566956f45cef57f8eb5df445) @@ -234,7 +234,6 @@ static void checkDialInPumpFlowAgainstSpeed( void ); static void checkDialInPumpMCCurrent( void ); static void checkDialInFlowSensorSignalStrength( void ); -static U32 getPublishDialInFlowDataInterval( void ); /*********************************************************************//** * @brief @@ -740,26 +739,6 @@ /*********************************************************************//** * @brief - * The getPublishDialInFlowDataInterval function gets the dialIn flow data - * publication interval. - * @details Inputs: dialInFlowDataPublishInterval - * @details Outputs: none - * @return the current dialIn flow data publication interval (in task intervals). - *************************************************************************/ -U32 getPublishDialInFlowDataInterval( void ) -{ - U32 result = dialInFlowDataPublishInterval.data; - - if ( OVERRIDE_KEY == dialInFlowDataPublishInterval.override ) - { - result = dialInFlowDataPublishInterval.ovData; - } - - return result; -} - -/*********************************************************************//** - * @brief * The getTargetDialInFlowRate function gets the current target dialIn flow * rate. * @details Inputs: targetDialInFlowRate @@ -916,7 +895,7 @@ static void publishDialInFlowData( void ) { // Publish dialIn flow data on interval - if ( ++dialInFlowDataPublicationTimerCounter >= getPublishDialInFlowDataInterval() ) + if ( ++dialInFlowDataPublicationTimerCounter >= getU32OverrideValue( &dialInFlowDataPublishInterval ) ) { DIALIN_PUMP_STATUS_PAYLOAD_T payload;