Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rb37e7ab88f133b7ba7f9b604e4e164b2855b239e -rae31b4c999dccae70fb40fb9d98a4380ce2c7415
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision b37e7ab88f133b7ba7f9b604e4e164b2855b239e)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision ae31b4c999dccae70fb40fb9d98a4380ce2c7415)
@@ -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"
@@ -56,6 +57,9 @@
 #define MAX_ADJ_DELTA_TEMP_C                                       7.0F                                                            ///< Maximum adjusted delta temperature to add/remove from calculated target temperature
 
 #define D5_HEAT_TX_INIT_FEED_FORWARD                               0.0F                                                            ///< Initial Feed forward term for heater control
+//#define D5_HEAT_TX_P_COEFFICIENT                                   0.050F                                                          ///< P Term for AC primary heater control during treatment mode.
+//#define D5_HEAT_TX_I_COEFFICIENT                                   0.015F                                                          ///< I Term for AC primary heater control during treatment mode.
+
 #define D5_HEAT_TX_P_COEFFICIENT                                   0.035F                                                          ///< P Term for AC primary heater control during treatment mode.
 #define D5_HEAT_TX_I_COEFFICIENT                                   0.004F                                                          ///< I Term for AC primary heater control during treatment mode.
 
@@ -76,6 +80,7 @@
 #define HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL                       0.2F                                                            ///< Heaters max voltage out of range tolerance.
 #define D5_HEATER_DEADBAND_CONTROL                                 0.1F                                                            ///< Heater deadband range for conrtol.
 
+//#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
@@ -400,11 +405,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;