Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rb37e7ab88f133b7ba7f9b604e4e164b2855b239e -r279a41c031010740e5121ea978d8f069a4b7deb7
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision b37e7ab88f133b7ba7f9b604e4e164b2855b239e)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 279a41c031010740e5121ea978d8f069a4b7deb7)
@@ -18,6 +18,7 @@
 #include <math.h> // Used for mathematical operations
 
 #include "Conductivity.h"
+#include "ConductivityTeensy.h"
 #include "FpgaDD.h"
 #include "Heaters.h"
 #include "Level.h"
@@ -400,11 +401,17 @@
     if ( ++primaryTargetTempAdjCounter >= D5_TARGET_TEMP_ADJUST_INTERVAL_MS )
     {
         F32 targetTempfromTD            = getTDTargetDialysateTemperature();
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-        F32 measuredTempAtDialyzer      = getTeensyConductivityTemperatureValue( D27_COND );
-#else
-        F32 measuredTempAtDialyzer      = getConductivityTemperatureValue( D27_COND );
-#endif
+        F32 measuredTempAtDialyzer      = 0.0F;
+
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        {
+            measuredTempAtDialyzer      = getTeensyConductivityTemperatureValue( D27_COND );
+        }
+        else
+        {
+            measuredTempAtDialyzer      = getConductivityTemperature( D27_COND );
+        }
+
         F32 calcTargetTemp              = getHeaterTargetTemperature( D5_HEAT );
         F32 dialysateFlowrate           = getTDDialysateFlowrate();
         F32 deltaTempC                  = targetTempfromTD - measuredTempAtDialyzer;