Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -r811395ecb8574f4190671ffdf4217675a7adfbf7 -r5d7b4ae06bb86aa580c407829367785e6b97acc8 --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 811395ecb8574f4190671ffdf4217675a7adfbf7) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 5d7b4ae06bb86aa580c407829367785e6b97acc8) @@ -8,7 +8,7 @@ * @file Conductivity.c * * @author (last) Michael Garthwaite -* @date (last) 27-Jan-2026 +* @date (last) 06-Mar-2026 * * @author (original) Vinayakam Mani * @date (original) 13-Sep-2024 @@ -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 calculatedConductivity = getTeensyConductivityValue( sensor ); + if (sensor != D74_COND ) + { + rawCond = getTeensyConductivityValue( sensor ); + } + else + { + rawCond = getConductivityValue( sensor ); + } #else - F32 calculatedConductivity = getConductivityValue( sensor ); + rawCond = getConductivityValue( sensor ); #endif // TODO - calibrate @@ -317,15 +325,23 @@ 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 calculatedTemp = getTeensyConductivityTemperatureValue( sensor ); + if (sensor != D74_COND ) + { + rawTemp = getTeensyConductivityTemperatureValue( sensor ); + } + else + { + rawTemp = getConductivityTemperatureValue( sensor ); + } #else - F32 calculatedTemp = getConductivityTemperatureValue( sensor ); + rawTemp = getConductivityTemperatureValue( sensor ); #endif - // TODO - calibrate if ( filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsCount >= SIZE_OF_FLOW_ROLLING_AVG )