Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -rbd896114f304304a7096b30b2a85067a64645e82 -r17bccac1b5d6c5f17be43b06d3a3c1a2b6201529 --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision bd896114f304304a7096b30b2a85067a64645e82) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 17bccac1b5d6c5f17be43b06d3a3c1a2b6201529) @@ -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