Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rf4a7ca238b4d8fa7ee756ec4dc813c3d0ffa7f84 -r0e084183dc794092c52734b916fcd79dc16829ad
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision f4a7ca238b4d8fa7ee756ec4dc813c3d0ffa7f84)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 0e084183dc794092c52734b916fcd79dc16829ad)
@@ -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.
@@ -106,8 +106,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.
@@ -704,7 +704,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_2_0_HW ) != TRUE )
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
             {
                 measuredTempAtDialyzer = getTeensyConductivityTemperatureValue( D27_COND );
             }