Index: firmware/.launches/DG.launch
===================================================================
diff -u -rd4b046813eb5b680702ba2a8376efe793607a0ea -reb21c6c63f6c2181a6405cd7c2218b867f4af294
--- firmware/.launches/DG.launch	(.../DG.launch)	(revision d4b046813eb5b680702ba2a8376efe793607a0ea)
+++ firmware/.launches/DG.launch	(.../DG.launch)	(revision eb21c6c63f6c2181a6405cd7c2218b867f4af294)
@@ -6,7 +6,7 @@
 </mapAttribute>
 <mapAttribute key="ccs.memoryview.pageexpr">
 <mapEntry key="org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowser.PIN_CLONE_VIEW_1@#$Texas Instruments XDS110 USB Debug Probe/CortexR4" value="@@0x08011EAC"/>
-<mapEntry key="org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowser@#$Texas Instruments XDS110 USB Debug Probe/CortexR4" value="@@0xF0200000"/>
+<mapEntry key="org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowser@#$Texas Instruments XDS110 USB Debug Probe/CortexR4" value="@@0xF0201660"/>
 </mapAttribute>
 <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_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;"/>
Index: firmware/App/DGCommon.h
===================================================================
diff -u -rd4b046813eb5b680702ba2a8376efe793607a0ea -reb21c6c63f6c2181a6405cd7c2218b867f4af294
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision d4b046813eb5b680702ba2a8376efe793607a0ea)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision eb21c6c63f6c2181a6405cd7c2218b867f4af294)
@@ -38,7 +38,7 @@
 //    #define DISABLE_HEATERS_AND_TEMPS       1
     #define DISABLE_ACCELS                  1
     #define SKIP_POST                       1
-    #define DISABLE_CAL_CHECK               1
+    //#define DISABLE_CAL_CHECK               1
 //    #define ENABLE_DIP_SWITCHES             1
 //    #define EMC_TEST_BUILD                  1
     #define ALARMS_DEBUG                    1