Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r1781335a8c1833fad17b275bf44c7f6675e68423 -r2e89a75592087ba15cae7070a92173e9f1efa8fe
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 1781335a8c1833fad17b275bf44c7f6675e68423)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 2e89a75592087ba15cae7070a92173e9f1efa8fe)
@@ -40,23 +40,23 @@
  */
 
 // ********** private definitions **********
-#define AC_HEATER_TX_MAX_DUTY_CYCLE                                0.50F                                                           ///< AC Heater Treatement mode max duty cycle (50% of 1400W : 700W ) or ON state
-#define AC_HEATER_HEAT_MAX_DUTY_CYCLE                              0.70F                                                           ///< AC Heater heat disinfect mode max duty cycle (70% of 1400W : 980W ) or ON state
+#define AC_HEATER_TX_MAX_DUTY_CYCLE                                0.50F                                                           ///< AC Heater treatment mode max duty cycle (50% of 1400W : 700W )
+#define AC_HEATER_HEAT_MAX_DUTY_CYCLE                              0.70F                                                           ///< AC Heater heat disinfect mode max duty cycle (70% of 1400W : 980W )
 #define AC_HEATER_MAX_DUTY_CYCLE                                   1.0F                                                            ///< AC Heater max duty cycle (100.0%) or ON state
 #define DC_HEATER_MAX_DUTY_CYCLE                                   1.0F                                                            ///< DC Heater max duty cycle (100%) or ON state
 #define HEATERS_MIN_DUTY_CYCLE                                     0.0F                                                            ///< Heaters minimum duty cycle (0.00%) or OFF state
 #define HEATERS_DISINFECT_TEMPERATURE_DRIFT_C                      3.0F                                                            ///< Heaters disinfect temperature drift in C.
 #define HEATERS_ZERO_DELTA_TEMP_C                                  0.0F                                                            ///< Heaters zero delta temperature in C.
 #define HEATERS_DUTY_CYCLE_CONVERSION_FACTOR                       100.0F                                                          ///< Heaters duty cycle 0: OFF, 100: 100% duty cycle.
 #define HEATERS_ZERO_EFFICIENCY                                    0.0F                                                            ///< Zero heater efficiency
-#define HEATER_CNTL_TRANSFER_DELTA_TEMP_C                          0.25F                                                           ///< AC heater delta temperature to transfer control from open to close loop
+#define HEATER_CNTL_TRANSFER_DELTA_TEMP_C                          0.50F                                                           ///< AC heater delta temperature to transfer control from open to close loop
 
 #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.048F                                                          ///< P Term for AC primary heater control during treatment mode.
-#define D5_HEAT_TX_I_COEFFICIENT                                   0.012F                                                          ///< 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.
 
 #define D45_HEAT_P_COEFFICIENT                                     0.20F                                                           ///< P Term for trimmer heater control.
 #define D45_HEAT_I_COEFFICIENT                                     0.05F                                                           ///< I Term for trimmer heater control.
@@ -560,10 +560,10 @@
 
         if ( DD_MODE_HEAT != opMode )
         {
-            F32 deltaTempC          = targetTemperature - measuredTemperature;
+            F32 deltaTempC          = measuredTemperature - targetTemperature;
             F32 capDeltaTempC       = MAX( deltaTempC, HEATERS_ZERO_DELTA_TEMP_C );
 
-            if ( capDeltaTempC <= HEATER_CNTL_TRANSFER_DELTA_TEMP_C )
+            if ( capDeltaTempC >= HEATER_CNTL_TRANSFER_DELTA_TEMP_C )
             {
                 // Transfer Control to target when delta temp is minimal.
                 state = HEATER_EXEC_STATE_CONTROL_TO_TARGET;
@@ -855,8 +855,8 @@
     {
         HEATERS_DATA_T data;
 
-        data.d5_HeaterDC                = getHeaterControl( D5_HEAT );
-        data.d45_HeaterDC               = getHeaterControl( D45_HEAT );
+        data.d5_HeaterDC                = getHeaterControl( D5_HEAT ) * HEATERS_DUTY_CYCLE_CONVERSION_FACTOR;
+        data.d45_HeaterDC               = getHeaterControl( D45_HEAT ) * HEATERS_DUTY_CYCLE_CONVERSION_FACTOR;
         data.d5_HeaterTargetTemp        = getHeaterTargetTemperature( D5_HEAT );
         data.d45_HeaterTargetTemp       = getHeaterTargetTemperature( D45_HEAT );
         data.d5_HeaterState             = heatersStatus[ D5_HEAT ].state;