Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r986abcfcf047822cad1a10c1ee0924a80dd5f512 -re7dd4d4f0d9cbb0d8e7abb994a16f0389251e4ba
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e7dd4d4f0d9cbb0d8e7abb994a16f0389251e4ba)
@@ -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;
             // TODO alarm if temperature if out of range or just reject?
         }
+#endif
     }
     else
     {
@@ -219,13 +221,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
     {
@@ -903,12 +908,12 @@
     if ( trimmerHeaterInternalTemp > HEATERS_MAX_ALLOWED_INTERNAL_TEMPERATURE_C )
     {
         isTempOut = TRUE;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, trimmerHeaterInternalTemp );
+        //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, trimmerHeaterInternalTemp );
     }
     else if ( trimmerHeaterColdJunctionTemp > HEATERS_MAX_ALLOWED_COLD_JUNCTION_TEMPERATURE_C )
     {
         isTempOut = TRUE;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, trimmerHeaterColdJunctionTemp );
+        //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, trimmerHeaterColdJunctionTemp );
     }
 
 #ifndef IGNORE_HEATERS_MONITOR