Index: firmware/.cproject
===================================================================
diff -u -r5bec978fa9cce89bbf8c559f0844b7528a10c0d1 -rae2e9a17bf7bbab12b6d8c2a9812f62ec7fb9ab8
--- firmware/.cproject	(.../.cproject)	(revision 5bec978fa9cce89bbf8c559f0844b7528a10c0d1)
+++ firmware/.cproject	(.../.cproject)	(revision ae2e9a17bf7bbab12b6d8c2a9812f62ec7fb9ab8)
@@ -51,14 +51,11 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE.1286433369" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="__TI_VIM_128CH__"/>
 									<listOptionValue builtIn="false" value="_HD_"/>
-
-
 									<listOptionValue builtIn="false" value="__TI_VFPV3D16_SUPPORT__"/>
 								</option>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEBUGGING_MODEL.17413764" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WARNING.770195724" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WARNING" valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
-
 								</option>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WRAP.1520602065" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DISPLAY_ERROR_NUMBER.715518089" name="Emit diagnostic identifier numbers (--display_error_number, -pden)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
Index: firmware/.launches/HD.launch
===================================================================
diff -u -r5bec978fa9cce89bbf8c559f0844b7528a10c0d1 -rae2e9a17bf7bbab12b6d8c2a9812f62ec7fb9ab8
--- firmware/.launches/HD.launch	(.../HD.launch)	(revision 5bec978fa9cce89bbf8c559f0844b7528a10c0d1)
+++ firmware/.launches/HD.launch	(.../HD.launch)	(revision ae2e9a17bf7bbab12b6d8c2a9812f62ec7fb9ab8)
@@ -1,6 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="com.ti.ccstudio.debug.launchType.device.debugging">
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_hd/hdfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe_0/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;"/>
+<mapAttribute key="ccs.memoryview.format">
+<mapEntry key="org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowser@#$Texas Instruments XDS110 USB Debug Probe_0/CortexR4@#$0" value="32-Bit Hex - TI Style"/>
+</mapAttribute>
+<mapAttribute key="ccs.memoryview.pageexpr">
+<mapEntry key="org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowser@#$Texas Instruments XDS110 USB Debug Probe_0/CortexR4" value="@@0xF0200000"/>
+</mapAttribute>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_hd/hdfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe_0/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;"/>
+<setAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_HIDE_CONFIG_ELEMENT_TYPES">
+<setEntry value="BOARD"/>
+<setEntry value="BYPASSED_CPU"/>
+<setEntry value="BYPASSED_ROUTER"/>
+<setEntry value="CONNECTION"/>
+<setEntry value="DEVICE"/>
+<setEntry value="NON_DEBUG_CPU"/>
+<setEntry value="NO_DRIVER"/>
+<setEntry value="ROUTER"/>
+<setEntry value="SUBPATH"/>
+<setEntry value="SYSTEM"/>
+</setAttribute>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM./home/fw/workspace_hd/hdfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe_0/CortexR4" value="${build_artifact:HD}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT./home/fw/workspace_hd/hdfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe_0/CortexR4" value="HD"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:HD}"/>
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r94895e32fe18e78b98fe3bb7786838cf00afdbfa -rae2e9a17bf7bbab12b6d8c2a9812f62ec7fb9ab8
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 94895e32fe18e78b98fe3bb7786838cf00afdbfa)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision ae2e9a17bf7bbab12b6d8c2a9812f62ec7fb9ab8)
@@ -97,6 +97,7 @@
     { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_VENOUS_PRESSURE_HIGH
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_UF_RATE_ACCURACY_ERROR
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_UF_VOLUME_ACCURACY_ERROR
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR
 };
 
 /// A blank alarm data record for alarms that do not include alarm data when triggered.