Index: firmware/.launches/DG.launch
===================================================================
diff -u -r3eb7c2e62c727be195cd937d49957db9d4ba83b4 -rbbf67569fc5f34815c0e0855dd452de2be5a7976
--- firmware/.launches/DG.launch	(.../DG.launch)	(revision 3eb7c2e62c727be195cd937d49957db9d4ba83b4)
+++ firmware/.launches/DG.launch	(.../DG.launch)	(revision bbf67569fc5f34815c0e0855dd452de2be5a7976)
@@ -1,30 +1,10 @@
 <?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/workspace_dg/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_DEBUGGER_PROPERTIES./home/fw/workspace_dg_develop/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_DEBUGGER_PROPERTIES./home/fw/workspace_dg_flush/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_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;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/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="${build_artifact:DG}"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM./home/fw/workspace_dg_develop/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="${build_artifact:DG}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_dg_flush/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/workspace_dg_flush/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="${build_artifact:DG}"/>
-<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/workspace_dg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="DG"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT./home/fw/workspace_dg_develop/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="DG"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT./home/fw/workspace_dg_flush/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="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/workspace_dg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="/home/fw/workspace_dg/dgfirmware/firmware/Debug/DG.out"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM./home/fw/workspace_dg_develop/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="/home/fw/workspace_dg_develop/dgfirmware/firmware/Debug/DG.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM./home/fw/workspace_dg_flush/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="/home/fw/workspace_dg_flush/dgfirmware/firmware/Debug/DG.out"/>
-<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/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/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/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/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="/home/fw/workspace_dg/dgfirmware/firmware/Debug/DG.out"/>
->>>>>>> staging
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/DG"/>
 </listAttribute>
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r28b5f2e7f757647145a82a39aca0a5f3652c68a1 -rbbf67569fc5f34815c0e0855dd452de2be5a7976
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 28b5f2e7f757647145a82a39aca0a5f3652c68a1)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision bbf67569fc5f34815c0e0855dd452de2be5a7976)
@@ -882,6 +882,8 @@
         data.mainPrimayHeaterDC   = mainPrimaryHeaterDutyCycle * 100.0;
         data.smallPrimaryHeaterDC = smallPrimaryHeaterDutyCycle * 100.0;
         data.trimmerHeaterDC      = trimmerHeaterDutyCycle * 100.0;
+        data.primaryTargetTemp    = primaryHeaterTargetTemperature;
+        data.trimmerTargetTemp    = trimmerHeaterTargetTemperature;
 
         broadcastHeatersData( &data );
 
Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -r5c967dc311b485769e50e5e4f122be21079b5ae9 -rbbf67569fc5f34815c0e0855dd452de2be5a7976
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 5c967dc311b485769e50e5e4f122be21079b5ae9)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision bbf67569fc5f34815c0e0855dd452de2be5a7976)
@@ -56,6 +56,8 @@
     F32 mainPrimayHeaterDC;                 ///< Main primary heater DC
     F32 smallPrimaryHeaterDC;               ///< Small primary heater DC
     F32 trimmerHeaterDC;                    ///< Trimmer heater DC
+    F32 primaryTargetTemp;                  ///< Primary heaters target temperature
+    F32 trimmerTargetTemp;                  ///< Trimmer heater target temperature
 } HEATERS_DATA_T;
 
 #pragma pack(pop)
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r3eb7c2e62c727be195cd937d49957db9d4ba83b4 -rbbf67569fc5f34815c0e0855dd452de2be5a7976
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 3eb7c2e62c727be195cd937d49957db9d4ba83b4)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision bbf67569fc5f34815c0e0855dd452de2be5a7976)
@@ -813,10 +813,10 @@
         data.internalTHDORTD            = getTemperatureValue ( TEMPSENSORS_INTERNAL_THDO_RTD );
         data.internalTDIRTD             = getTemperatureValue ( TEMPSENSORS_INTERNAL_TDI_RTD );
         data.internalCondSnsrTemp       = getTemperatureValue ( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR );
-        data.primaryThermoCoupleRaw     = tempSensors[ TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
-        data.primaryColdjuncRaw         = tempSensors[ TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
-        data.trimmerThermoCoupleRaw     = tempSensors[ TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
-        data.trimmerColdjuncRaw         = tempSensors[ TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
+        data.primaryThermoCoupleRaw     = getFPGAPrimaryHeaterTemp();
+        data.primaryColdjuncRaw         = getFPGAPrimaryColdJunctionTemp();
+        data.trimmerThermoCoupleRaw     = getFPGATrimmerHeaterTemp();
+        data.trimmerColdjuncRaw         = getFPGATrimmerColdJunctionTemp();
         data.cond1Raw                   = tempSensors[ TEMPSENSORS_CONDUCTIVITY_SENSOR_1 ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
         data.cond2Raw                   = tempSensors[ TEMPSENSORS_CONDUCTIVITY_SENSOR_2 ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
 
Index: firmware/App/Controllers/TemperatureSensors.h
===================================================================
diff -u -r28b5f2e7f757647145a82a39aca0a5f3652c68a1 -rbbf67569fc5f34815c0e0855dd452de2be5a7976
--- firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision 28b5f2e7f757647145a82a39aca0a5f3652c68a1)
+++ firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision bbf67569fc5f34815c0e0855dd452de2be5a7976)
@@ -76,10 +76,10 @@
     F32 internalTHDORTD;
     F32 internalTDIRTD;
     F32 internalCondSnsrTemp;
-    S32 primaryThermoCoupleRaw;
-    S32 primaryColdjuncRaw;
-    S32 trimmerThermoCoupleRaw;
-    S32 trimmerColdjuncRaw;
+    U32 primaryThermoCoupleRaw;
+    U32 primaryColdjuncRaw;
+    U32 trimmerThermoCoupleRaw;
+    U32 trimmerColdjuncRaw;
     S32 cond1Raw;
     S32 cond2Raw;
 } TEMPERATURE_SENSORS_DATA_T;