Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r4b09605126f35b80406e95d079f3822c51a3ba25 -re0102a0a08c0d83bcc8e959551079063e2e60d9f
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 4b09605126f35b80406e95d079f3822c51a3ba25)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e0102a0a08c0d83bcc8e959551079063e2e60d9f)
@@ -126,7 +126,7 @@
 static U32 dataPublicationTimerCounter;                                                                                            ///< Data publication timer counter.
 static U32 primaryTargetTempAdjCounter;                                                                                            ///< Primary target temperature adjustment counter.
 static BOOL isTargetTempAdjusted;                                                                                                  ///< Flag indicating that target temperature is adjusted
-static U32 adjustedTargetTemp;                                                                                                     ///< Adjusted primary target temperature
+static U32 adjustedPrimaryTargetTemp;                                                                                                     ///< Adjusted primary target temperature
 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
@@ -143,7 +143,7 @@
 static HEATERS_STATE_T handleHeaterStateRampToTarget( DD_HEATERS_T heater );
 static HEATERS_STATE_T handleHeaterStateControlToTarget( DD_HEATERS_T heater );
 static HEATERS_STATE_T handleHeaterStateControlToDisinfectTarget( DD_HEATERS_T heater );
-static void updatePrimaryHeaterTargetTemp( DD_HEATERS_T heater );
+static void updatePrimaryHeaterTargetTemp( void );
 static F32 calculateDutyCycle( F32 flowrate, F32 deltaTemp, F32 power, F32 efficiency, F32 min, F32 max );
 
 static void setHeaterControl( DD_HEATERS_T heater );
@@ -195,7 +195,7 @@
     startupHeaterControl                             = TRUE;
     lastDialTargetTemperatureSet                     = 0.0F;
     primaryTargetTempAdjCounter                      = 0;
-    adjustedTargetTemp                               = 0.0F;
+    adjustedPrimaryTargetTemp                        = 0.0F;
     isTargetTempAdjusted                             = FALSE;
 
     for ( heater = DD_HEATERS_FIRST; heater < NUM_OF_DD_HEATERS; heater++ )
@@ -358,19 +358,16 @@
 
 /*********************************************************************//**
  * @brief
- * The signaltoResetAdjustedTargetTemp function resets the flag to
- * update/adjust the target dialysate temperature
+ * The signaltoResetPrimaryHeaterAdjustedTargetTemp function resets the flag to
+ * update/adjust the primary heater target dialysate temperature
  * @details \b Inputs: none
  * @details \b Outputs: isTargetTempAdjusted
  * @param heater: heater ID to update the heater control.
  * @return none
  *************************************************************************/
-void signaltoResetAdjustedTargetTemp( DD_HEATERS_T heater )
+void signaltoResetPrimaryHeaterAdjustedTargetTemp( void )
 {
-    if ( D5_HEAT == heater )
-    {
-        isTargetTempAdjusted = FALSE;
-    }
+   isTargetTempAdjusted = FALSE;
 }
 
 /*********************************************************************//**
@@ -379,36 +376,32 @@
  * target dialysate temperature
  * @details \b Inputs: Set Target Temperature, D28 Temp
  * @details \b Outputs: Adjusted target temperature
- * @param heater: heater ID to update the heater control.
  * @return none
  *************************************************************************/
-static void updatePrimaryHeaterTargetTemp( DD_HEATERS_T heater )
+static void updatePrimaryHeaterTargetTemp( void )
 {
-    if ( D5_HEAT == heater )
+    if ( ++primaryTargetTempAdjCounter >= D5_TARGET_TEMP_ADJUST_INTERVAL_MS )
     {
-        if ( ++primaryTargetTempAdjCounter >= D5_TARGET_TEMP_ADJUST_INTERVAL_MS )
+        F32 targetTempfromTD            = getTDTargetDialysateTemperature();
+        F32 measuredTempAtDialyzer      = getConductivityTemperatureValue( D27_COND );
+        F32 calcTargetTemp              = getHeaterTargetTemperature( D5_HEAT );
+        F32 deltaTempC                  = targetTempfromTD - measuredTempAtDialyzer;
+        F32 capDeltaTempC               = MIN( fabs(deltaTempC), MAX_ADJ_DELTA_TEMP_C );
+
+        if ( deltaTempC > HEATERS_ZERO_DELTA_TEMP_C )
         {
-            F32 targetTempfromTD            = getTDTargetDialysateTemperature();
-            F32 measuredTempAtDialyzer      = getConductivityTemperatureValue( D27_COND );
-            F32 calcTargetTemp              = getHeaterTargetTemperature( heater );
-            F32 deltaTempC                  = targetTempfromTD - measuredTempAtDialyzer;
-            F32 capDeltaTempC               = MIN( fabs(deltaTempC), MAX_ADJ_DELTA_TEMP_C );
+            adjustedPrimaryTargetTemp = calcTargetTemp + capDeltaTempC;
+        }
+        else
+        {
+            adjustedPrimaryTargetTemp = calcTargetTemp - capDeltaTempC;
+        }
 
-            if ( deltaTempC > HEATERS_ZERO_DELTA_TEMP_C )
-            {
-                adjustedTargetTemp = calcTargetTemp + capDeltaTempC;
-            }
-            else
-            {
-                adjustedTargetTemp = calcTargetTemp - capDeltaTempC;
-            }
+        adjustedPrimaryTargetTemp = MIN(adjustedPrimaryTargetTemp, ( calcTargetTemp + MAX_ADJ_DELTA_TEMP_C ) );
+        adjustedPrimaryTargetTemp = MAX(adjustedPrimaryTargetTemp, ( calcTargetTemp - MAX_ADJ_DELTA_TEMP_C ) );
 
-            adjustedTargetTemp = MIN(adjustedTargetTemp, ( calcTargetTemp + MAX_ADJ_DELTA_TEMP_C ) );
-            adjustedTargetTemp = MAX(adjustedTargetTemp, ( calcTargetTemp - MAX_ADJ_DELTA_TEMP_C ) );
-
-            isTargetTempAdjusted        = TRUE;
-            primaryTargetTempAdjCounter = 0;
-        }
+        isTargetTempAdjusted        = TRUE;
+        primaryTargetTempAdjCounter = 0;
     }
 }
 
@@ -697,7 +690,11 @@
     F32 measuredTemperature  = 0.0F;
     F32 ctrl                 = 0.0F;
 
-    updatePrimaryHeaterTargetTemp( heater );
+    // Update primary heater target temperature at defined interval
+    if ( D5_HEAT == heater )
+    {
+        updatePrimaryHeaterTargetTemp();
+    }
 
     if ( ++heatersStatus[ heater ].controlIntervalCounter >= controlInterval[ heater ] )
     {
@@ -709,22 +706,24 @@
 
             if ( TRUE == startupHeaterControl )
             {
-                startupHeaterControl    = FALSE;
                 F32 deltaTempC          = targetTemperature - inletTemperature;
                 F32 capDeltaTempC       = MAX( deltaTempC, HEATERS_ZERO_DELTA_TEMP_C );
                 F32 flowrate            = getTDDialysateFlowrate() / LITER_IN_ML ;
                 F32 feedforward         = calculateDutyCycle( flowrate, capDeltaTempC, PRIMARY_HEATER_MAX_PWR_WATTS, AC_HEATER_EFFICIENCY,
                                                               HEATERS_MIN_DUTY_CYCLE, AC_HEATER_TX_MAX_DUTY_CYCLE );
+                startupHeaterControl    = FALSE;
                 control[ heater ].data  = feedforward;
                 resetPIController( PI_CONTROLLER_ID_D5_HEAT, HEATERS_MIN_DUTY_CYCLE, feedforward );
             }
             else
             {
+                F32 deltaTempC = 0.0F;
+
                 if ( TRUE == isTargetTempAdjusted )
                 {
-                   targetTemperature    = adjustedTargetTemp;
+                   targetTemperature = adjustedPrimaryTargetTemp;
                 }
-                F32 deltaTempC          = fabs( targetTemperature - measuredTemperature );
+                deltaTempC  = fabs( targetTemperature - measuredTemperature );
 
                 if ( deltaTempC >= D5_HEATER_DEADBAND_CONTROL )
                 {
@@ -929,11 +928,9 @@
         HEATERS_DATA_T data;
 
         data.d5_HeaterDC                = getHeaterControl( D5_HEAT ) * HEATERS_DUTY_CYCLE_CONVERSION_FACTOR;
-        data.d45_HeaterDC               = getTDTargetDialysateTemperature();
-        //data.d45_HeaterDC               = getHeaterControl( D45_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       = adjustedTargetTemp;
-        //data.d45_HeaterTargetTemp       = getHeaterTargetTemperature( D45_HEAT );
+        data.d45_HeaterTargetTemp       = getHeaterTargetTemperature( D45_HEAT );
         data.d5_HeaterState             = heatersStatus[ D5_HEAT ].state;
         data.d45_HeaterState            = heatersStatus[ D45_HEAT ].state;
 #ifndef __HEATERS_DEBUG__