Index: firmware/App/Controllers/Thermistors.c =================================================================== diff -u -r22f1a58ac8e419353ec004b04e7c765c1d59df2b -r54e58f64179ea382d2e2c403c8c3b9a15a612636 --- firmware/App/Controllers/Thermistors.c (.../Thermistors.c) (revision 22f1a58ac8e419353ec004b04e7c765c1d59df2b) +++ firmware/App/Controllers/Thermistors.c (.../Thermistors.c) (revision 54e58f64179ea382d2e2c403c8c3b9a15a612636) @@ -63,7 +63,6 @@ static void convertADC2Temperature( void ); static F32 calculateThemristorTemperature( U32 adcValue ); static void publishThermistorsData( void ); -static U32 getPublishThermistorsDataInterval( void ); /*********************************************************************//** * @brief @@ -302,26 +301,6 @@ /*********************************************************************//** * @brief - * The getPublishThermistorsDataInterval function gets the thermistors - * data publish interval. - * @details Inputs: thermistorsPublishInterval - * @details Outputs: none - * @return data publish time interval in counts - *************************************************************************/ -static U32 getPublishThermistorsDataInterval( void ) -{ - U32 result = thermistorsPublishInterval.data; - - if ( OVERRIDE_KEY == thermistorsPublishInterval.override ) - { - result = thermistorsPublishInterval.ovData; - } - - return result; -} - -/*********************************************************************//** - * @brief * The publishThermistorsData function publishes the thermistors and * temperature sensors data at the specified time interval. * @details Inputs: dataPublishCounter @@ -330,7 +309,7 @@ *************************************************************************/ static void publishThermistorsData( void ) { - if ( ++dataPublishCounter > getPublishThermistorsDataInterval() ) + if ( ++dataPublishCounter > getU32OverrideValue( &thermistorsPublishInterval ) ) { THERMISTORS_DATA_T sensorsData;