Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r895ae090a3c78f9e002ac526332ef29929ceef71 -rea58258093207cb49785aa04ab1e19065166cac6
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 895ae090a3c78f9e002ac526332ef29929ceef71)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision ea58258093207cb49785aa04ab1e19065166cac6)
@@ -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"
@@ -80,6 +81,7 @@
 #define D5_HEATER_PWM_ADJ_SLOPE_FACTOR                             0.00005F                                                        ///< AC heater close loop PWM adjustment slope factor
 #define D5_HEATER_PWM_INTERCEPT_FACTOR                             0.0055F                                                         ///< AC heater close loop PWM adjustment intercept factor
 
+//#define D5_HEAT_CONTROL_INTERVAL_MS                                30000                                                           /// Primary heater control interval in milli seconds
 #define D5_HEAT_CONTROL_INTERVAL_MS                                3000                                                            /// Primary heater control interval in milli seconds
 #define D5_HEAT_CONTROL_INTERVAL_COUNT                             ( D5_HEAT_CONTROL_INTERVAL_MS / TASK_GENERAL_INTERVAL )         ///< Primary heater control interval count.
 #define D45_HEAT_CONTROL_INTERVAL_MS                               ( 1 * MS_PER_SECOND )                                           ///< Trimmer heater control interval in milli seconds
@@ -513,11 +515,17 @@
     if ( ++primaryTargetTempAdjCounter >= d5OuterLoopControlInterval )
     {
         F32 targetTempfromTD            = getTDTargetDialysateTemperature();
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-        F32 measuredTempAtDialyzer      = getTeensyConductivityTemperatureValue( D27_COND );
-#else
-        F32 measuredTempAtDialyzer      = getFilteredConductivitySensorTemperature( 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      = getFilteredConductivitySensorTemperature( D27_COND );
+        }
+
         F32 calcTargetTemp              = getHeaterTargetTemperature( D5_HEAT );
         F32 dialysateFlowrate           = getTDDialysateFlowrate();
         F32 deltaTempC                  = targetTempfromTD - measuredTempAtDialyzer;