Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -re6f3a632890f96a5aa282922d11df148bdd06587 -rd3819286869611f9c02add72a0f8e321598fdf42 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision e6f3a632890f96a5aa282922d11df148bdd06587) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision d3819286869611f9c02add72a0f8e321598fdf42) @@ -162,7 +162,6 @@ static void processHtrsTempSnsrsADCRead( U32 sensorIndex, U16 adc, U32 fpgaError, U32 fpgaCount ); static BOOL isADCReadValid( U32 sensorIndex, U32 fpgaError, U32 fpgaCount ); static void processADCRead( U32 sensorIndex, S32 adc ); -static U32 getPublishTemperatureSensorsDataInterval( void ); static void publishTemperatureSensorsData( void ); static void monitorTemperatureSnsrs( U32 sensorIndex, F32 temperature ); @@ -828,26 +827,6 @@ /*********************************************************************//** * @brief - * The getPublishTemperatureSensorsDataInterval function returns the data - * publication interval either from the data or from the override. - * @details Inputs: tempSensorsPublishInterval - * @details Outputs: none - * @return data publish interval - *************************************************************************/ -static U32 getPublishTemperatureSensorsDataInterval( void ) -{ - U32 result = tempSensorsPublishInterval.data; - - if ( tempSensorsPublishInterval.override == OVERRIDE_KEY ) - { - result = tempSensorsPublishInterval.ovData; - } - - return result; -} - -/*********************************************************************//** - * @brief * The publishTemperatureSensorsData function broadcasts the temperature * sensors data at the publication interval. * @details Inputs: dataPublicationTimerCounter, tempValuesForPublication @@ -856,7 +835,7 @@ *************************************************************************/ static void publishTemperatureSensorsData( void ) { - if ( ++dataPublicationTimerCounter >= getPublishTemperatureSensorsDataInterval() ) + if ( ++dataPublicationTimerCounter >= getU32OverrideValue( &tempSensorsPublishInterval ) ) { TEMPERATURE_SENSORS_DATA_T data;