Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r363b26b9ab427b7e39e505425c1b15e0584669cb -r4a80b214d221c1f64feb215d828a10d8fddbaf4d
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 363b26b9ab427b7e39e505425c1b15e0584669cb)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 4a80b214d221c1f64feb215d828a10d8fddbaf4d)
@@ -51,8 +51,8 @@
 #define HEATERS_ZERO_EFFICIENCY                                    0.0F                                                            ///< Zero heater efficiency
 
 #define D5_HEAT_TX_INIT_FEED_FORWARD                               0.0F                                                            ///< Initial Feed forward term for heater control
-#define D5_HEAT_TX_P_COEFFICIENT                                   0.015F                                                          ///< P Term for AC primary heater control during treatment mode.
-#define D5_HEAT_TX_I_COEFFICIENT                                   0.0021F                                                         ///< I Term for AC primary heater control during treatment mode.
+#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 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.
@@ -119,6 +119,7 @@
 static const F32 WATER_SPECIFIC_HEAT_DIVIDED_BY_MINUTES = 4184.0F / (F32)SEC_PER_MIN;                                              ///< Water specific heat in J/KgC / 60.
 static OVERRIDE_U32_T heatersDataPublishInterval = { HEATERS_DATA_PUBLISH_INTERVAL, HEATERS_DATA_PUBLISH_INTERVAL, 0, 0 };         ///< Heaters data publish time interval.
 static F32 convertDC;                                                                                                              ///< AC Heater converted duty cycle
+static F32 lastDialTargetTemperatureSet;                                                                                           ///< last dialysate target temperature set for heater control
 static BOOL startupHeaterControl;                                                                                                  ///< First time control with the energy equation.
 
 //For testing
@@ -180,6 +181,7 @@
     heatersStatus[ D5_HEAT ].controlIntervalCounter  = D5_HEAT_CONTROL_INTERVAL_START_COUNT;
     heatersStatus[ D45_HEAT ].controlIntervalCounter = 0;
     startupHeaterControl                             = TRUE;
+    lastDialTargetTemperatureSet                     = 0.0F;
 
     for ( heater = DD_HEATERS_FIRST; heater < NUM_OF_DD_HEATERS; heater++ )
     {
@@ -241,17 +243,25 @@
 {
     BOOL result = FALSE;
 
-    if( heater < NUM_OF_DD_HEATERS )
+    if ( heater < NUM_OF_DD_HEATERS )
     {
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
         // Check if the requested temperature is within the allowed range
-        if ( ( targetTemperature >= HEATER_TARGET_TEMPERATURE_MIN ) && ( targetTemperature <= HEATER_TARGET_TEMPERATURE_MAX ) )
+        if ( ( ( targetTemperature >= HEATER_TARGET_TEMPERATURE_MIN ) && ( targetTemperature <= HEATER_TARGET_TEMPERATURE_MAX ) ) &&
+             ( lastDialTargetTemperatureSet != targetTemperature ) )
         {
             targetTempC[ heater ].data                   = targetTemperature;
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
+            lastDialTargetTemperatureSet                 = targetTemperature;
+
+            if ( D5_HEAT == heater )
+            {
+                startupHeaterControl = TRUE;
+            }
+
         }
     }
     else
@@ -372,12 +382,12 @@
         heatersStatus[ heater ].heaterOnState               = FALSE;
         control[ heater ].data                              = HEATERS_MIN_DUTY_CYCLE;
         heatersStatus[ heater ].state                       = HEATER_EXEC_STATE_OFF;
-        startupHeaterControl                                = TRUE;
 
         //Update control interval counter
         if ( D5_HEAT == heater )
         {
             heatersStatus[ D5_HEAT ].controlIntervalCounter = D5_HEAT_CONTROL_INTERVAL_START_COUNT;
+            startupHeaterControl                            = TRUE;
         }
         else
         {
@@ -656,14 +666,14 @@
 
             ctrl = runPIController( PI_CONTROLLER_ID_D45_HEAT, targetTemperature, measuredTemperature );
             control[ heater ].data = ctrl;
-#ifdef __HEATERS_DEBUG__
-            U32 i;
-
-            for ( i = 0; i < NUM_OF_CONTROLLER_SIGNAL; i++ )
-            {
-                pIControlSignal[ i ] = getPIControllerSignals( PI_CONTROLLER_ID_D45_HEAT, (PI_CONTROLLER_SIGNALS_ID)i );
-            }
-#endif
+//#ifdef __HEATERS_DEBUG__
+//            U32 i;
+//
+//            for ( i = 0; i < NUM_OF_CONTROLLER_SIGNAL; i++ )
+//            {
+//                pIControlSignal[ i ] = getPIControllerSignals( PI_CONTROLLER_ID_D45_HEAT, (PI_CONTROLLER_SIGNALS_ID)i );
+//            }
+//#endif
         }
 
         heatersStatus[ heater ].hasTargetTempChanged   = FALSE;