Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -ra8b1004967be1c3bd4d46e96ff5886a0ec1446cc -r1768e1d302978a3748ab1e684576f208472e4a54
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision a8b1004967be1c3bd4d46e96ff5886a0ec1446cc)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 1768e1d302978a3748ab1e684576f208472e4a54)
@@ -85,7 +85,8 @@
 {
     CONDUCTIVITY_SENSORS_T sensor;
 
-    initConductivitySensors();
+    //initConductivitySensors();
+    initConductivityTeensy();
 
     ddConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     fpConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
@@ -135,8 +136,12 @@
 void execConductivity( void )
 {
     //read conductivity sensors raw value
+#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
+    execConductivityTeensy();
+#else
     readConductivitySensors();
 
+#endif
     //control conductivity sensor
     // TODO : need more clarity on why and when to execute following control.
 #if 0
@@ -211,7 +216,11 @@
 
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-        F32 rawCond = (F32)getConductivityValue( sensor );
+#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
+        F32 rawCond = getTeensyConductivityValue( sensor );
+#else
+        F32 rawCond = getConductivityValue( sensor );
+#endif
 
         // TODO - calibrate
 
@@ -271,7 +280,11 @@
 
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-        F32 rawTemp = (F32)getConductivityTemperatureValue( sensor );
+#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
+        F32 rawTemp = getTeensyConductivityTemperatureValue( sensor );
+#else
+        F32 rawTemp = getConductivityTemperatureValue( sensor );
+#endif
 
         // TODO - calibrate
 
@@ -304,11 +317,11 @@
     {
         DD_CONDUCTIVITY_DATA_T data;
 
-        data.d17Cond        = getConductivityValue( D17_COND );
-        data.d27Cond        = getConductivityValue( D27_COND );
-        data.d29Cond        = getConductivityValue( D29_COND );
-        data.d43Cond        = getConductivityValue( D43_COND );
-        data.d74Cond        = getConductivityValue( D74_COND );
+        data.d17Cond        = getFilteredConductivity( D17_COND );
+        data.d27Cond        = getFilteredConductivity( D27_COND );
+        data.d29Cond        = getFilteredConductivity( D29_COND );
+        data.d43Cond        = getFilteredConductivity( D43_COND );
+        data.d74Cond        = getFilteredConductivity( D74_COND );
         ddConductivityPublishTimerCounter        = 0;
 
         broadcastData( MSG_ID_DD_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( DD_CONDUCTIVITY_DATA_T ) );