Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r544e9782a1b8d444224f41efef38a5204c262722 -r6ce44043f6a5fb452ca10c9eca4f081967656a7d
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 544e9782a1b8d444224f41efef38a5204c262722)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 6ce44043f6a5fb452ca10c9eca4f081967656a7d)
@@ -180,6 +180,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -190,6 +191,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -223,13 +225,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
     {