Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753 -r6e3bbb4c27eae91fed11b118cced935a04c6b90a
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 6e3bbb4c27eae91fed11b118cced935a04c6b90a)
@@ -175,6 +175,7 @@
 {
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -185,6 +186,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             // TODO alarm if temperature if out of range or just reject?
         }
+#endif
     }
     else
     {
@@ -216,13 +218,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
     {