Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rbcb768dd6a13286e028533394916a9f69c9f254f -rf4a444de1b2b78922a911448a65cfcc8677f86cb
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision bcb768dd6a13286e028533394916a9f69c9f254f)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision f4a444de1b2b78922a911448a65cfcc8677f86cb)
@@ -172,6 +172,7 @@
 {
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -182,6 +183,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             // TODO alarm if temperature if out of range or just reject?
         }
+#endif
     }
     else
     {
@@ -213,13 +215,16 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         if ( TRUE == heatersStatus[ heater ].hasTargetTempChanged )
         {
             status = TRUE;
             heatersStatus[ heater ].startHeaterSignal = TRUE;
         }
+#endif
     }
     else
     {