Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -r51e60f3e3a7c95c910c24dd5f3b58e0c6b2691b8
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a9315539f527b92523b1598ff91e47db4d71dae2)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 51e60f3e3a7c95c910c24dd5f3b58e0c6b2691b8)
@@ -174,6 +174,7 @@
 {
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -184,6 +185,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             // TODO alarm if temperature if out of range or just reject?
         }
+#endif
     }
     else
     {
@@ -215,13 +217,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
     {