Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r669f36cf32c3b500aa2fd5b08c58ee5e6b2e7f08 -r6d3a38303c448c14f9f64781dd39cbf2ac0fceec
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 669f36cf32c3b500aa2fd5b08c58ee5e6b2e7f08)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 6d3a38303c448c14f9f64781dd39cbf2ac0fceec)
@@ -182,6 +182,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -192,6 +193,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -225,13 +227,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
     {