Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r26f63d0260a3c35277e3e6dbca3573c253775318 -r1b95ae077de1d01a314be8cc011662ab508fba10
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 26f63d0260a3c35277e3e6dbca3573c253775318)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 1b95ae077de1d01a314be8cc011662ab508fba10)
@@ -174,6 +174,7 @@
 {
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -184,6 +185,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             // TODO alarm if temperature if out of range or just reject?
         }
+#endif
     }
     else
     {
@@ -215,13 +217,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
     {
@@ -322,9 +327,11 @@
 
     if ( TRUE == heaterCmdPtr->startHeater )
     {
+#ifndef DISABLE_TRIMMER_HEATER
         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;
@@ -334,6 +341,7 @@
         {
             cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER;
         }
+#endif
     }
     else
     {
@@ -356,7 +364,7 @@
  *************************************************************************/
 void execHeatersMonitor( void )
 {
-    /*DG_HEATERS_T heater;
+    DG_HEATERS_T heater;
 
 #ifndef IGNORE_HEATERS_MONITOR
     checkPrimaryHeaterTempSensors();
@@ -399,7 +407,7 @@
                 heatersStatus[ heater ].heaterOnWithNoFlowTimer = getMSTimerCount();
             }
         }
-    }*/
+    }
 
     // TODO un-comment the heaters voltage
     //monitorHeatersVoltage();
@@ -821,12 +829,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 );
     }
 
     // If it is above the range for the first time, stop the trimmer heater