Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -rfd42b31a0572ab85c862ebf94997766f27dd8e97 -r97ea48347859157d941d743deedb5b980b4c4594 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision fd42b31a0572ab85c862ebf94997766f27dd8e97) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 97ea48347859157d941d743deedb5b980b4c4594) @@ -101,9 +101,7 @@ static U32 ddTempDataPublicationTimerCounter; ///< DD Temperature sensors data publish timer counter. static U32 fpTempDataPublicationTimerCounter; ///< FP Temperature sensors data publish timer counter. static OVERRIDE_U32_T ddTempSensorsPublishInterval; ///< DD Temperature sensors publish time interval override. -static OVERRIDE_U32_T fpTempSensorsPublishInterval; ///< FPppp Temperature sensors publish time interval override. -//static OVERRIDE_U32_T ddTempSensorsPublishInterval = { TEMP_SENSORS_DATA_PUBLISH_INTERVAL, -// TEMP_SENSORS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Temperature sensors publish time interval override. +static OVERRIDE_U32_T fpTempSensorsPublishInterval; ///< FP Temperature sensors publish time interval override. // ********** private function prototypes ********** @@ -113,6 +111,7 @@ static void filterDialTemperatureReadings( void ); static void getTempMovingAverageTimeInterval( void ); static void publishTemperatureSensorsData( void ); + /*********************************************************************//** * @brief * The initTemperature function initializes the temperature unit. @@ -488,10 +487,10 @@ { TEMPERATURE_SENSORS_FP_DATA_T data; -// data.p10Temp = getFilteredConductivitySensorTemperature( P9_COND ); -// data.p19Temp = getFilteredConductivitySensorTemperature( P18_COND ); data.m1Temp = getFilteredPressureSensorTemperature( M1_PRES ); data.m3Temp = getFilteredPressureSensorTemperature( M3_PRES ); + data.p10Temp = getFilteredConductivitySensorTemperature( P9_COND ); + data.p19Temp = getFilteredConductivitySensorTemperature( P18_COND ); data.p8Temp = getFilteredPressureSensorTemperature( P8_PRES ); data.p13Temp = getFilteredPressureSensorTemperature( P13_PRES ); data.p17Temp = getFilteredPressureSensorTemperature( P17_PRES );