Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r4cabd64c4ff295eb985f0a62132fef94c4e92921 -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 4cabd64c4ff295eb985f0a62132fef94c4e92921)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f)
@@ -30,7 +30,7 @@
 #include "TaskGeneral.h"
 #include "TaskPriority.h"
 #include "TDInterface.h"
-#include "TemperatureSensors.h"
+#include "Temperature.h"
 #include "Timers.h"
 #include "Utilities.h"
 
@@ -551,7 +551,8 @@
 
     if ( D5_HEAT == heater )
     {
-        measuredTemperature = getTemperatureValue( D4_TEMP );
+       // measuredTemperature = getTemperatureValue( D4_TEMP );
+        measuredTemperature = getD4AverageTemperature();
 
         if ( DD_MODE_HEAT != opMode )
         {
@@ -577,7 +578,8 @@
     }
     else
     {
-        measuredTemperature = getTemperatureValue( D50_TEMP );
+        //measuredTemperature = getTemperatureValue( D50_TEMP );
+        measuredTemperature = getD50AverageTemperature();
 
         if ( DD_MODE_HEAT != opMode )
         {
@@ -629,7 +631,8 @@
     {
         if ( D5_HEAT == heater )
         {
-            measuredTemperature = getTemperatureValue( D4_TEMP );
+            //measuredTemperature = getTemperatureValue( D4_TEMP );
+            measuredTemperature = getD4AverageTemperature();
             // Inlet temperature post heat exchanger
             inletTemperature    = getTemperatureValue( X6_TEMP );
 
@@ -662,7 +665,8 @@
         }
         else
         {
-            measuredTemperature = getTemperatureValue( D50_TEMP );
+            //measuredTemperature = getTemperatureValue( D50_TEMP );
+            measuredTemperature = getD50AverageTemperature();
 
             ctrl = runPIController( PI_CONTROLLER_ID_D45_HEAT, targetTemperature, measuredTemperature );
             control[ heater ].data = ctrl;