Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -rbd896114f304304a7096b30b2a85067a64645e82 -r72de2cfa37decafea02ad19a52e44aca5d3da024 --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision bd896114f304304a7096b30b2a85067a64645e82) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 72de2cfa37decafea02ad19a52e44aca5d3da024) @@ -253,13 +253,21 @@ static void filterConductivitySensorReadings( void ) { CONDUCTIVITY_SENSORS_T sensor; - + F32 rawCond = 0.0F; for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) { #ifdef __TEENSY_CONDUCTIVITY_DRIVER__ - F32 rawCond = getTeensyConductivityValue( sensor ); + + if (sensor != D74_COND ) + { + rawCond = getTeensyConductivityValue( sensor ); + } + else + { + rawCond = getConductivityValue( sensor ); + } #else - F32 rawCond = getConductivityValue( sensor ); + rawCond = getConductivityValue( sensor ); #endif // TODO - calibrate @@ -317,15 +325,24 @@ static void filterConductivitySensorTemperatureReadings( void ) { CONDUCTIVITY_SENSORS_T sensor; + F32 rawTemp = 0.0F; for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) { + #ifdef __TEENSY_CONDUCTIVITY_DRIVER__ - F32 rawTemp = getTeensyConductivityTemperatureValue( sensor ); + + if (sensor != D74_COND ) + { + rawTemp = getTeensyConductivityTemperatureValue( sensor ); + } + else + { + rawTemp = getConductivityTemperatureValue( sensor ); + } #else - F32 rawTemp = getConductivityTemperatureValue( sensor ); + rawCond = getConductivityTemperatureValue( sensor ); #endif - // TODO - calibrate if ( filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsCount >= SIZE_OF_FLOW_ROLLING_AVG )