Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rb689a4627e86e263cb69e83b91e80802bf411c92 -r4cdcb589ad34efa472c94180e6de938132cbc89b
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision b689a4627e86e263cb69e83b91e80802bf411c92)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 4cdcb589ad34efa472c94180e6de938132cbc89b)
@@ -7,8 +7,8 @@
 *
 * @file    Heaters.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      03-Mar-2026
+* @author  (last)      Michael Garthwaite
+* @date    (last)      30-Mar-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  11-Oct-2024
@@ -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"
@@ -518,11 +519,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      = getConductivityTemperature( D27_COND );
+        }
+
         F32 calcTargetTemp              = getHeaterTargetTemperature( D5_HEAT );
         F32 dialysateFlowrate           = getTDDialysateFlowrate();
         F32 deltaTempC                  = targetTempfromTD - measuredTempAtDialyzer;