Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r90cbf13cf67e4d1ede545b867c83bfd14c6f77b3 -re084f5fb29932dc2d369a6899cca0e8771caf00f
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 90cbf13cf67e4d1ede545b867c83bfd14c6f77b3)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e084f5fb29932dc2d369a6899cca0e8771caf00f)
@@ -181,6 +181,7 @@
 {
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -191,6 +192,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             // TODO alarm if temperature if out of range or just reject?
         }
+#endif
     }
     else
     {
@@ -222,13 +224,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
     {