Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r8a553b10a224c745cb4bd6d963c867391905ba8c -ra5723df5741ceaf13cd6cf9cab50a55bfea15501
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 8a553b10a224c745cb4bd6d963c867391905ba8c)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a5723df5741ceaf13cd6cf9cab50a55bfea15501)
@@ -176,6 +176,7 @@
 {
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -186,6 +187,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             // TODO alarm if temperature if out of range or just reject?
         }
+#endif
     }
     else
     {
@@ -217,13 +219,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
     {
@@ -324,18 +329,20 @@
 
     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; DEBUG_DENALI
-            //heatersStatus[ DG_TRIMMER_HEATER ].startHeaterSignal = TRUE;
+            heatersStatus[ DG_TRIMMER_HEATER ].targetTemp        = heaterCmdPtr->targetTemp;
+            heatersStatus[ DG_TRIMMER_HEATER ].startHeaterSignal = TRUE;
 #endif
         }
         else
         {
             cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER;
         }
+#endif
     }
     else
     {
@@ -896,12 +903,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