Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r50144ec3e96785cf76d5bfd22ee65029c82e732b -rbd896114f304304a7096b30b2a85067a64645e82 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 50144ec3e96785cf76d5bfd22ee65029c82e732b) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision bd896114f304304a7096b30b2a85067a64645e82) @@ -7,7 +7,7 @@ * * @file Temperature.c * -* @author (last) Varshini Nagabooshanam +* @author (last) Michael Garthwaite * @date (last) 27-Jan-2026 * * @author (original) Vinayakam Mani @@ -16,7 +16,11 @@ ***************************************************************************/ #include "BalancingChamber.h" -#include "ConductivitySensors.h" +#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ +#include "ConductivityTeensy.h" +#else +#include "ConductivitySensor.h" +#endif #include "Conductivity.h" #include "Flow.h" #include "Messaging.h" @@ -380,7 +384,11 @@ 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 ); +#else F32 temperatureC = getConductivityTemperatureValue( sensor ); +#endif U32 currentIndex = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex; F32 prevSampleToRemoveC = dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ]; @@ -511,11 +519,19 @@ data.d50Temp = getTemperatureValue( D50_TEMP ); data.d99Temp = getTemperatureValue( D99_TEMP ); data.boardTemp = getTemperatureValue( BRD_TEMP ); +#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ + data.d16CondTemp = getTeensyConductivityTemperatureValue( D17_COND ); + data.d28CondTemp = getTeensyConductivityTemperatureValue( D27_COND ); + data.d30CondTemp = getTeensyConductivityTemperatureValue( D29_COND ); + data.d44CondTemp = getTeensyConductivityTemperatureValue( D43_COND ); + data.d75CondTemp = getTeensyConductivityTemperatureValue( D74_COND ); +#else data.d16CondTemp = getConductivityTemperatureValue( D17_COND ); data.d28CondTemp = getConductivityTemperatureValue( D27_COND ); data.d30CondTemp = getConductivityTemperatureValue( D29_COND ); data.d44CondTemp = getConductivityTemperatureValue( D43_COND ); data.d75CondTemp = getConductivityTemperatureValue( D74_COND ); +#endif data.d4AvgTemp = getD4AverageTemperature(); data.d50AvgTemp = getD50AverageTemperature(); data.d99AvgTemp = getD99AverageTemperature();