Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -r325e67dab10f6666702bf0f1256015b31e58de4f -rd305a91c82fe89a76d9accbb8faa3d81e3106341
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 325e67dab10f6666702bf0f1256015b31e58de4f)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision d305a91c82fe89a76d9accbb8faa3d81e3106341)
@@ -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"
@@ -347,7 +351,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 ];
 
@@ -467,11 +475,19 @@
         // TODO: update the following lines after Baro Sensor data is read from TD
         data.baroTemp       = 0.0F;
 //        data.baroTemp       = getTemperatureValue( BARO_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.d28AvgTemp     = dialTempMovingAvgData[ DIAL_TEMP_D28 ].dialTempAvgC;