Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -rd748813399d38ef5b71d760e327e368cc82d7a38 -r72de2cfa37decafea02ad19a52e44aca5d3da024 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision d748813399d38ef5b71d760e327e368cc82d7a38) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 72de2cfa37decafea02ad19a52e44aca5d3da024) @@ -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++ ) { @@ -390,10 +391,19 @@ else if ( TRUE == didTimeout( dialTempMovingAvgData[ i ].dialTempDataColStartTimeMS, D28_D30_DATA_COLLECTION_TIME_MS ) ) { 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 +540,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 );