Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rd7abd9c0c214ec3b7704e7f89b6de83c341b9b0e -r279a41c031010740e5121ea978d8f069a4b7deb7
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision d7abd9c0c214ec3b7704e7f89b6de83c341b9b0e)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 279a41c031010740e5121ea978d8f069a4b7deb7)
@@ -102,11 +102,8 @@
 {
     CONDUCTIVITY_SENSORS_T sensor;
 
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
     initConductivityTeensy();
-#else
     initConductivitySensors();
-#endif
 
     ddConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     fpConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
@@ -175,11 +172,9 @@
 void execConductivity( void )
 {
     //read conductivity sensors raw value
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
     execConductivityTeensy();
-#else
     execConductivitySensors();
-#endif
+
     filterConductivitySensors();
     calcRORejectionRatio();     // TODO: should this be called here or inside filter function
     filterRORejectionRatioReadings();
@@ -244,22 +239,19 @@
 static void filterConductivitySensorReadings( void )
 {
     CONDUCTIVITY_SENSORS_T sensor;
-    F32 rawCond = 0.0F;
+    F32 calculatedConductivity = 0.0F;
 
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-        if (sensor != D74_COND )
+
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
         {
-            rawCond = getTeensyConductivityValue( sensor );
+            calculatedConductivity = getTeensyConductivityValue( sensor );
         }
         else
         {
-            rawCond = getConductivityValue( sensor );
+            calculatedConductivity = getConductivity( sensor );
         }
-#else
-        rawCond = getConductivityValue( sensor );
-#endif
 
         // TODO - calibrate
 
@@ -316,22 +308,18 @@
 static void filterConductivitySensorTemperatureReadings( void )
 {
     CONDUCTIVITY_SENSORS_T sensor;
-    F32 rawTemp = 0.0F;
+    F32 calculatedTemperature = 0.0F;
 
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-        if (sensor != D74_COND )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
         {
-            rawTemp = getTeensyConductivityTemperatureValue( sensor );
+            calculatedTemperature = getTeensyConductivityTemperatureValue( sensor );
         }
         else
         {
-            rawTemp = getConductivityTemperatureValue( sensor );
+            calculatedTemperature = getConductivityTemperature( sensor );
         }
-#else
-        rawTemp = getConductivityTemperatureValue( sensor );
-#endif
 
         // TODO - calibrate