Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r2468e56fbecd26da713bc78535bd727f4b105fe1 -rab7dfc361e5ee347141842b317f1fc2f16e4e3f3
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 2468e56fbecd26da713bc78535bd727f4b105fe1)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision ab7dfc361e5ee347141842b317f1fc2f16e4e3f3)
@@ -183,6 +183,7 @@
 {
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -199,6 +200,7 @@
                 // TODO alarm if temperature if out of range or just reject?
             }
         }
+#endif
     }
     else
     {
@@ -230,13 +232,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
     {
@@ -321,6 +326,7 @@
         if ( ( MINIMUM_TARGET_TEMPERATURE <= heaterCmdPtr->targetTemp ) && ( heaterCmdPtr->targetTemp <= MAXIMUM_TARGET_TEMPERATURE ) )
         {
             cmdResponse.rejected = FALSE;
+
     #ifndef DISABLE_HEATERS_AND_TEMPS
             heatersStatus[ DG_TRIMMER_HEATER ].targetTemp        = heaterCmdPtr->targetTemp;
             heatersStatus[ DG_TRIMMER_HEATER ].startHeaterSignal = TRUE;
@@ -352,7 +358,7 @@
  *************************************************************************/
 void execHeatersMonitor( void )
 {
-    /*DG_HEATERS_T heater;
+    DG_HEATERS_T heater;
 
 #ifndef IGNORE_HEATERS_MONITOR
     checkPrimaryHeaterTempSensors();
@@ -395,7 +401,7 @@
                 heatersStatus[ heater ].heaterOnWithNoFlowTimer = getMSTimerCount();
             }
         }
-    }*/
+    }
 
     // TODO un-comment the heaters voltage
     //monitorHeatersVoltage();