Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r0b93322875e9aa5719941574fde93d3042dc6796 -r3e9328290bdbc18a940935bd7f7c720ca8432b1d
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 0b93322875e9aa5719941574fde93d3042dc6796)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3e9328290bdbc18a940935bd7f7c720ca8432b1d)
@@ -178,6 +178,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -188,6 +189,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -221,13 +223,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
     {