Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -re163e9faf44d2eb475188b8ea4d6a3befb6e753f -re6fef0f312d07e308c88caafef7e952689328248
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e163e9faf44d2eb475188b8ea4d6a3befb6e753f)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e6fef0f312d07e308c88caafef7e952689328248)
@@ -56,9 +56,6 @@
 #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.
 
@@ -79,12 +76,11 @@
 #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
 #define D45_HEAT_CONTROL_INTERVAL_COUNT                            ( D45_HEAT_CONTROL_INTERVAL_MS / TASK_GENERAL_INTERVAL )        ///< Trimmer heater control interval count.
-#define D5_TARGET_TEMP_ADJUST_INTERVAL_MS                          ( 3 * SEC_PER_MIN * MS_PER_SECOND / TASK_GENERAL_INTERVAL )    ///< Adjust primary target temperature
+#define D5_TARGET_TEMP_ADJUST_INTERVAL_MS                          ( 3 * SEC_PER_MIN * MS_PER_SECOND / TASK_GENERAL_INTERVAL )     ///< Adjust primary target temperature
 #define PRIMARY_HEATER_MAX_PWR_WATTS                               1400.0F                                                         ///< AC Primary Heater Max Power consumeption in Watts
 #define TX_PRIMARY_HEATER_MAX_PWR_WATTS                            700.0F                                                          ///< Estimated power to be supplied to the primary heater during treatement mode
 #define HEAT_PRIMARY_HEATER_MAX_PWR_WATTS                          980.0F                                                          ///< Estimated power to be supplied to the primary heater during heat disinfect mode