Index: firmware/.launches/DG.launch
===================================================================
diff -u -r69c1c495f29d102b2bfac2045b7611e63a8bad08 -r388a6f1cf7661a973b0b08c2eeb4de30522c1e88
--- firmware/.launches/DG.launch	(.../DG.launch)	(revision 69c1c495f29d102b2bfac2045b7611e63a8bad08)
+++ firmware/.launches/DG.launch	(.../DG.launch)	(revision 388a6f1cf7661a973b0b08c2eeb4de30522c1e88)
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="com.ti.ccstudio.debug.launchType.device.debugging">
+<<<<<<< HEAD
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/wsdg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM./home/fw/wsdg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="${build_artifact:DG}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT./home/fw/wsdg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="DG"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:DG}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM./home/fw/wsdg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="/home/fw/wsdg/dgfirmware/firmware/Debug/DG.out"/>
+=======
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_dg-old/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;FlashEraseSelection&quot;&gt;&#10;    &lt;curValue&gt;Necessary Sectors Only (for Program Load)&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM./home/fw/workspace_dg-old/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="${build_artifact:DG}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT./home/fw/workspace_dg-old/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="DG"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:DG}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM./home/fw/workspace_dg-old/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="/home/fw/workspace_dg-old/dgfirmware/firmware/Debug/DG.out"/>
+>>>>>>> d838fbaa8507b883fa112e69137e86fc9fb2cb6f
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/DG"/>
 </listAttribute>
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rd838fbaa8507b883fa112e69137e86fc9fb2cb6f -r388a6f1cf7661a973b0b08c2eeb4de30522c1e88
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision d838fbaa8507b883fa112e69137e86fc9fb2cb6f)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 388a6f1cf7661a973b0b08c2eeb4de30522c1e88)
@@ -231,7 +231,9 @@
     if ( primaryHeaterTargetTemperature >= MINIMUM_TARGET_TEMPERATURE &&
          primaryHeaterTargetTemperature <= MAXIMUM_TARGET_TEMPERATURE  )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         hasStartPrimaryHeaterRequested = TRUE;
+#endif
         status = TRUE;
     }
 
@@ -256,7 +258,9 @@
     if ( trimmerHeaterTargetTemperature >= MINIMUM_TARGET_TEMPERATURE &&
          trimmerHeaterTargetTemperature <= MAXIMUM_TARGET_TEMPERATURE )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         hasStartTrimmerHeaterRequested = TRUE;
+#endif
         status = TRUE;
     }
 
@@ -847,6 +851,7 @@
                                (U32)(trimmerHeaterDutyCycle*100) );
  //NOTE: This section will be removed
 #ifdef DEBUG_ENABLED
+#ifdef HEATERS_DEBUG
     {
        char debugTempStr[ 256 ];
        sprintf( debugTempStr, "TPo: %6.2f, PriCJ: %6.2f, PriTC: %6.2f, TpriInt: %6.2f, TRo: %6.2f, TriCJ: %6.2f, TriTC: %6.2f, TtriInt: %6.2f\r\n",
@@ -863,6 +868,7 @@
         sendDebugData ( (U08*)debugTempStr, strlen(debugTempStr) );
     }
 #endif
+#endif
         dataPublicationTimerCounter = 0;
     }
 }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd838fbaa8507b883fa112e69137e86fc9fb2cb6f -r388a6f1cf7661a973b0b08c2eeb4de30522c1e88
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d838fbaa8507b883fa112e69137e86fc9fb2cb6f)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 388a6f1cf7661a973b0b08c2eeb4de30522c1e88)
@@ -30,17 +30,12 @@
 #include "ROPump.h"
 #include "RTC.h"
 #include "SystemComm.h"
+#include "SafetyShutdown.h"
+#include "SystemCommMessages.h"
+#include "TemperatureSensors.h"
 #include "Utilities.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
-#include "SystemCommMessages.h"
-#include "SafetyShutdown.h"
-#include "Utilities.h"
-#include "SystemComm.h"
-#include "RTC.h"
-#include "LoadCell.h"
-#include "TemperatureSensors.h"
-#include "Heaters.h"
 
 // ********** private definitions **********