Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rb0a5452ec4b9be9be937095b1249079a2fce5ce5 -r49098a843da3aac6bd86250efbf53bd12e8bf6ab
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision b0a5452ec4b9be9be937095b1249079a2fce5ce5)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 49098a843da3aac6bd86250efbf53bd12e8bf6ab)
@@ -183,6 +183,7 @@
 {
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -193,6 +194,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             // TODO alarm if temperature if out of range or just reject?
         }
+#endif
     }
     else
     {
@@ -224,13 +226,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
     {