Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -r3749d041224897f9da5a1cfadae7bab81d94437b -r4643a4b7f7ecaca8e07a809af6b218fac1c74799
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 3749d041224897f9da5a1cfadae7bab81d94437b)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799)
@@ -16,11 +16,6 @@
 ***************************************************************************/
 
 #include "BalancingChamber.h"
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-#include "ConductivityTeensy.h"
-#else
-#include "ConductivitySensors.h"
-#endif
 #include "Conductivity.h"
 #include "Flow.h"
 #include "Messaging.h"
@@ -373,6 +368,9 @@
 static void filterDialTemperatureReadings( void )
 {
     DIAL_TEMPERATURE_SENSORS_T i;
+    F32 temperatureC = 0.0F;
+    U32 currentIndex = 0;
+    F32 prevSampleToRemoveC = 0.0f;
 
     for ( i = DIAL_TEMP_FIRST; i < NUM_OF_DIAL_TEMPS; i++ )
     {
@@ -384,14 +382,19 @@
         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             = getConductivityTemperature( sensor );
-#endif
-            U32 currentIndex             = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex;
-            F32 prevSampleToRemoveC      = dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ];
 
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+            {
+                temperatureC = getTeensyConductivityTemperatureValue( sensor );
+            }
+            else
+            {
+                temperatureC = getConductivityTemperature( sensor );
+            }
+
+            currentIndex = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex;
+            prevSampleToRemoveC = dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ];
+
             dialTempMovingAvgData[ i ].dialTempDataColStartTimeMS       = getMSTimerCount();
             dialTempMovingAvgData[ i ].dialTempColHasTimerBeenSet       = TRUE;
             dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ] = temperatureC;
@@ -519,19 +522,24 @@
         data.d50Temp        = getTemperatureValue( D50_TEMP );
         data.d99Temp        = getTemperatureValue( D99_TEMP );
         data.boardTemp      = getTemperatureValue( BRD_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    = getConductivityTemperature( D17_COND );
-        data.d28CondTemp    = getConductivityTemperature( D27_COND );
-        data.d30CondTemp    = getConductivityTemperature( D29_COND );
-        data.d44CondTemp    = getConductivityTemperature( D43_COND );
-        data.d75CondTemp    = getConductivityTemperature( D74_COND );
-#endif
+
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        {
+            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    = getConductivityTemperature( D17_COND );
+            data.d28CondTemp    = getConductivityTemperature( D27_COND );
+            data.d30CondTemp    = getConductivityTemperature( D29_COND );
+            data.d44CondTemp    = getConductivityTemperature( D43_COND );
+            data.d75CondTemp    = getConductivityTemperature( D74_COND );
+        }
+
         data.d4AvgTemp      = getD4AverageTemperature();
         data.d50AvgTemp     = getD50AverageTemperature();
         data.d99AvgTemp     = getD99AverageTemperature();