Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rff82c2f697e729f16098416acad3d98e337a38cd -r614a58c1d55d79e47329adb7e191d8cc9c681c72
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision ff82c2f697e729f16098416acad3d98e337a38cd)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 614a58c1d55d79e47329adb7e191d8cc9c681c72)
@@ -102,8 +102,11 @@
 {
     CONDUCTIVITY_SENSORS_T sensor;
 
-    //initConductivitySensors();
+#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
     initConductivityTeensy();
+#else
+    initConductivitySensors();
+#endif
 
     ddConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     fpConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
@@ -176,7 +179,6 @@
     execConductivityTeensy();
 #else
     readConductivitySensors();
-
 #endif
     //control conductivity sensor
     // TODO : need more clarity on why and when to execute following control.