Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -re7e698ed85055dd286e8c0501a582ff66d601590 -r35ccc443e6440d79231ab4a3951bebc0e9789b68
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e7e698ed85055dd286e8c0501a582ff66d601590)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 35ccc443e6440d79231ab4a3951bebc0e9789b68)
@@ -7,8 +7,8 @@
 *
 * @file    Heaters.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      28-May-2026
+* @author  (last)      Michael Garthwaite
+* @date    (last)      10-Jun-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  11-Oct-2024
@@ -58,7 +58,7 @@
 #define D5_HEAT_TX_P_COEFFICIENT                                   0.034F                                                          ///< P Term for AC primary heater control during treatment mode.
 #define D5_HEAT_TX_I_COEFFICIENT                                   0.001F                                                          ///< I Term for AC primary heater control during treatment mode.
 
-#define D45_HEAT_P_COEFFICIENT                                     0.05F //0.01F                                                   ///< P Term for trimmer heater control.
+#define D45_HEAT_P_COEFFICIENT                                     0.05F                                                           ///< P Term for trimmer heater control.
 #define D45_HEAT_I_COEFFICIENT                                     0.0005F                                                         ///< I Term for trimmer heater control.
 #define D45_HEAT_TX_INIT_FEED_FORWARD                              0.0F                                                            ///< Initial Feed forward term for heater control
 #define D45_HEAT_HIGHER_QD_P_COEFFICIENT                           0.2F                                                            ///< P Term for trimmer heater control for higher dialysate flow rate.
@@ -107,8 +107,8 @@
 #define D5_HEAT_OUT_TX_P_COEFFICIENT                               0.5F                                                            ///< P Term for AC primary heater outer loop control during treatment mode.
 #define D5_HEAT_OUT_TX_I_COEFFICIENT                               0.4F                                                            ///< I Term for AC primary heater outer loop control during treatment mode.
 #else
-#define D5_HEAT_OUT_TX_P_COEFFICIENT                               0.75F //2.00F //0.5F                                            ///< P Term for AC primary heater outer loop control during treatment mode.
-#define D5_HEAT_OUT_TX_I_COEFFICIENT                               0.15F //0.04F //0.08F //0.4F                                    ///< I Term for AC primary heater outer loop control during treatment mode.
+#define D5_HEAT_OUT_TX_P_COEFFICIENT                               0.75F                                                           ///< P Term for AC primary heater outer loop control during treatment mode.
+#define D5_HEAT_OUT_TX_I_COEFFICIENT                               0.15F                                                           ///< I Term for AC primary heater outer loop control during treatment mode.
 #endif
 #define D5_HEAT_OUT_LOWQD_TX_P_COEFFICIENT                         0.5F                                                            ///< P Term for AC primary heater outer loop - low Qd(<200) control during treatment mode.
 #define D5_HEAT_OUT_LOWQD_TX_I_COEFFICIENT                         0.25F                                                           ///< I Term for AC primary heater outer loop - low Qd(<200) control during treatment mode.
@@ -605,7 +605,7 @@
         // Use new RTD sensor placed closed to dialyzer, connected to D1 port
         measuredTempAtDialyzer = getFilteredTemperatureValue( D1_TEMP );
 #else
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
+        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
         {
             measuredTempAtDialyzer = getTeensyConductivityTemperatureValue( D27_COND );
         }
@@ -703,7 +703,7 @@
             // Use new RTD sensor placed closed to dialyzer, connected to D1 port
             measuredTempAtDialyzer = getFilteredTemperatureValue( D1_TEMP );
 #else
-            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
+            if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
             {
                 measuredTempAtDialyzer = getTeensyConductivityTemperatureValue( D27_COND );
             }