Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r7aafdc16c133bcd4cb0ce5fe08079c1969cc67d2 -rd305a91c82fe89a76d9accbb8faa3d81e3106341
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 7aafdc16c133bcd4cb0ce5fe08079c1969cc67d2)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision d305a91c82fe89a76d9accbb8faa3d81e3106341)
@@ -18,7 +18,6 @@
 #include <string.h>             // For memcpy
 
 #include "Conductivity.h"
-#include "ConductivityTeensy.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
 #include "OperationModes.h"
@@ -68,16 +67,6 @@
 static U32 fpConductivityPublishTimerCounter;                                                                           ///< FP Conductivity data publication counter.
 static OVERRIDE_U32_T fpConductivityDataPublishInterval;                                                                ///< FP Conductivity sensors publish time interval override.
 
-static const CONDUCTIVITY_SENSORS_T teensyCondMap[] =
-{
-     P9_COND,
-     P18_COND,
-     D17_COND,
-     D27_COND,
-     D29_COND,
-     D43_COND,
-};
-
 // ********** private function prototypes **********
 
 static void publishConductivitySensorsData( void );
@@ -96,7 +85,8 @@
 {
     CONDUCTIVITY_SENSORS_T sensor;
 
-    initConductivitySensors();
+    //initConductivitySensors();
+    initCondTeensy();
 
     ddConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     fpConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
@@ -146,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
@@ -157,8 +151,6 @@
     execConductivitySensorRead();
 #endif
 
-    execConductivityTeensy();
-
     filterConductivitySensors();
     // publish conductivity sensors
     publishConductivitySensorsData();
@@ -224,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
 
@@ -284,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
 
@@ -317,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 ) );