Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r019e570cacd748a39dfbd500fe5bd65f596f488c -r0797158d6e367debb04e043798f1aeb1fb17063b --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 019e570cacd748a39dfbd500fe5bd65f596f488c) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 0797158d6e367debb04e043798f1aeb1fb17063b) @@ -379,6 +379,7 @@ static void filterDialTemperatureReadings( void ) { DIAL_TEMPERATURE_SENSORS_T i; + F32 temperatureC = 0.0F; for ( i = DIAL_TEMP_FIRST; i < NUM_OF_DIAL_TEMPS; i++ ) { @@ -391,9 +392,17 @@ { CONDUCTIVITY_SENSORS_T sensor = ( DIAL_TEMP_D28 == i ? D27_COND : D29_COND ); #ifdef __TEENSY_CONDUCTIVITY_DRIVER__ - F32 temperatureC = getTeensyConductivityTemperatureValue( sensor ); + + if (sensor != D74_COND) + { + temperatureC = getTeensyConductivityTemperatureValue( sensor ); + } + else + { + temperatureC = getConductivityTemperatureValue( sensor ); + } #else - F32 temperatureC = getConductivityTemperatureValue( sensor ); + temperatureC = getConductivityTemperatureValue( sensor ); #endif U32 currentIndex = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex; F32 prevSampleToRemoveC = dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ]; @@ -530,7 +539,7 @@ data.d28CondTemp = getTeensyConductivityTemperatureValue( D27_COND ); data.d30CondTemp = getTeensyConductivityTemperatureValue( D29_COND ); data.d44CondTemp = getTeensyConductivityTemperatureValue( D43_COND ); - data.d75CondTemp = getTeensyConductivityTemperatureValue( D74_COND ); + data.d75CondTemp = getConductivityTemperatureValue( D74_COND ); #else data.d16CondTemp = getConductivityTemperatureValue( D17_COND ); data.d28CondTemp = getConductivityTemperatureValue( D27_COND );