enable DLE only

Merge remote-tracking branch 'origin/host_test/master' into host_test/master
update BLE4.2 feature
2020-03-27 11:37:46 +08:00 · 2020-03-26 16:57:33 +08:00 · 2020-03-26 16:57:24 +08:00 · 2020-03-26 16:50:16 +08:00 · 2020-03-26 16:49:57 +08:00 · 2020-03-26 16:45:10 +08:00
163 changed files with 7423 additions and 6407 deletions
@@ -8,6 +8,6 @@ AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortFunctionsOnASingleLine: Empty
 BinPackArguments: false
 BinPackParameters: false
-IndentCaseLabels: false
+IndentCaseLabels: true
 SortIncludes: true
 TabWidth: 4
@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="keyword" value="Copyright .*" />
+    <option name="notice" value="Copyright (c) &amp;#36;today.year. BioPro. Scientific." />
+    <option name="myName" value="BioProSci" />
+  </copyright>
+</component>
@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <settings default="BioProSci">
+    <module2copyright>
+      <element module="SimplePeripheral" copyright="BioProSci" />
+    </module2copyright>
+  </settings>
+</component>
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="HostTest" pattern="file[BioProCC2650]:simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master//*" />
+</component>
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="SimplePeripheral" pattern="file[BioProCC2650]:simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage//*" />
+</component>
@@ -0,0 +1,63 @@
+BioProCC2650
+============
+
+BioPro Device
+-------------
+
+### Major source code path
+
+`simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h`
+
+`simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/simple_peripheral.c`
+
+`simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/main.c`
+
+   
+### Current project
+
+1.  Elite
+
+    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_tni.h`
+
+2.  Neulive 1.2
+
+    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_uni.h`
+
+3.  Neulive 1.3
+
+    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_neulive.h`
+
+4.  EliteZM
+
+    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_zm.h`
+
+5.  NeuliveSTI
+
+    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_sti.h`
+
+### Notable source code
+    
+*   gpio table
+
+    `simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/BOOSTXL_CC2650MA.h`
+
+    `simplelink/ble_sdk_2_02_02_25/src/boards/CC2650_LAUNCHXL/CC2650_LAUNCHXL.h`
+
+*   characteristic
+
+    `simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/simple_gatt_profile.h`
+
+    `simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx/simple_gatt_profile.c`
+
+BioPro Control
+--------------
+
+major source code path:
+
+`simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/host_test_app.c`
+
+`simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/main.c`
+
+-----------------------------------------------
+
+Copyright (c) 2019. BioPro. Scientific.
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/common/cc26xx/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc/
@@ -1 +0,0 @@
-../tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/heapmgr/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/icall/inc/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/inc/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/npi/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/profiles/roles/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/rom/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/target/
@@ -0,0 +1,83 @@
+import unittest
+from typing import List, Optional
+from random import randint
+
+REC_CHANNEL_COUNT = 16
+
+
+def to_channel_table(*channel: int) -> List[bool]:
+    return [i in channel for i in range(REC_CHANNEL_COUNT)]
+
+
+def rearrange_channel_mux_table(channel_table: List[bool]) -> Optional[List[int]]:
+    enable_channel_number = 0
+    last_enable_channel = 0
+
+    for i in range(REC_CHANNEL_COUNT):
+        if channel_table[i]:
+            last_enable_channel = i
+            enable_channel_number += 1
+
+    if enable_channel_number == 0:
+        return None
+
+    channel_mux = [0 for _ in range(REC_CHANNEL_COUNT)]
+
+    if enable_channel_number == 1:
+        channel_mux[0] = last_enable_channel
+
+        return channel_mux
+
+    next_enable_channel = last_enable_channel
+    channel_mux_index = last_enable_channel
+
+    channel_mux[channel_mux_index] = last_enable_channel
+    channel_mux_index -= 1
+
+    while channel_mux_index >= 0:
+        i = next_enable_channel - 1
+
+        while i >= 0:
+            if channel_table[i]:
+                next_enable_channel = i
+                break
+
+            i -= 1
+
+        if i < 0:
+            break
+
+        else:
+            channel_mux[channel_mux_index] = next_enable_channel
+            channel_mux_index -= 1
+
+    offset = last_enable_channel - channel_mux_index
+
+    while channel_mux_index >= 0:
+        channel_mux[channel_mux_index] = channel_mux[channel_mux_index + offset]
+        channel_mux_index -= 1
+
+    return channel_mux
+
+
+class UniRearrangeMuxChannelTest(unittest.TestCase):
+    def test_empty_channel(self):
+        self.assertIsNone(rearrange_channel_mux_table(to_channel_table()))
+
+    def test_single_channel(self):
+        for _ in range(3):
+            c = randint(0, REC_CHANNEL_COUNT - 1)
+
+            expect = [c if i == 0 else 0 for i in range(REC_CHANNEL_COUNT)]
+            print(expect)
+            self.assertEqual(expect, rearrange_channel_mux_table(to_channel_table(c)))
+
+    def test_two_channel(self):
+        self.assertEqual([2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+                         rearrange_channel_mux_table(to_channel_table(1, 2)))
+        self.assertEqual([2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+                         rearrange_channel_mux_table(to_channel_table(2, 1)))
+
+
+if __name__ == '__main__':
+    unittest.main()
@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>
@@ -15,10 +15,21 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.424169782" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out" prebuildStep="">
-					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.424169782." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.136928788" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.37064489">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1210258155" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties=""
+							   cleanCommand="${CG_CLEAN_CMD}" description=""
+							   errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser"
+							   id="com.ti.ccstudio.buildDefinitions.TMS470.Default.424169782" name="FlashROM"
+							   parent="com.ti.ccstudio.buildDefinitions.TMS470.Default"
+							   postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out"
+							   prebuildStep="">
+					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.424169782." name="/"
+								resourcePath="">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.1537255176"
+								   name="TI Build Tools"
+								   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
+								   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1109092833">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1528413609"
+									superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
@@ -26,26 +37,58 @@
 								<listOptionValue builtIn="false" value="XDC_VERSION=3.32.0.06_core"/>
 								<listOptionValue builtIn="false" value="INACTIVE_REPOS="/>
 								<listOptionValue builtIn="false" value="EXPANDED_REPOS="/>
-								<listOptionValue builtIn="false" value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
+								<listOptionValue builtIn="false"
+												 value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
 								<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
 								<listOptionValue builtIn="false" value="OUTPUT_TYPE=rtscApplication:executable"/>
 								<listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
-								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
+								<listOptionValue builtIn="false"
+												 value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
 								<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
 							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1594012352" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.884318453" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.533944020" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1506775938" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.1113348311" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1386730269" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1504759685" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1493045381" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.720922480" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.621501022" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1073606662" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1750727892"
+									superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
+									value="18.1.5.LTS" valueType="string"/>
+							<targetPlatform
+									id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1816818114"
+									name="Platform"
+									superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
+							<builder buildPath="${BuildDirectory}"
+									 id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.642479704"
+									 name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal"
+									 superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.479338557"
+								  name="ARM Compiler"
+								  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.994949198"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1779598874"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.721307142"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.125246157"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN"
+										value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.2012061320"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.476352492"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.168539226"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH"
+										valueType="includePath">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-									<listOptionValue builtIn="false" value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\host_test\cc26xx\app\cc2650"/>
+									<listOptionValue builtIn="false"
+													 value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\host_test\cc26xx\app\master"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/examples/host_test/cc26xx/app"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
@@ -57,7 +100,8 @@
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/target"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
+									<listOptionValue builtIn="false"
+													 value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/sdata"/>
@@ -67,7 +111,9 @@
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.2012350267" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.363193887"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
+										valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
 									<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
 									<listOptionValue builtIn="false" value="CC2650_HOSTTESTAPP"/>
@@ -77,7 +123,7 @@
 									<listOptionValue builtIn="false" value="ICALL_MAX_NUM_ENTITIES=6"/>
 									<listOptionValue builtIn="false" value="ICALL_MAX_NUM_TASKS=3"/>
 									<listOptionValue builtIn="false" value="MAX_NUM_BLE_CONNS=8"/>
-									<listOptionValue builtIn="false" value="MAX_PDU_SIZE=255"/>
+									<listOptionValue builtIn="false" value="MAX_PDU_SIZE=251"/>
 									<listOptionValue builtIn="false" value="NPI_USE_UART"/>
 									<listOptionValue builtIn="false" value="USE_ICALL"/>
 									<listOptionValue builtIn="false" value="xBOARD_DISPLAY_EXCLUDE_LCD"/>
@@ -85,69 +131,162 @@
 									<listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
 									<listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.224289740" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.294930590" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1311940013"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.2064874038"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS"
+										valueType="stringList">
 									<listOptionValue builtIn="false" value="48"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.451343672" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1434051367"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING"
+										valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.2064869740" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1403269172" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.299069087" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1054593545" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.799465540"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.517472866"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER"
+										value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.507310624"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.2049396471"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE"
+										valueType="stringList">
 									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
-									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
+									<listOptionValue builtIn="false"
+													 value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
 								</option>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1087313500" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1358529988" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1106701818" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1931280841" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.2110223277"
+										name="C Sources"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.918000918"
+										name="C++ Sources"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.641978750"
+										name="Assembly Sources"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1409087668"
+										name="Assembly Sources"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.37064489" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1134406099" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.210645710" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1502641146" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1870612882" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.505994136" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1109092833"
+								  name="ARM Linker"
+								  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1678442973"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE"
+										value="256" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.367075675"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE"
+										value="0" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1837422418"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE"
+										value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.917185204"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE"
+										value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.892817829"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY"
+										valueType="libs">
 									<listOptionValue builtIn="false" value="libc.a"/>
-									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
-									<listOptionValue builtIn="false" value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
+									<listOptionValue builtIn="false"
+													 value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
+									<listOptionValue builtIn="false"
+													 value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.2037194602" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.974559234"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH"
+										valueType="libPaths">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.983516893" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.27476708"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS"
+										valueType="stringList">
 									<listOptionValue builtIn="false" value="10247-D"/>
 									<listOptionValue builtIn="false" value="16002-D"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.149997443" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1443585498" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1373189675" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1262389112" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1547031242" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.148684573" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.1853959754" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.896474434" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.235707068"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.282108168"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER"
+										value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1474361267"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO"
+										value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.839523781"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.556382195"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on"
+										valueType="enumerated"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.893707763"
+										name="Linker Command Files"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.347090872"
+										name="Linker Command Files"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1986196973"
+										name="Generated Linker Command Files"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.112378568" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1489301946" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.1781561401" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1666511750" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1217013712"
+								  name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.2005021581"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8"
+										valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.843817789"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8"
+										valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.444921916"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL"
+										valueType="enumerated"/>
 							</tool>
-							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1597178438" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1157586592" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
+							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1206125950" name="XDCtools"
+								  superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1447176325"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH"
+										valueType="stringList">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_REPOS}"/>
 									<listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
 								</option>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.818653015" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.1701617419" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.902568806" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1802155224" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1913827880" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1356547121" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.278021553"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET"
+										value="ti.targets.arm.elf.M3" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.1259072406"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM"
+										value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1080552633"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW"
+										value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1728380155"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE"
+										value="release" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1621099990"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR"
+										value="${CG_TOOL_ROOT}" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.355879919"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS"
+										value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="2" id="The Converter Usage">
-                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
-                        <choice Name="Overclock with user specified value" value="unused">
-                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
-                        </choice>
-                    </property>
-                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="1" id="Power Selection">
+                <choice Name="Probe supplied power" value="1">
+                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
+                </choice>
+            </property>
+            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
+            <property Type="choicelist" Value="4" id="SWD Mode Settings">
+                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
                </choice>
            </property>
            <platform XML_version="1.2" id="platform_0">
@@ -1,10 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2019-04-28 18:23:23.057000)
+** Stack Frontier Generator 1.1.0 (2019-10-01 14:44:57.758000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */

 --define=ICALL_STACK0_ADDR=0x8001
 --define=ICALL_STACK0_START=0x8000
--define=ICALL_RAM0_START=0x20004340
+--define=ICALL_RAM0_START=0x20004310

@@ -1,10 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2019-04-28 18:23:23.057000)
+** Stack Frontier Generator 1.1.0 (2019-10-01 14:44:57.758000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */

--define=ICALL_RAM0_START=0x20004340
+--define=ICALL_RAM0_START=0x20004310
 --define=ICALL_STACK0_START=0x8000
 --define=ICALL_STACK0_ADDR=0x8001

@@ -4,5 +4,5 @@
 */

 "C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\host\host_pcxx.a"
-"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\ctrl\cc2640\cc2640_ctrl_pcxx_41c.a"
-"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_full_v41.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\ctrl\cc2640\cc2640_ctrl_pcxx_41c_ext.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_full_v41_v42.a"
@@ -16,11 +16,11 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa

 TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"

-INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/cc2650" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
+INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 

-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq
+CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
+ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
+AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armar rq

 DEL = C:/ti/xdctools_3_32_00_06_core/packages/../bin/rm -f
 CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f
@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>
@@ -13,133 +13,254 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;${TOOLS_BLE}/frontier/frontier.exe ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd " prebuildStep="&quot;${TOOLS_BLE}/lib_search/lib_search.exe&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
-					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.862906140" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1373763881">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.749555863" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
-								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
-								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
-								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
-								<listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
-								<listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
-								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_ble_stack.cmd;"/>
-								<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
-								<listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
-							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1226924946" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.666439040" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.1487778905" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.352371900" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.1312023808" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.342082829" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.348530318" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1738096723" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1803929349" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.327756378" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.84498721" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
-									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/examples/host_test/cc26xx/stack"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/aes/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/icall/src/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
-									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/npi/src"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx/npi/stack"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
-									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.449036407" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="CC26XX"/>
-									<listOptionValue builtIn="false" value="CC26XXWARE"/>
-									<listOptionValue builtIn="false" value="DATA="/>
-									<listOptionValue builtIn="false" value="EXT_HAL_ASSERT"/>
-									<listOptionValue builtIn="false" value="FLASH_ROM_BUILD"/>
-									<listOptionValue builtIn="false" value="INCLUDE_AES_DECRYPT"/>
-									<listOptionValue builtIn="false" value="NEAR_FUNC="/>
-									<listOptionValue builtIn="false" value="OSAL_CBTIMER_NUM_TASKS=1"/>
-									<listOptionValue builtIn="false" value="OSAL_SNV=1"/>
-									<listOptionValue builtIn="false" value="POWER_SAVING"/>
-									<listOptionValue builtIn="false" value="USE_ICALL"/>
-									<listOptionValue builtIn="false" value="xDEBUG"/>
-									<listOptionValue builtIn="false" value="xDEBUG_ENC"/>
-									<listOptionValue builtIn="false" value="xDEBUG_GPIO"/>
-									<listOptionValue builtIn="false" value="xDEBUG_SW_TRACE"/>
-									<listOptionValue builtIn="false" value="xTESTMODES"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.242123959" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.601259316" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
-									<listOptionValue builtIn="false" value="48"/>
-									<listOptionValue builtIn="false" value="16004"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.911375671" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
-									<listOptionValue builtIn="false" value="225"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.897642261" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.916023731" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1852873766" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
-									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
-									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
-								</option>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.977794136" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.980317392" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1333878599" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.289210215" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
-							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1373763881" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1720562086" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.1630117678" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1302394488" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1128043424" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.137622820" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
-									<listOptionValue builtIn="false" value="libc.a"/>
-									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"/>
-									<listOptionValue builtIn="false" value="${ROM}/ble_rom_releases/04242014/ble_rom_patch.symbols"/>
-									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.790272373" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
-									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.1324992868" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
-									<listOptionValue builtIn="false" value="16002-D"/>
-									<listOptionValue builtIn="false" value="10325-D"/>
-									<listOptionValue builtIn="false" value="10247-D"/>
-									<listOptionValue builtIn="false" value="10229-D"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.216507169" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1382163767" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1890909858" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.830512447" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT" value="startup_entry" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1081803857" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.249638271" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.407917293" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.2031489241" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1616606673" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
-							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1647667237" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1600156533" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.360730399" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1462981440" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry excluding="cc26x0f128.cmd|TOOLS/buildConfig-4.0.opt" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
+                <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties=""
+                               cleanCommand="${CG_CLEAN_CMD}" description=""
+                               id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658" name="FlashROM"
+                               parent="com.ti.ccstudio.buildDefinitions.TMS470.Default"
+                               postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;${TOOLS_BLE}/frontier/frontier.exe ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd "
+                               prebuildStep="&quot;${TOOLS_BLE}/lib_search/lib_search.exe&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
+                    <folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658." name="/"
+                                resourcePath="">
+                        <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.475246864"
+                                   name="TI Build Tools"
+                                   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
+                                   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.786665632">
+                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1030725040"
+                                    superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+                                <listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
+                                <listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
+                                <listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
+                                <listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
+                                <listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
+                                <listOptionValue builtIn="false"
+                                                 value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_ble_stack.cmd;"/>
+                                <listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
+                                <listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
+                            </option>
+                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1972562543"
+                                    superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
+                                    value="18.1.4.LTS" valueType="string"/>
+                            <targetPlatform
+                                    id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.169579217"
+                                    name="Platform"
+                                    superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
+                            <builder buildPath="${BuildDirectory}"
+                                     id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.1467594372"
+                                     name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal"
+                                     superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1117062776"
+                                  name="ARM Compiler"
+                                  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.737537651"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.2122298168"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.922316537"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.686520452"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN"
+                                        value="true" valueType="boolean"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1306361468"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.570791435"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1996254735"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH"
+                                        valueType="includePath">
+                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/examples/host_test/cc26xx/stack"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target"/>
+                                    <listOptionValue builtIn="false"
+                                                     value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/aes/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/icall/src/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
+                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/npi/src"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx/npi/stack"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
+                                    <listOptionValue builtIn="false" value="${CC26XXWARE}"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1424063549"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
+                                        valueType="definedSymbols">
+                                    <listOptionValue builtIn="false" value="CC26XX"/>
+                                    <listOptionValue builtIn="false" value="CC26XXWARE"/>
+                                    <listOptionValue builtIn="false" value="DATA="/>
+                                    <listOptionValue builtIn="false" value="EXT_HAL_ASSERT"/>
+                                    <listOptionValue builtIn="false" value="FLASH_ROM_BUILD"/>
+                                    <listOptionValue builtIn="false" value="INCLUDE_AES_DECRYPT"/>
+                                    <listOptionValue builtIn="false" value="NEAR_FUNC="/>
+                                    <listOptionValue builtIn="false" value="OSAL_CBTIMER_NUM_TASKS=1"/>
+                                    <listOptionValue builtIn="false" value="OSAL_SNV=1"/>
+                                    <listOptionValue builtIn="false" value="POWER_SAVING"/>
+                                    <listOptionValue builtIn="false" value="USE_ICALL"/>
+                                    <listOptionValue builtIn="false" value="xDEBUG"/>
+                                    <listOptionValue builtIn="false" value="xDEBUG_ENC"/>
+                                    <listOptionValue builtIn="false" value="xDEBUG_GPIO"/>
+                                    <listOptionValue builtIn="false" value="xDEBUG_SW_TRACE"/>
+                                    <listOptionValue builtIn="false" value="xTESTMODES"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.754989819"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1080092437"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS"
+                                        valueType="stringList">
+                                    <listOptionValue builtIn="false" value="48"/>
+                                    <listOptionValue builtIn="false" value="16004"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.999024864"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING"
+                                        valueType="stringList">
+                                    <listOptionValue builtIn="false" value="225"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1556840847"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1818892958"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER"
+                                        value="true" valueType="boolean"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1434574785"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE"
+                                        valueType="stringList">
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
+                                    <listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
+                                </option>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1986725920"
+                                        name="C Sources"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1096088215"
+                                        name="C++ Sources"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1564058248"
+                                        name="Assembly Sources"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.745772697"
+                                        name="Assembly Sources"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+                            </tool>
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.786665632"
+                                  name="ARM Linker"
+                                  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1677233886"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE"
+                                        value="256" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.689154633"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE"
+                                        value="0" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1820684332"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE"
+                                        value="&quot;${ProjName}.map&quot;" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1938454486"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE"
+                                        value="${ProjName}.out" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1081456336"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY"
+                                        valueType="libs">
+                                    <listOptionValue builtIn="false" value="libc.a"/>
+                                    <listOptionValue builtIn="false"
+                                                     value="${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"/>
+                                    <listOptionValue builtIn="false"
+                                                     value="${ROM}/ble_rom_releases/04242014/ble_rom_patch.symbols"/>
+                                    <listOptionValue builtIn="false"
+                                                     value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1520088784"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH"
+                                        valueType="libPaths">
+                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
+                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.416149148"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS"
+                                        valueType="stringList">
+                                    <listOptionValue builtIn="false" value="16002-D"/>
+                                    <listOptionValue builtIn="false" value="10325-D"/>
+                                    <listOptionValue builtIn="false" value="10247-D"/>
+                                    <listOptionValue builtIn="false" value="10229-D"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.256169156"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.899497414"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER"
+                                        value="true" valueType="boolean"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1750046018"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO"
+                                        value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.1884235777"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT"
+                                        value="startup_entry" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1126585282"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.917059863"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on"
+                                        valueType="enumerated"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.329975596"
+                                        name="Linker Command Files"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.30261043"
+                                        name="Linker Command Files"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.498724975"
+                                        name="Generated Linker Command Files"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+                            </tool>
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1533021831"
+                                  name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.958672258"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8"
+                                        valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.148593719"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8"
+                                        valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1639548187"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL"
+                                        valueType="enumerated"/>
+                            </tool>
+                        </toolChain>
+                    </folderInfo>
+                    <sourceEntries>
+                        <entry excluding="cc26x0f128.cmd|TOOLS/buildConfig-4.0.opt"
+                               flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+                    </sourceEntries>
+                </configuration>
+            </storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
@@ -157,4 +278,5 @@
 			<content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cxxSource" language="com.ti.ccstudio.core.TIGPPLanguage"/>
 		</project-mappings>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 </cproject>
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="2" id="The Converter Usage">
-                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
-                        <choice Name="Overclock with user specified value" value="unused">
-                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
-                        </choice>
-                    </property>
-                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="1" id="Power Selection">
+                <choice Name="Probe supplied power" value="1">
+                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
+                </choice>
+            </property>
+            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
+            <property Type="choicelist" Value="4" id="SWD Mode Settings">
+                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
                </choice>
            </property>
            <platform XML_version="1.2" id="platform_0">
@@ -132,7 +132,7 @@
 /* -DBLE_V42_FEATURES=SECURE_CONNS_CFG+EXT_DATA_LEN_CFG */
 /* -DBLE_V42_FEATURES=SECURE_CONNS_CFG */
 /* -DBLE_V42_FEATURES=PRIVACY_1_2_CFG */
-/* -DBLE_V42_FEATURES=EXT_DATA_LEN_CFG */
+-DBLE_V42_FEATURES=EXT_DATA_LEN_CFG

 /* Include Transport Layer (Full or PTM) */
 /* -DHCI_TL_NONE */
@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>
@@ -18,13 +18,13 @@
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o      ${ProjName}.hex ${ProjName}.out" prebuildStep="">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.308833195" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.2125878104">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.2138235341" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.536293627" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1328470467">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1061664661" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
 								<listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
-								<listOptionValue builtIn="false" value="XDC_VERSION=3.32.0.06_core"/>
+								<listOptionValue builtIn="false" value="XDC_VERSION=3.32.2.25_core"/>
 								<listOptionValue builtIn="false" value="INACTIVE_REPOS="/>
 								<listOptionValue builtIn="false" value="EXPANDED_REPOS="/>
 								<listOptionValue builtIn="false" value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
@@ -34,17 +34,17 @@
 								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
 								<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
 							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.243195404" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.955793533" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.638576662" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1016177761" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.2070806136" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1411365061" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.193495829" name="Application binary interface. (--abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1573436637" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.978889992" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.1392883332" name="Speed vs. size trade-offs (--opt_for_speed, -mf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.511635494" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.2084243755" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.5.LTS" valueType="string"/>
+							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1236753639" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
+							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.1381454801" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.2063552776" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.594357075" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.504957460" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1747270972" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1386053724" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1376904847" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.342602630" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1946350142" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 									<listOptionValue builtIn="false" value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\simple_peripheral\cc26xx\app\headstage"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/cc26xx/app"/>
@@ -70,10 +70,15 @@
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.521147483" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.259148203" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
+									<listOptionValue builtIn="false" value="HEADSTAGE_NOTIFY_USE_ATT"/>
+									<listOptionValue builtIn="false" value="HEADSTAGE_MA_USE_ADC"/>
+									<listOptionValue builtIn="false" value="HEADSTAGE_RECORD_BATTERY"/>
+									<listOptionValue builtIn="false" value="HEADSTAGE_CIS_VOLT_H"/>
 									<listOptionValue builtIn="false" value="POWER_SAVING"/>
 									<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
+									<listOptionValue builtIn="false" value="HEADSTAGE_MA_USE_SPI2"/>
 									<listOptionValue builtIn="false" value="CC26XX"/>
 									<listOptionValue builtIn="false" value="GAPROLE_TASK_STACK_SIZE=540"/>
 									<listOptionValue builtIn="false" value="HEAPMGR_SIZE=0"/>
@@ -85,71 +90,71 @@
 									<listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
 									<listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.1861999587" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1867564782" name="C Dialect" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.2052831394" name="Enable support for GCC extensions (DEPRECATED) (--gcc)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1102242787" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.1377489319" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.810447435" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1546172563" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1129160325" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="48"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.727880917" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1901410490" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.996618365" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.858761211" name="Emit diagnostic identifier numbers (--display_error_number, -pden)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.96303422" name="Place each function in a separate subsection (--gen_func_subsections, -ms)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1634706392" name="Read options from specified file (--cmd_file, -@)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1748751449" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1658744892" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.56285355" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1505757478" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
 									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
 								</option>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1149005836" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.404213358" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1356338499" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1609020645" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1150300143" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1811767088" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.415137767" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.955985868" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.2125878104" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1993482378" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.833137428" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1072440081" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.95815077" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1766117832" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1328470467" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1662620538" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.579378067" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.196713908" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.168703039" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1498581331" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="libc.a"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
 									<listOptionValue builtIn="false" value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1149343368" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.227752631" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.512740056" name="Suppress diagnostic &lt;id&gt; (--diag_suppress)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.1367501028" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="10247-D"/>
 									<listOptionValue builtIn="false" value="16002-D"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.755787473" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1039632635" name="Emit diagnostic identifier numbers (--display_error_number)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.160090718" name="Detailed link information data-base into &lt;file&gt; (--xml_link_info, -xml_link_info)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1907564273" name="Aggressively reduce size of the DWARF information (--compress_dwarf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1278577864" name="Eliminate sections not needed in the executable (--unused_section_elimination)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1166775149" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.1192919935" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1491242603" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.319771365" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.2135582732" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.143179661" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.457546062" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.271609992" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.102155116" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.1345965953" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1103706103" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1967400950" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1242139870" name="Specify rom width (--romwidth, -romwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.1863065780" name="Specify memory width (--memwidth, -memwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.47746446" name="Output format" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.544897445" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1579936466" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.1774538757" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.63898863" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
 							</tool>
-							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1864525425" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.46430604" name="Package repositories (--xdcpath)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
+							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1467642076" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.70584091" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_REPOS}"/>
 									<listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
 								</option>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.313008504" name="Target (-t)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.807892561" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1808973543" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1028195441" name="Build-profile (-r)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.295955151" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.128448790" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.1938529965" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.1056462866" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.972116281" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1987724074" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.469560275" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1799115265" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="2" id="The Converter Usage">
-                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
-                        <choice Name="Overclock with user specified value" value="unused">
-                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
-                        </choice>
-                    </property>
-                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="1" id="Power Selection">
+                <choice Name="Probe supplied power" value="1">
+                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
+                </choice>
+            </property>
+            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
+            <property Type="choicelist" Value="4" id="SWD Mode Settings">
+                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
                </choice>
            </property>
            <platform XML_version="1.2" id="platform_0">
@@ -16,11 +16,11 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa

 TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"

-INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/cc2650" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
+INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/cc2650" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 

-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq
+CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
+ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
+AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armar rq

 DEL = C:/ti/xdctools_3_32_00_06_core/packages/../bin/rm -f
 CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f
@@ -16,35 +16,35 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137.1867331134" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o      ${ProjName}.hex ${ProjName}.out" prebuildStep="">
+				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137.1867331134" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o      ${ProjName}.hex ${ProjName}.out" prebuildStep="">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137.1867331134." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.DebugToolchain.936572434" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug.1170584915">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1442263665" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.260390339" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1981462200">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.23520031" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2640F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
-								<listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
-								<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
 								<listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=&quot;libc.a&quot;"/>
-								<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
-								<listOptionValue builtIn="false" value="XDC_VERSION=3.32.0.06_core"/>
-								<listOptionValue builtIn="false" value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
+								<listOptionValue builtIn="false" value="XDC_VERSION=3.32.2.25_core"/>
 								<listOptionValue builtIn="false" value="INACTIVE_REPOS="/>
 								<listOptionValue builtIn="false" value="EXPANDED_REPOS="/>
-								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
+								<listOptionValue builtIn="false" value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
+								<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
 								<listOptionValue builtIn="false" value="OUTPUT_TYPE=rtscApplication:executable"/>
+								<listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
+								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
+								<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
 							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1948686990" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="16.9.4.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.targetPlatformDebug.436655999" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.builderDebug.2122969898" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.compilerDebug.1022199392" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.SILICON_VERSION.945741939" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CODE_STATE.1772665994" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.ABI.28185992" name="Application binary interface. [See 'General' page to edit] (--abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.LITTLE_ENDIAN.1551593263" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL.528776966" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED.1185808991" name="Speed vs. size trade-offs (--opt_for_speed, -mf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.INCLUDE_PATH.84242771" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.831968044" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
+							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1267545934" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
+							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.750370594" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.2015951802" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.1110843462" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.818133919" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1512178724" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.403801048" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1265261063" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.2140366031" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.2021662899" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 									<listOptionValue builtIn="false" value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\simple_peripheral\cc26xx\app\headstage"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/cc26xx/app"/>
@@ -70,10 +70,10 @@
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEBUGGING_MODEL.619228148" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT.1814512415" name="C Dialect" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GCC.1003845117" name="Enable support for GCC extensions (DEPRECATED) (--gcc)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GCC" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEFINE.1619548278" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.1320751896" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1333288757" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1518806086" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.142068852" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_LCD"/>
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
 									<listOptionValue builtIn="false" value="CC2650_LAUNCHXL"/>
@@ -89,64 +89,68 @@
 									<listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
 									<listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WARNING.468139615" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WARNING" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.918239795" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DISPLAY_ERROR_NUMBER.815341255" name="Emit diagnostic identifier numbers (--display_error_number, -pden)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_SUPPRESS.1499939580" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.999454079" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="48"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WRAP.1353908093" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GEN_FUNC_SUBSECTIONS.522002742" name="Place each function in a separate subsection (--gen_func_subsections, -ms)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CMD_FILE.1093592148" name="Read options from specified file (--cmd_file, -@)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CMD_FILE" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.2100604413" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1575039329" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.832421721" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.636768539" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
 									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
 								</option>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__C_SRCS.1484724680" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__CPP_SRCS.1857516437" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM_SRCS.842046581" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM2_SRCS.880239501" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.227087947" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.39034037" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.866335595" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1329381206" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug.1170584915" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.STACK_SIZE.1798831431" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.STACK_SIZE" value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.HEAP_SIZE.1039761941" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.MAP_FILE.80438512" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.OUTPUT_FILE.323523388" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.LIBRARY.203910805" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.LIBRARY" valueType="libs">
-									<listOptionValue builtIn="false" value="&quot;libc.a&quot;"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1981462200" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.57445792" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.636200649" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.552585024" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1019171703" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1966015673" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+									<listOptionValue builtIn="false" value="libc.a"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
 									<listOptionValue builtIn="false" value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.SEARCH_PATH.2045110069" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.SEARCH_PATH" valueType="libPaths">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1109423160" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_WRAP.1885279599" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_SUPPRESS.1195915855" name="Suppress diagnostic &lt;id&gt; (--diag_suppress)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1289256461" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1055939214" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.1474045154" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="10247-D"/>
 									<listOptionValue builtIn="false" value="16002-D"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DISPLAY_ERROR_NUMBER.812278410" name="Emit diagnostic identifier numbers (--display_error_number)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.XML_LINK_INFO.655770989" name="Detailed link information data-base into &lt;file&gt; (--xml_link_info, -xml_link_info)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.UNUSED_SECTION_ELIMINATION.290129903" name="Eliminate sections not needed in the executable (--unused_section_elimination)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.COMPRESS_DWARF.820922589" name="Aggressively reduce size of the DWARF information (--compress_dwarf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD_SRCS.1627390590" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD2_SRCS.314219026" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__GEN_CMDS.298789754" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.834418659" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1787080463" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1975085474" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1644580451" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.872014788" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1023837449" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.645947981" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex"/>
-							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1311186821" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.77089036" name="Package repositories (--xdcpath)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1158315651" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.485049417" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.97427136" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.614513055" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
+							</tool>
+							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1429090237" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1017190303" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_REPOS}"/>
 									<listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
 								</option>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.595027378" name="Target (-t)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.942771587" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.309371946" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.567582658" name="Build-profile (-r)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.888142064" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="&quot;${CG_TOOL_ROOT}&quot;" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.2133539592" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.1689982900" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.1214214406" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.402329212" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.35098461" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.2036910366" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.53221425" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
@@ -292,8 +296,8 @@
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__GEN_CMDS.1583605295" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.1106108574" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.ROMWIDTH.1273210432" name="Specify rom width (--romwidth, -romwidth)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.ROMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.MEMWIDTH.1804106884" name="Specify memory width (--memwidth, -memwidth)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.MEMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.ROMWIDTH.1273210432" name="Specify rom width (--romwidth, -romwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.ROMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.MEMWIDTH.1804106884" name="Specify memory width (--memwidth, -memwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.MEMWIDTH" value="8" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.OUTPUT_FORMAT.1229261984" name="Output format" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
 							</tool>
 							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.802347647" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
@@ -1,9 +1,13 @@
 <?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.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" 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.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" 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.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650lp_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650lp_app}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650lp_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650lp_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650lp_app}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650lp_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650lp_app.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650lp_app"/>
@@ -1,9 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2016-03-28 14:11:07.308000)
+** Stack Frontier Generator 1.1.0 (2019-05-13 17:33:59.404000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */

--define=ICALL_STACK0_ADDR=0xe001
--define=ICALL_STACK0_START=0xe000
--define=ICALL_RAM0_START=0x20004368
+--define=ICALL_STACK0_ADDR=0xf001
+--define=ICALL_STACK0_START=0xf000
+--define=ICALL_RAM0_START=0x20004320
+
@@ -1,9 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2016-03-28 14:11:07.308000)
+** Stack Frontier Generator 1.1.0 (2019-05-13 17:33:59.404000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */

--define=ICALL_RAM0_START=0x20004368
--define=ICALL_STACK0_START=0xe000
--define=ICALL_STACK0_ADDR=0xe001
+--define=ICALL_RAM0_START=0x20004320
+--define=ICALL_STACK0_START=0xf000
+--define=ICALL_STACK0_ADDR=0xf001
+
@@ -4,5 +4,5 @@
 */

 "C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\host\host_pxxx.a"
-"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\ctrl\cc2640\cc2640_ctrl_pxxx_ext.a"
-"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_none_v41_v42.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\ctrl\cc2640\cc2640_ctrl_pxxx.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_none.a"
@@ -1,12 +1,12 @@

-XOPTS = -I"C:/ti/xdctools_3_32_00_06_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
+XOPTS = -I"C:/ti/xdctools_3_32_02_25_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3

 vpath % C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
-vpath %.c C:/ti/xdctools_3_32_00_06_core/packages/
+vpath %.c C:/ti/xdctools_3_32_02_25_core/packages/

 CCOPTS    = --endian=little -mv7M3 --abi=eabi -q -ms --opt_for_speed=0  --program_level_compile -o3 -g --optimize_with_debug  -Dti_sysbios_knl_Task_minimizeLatency__D=FALSE -Dti_sysbios_family_arm_cc26xx_Boot_driverlibVersion=2 -Dti_sysbios_knl_Clock_stopCheckNext__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_enableException__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_disablePriority__D=32U -Dti_sysbios_family_arm_m3_Hwi_numSparseInterrupts__D=0U

-XDC_ROOT  = C:/ti/xdctools_3_32_00_06_core/packages/
+XDC_ROOT  = C:/ti/xdctools_3_32_02_25_core/packages/

 BIOS_ROOT = C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/

@@ -16,14 +16,14 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa

 TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"

-INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
+INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 

-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armar rq
+CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
+ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
+AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq

-DEL = C:/ti/xdctools_3_32_00_06_core/packages/../bin/rm -f
-CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f
+DEL = C:/ti/xdctools_3_32_02_25_core/packages/../bin/rm -f
+CP = C:/ti/xdctools_3_32_02_25_core/packages/../bin/cp -f

 define RM
 	$(if $(wildcard $1),$(DEL) $1,:)
@@ -1,9 +1,13 @@
 <?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.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" 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.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" 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.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650lp_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650lp_stack}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650lp_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650lp_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650lp_stack}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650lp_stack.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650lp_stack.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650lp_stack"/>
@@ -36,10 +36,11 @@
 *  CC2650 Booster Pack.
 */

-
 /*
 *  ====================== Includes ============================================
 */
+
+// clang-format off
 #include <xdc/std.h>
 #include <xdc/runtime/System.h>

@@ -56,6 +57,7 @@
 #include <inc/hw_ints.h>
 #include <driverlib/ioc.h>
 #include <driverlib/udma.h>
+// clang-format on

 #include "Board.h"

@@ -65,7 +67,7 @@
 *  settings for this board.
 *  When a pin is allocated and then de-allocated, it will revert to the state
 *  configured in this table.
-*/
+ */

 /* Place into subsections to allow the TI linker to remove items properly */
 #if defined(__TI_COMPILER_VERSION__)
@@ -73,19 +75,20 @@
 #pragma DATA_SECTION(PINCC26XX_hwAttrs, ".const:PINCC26XX_hwAttrs")
 #endif

-const PIN_Config BoardGpioInitTable[] = {
-    Board_RLED   | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,         /* LED initially off             */
-    Board_GLED   | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,         /* LED initially off             */
-    Board_UART_RX | PIN_INPUT_EN | PIN_PULLDOWN,                                              /* UART RX  */
-    Board_UART_TX | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,                        /* UART TX */
-   Board_SRDY | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,                           /* SRDY */
-   Board_MRDY | PIN_INPUT_EN | PIN_PULLDOWN,                                                 /* MRDY */
-    PIN_TERMINATE
-};
+const PIN_Config BoardGpioInitTable[] = {                                           //
+    Board_RLED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, /* LED initially off             */
+    Board_GLED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, /* LED initially off             */
+    Board_UART_RX | PIN_INPUT_EN | PIN_PULLDOWN,                                    /* UART RX  */
+    Board_UART_TX | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,              /* UART TX */
+    Board_SRDY | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,                 /* SRDY */
+    Board_MRDY | PIN_INPUT_EN | PIN_PULLDOWN,                                       /* MRDY */
+    PIN_TERMINATE};

 const PINCC26XX_HWAttrs PINCC26XX_hwAttrs = {
+    //
    .intPriority = ~0,
    .swiPriority = 0
+    //
 };
 /*============================================================================*/

@@ -96,13 +99,14 @@ const PINCC26XX_HWAttrs PINCC26XX_hwAttrs = {
 #if defined(__TI_COMPILER_VERSION__)
 #pragma DATA_SECTION(PowerCC26XX_config, ".const:PowerCC26XX_config")
 #endif
+
 const PowerCC26XX_Config PowerCC26XX_config = {
-    .policyInitFxn      = NULL,
-    .policyFxn          = &PowerCC26XX_standbyPolicy,
-    .calibrateFxn       = &PowerCC26XX_calibrate,
-    .enablePolicy       = TRUE,
-    .calibrateRCOSC_LF  = TRUE,
-    .calibrateRCOSC_HF  = TRUE,
+    .policyInitFxn     = NULL,
+    .policyFxn         = &PowerCC26XX_standbyPolicy,
+    .calibrateFxn      = &PowerCC26XX_calibrate,
+    .enablePolicy      = TRUE,
+    .calibrateRCOSC_LF = TRUE,
+    .calibrateRCOSC_HF = TRUE,
 };
 /*
 *  ============================= Power end ====================================
@@ -126,28 +130,32 @@ UARTCC26XX_Object uartCC26XXObjects[BOOSTXL_CC2650MA_UARTCOUNT];

 /* UART hardware parameter structure, also used to assign UART pins */
 const UARTCC26XX_HWAttrsV2 uartCC26XXHWAttrs[BOOSTXL_CC2650MA_UARTCOUNT] = {
+    //
    {
-        .baseAddr       = UART0_BASE,
-        .powerMngrId    = PowerCC26XX_PERIPH_UART0,
-        .intNum         = INT_UART0_COMB,
-        .intPriority    = ~0,
-        .swiPriority    = 0,
-        .txPin          = Board_UART_TX,
-        .rxPin          = Board_UART_RX,
-        .ctsPin         = PIN_UNASSIGNED,
-        .rtsPin         = PIN_UNASSIGNED
+        .baseAddr    = UART0_BASE,
+        .powerMngrId = PowerCC26XX_PERIPH_UART0,
+        .intNum      = INT_UART0_COMB,
+        .intPriority = ~0,
+        .swiPriority = 0,
+        .txPin       = Board_UART_TX,
+        .rxPin       = Board_UART_RX,
+        .ctsPin      = PIN_UNASSIGNED,
+        .rtsPin      = PIN_UNASSIGNED
+        //
    }
+    //
 };

 /* UART configuration structure */
-const UART_Config UART_config[] = {
+const UART_Config UART_config[] = {  //
    {
+        //
        .fxnTablePtr = &UARTCC26XX_fxnTable,
        .object      = &uartCC26XXObjects[0],
        .hwAttrs     = &uartCC26XXHWAttrs[0]
+        //
    },
-    {NULL, NULL, NULL}
-};
+    {NULL, NULL, NULL}};
 /*
 *  ============================= UART end =====================================
 */
@@ -169,22 +177,27 @@ UDMACC26XX_Object udmaObjects[BOOSTXL_CC2650MA_UDMACOUNT];

 /* UDMA configuration structure */
 const UDMACC26XX_HWAttrs udmaHWAttrs[BOOSTXL_CC2650MA_UDMACOUNT] = {
+    //
    {
+        //
        .baseAddr    = UDMA0_BASE,
        .powerMngrId = PowerCC26XX_PERIPH_UDMA,
        .intNum      = INT_DMA_ERR,
        .intPriority = ~0
+        //
    }
+    //
 };

 /* UDMA configuration structure */
-const UDMACC26XX_Config UDMACC26XX_config[] = {
+const UDMACC26XX_Config UDMACC26XX_config[] = {  //
    {
-         .object  = &udmaObjects[0],
-         .hwAttrs = &udmaHWAttrs[0]
+        //
+        .object  = &udmaObjects[0],
+        .hwAttrs = &udmaHWAttrs[0]
+        //
    },
-    {NULL, NULL}
-};
+    {NULL, NULL}};
 /*
 *  ============================= UDMA end =====================================
 */
@@ -205,41 +218,63 @@ const UDMACC26XX_Config UDMACC26XX_config[] = {
 SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];

 /* SPI configuration structure, describing which pins are to be used */
-const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_UDMACOUNT] = {
+const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_SPICOUNT] = {
+    //
    {
-        .baseAddr           = SSI0_BASE,
-        .intNum             = INT_SSI0_COMB,
-        .intPriority        = ~0,
-        .swiPriority        = 0,
-        .powerMngrId        = PowerCC26XX_PERIPH_SSI0,
-        .defaultTxBufValue  = 0,
-        .rxChannelBitMask   = 1<<UDMA_CHAN_SSI0_RX,
-        .txChannelBitMask   = 1<<UDMA_CHAN_SSI0_TX,
-        .mosiPin            = Board_SPI0_MOSI,
-        .misoPin            = Board_SPI0_MISO,
-        .clkPin             = Board_SPI0_CLK,
-        .csnPin             = Board_SPI0_CS
+        //
+        .baseAddr          = SSI0_BASE,
+        .intNum            = INT_SSI0_COMB,
+        .intPriority       = ~0,
+        .swiPriority       = 0,
+        .powerMngrId       = PowerCC26XX_PERIPH_SSI0,
+        .defaultTxBufValue = 0,
+        .rxChannelBitMask  = 1 << UDMA_CHAN_SSI0_RX,
+        .txChannelBitMask  = 1 << UDMA_CHAN_SSI0_TX,
+        .mosiPin           = Board_SPI0_MOSI,
+        .misoPin           = Board_SPI0_MISO,
+        .clkPin            = Board_SPI0_CLK,
+        .csnPin            = Board_SPI0_CS
+        //
    },
+#ifdef HEADSTAGE_MA_USE_SPI2
+    {
+        //
+        .baseAddr          = SSI1_BASE,
+        .intNum            = INT_SSI1_COMB,
+        .intPriority       = ~0,
+        .swiPriority       = 0,
+        .powerMngrId       = PowerCC26XX_PERIPH_SSI1,
+        .defaultTxBufValue = 0,
+        .rxChannelBitMask  = 1 << UDMA_CHAN_SSI1_RX,
+        .txChannelBitMask  = 1 << UDMA_CHAN_SSI1_TX,
+        .mosiPin           = Board_SPI1_MOSI,
+        .misoPin           = Board_SPI1_MISO,
+        .clkPin            = Board_SPI1_CLK,
+        .csnPin            = Board_SPI1_CS  //
+    },
+#endif
 };

 /* SPI configuration structure */
-const SPI_Config SPI_config[] = {
+const SPI_Config SPI_config[] = {  //
    {
-         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-         .object      = &spiCC26XXDMAObjects[0],
-         .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
+        //
+        .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+        .object      = &spiCC26XXDMAObjects[0],
+        .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
+        //
    },
    {
-         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-         .object      = &spiCC26XXDMAObjects[1],
-         .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
+        //
+        .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+        .object      = &spiCC26XXDMAObjects[1],
+        .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
+        //
    },
-    {NULL, NULL, NULL}
-};
+    {NULL, NULL, NULL}};
 /*
 *  ========================== SPI DMA end =====================================
-*/
-
+ */

 /*
 *  ========================== Crypto begin ====================================
@@ -259,28 +294,28 @@ const SPI_Config SPI_config[] = {
 CryptoCC26XX_Object cryptoCC26XXObjects[BOOSTXL_CC2650MA_CRYPTOCOUNT];

 /* Crypto configuration structure, describing which pins are to be used */
-const CryptoCC26XX_HWAttrs cryptoCC26XXHWAttrs[BOOSTXL_CC2650MA_CRYPTOCOUNT] = {
-    {
-        .baseAddr       = CRYPTO_BASE,
-        .powerMngrId    = PowerCC26XX_PERIPH_CRYPTO,
-        .intNum         = INT_CRYPTO_RESULT_AVAIL_IRQ,
-        .intPriority    = ~0,
-    }
-};
+const CryptoCC26XX_HWAttrs cryptoCC26XXHWAttrs[BOOSTXL_CC2650MA_CRYPTOCOUNT] = {{
+    //
+    .baseAddr    = CRYPTO_BASE,
+    .powerMngrId = PowerCC26XX_PERIPH_CRYPTO,
+    .intNum      = INT_CRYPTO_RESULT_AVAIL_IRQ,
+    .intPriority = ~0,
+    //
+}};

 /* Crypto configuration structure */
-const CryptoCC26XX_Config CryptoCC26XX_config[] = {
+const CryptoCC26XX_Config CryptoCC26XX_config[] = {  //
    {
-         .object  = &cryptoCC26XXObjects[0],
-         .hwAttrs = &cryptoCC26XXHWAttrs[0]
+        //
+        .object  = &cryptoCC26XXObjects[0],
+        .hwAttrs = &cryptoCC26XXHWAttrs[0]
+        //
    },
-    {NULL, NULL}
-};
+    {NULL, NULL}};
 /*
 *  ========================== Crypto end ======================================
 */

-
 /*
 *  ========================= RF driver begin ==================================
 */
@@ -294,10 +329,12 @@ const CryptoCC26XX_Config CryptoCC26XX_config[] = {

 /* RF hwi and swi priority */
 const RFCC26XX_HWAttrs RFCC26XX_hwAttrs = {
+    //
    .hwiCpe0Priority = ~0,
    .hwiHwPriority   = ~0,
-    .swiCpe0Priority =  5,
-    .swiHwPriority   =  5,
+    .swiCpe0Priority = 5,
+    .swiHwPriority   = 5,
+    //
 };

 /*
@@ -320,20 +357,21 @@ const RFCC26XX_HWAttrs RFCC26XX_hwAttrs = {
 TRNGCC26XX_Object trngCC26XXObjects[BOOSTXL_CC2650MA_TRNGCOUNT];

 /* TRNG configuration structure, describing which pins are to be used */
-const TRNGCC26XX_HWAttrs TRNGCC26XXHWAttrs[BOOSTXL_CC2650MA_TRNGCOUNT] = {
-    {
-        .powerMngrId    = PowerCC26XX_PERIPH_TRNG,
-    }
-};
+const TRNGCC26XX_HWAttrs TRNGCC26XXHWAttrs[BOOSTXL_CC2650MA_TRNGCOUNT] = {{
+    //
+    .powerMngrId = PowerCC26XX_PERIPH_TRNG,
+    //
+}};

 /* TRNG configuration structure */
-const TRNGCC26XX_Config TRNGCC26XX_config[] = {
+const TRNGCC26XX_Config TRNGCC26XX_config[] = {  //
    {
-         .object  = &trngCC26XXObjects[0],
-         .hwAttrs = &TRNGCC26XXHWAttrs[0]
+        //
+        .object  = &trngCC26XXObjects[0],
+        .hwAttrs = &TRNGCC26XXHWAttrs[0]
+        //
    },
-    {NULL, NULL}
-};
+    {NULL, NULL}};

 /*
 *  ========================= TRNG end ====================================
@@ -351,14 +389,62 @@ const TRNGCC26XX_Config TRNGCC26XX_config[] = {

 /* GPTimer hardware attributes, one per timer part (Timer 0A, 0B, 1A, 1B..) */
 const GPTimerCC26XX_HWAttrs gptimerCC26xxHWAttrs[BOOSTXL_CC2650MA_GPTIMERPARTSCOUNT] = {
-    { .baseAddr = GPT0_BASE, .intNum = INT_GPT0A, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT0, .pinMux = GPT_PIN_0A, },
-    { .baseAddr = GPT0_BASE, .intNum = INT_GPT0B, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT0, .pinMux = GPT_PIN_0B, },
-    { .baseAddr = GPT1_BASE, .intNum = INT_GPT1A, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT1, .pinMux = GPT_PIN_1A, },
-    { .baseAddr = GPT1_BASE, .intNum = INT_GPT1B, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT1, .pinMux = GPT_PIN_1B, },
-    { .baseAddr = GPT2_BASE, .intNum = INT_GPT2A, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT2, .pinMux = GPT_PIN_2A, },
-    { .baseAddr = GPT2_BASE, .intNum = INT_GPT2B, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT2, .pinMux = GPT_PIN_2B, },
-    { .baseAddr = GPT3_BASE, .intNum = INT_GPT3A, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT3, .pinMux = GPT_PIN_3A, },
-    { .baseAddr = GPT3_BASE, .intNum = INT_GPT3B, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT3, .pinMux = GPT_PIN_3B, },
+    {
+        .baseAddr    = GPT0_BASE,
+        .intNum      = INT_GPT0A,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT0,
+        .pinMux      = GPT_PIN_0A,
+    },
+    {
+        .baseAddr    = GPT0_BASE,
+        .intNum      = INT_GPT0B,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT0,
+        .pinMux      = GPT_PIN_0B,
+    },
+    {
+        .baseAddr    = GPT1_BASE,
+        .intNum      = INT_GPT1A,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT1,
+        .pinMux      = GPT_PIN_1A,
+    },
+    {
+        .baseAddr    = GPT1_BASE,
+        .intNum      = INT_GPT1B,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT1,
+        .pinMux      = GPT_PIN_1B,
+    },
+    {
+        .baseAddr    = GPT2_BASE,
+        .intNum      = INT_GPT2A,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT2,
+        .pinMux      = GPT_PIN_2A,
+    },
+    {
+        .baseAddr    = GPT2_BASE,
+        .intNum      = INT_GPT2B,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT2,
+        .pinMux      = GPT_PIN_2B,
+    },
+    {
+        .baseAddr    = GPT3_BASE,
+        .intNum      = INT_GPT3A,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT3,
+        .pinMux      = GPT_PIN_3A,
+    },
+    {
+        .baseAddr    = GPT3_BASE,
+        .intNum      = INT_GPT3B,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT3,
+        .pinMux      = GPT_PIN_3B,
+    },
 };

 /*  GPTimer objects, one per full-width timer (A+B) (Timer 0, Timer 1..) */
@@ -366,14 +452,15 @@ GPTimerCC26XX_Object gptimerCC26XXObjects[BOOSTXL_CC2650MA_GPTIMERCOUNT];

 /* GPTimer configuration (used as GPTimer_Handle by driver and application) */
 const GPTimerCC26XX_Config GPTimerCC26XX_config[BOOSTXL_CC2650MA_GPTIMERPARTSCOUNT] = {
-    { &gptimerCC26XXObjects[0], &gptimerCC26xxHWAttrs[0], GPT_A },
-    { &gptimerCC26XXObjects[0], &gptimerCC26xxHWAttrs[1], GPT_B },
-    { &gptimerCC26XXObjects[1], &gptimerCC26xxHWAttrs[2], GPT_A },
-    { &gptimerCC26XXObjects[1], &gptimerCC26xxHWAttrs[3], GPT_B },
-    { &gptimerCC26XXObjects[2], &gptimerCC26xxHWAttrs[4], GPT_A },
-    { &gptimerCC26XXObjects[2], &gptimerCC26xxHWAttrs[5], GPT_B },
-    { &gptimerCC26XXObjects[3], &gptimerCC26xxHWAttrs[6], GPT_A },
-    { &gptimerCC26XXObjects[3], &gptimerCC26xxHWAttrs[7], GPT_B },
+    //
+    {&gptimerCC26XXObjects[0], &gptimerCC26xxHWAttrs[0], GPT_A},
+    {&gptimerCC26XXObjects[0], &gptimerCC26xxHWAttrs[1], GPT_B},
+    {&gptimerCC26XXObjects[1], &gptimerCC26xxHWAttrs[2], GPT_A},
+    {&gptimerCC26XXObjects[1], &gptimerCC26xxHWAttrs[3], GPT_B},
+    {&gptimerCC26XXObjects[2], &gptimerCC26xxHWAttrs[4], GPT_A},
+    {&gptimerCC26XXObjects[2], &gptimerCC26xxHWAttrs[5], GPT_B},
+    {&gptimerCC26XXObjects[3], &gptimerCC26xxHWAttrs[6], GPT_A},
+    {&gptimerCC26XXObjects[3], &gptimerCC26xxHWAttrs[7], GPT_B},
 };

 /*
@@ -391,14 +478,15 @@ const GPTimerCC26XX_Config GPTimerCC26XX_config[BOOSTXL_CC2650MA_GPTIMERPARTSCOU
 #endif
 /* PWM configuration, one per PWM output.   */
 PWMTimerCC26XX_HwAttrs pwmtimerCC26xxHWAttrs[BOOSTXL_CC2650MA_PWMCOUNT] = {
-    { .pwmPin = Board_PWMPIN0, .gpTimerUnit = Board_GPTIMER0A },
-    { .pwmPin = Board_PWMPIN1, .gpTimerUnit = Board_GPTIMER0B },
-    { .pwmPin = Board_PWMPIN2, .gpTimerUnit = Board_GPTIMER1A },
-    { .pwmPin = Board_PWMPIN3, .gpTimerUnit = Board_GPTIMER1B },
-    { .pwmPin = Board_PWMPIN4, .gpTimerUnit = Board_GPTIMER2A },
-    { .pwmPin = Board_PWMPIN5, .gpTimerUnit = Board_GPTIMER2B },
-    { .pwmPin = Board_PWMPIN6, .gpTimerUnit = Board_GPTIMER3A },
-    { .pwmPin = Board_PWMPIN7, .gpTimerUnit = Board_GPTIMER3B },
+    //
+    {.pwmPin = Board_PWMPIN0, .gpTimerUnit = Board_GPTIMER0A},
+    {.pwmPin = Board_PWMPIN1, .gpTimerUnit = Board_GPTIMER0B},
+    {.pwmPin = Board_PWMPIN2, .gpTimerUnit = Board_GPTIMER1A},
+    {.pwmPin = Board_PWMPIN3, .gpTimerUnit = Board_GPTIMER1B},
+    {.pwmPin = Board_PWMPIN4, .gpTimerUnit = Board_GPTIMER2A},
+    {.pwmPin = Board_PWMPIN5, .gpTimerUnit = Board_GPTIMER2B},
+    {.pwmPin = Board_PWMPIN6, .gpTimerUnit = Board_GPTIMER3A},
+    {.pwmPin = Board_PWMPIN7, .gpTimerUnit = Board_GPTIMER3B},
 };

 /* PWM object, one per PWM output */
@@ -408,17 +496,16 @@ extern const PWM_FxnTable PWMTimerCC26XX_fxnTable;

 /* PWM configuration (used as PWM_Handle by driver and application) */
 const PWM_Config PWM_config[BOOSTXL_CC2650MA_PWMCOUNT + 1] = {
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[0], &pwmtimerCC26xxHWAttrs[0] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[1], &pwmtimerCC26xxHWAttrs[1] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[2], &pwmtimerCC26xxHWAttrs[2] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[3], &pwmtimerCC26xxHWAttrs[3] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[4], &pwmtimerCC26xxHWAttrs[4] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[5], &pwmtimerCC26xxHWAttrs[5] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[6], &pwmtimerCC26xxHWAttrs[6] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[7], &pwmtimerCC26xxHWAttrs[7] },
-    { NULL,                NULL,                 NULL                 }
-};
-
+    //
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[0], &pwmtimerCC26xxHWAttrs[0]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[1], &pwmtimerCC26xxHWAttrs[1]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[2], &pwmtimerCC26xxHWAttrs[2]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[3], &pwmtimerCC26xxHWAttrs[3]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[4], &pwmtimerCC26xxHWAttrs[4]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[5], &pwmtimerCC26xxHWAttrs[5]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[6], &pwmtimerCC26xxHWAttrs[6]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[7], &pwmtimerCC26xxHWAttrs[7]},
+    {NULL, NULL, NULL}};

 /*
 *  ============================= PWM end ======================================
@@ -101,45 +101,42 @@ extern const PIN_Config BoardGpioInitTable[];

 /* Connector J2 */
 #define Board_BP_Pin_J2_19             DIO8
-#define Board_BP_Pin_J2_18             DIO9          /* CS */
-#define Board_BP_Pin_J2_17             IOID_UNUSED   /* NC */
-#define Board_BP_Pin_J2_15             DIO11         /* MOSI */
-#define Board_BP_Pin_J2_14             DIO12         /* MISO */
+#define Board_BP_Pin_J2_18             DIO9
+#define Board_BP_Pin_J2_17             IOID_UNUSED
+#define Board_BP_Pin_J2_15             DIO11
+#define Board_BP_Pin_J2_14             DIO12
 #define Board_BP_Pin_J2_13             DIO13
 #define Board_BP_Pin_J2_12             DIO14
-#define Board_BP_Pin_J2_11             IOID_UNUSED   /* NC */
+#define Board_BP_Pin_J2_11             IOID_UNUSED

 /* Mapping of BoosterPack Connector Pins to BoosterPack Standard Functions (reflecting the BoosterPack Standard)
 */

-/* Connector J1 */
-#define Board_BP_AnalogIn_0            Board_BP_Pin_J1_2
-#define Board_BP_UART_Rx               Board_BP_Pin_J1_3 /* To MCU on LaunchPad */
-#define Board_BP_UART_Tx               Board_BP_Pin_J1_4 /* From MCU on LauchPad*/
-#define Board_BP_GPIO_0                Board_BP_Pin_J1_5
-#define Board_BP_AnalogIn_1            Board_BP_Pin_J1_6
-#define Board_BP_SPI_CLK               Board_BP_Pin_J1_7
-#define Board_BP_GPIO_1                Board_BP_Pin_J1_8
-#define Board_BP_I2C_SCL               Board_BP_Pin_J1_9
-#define Board_BP_I2C_SDA               Board_BP_Pin_J1_10
-
-/* Connector J2 */
-#define Board_BP_PWM_0                 Board_BP_Pin_J2_19
-#define Board_BP_SPI_CS_Wireless       Board_BP_Pin_J2_18
-#define Board_BP_GPIO_3                Board_BP_Pin_J2_17
-#define Board_BP_SPI_MOSI              Board_BP_Pin_J2_15
-#define Board_BP_SPI_MISO              Board_BP_Pin_J2_14
-#define Board_BP_SPI_CS_Display        Board_BP_Pin_J2_13
-#define Board_BP_SPI_CS_Other          Board_BP_Pin_J2_12
-#define Board_BP_GPIO_2                Board_BP_Pin_J2_11
-
+/* Connector J1 and J2*/
+#define Board_BP_AnalogIn_0            IOID_UNUSED
+#define Board_BP_AnalogIn_1            IOID_UNUSED
+#define Board_BP_SPI_CS_Wireless       IOID_UNUSED
+#define Board_BP_SPI_CS_Display        IOID_UNUSED
+#define Board_BP_SPI_CS_Other          IOID_UNUSED
+#define Board_BP_SPI_MISO              DIO12
+#define Board_BP_SPI_MOSI              DIO11
+#define Board_BP_SPI_CLK               DIO10
+#define Board_BP_I2C_SCL               IOID_UNUSED
+#define Board_BP_I2C_SDA               IOID_UNUSED
+#define Board_BP_UART_Rx               DIO1
+#define Board_BP_UART_Tx               DIO0
+#define Board_BP_GPIO_0                IOID_UNUSED
+#define Board_BP_GPIO_1                IOID_UNUSED
+#define Board_BP_GPIO_2                IOID_UNUSED
+#define Board_BP_GPIO_3                IOID_UNUSED
+#define Board_BP_PWM_0                 IOID_UNUSED

 /* Mapping of application specific functionality of the BoosterPack to BoosterPack Pins (application dependent)
 */

 /* On-board LEDs */
-#define Board_GLED                     DIO2                      /* Green LED */
-#define Board_RLED                     DIO4                      /* Red LED */
+#define Board_GLED                     PIN_UNASSIGNED            /* Green LED */
+#define Board_RLED                     PIN_UNASSIGNED            /* Red LED */

 /* UART Board */
 #define Board_UART_TX                  Board_BP_UART_Rx          /* RXD */
@@ -149,11 +146,16 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_SPI0_MISO                Board_BP_SPI_MISO
 #define Board_SPI0_MOSI                Board_BP_SPI_MOSI
 #define Board_SPI0_CLK                 Board_BP_SPI_CLK
-#define Board_SPI0_CS                  Board_BP_SPI_CS_Wireless
+#define Board_SPI0_CS                  PIN_UNASSIGNED
+
+#define Board_SPI1_MISO                PIN_UNASSIGNED
+#define Board_SPI1_MOSI                PIN_UNASSIGNED
+#define Board_SPI1_CLK                 PIN_UNASSIGNED
+#define Board_SPI1_CS                  PIN_UNASSIGNED

 /* Power Management Board */
-#define Board_SRDY                     Board_BP_Pin_J2_19
-#define Board_MRDY                     Board_BP_Pin_J1_2
+#define Board_SRDY                     PIN_UNASSIGNED
+#define Board_MRDY                     PIN_UNASSIGNED

 /* PWM outputs */
 #define Board_PWMPIN0                  PIN_UNASSIGNED
@@ -165,15 +167,23 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_PWMPIN6                  PIN_UNASSIGNED
 #define Board_PWMPIN7                  PIN_UNASSIGNED

+
 /** ============================================================================
 *  Instance identifiers
 *  ==========================================================================*/
 /* Generic SPI instance identifiers */
 #define Board_SPI0                  BOOSTXL_CC2650MA_SPI0
+
+#ifdef HEADSTAGE_MA_USE_SPI2
+#define Board_SPI1                  BOOSTXL_CC2650MA_SPI1
+#endif
+
 /* Generic UART instance identifiers */
 #define Board_UART                  BOOSTXL_CC2650MA_UART0
+
 /* Generic TRNG instance identiifer */
 #define Board_TRNG                  BOOSTXL_CC2650MA_TRNG0
+
 /* Generic GPTimer instance identifiers */
 #define Board_GPTIMER0A             BOOSTXL_CC2650MA_GPTIMER0A
 #define Board_GPTIMER0B             BOOSTXL_CC2650MA_GPTIMER0B
@@ -183,6 +193,7 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_GPTIMER2B             BOOSTXL_CC2650MA_GPTIMER2B
 #define Board_GPTIMER3A             BOOSTXL_CC2650MA_GPTIMER3A
 #define Board_GPTIMER3B             BOOSTXL_CC2650MA_GPTIMER3B
+
 /* Generic PWM instance identifiers */
 #define Board_PWM0                  BOOSTXL_CC2650MA_PWM0
 #define Board_PWM1                  BOOSTXL_CC2650MA_PWM1
@@ -215,6 +226,10 @@ typedef enum BOOSTXL_CC2650MA_CryptoName {
 typedef enum BOOSTXL_CC2650MA_SPIName {
    BOOSTXL_CC2650MA_SPI0 = 0,

+#ifdef HEADSTAGE_MA_USE_SPI2
+    BOOSTXL_CC2650MA_SPI1 ,
+#endif
+
    BOOSTXL_CC2650MA_SPICOUNT
 } BOOSTXL_CC2650MA_SPIName;

@@ -294,6 +309,29 @@ typedef enum BOOSTXL_CC2650MA_PWM
    BOOSTXL_CC2650MA_PWMCOUNT
 } BOOSTXL_CC2650MA_PWM;

+#ifdef HEADSTAGE_MA_USE_ADC
+
+/*!
+ *  @def    BOOSTXL_CC2650MA_ADCName
+ *  @brief  Enum of ADCs
+ */
+typedef enum BOOSTXL_CC2650MA_ADCName {
+    BOOSTXL_CC2650MA_ADC0 = 0,
+    BOOSTXL_CC2650MA_ADC1,
+    BOOSTXL_CC2650MA_ADC2,
+    BOOSTXL_CC2650MA_ADC3,
+    BOOSTXL_CC2650MA_ADC4,
+    BOOSTXL_CC2650MA_ADC5,
+    BOOSTXL_CC2650MA_ADC6,
+    BOOSTXL_CC2650MA_ADC7,
+    BOOSTXL_CC2650MA_ADCDCOUPL,
+    BOOSTXL_CC2650MA_ADCVSS,
+    BOOSTXL_CC2650MA_ADCVDDS,
+    BOOSTXL_CC2650MA_ADCCOUNT
+} BOOSTXL_CC2650MA_ADCName;
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif
@@ -84,9 +84,9 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_UART_RTS              IOID_18         /* RTS */

 /* SPI Board */
-#define Board_SPI0_MISO             IOID_8          /* RF1.20 */
-#define Board_SPI0_MOSI             IOID_9          /* RF1.18 */
-#define Board_SPI0_CLK              IOID_10         /* RF1.16 */
+#define Board_SPI0_MISO             IOID_9          /* RF1.20 */
+#define Board_SPI0_MOSI             IOID_8          /* RF1.18 */
+#define Board_SPI0_CLK              IOID_13         /* RF1.16 */
 #define Board_SPI0_CSN              PIN_UNASSIGNED
 #define Board_SPI1_MISO             PIN_UNASSIGNED
 #define Board_SPI1_MOSI             PIN_UNASSIGNED
@@ -144,13 +144,17 @@ extern const PIN_Config BoardGpioInitTable[];
 *  ==========================================================================*/
 /* Generic I2C instance identifiers */
 #define Board_I2C                   CC2650_LAUNCHXL_I2C0
+
 /* Generic SPI instance identifiers */
 #define Board_SPI0                  CC2650_LAUNCHXL_SPI0
 #define Board_SPI1                  CC2650_LAUNCHXL_SPI1
+
 /* Generic UART instance identifiers */
 #define Board_UART                  CC2650_LAUNCHXL_UART0
+
 /* Generic Crypto instance identifiers */
 #define Board_CRYPTO                CC2650_LAUNCHXL_CRYPTO0
+
 /* Generic GPTimer instance identifiers */
 #define Board_GPTIMER0A             CC2650_LAUNCHXL_GPTIMER0A
 #define Board_GPTIMER0B             CC2650_LAUNCHXL_GPTIMER0B
@@ -160,6 +164,7 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_GPTIMER2B             CC2650_LAUNCHXL_GPTIMER2B
 #define Board_GPTIMER3A             CC2650_LAUNCHXL_GPTIMER3A
 #define Board_GPTIMER3B             CC2650_LAUNCHXL_GPTIMER3B
+
 /* Generic PWM instance identifiers */
 #define Board_PWM0                  CC2650_LAUNCHXL_PWM0
 #define Board_PWM1                  CC2650_LAUNCHXL_PWM1
@@ -66,7 +66,7 @@ extern "C"
 // ****************************************************************************

 #if !defined(NPI_SPI_CONFIG)
-#define NPI_SPI_CONFIG Board_SPI1
+#define NPI_SPI_CONFIG Board_SPI0
 #endif

 #ifndef NPI_FLOW_CTRL
@@ -55,7 +55,7 @@ extern "C"
 // includes
 // ****************************************************************************
 #include "hal_types.h"
-#include "npi/src/inc/npi_config.h"
+#include "inc/npi_config.h"

 // ****************************************************************************
 // defines
@@ -9,7 +9,7 @@
 Target Device: CC2650, CC2640

 ******************************************************************************
- 
+
 Copyright (c) 2013-2018, Texas Instruments Incorporated
 All rights reserved.

@@ -45,10 +45,11 @@
 Release Date: 2018-04-02 18:03:35
 *****************************************************************************/

-/*********************************************************************
- * INCLUDES
- */
+/*================
+ ==== include ====
+ ===============*/

+// clang-format off
 #include <ti/sysbios/knl/Task.h>
 #include <ti/sysbios/hal/Hwi.h>
 #include <ti/sysbios/knl/Clock.h>
@@ -68,10 +69,10 @@

 #include "gapbondmgr.h"
 #include "osal_snv.h"
+#include "icall.h"
 #include "icall_apimsg.h"

 #include "util.h"
-#include <ti/mw/display/Display.h>

 #include "inc/npi_ble.h"
 #include "inc/npi_task.h"
@@ -88,13 +89,20 @@

 #include "host_test_app.h"

-#if defined( USE_FPGA ) || defined( DEBUG_SW_TRACE )
-#include <driverlib/ioc.h>
-#endif // USE_FPGA | DEBUG_SW_TRACE
+#include "master/cc2650_master.h"

-/*********************************************************************
- * CONSTANTS
+// clang-format on
+
+/*=================
+ ==== constant ====
+ =================*/
+
+// clang-format off
+
+/*
+ * GAP GATT Attributes
 */
+#define DEVICE_NAME "BioProController"

 // LE Event Lengths
 #define HCI_CMD_COMPLETE_EVENT_LEN              3
@@ -104,62 +112,38 @@

 // Task configuration
 #define HTA_TASK_PRIORITY                       1
-#define HTA_TASK_STACK_SIZE                     644
+#define HTA_TASK_STACK_SIZE                     844

-/*********************************************************************
- * GLOBAL VARIABLES
- */
+// data length extension
+#define APP_SUGGESTED_PDU_SIZE                  251
+#define APP_SUGGESTED_TX_TIME                   2120

-// Display Interface
-Display_Handle dispHandle = NULL;
+// clang-format on

-/*********************************************************************
- * LOCAL VARIABLES
- */
 // Entity ID globally used to check for source and/or destination of messages
-static ICall_EntityID selfEntity;
+static ICall_EntityID self;

 // Semaphore globally used to post events to the application thread
-static ICall_Semaphore sem;
+ICall_Semaphore semaphore;

 // Task configuration
 Task_Struct htaTask;
-Char htaTaskStack[HTA_TASK_STACK_SIZE];
+Char        htaTaskStack[HTA_TASK_STACK_SIZE];

-#if !defined ( GATT_DB_OFF_CHIP )
-  static uint8 deviceName[GAP_DEVICE_NAME_LEN] = { 0 };
-  static uint16 appearance = 17;
-#endif
-
-// Stack build revision
-ICall_BuildRevision buildRev;
-
-/*********************************************************************
- * LOCAL FUNCTIONS
- */
+/*=========================
+ ==== function declare ====
+ ========================*/

 static void HostTestApp_init(void);
 static void HostTestApp_taskFxn(UArg a0, UArg a1);
-
-static void HostTestApp_processGapEvent(ICall_HciExtEvt *pMsg);
-static void HostTestApp_processBLEEvent(ICall_HciExtEvt *pMsg);
-
-static void sendCommandCompleteEvent(uint8 eventCode, uint16 opcode,
-                                     uint8 numParam, uint8 *param);
-static void sendCommandStatusEvent(uint8_t eventCode, uint16_t status,
-                                   uint16_t opcode);
+static void HostTestApp_processGapEvent(ICall_HciExtEvt *message);
+static void HostTestApp_processAttEvent(gattMsgEvent_t *message);
+static void HostTestApp_processBLEEvent(ICall_HciExtEvt *message);
+static void sendCommandCompleteEvent(uint8 eventCode, uint16 opcode, uint8 numParam, uint8 *param);
+static void sendCommandStatusEvent(uint8_t eventCode, uint16_t status, uint16_t opcode);
 static void sendBLECompleteEvent(uint8 eventLen, uint8 *pEvent);

-/*********************************************************************
- * EXTERN FUNCTIONS
- */
-extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
-
-/*********************************************************************
- * PUBLIC FUNCTIONS
- */
-
-/*********************************************************************
+/**
 * @fn      HostTestApp_createTask
 *
 * @brief   Task creation function for the Host Test App.
@@ -168,20 +152,19 @@ extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
 *
 * @return  none
 */
-void HostTestApp_createTask(void)
-{
-  Task_Params taskParams;
+void HostTestApp_createTask(void) {
+    Task_Params taskParams;

-  // Configure task
-  Task_Params_init(&taskParams);
-  taskParams.stack = htaTaskStack;
-  taskParams.stackSize = HTA_TASK_STACK_SIZE;
-  taskParams.priority = HTA_TASK_PRIORITY;
+    // Configure task
+    Task_Params_init(&taskParams);
+    taskParams.stack     = htaTaskStack;
+    taskParams.stackSize = HTA_TASK_STACK_SIZE;
+    taskParams.priority  = HTA_TASK_PRIORITY;

-  Task_construct(&htaTask, HostTestApp_taskFxn, &taskParams, NULL);
+    Task_construct(&htaTask, HostTestApp_taskFxn, &taskParams, NULL);
 }

-/*********************************************************************
+/**
 * @fn      HostTestApp_init
 *
 * @brief   Called during initialization and contains application
@@ -193,117 +176,33 @@ void HostTestApp_createTask(void)
 *
 * @return  none
 */
-static void HostTestApp_init(void)
-{
-  // Register the current thread as an ICall dispatcher application
-  // so that the application can send and receive messages.
-  ICall_registerApp(&selfEntity, &sem);
+static void HostTestApp_init(void) {
+    // Register the current thread as an ICall dispatcher application
+    // so that the application can send and receive messages.
+    ICall_registerApp(&self, &semaphore);

-#if defined( USE_FPGA )
-  // configure RF Core SMI Data Link
-  IOCPortConfigureSet(IOID_12, IOC_PORT_RFC_GPO0, IOC_STD_OUTPUT);
-  IOCPortConfigureSet(IOID_11, IOC_PORT_RFC_GPI0, IOC_STD_INPUT);
+    // Set device's Sleep Clock Accuracy
+    // HCI_EXT_SetSCACmd(40);

-  // configure RF Core SMI Command Link
-  IOCPortConfigureSet(IOID_10, IOC_IOCFG0_PORT_ID_RFC_SMI_CL_OUT, IOC_STD_OUTPUT);
-  IOCPortConfigureSet(IOID_9, IOC_IOCFG0_PORT_ID_RFC_SMI_CL_IN, IOC_STD_INPUT);
+#if defined(USE_RCOSC)
+    RCOSC_enableCalibration();
+#endif  // USE_RCOSC

-  // configure RF Core tracer IO
-  IOCPortConfigureSet(IOID_8, IOC_PORT_RFC_TRC, IOC_STD_OUTPUT);
-#else // !USE_FPGA
-  #if defined( DEBUG_SW_TRACE )
-    // configure RF Core tracer IO
-    IOCPortConfigureSet(IOID_8, IOC_PORT_RFC_TRC, IOC_STD_OUTPUT | IOC_CURRENT_4MA | IOC_SLEW_ENABLE);
-  #endif // DEBUG_SW_TRACE
-#endif // USE_FPGA
+    // Initialize GATT Client
+    VOID GATT_InitClient();

-  // Set device's Sleep Clock Accuracy
-  //HCI_EXT_SetSCACmd(40);
+    // Register to receive incoming ATT Indications or Notifications of attribute values.
+    GATT_RegisterForInd(self);

-#if defined( USE_RCOSC )
-  RCOSC_enableCalibration();
-#endif // USE_RCOSC
+    // Register for unprocessed HCI/Host event messages
+    GAP_RegisterForMsgs(self);

-  dispHandle = Display_open(Display_Type_LCD, NULL);
+    GGS_SetParameter(GGS_DEVICE_NAME_ATT, strlen(DEVICE_NAME), (void *)DEVICE_NAME);

-  // Register for unprocessed HCI/Host event messages
-  GAP_RegisterForMsgs(selfEntity);
-
-  // Initialize GATT Client
-  VOID GATT_InitClient();
-
-  // Get build revision
-  VOID Util_buildRevision(&buildRev);
-
-#if !defined ( GATT_DB_OFF_CHIP )
-
-  #if defined ( GATT_QUAL )
-    VOID GATTQual_AddService( GATT_ALL_SERVICES ); // Includes GAP and GATT Services
-  #else
-    // Add our services to GATT Server
-    VOID GGS_AddService( GATT_ALL_SERVICES );
-    VOID GATTServApp_AddService( GATT_ALL_SERVICES );
-    #if defined ( GATT_TEST )
-      VOID GATTTest_AddService( GATT_ALL_SERVICES );
-    #endif
-  #endif
-
-  // Set device name
-  if ((buildRev.hostInfo & CENTRAL_CFG) && (buildRev.hostInfo & PERIPHERAL_CFG))
-  {
-    memcpy(deviceName, "TI BLE All", 10);
-  }
-  else if (buildRev.hostInfo & CENTRAL_CFG)
-  {
-    memcpy(deviceName, "TI BLE Central", 14);
-  }
-  else if (buildRev.hostInfo & PERIPHERAL_CFG)
-  {
-    memcpy(deviceName, "TI BLE Peripheral",  17);
-  }
-  else
-  {
-    memcpy(deviceName, "TI BLE Unknown",  14);
-  }
-
-  VOID GGS_SetParameter(GGS_DEVICE_NAME_ATT, strlen((char *)deviceName), deviceName);
-  VOID GGS_SetParameter(GGS_APPEARANCE_ATT, sizeof(uint16), (void*)&appearance);
-
-#endif // GATT_DB_OFF_CHIP
-
-  Display_print0(dispHandle, 0, 0, "TI BLEv2.0");
-  Display_print0(dispHandle, 1, 0, "HostTestApp");
-
-  // Display Host build configuration
-  if ((buildRev.hostInfo & CENTRAL_CFG) && (buildRev.hostInfo & PERIPHERAL_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "All");
-  }
-  else if ((buildRev.hostInfo & CENTRAL_CFG) &&
-           (buildRev.hostInfo & BROADCASTER_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "Cent+Bcast");
-  }
-  else if ((buildRev.hostInfo & PERIPHERAL_CFG) &&
-           (buildRev.hostInfo & OBSERVER_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "Peri+Observ");
-  }
-  else if (buildRev.hostInfo & CENTRAL_CFG)
-  {
-    Display_print0(dispHandle, 2, 0, "Central");
-  }
-  else if (buildRev.hostInfo & PERIPHERAL_CFG)
-  {
-    Display_print0(dispHandle, 2, 0, "Peripheral");
-  }
-  else
-  {
-    Display_print1(dispHandle, 2, 0, "Unknown build cfg %d", buildRev.hostInfo);
-  }
+    HCI_LE_WriteSuggestedDefaultDataLenCmd(APP_SUGGESTED_PDU_SIZE, APP_SUGGESTED_TX_TIME);
 }

-/*********************************************************************
+/**
 * @fn      HostTestApp_taskFxn
 *
 * @brief   Application task entry point for the Host Test App.
@@ -312,55 +211,54 @@ static void HostTestApp_init(void)
 *
 * @return  none
 */
-static void HostTestApp_taskFxn(UArg a0, UArg a1)
-{
-  // Initialize application
-  HostTestApp_init();
+static void HostTestApp_taskFxn(UArg a0, UArg a1) {
+    // Initialize application
+    HostTestApp_init();
+    master_init();

-  // Application main loop
-  for (;;)
-  {
-    // Waits for a signal to the semaphore associated with the calling thread.
-    // Note that the semaphore associated with a thread is signaled when a
-    // message is queued to the message receive queue of the thread or when
-    // ICall_signal() function is called onto the semaphore.
-    ICall_Errno errno = ICall_wait(ICALL_TIMEOUT_FOREVER);
+    // Application main loop
+    for (;;) {
+        // Waits for a signal to the semaphore associated with the calling thread.
+        // Note that the semaphore associated with a thread is signaled when a
+        // message is queued to the message receive queue of the thread or when
+        // ICall_signal() function is called onto the semaphore.
+        ICall_Errno errno = ICall_wait(ICALL_TIMEOUT_FOREVER);

-    if (errno == ICALL_ERRNO_SUCCESS)
-    {
-      ICall_EntityID dest;
-      ICall_ServiceEnum src;
-      ICall_HciExtEvt *pMsg = NULL;
+        if (errno == ICALL_ERRNO_SUCCESS) {
+            ICall_EntityID    dest;
+            ICall_ServiceEnum src;
+            ICall_HciExtEvt * message = NULL;

-      if (ICall_fetchServiceMsg(&src, &dest,
-                                (void **)&pMsg) == ICALL_ERRNO_SUCCESS)
-      {
-        bool dealloc = true;
+            if (ICall_fetchServiceMsg(&src, &dest, (void **)&message) == ICALL_ERRNO_SUCCESS) {
+                if ((src == ICALL_SERVICE_CLASS_BLE) && (dest == self)) {
+                    // Process incoming messages
+                    switch (message->hdr.event) {
+                        case HCI_GAP_EVENT_EVENT:
+                            HostTestApp_processGapEvent(message);
+                            break;

-        if ((src == ICALL_SERVICE_CLASS_BLE) && (dest == selfEntity))
-        {
-          // Process incoming messages
-          switch (pMsg->hdr.event)
-          {
-            case HCI_GAP_EVENT_EVENT:
-              HostTestApp_processGapEvent(pMsg);
-              break;
+                        case GATT_MSG_EVENT:
+                            HostTestApp_processAttEvent((gattMsgEvent_t *)message);
+                            break;

-            default:
-              break;
-          }
+                        default:
+                            break;
+                    }
+                }
+
+                if (message) {
+                    ICall_freeMsg(message);
+                }
+            }
        }

-        if (dealloc == true)
-        {
-          ICall_freeMsg(pMsg);
+        if (EVENT_MASK > 0) {
+            master_event_handle();
        }
-      }
    }
-  }
 }

-/*********************************************************************
+/**
 * @fn      HostTestApp_processGapEvent
 *
 * @brief   Process an incoming GAP Event.
@@ -369,96 +267,102 @@ static void HostTestApp_taskFxn(UArg a0, UArg a1)
 *
 * @return  none
 */
-static void HostTestApp_processGapEvent(ICall_HciExtEvt *pMsg)
-{
-  switch(pMsg->hdr.status)
-  {
-    case HCI_COMMAND_COMPLETE_EVENT_CODE:
-      {
-        hciEvt_CmdComplete_t *pkt = (hciEvt_CmdComplete_t *)pMsg;
+static void HostTestApp_processGapEvent(ICall_HciExtEvt *message) {
+    switch (message->hdr.status) {
+        case HCI_COMMAND_COMPLETE_EVENT_CODE: {
+            hciEvt_CmdComplete_t *pkt = (hciEvt_CmdComplete_t *)message;

-        if (lastAppOpcodeSent == pkt->cmdOpcode)
-        {
-          // app processes this as it was embedded msg to stack
+            if (lastAppOpcodeSent == pkt->cmdOpcode) {
+                // app processes this as it was embedded message to stack

-          // Reset last opcode sent
-          lastAppOpcodeSent = 0xFFFF;
+                // Reset last opcode sent
+                lastAppOpcodeSent = 0xFFFF;
+            } else {
+                osal_msg_hdr_t *msgHdr;
+                uint8           len;
+
+                msgHdr = (osal_msg_hdr_t *)message;
+                msgHdr--;  // Backup to the message header
+
+                len = (uint8)(msgHdr->len - sizeof(hciEvt_CmdComplete_t));
+
+                sendCommandCompleteEvent(HCI_COMMAND_COMPLETE_EVENT_CODE, pkt->cmdOpcode, len, pkt->pReturnParam);
+            }
+            break;
        }
-        else
-        {
-          osal_msg_hdr_t *msgHdr;
-          uint8 len;

-          msgHdr = (osal_msg_hdr_t *)pMsg;
-          msgHdr--; // Backup to the msg header
+        case HCI_DISCONNECTION_COMPLETE_EVENT_CODE:
+            break;

-          len = (uint8)(msgHdr->len - sizeof ( hciEvt_CmdComplete_t ));
+        case HCI_COMMAND_STATUS_EVENT_CODE: {
+            hciEvt_CommandStatus_t *pkt = (hciEvt_CommandStatus_t *)message;

-          sendCommandCompleteEvent(HCI_COMMAND_COMPLETE_EVENT_CODE,
-                                   pkt->cmdOpcode, len, pkt->pReturnParam);
+            if (lastAppOpcodeSent == pkt->cmdOpcode) {
+                // app processes this as it was embedded msg to stack
+
+                // Reset last opcode sent
+                lastAppOpcodeSent = 0xFFFF;
+
+            } else if (pkt->cmdOpcode == HCI_LE_SET_PHY) {
+                sendCommandStatusEvent(HCI_COMMAND_STATUS_EVENT_CODE, pkt->cmdStatus, pkt->cmdOpcode);
+            }
+            break;
        }
-      }
-      break;

-    case HCI_DISCONNECTION_COMPLETE_EVENT_CODE:
-      break;
+        case HCI_LE_EVENT_CODE:
+            HostTestApp_processBLEEvent(message);
+            break;

-    case HCI_COMMAND_STATUS_EVENT_CODE:
-      {
-        hciEvt_CommandStatus_t *pkt = (hciEvt_CommandStatus_t *)pMsg;
+        case HCI_BLE_HARDWARE_ERROR_EVENT_CODE:
+            break;

-        if (lastAppOpcodeSent == pkt->cmdOpcode)
-        {
-          // app processes this as it was embedded msg to stack
+        case HCI_VE_EVENT_CODE: {
+            hciEvt_VSCmdComplete_t *pkt = (hciEvt_VSCmdComplete_t *)message;

-          // Reset last opcode sent
-          lastAppOpcodeSent = 0xFFFF;
+            if (lastAppOpcodeSent == pkt->cmdOpcode) {
+                // app processes this as it was embedded msg to stack
+
+                // Reset last opcode sent
+                lastAppOpcodeSent = 0xFFFF;
+            } else {
+                sendCommandCompleteEvent(HCI_VE_EVENT_CODE, pkt->cmdOpcode, pkt->length, pkt->pEventParam);
+            }
+            break;
        }
-        else if (pkt->cmdOpcode == HCI_LE_SET_PHY)
-        {
-          sendCommandStatusEvent(HCI_COMMAND_STATUS_EVENT_CODE, pkt->cmdStatus,
-                                 pkt->cmdOpcode);
-        }
-      }
-      break;

-    case HCI_LE_EVENT_CODE:
-      {
-        HostTestApp_processBLEEvent(pMsg);
-      }
-      break;
-
-    case HCI_BLE_HARDWARE_ERROR_EVENT_CODE:
-      {
-        AssertHandler(HAL_ASSERT_CAUSE_HARDWARE_ERROR,0);
-      }
-      break;
-
-    case HCI_VE_EVENT_CODE:
-      {
-        hciEvt_VSCmdComplete_t *pkt = (hciEvt_VSCmdComplete_t *)pMsg;
-
-        if (lastAppOpcodeSent == pkt->cmdOpcode)
-        {
-          // app processes this as it was embedded msg to stack
-
-          // Reset last opcode sent
-          lastAppOpcodeSent = 0xFFFF;
-        }
-        else
-        {
-          sendCommandCompleteEvent(HCI_VE_EVENT_CODE, pkt->cmdOpcode,
-                                   pkt->length, pkt->pEventParam);
-        }
-      }
-      break;
-
-    default:
-      break;
-  }
+        default:
+            break;
+    }
 }

-/*********************************************************************
+/**
+ * @fn      HostTestApp_processAttEvent
+ *
+ * @brief   Process an incoming ATT Event.
+
+ * @param   pMsg - message to process
+ *
+ * @return  None.
+ */
+static void HostTestApp_processAttEvent(gattMsgEvent_t *message) {
+    uint8_t method = message->method;
+
+    if (message->hdr.status == blePending) {
+        // pass
+    } else if ((method == ATT_READ_RSP) || (method == ATT_ERROR_RSP && message->msg.errorRsp.reqOpcode == ATT_READ_REQ)) {
+        // pass
+    } else if ((method == ATT_WRITE_RSP) || (method == ATT_ERROR_RSP && message->msg.errorRsp.reqOpcode == ATT_WRITE_REQ)) {
+        // pass
+    } else if (method == ATT_HANDLE_VALUE_NOTI) {
+        attHandleValueNoti_t *att_notify = (attHandleValueNoti_t *)(&message->msg);
+        master_handle_notify(att_notify->len, att_notify->pValue);
+    }
+
+    // Free message. Needed only for ATT Protocol messages
+    GATT_bm_free(&message->msg, message->method);
+}
+
+/**
 * @fn      HostTestApp_processBLEEvent
 *
 * @brief   Process an incoming BLE Event.
@@ -467,210 +371,176 @@ static void HostTestApp_processGapEvent(ICall_HciExtEvt *pMsg)
 *
 * @return  None.
 */
-static void HostTestApp_processBLEEvent(ICall_HciExtEvt *pMsg)
-{
-  hciEvt_BLEPhyUpdateComplete_t *pEvt = (hciEvt_BLEPhyUpdateComplete_t *)pMsg;
-  uint8 event[HCI_PHY_UPDATE_COMPLETE_EVENT_LEN];
-  uint8 eventLen;
+static void HostTestApp_processBLEEvent(ICall_HciExtEvt *message) {
+    hciEvt_BLEPhyUpdateComplete_t *pEvt = (hciEvt_BLEPhyUpdateComplete_t *)message;

-  switch (pEvt->BLEEventCode)
-  {
-    case HCI_BLE_PHY_UPDATE_COMPLETE_EVENT:
-      {
-        event[0] = HCI_BLE_PHY_UPDATE_COMPLETE_EVENT; // event code
-        event[1] = pEvt->status;                      // status
-        event[2] = LO_UINT16(pEvt->connHandle);       // connection handle (LSB)
-        event[3] = HI_UINT16(pEvt->connHandle);       // connection handle (MSB)
-        event[4] = pEvt->txPhy;                       // TX PHY
-        event[5] = pEvt->rxPhy;                       // RX PHY
+    uint8 event[HCI_PHY_UPDATE_COMPLETE_EVENT_LEN];
+    uint8 eventLen = 0;

-        eventLen = HCI_PHY_UPDATE_COMPLETE_EVENT_LEN;
-      }
-      break;
+    switch (pEvt->BLEEventCode) {
+        case HCI_BLE_PHY_UPDATE_COMPLETE_EVENT: {
+            event[0] = HCI_BLE_PHY_UPDATE_COMPLETE_EVENT;  // event code
+            event[1] = pEvt->status;                       // status
+            event[2] = LO_UINT16(pEvt->connHandle);        // connection handle (LSB)
+            event[3] = HI_UINT16(pEvt->connHandle);        // connection handle (MSB)
+            event[4] = pEvt->txPhy;                        // TX PHY
+            event[5] = pEvt->rxPhy;                        // RX PHY

-    default:
-      eventLen = 0;
-      break;
-  }
+            eventLen = HCI_PHY_UPDATE_COMPLETE_EVENT_LEN;
+            break;
+        }
+    }

-  if (eventLen > 0)
-  {
-    // Send BLE Complete Event
-    sendBLECompleteEvent(eventLen, event);
-  }
+    if (eventLen > 0) {
+        // Send BLE Complete Event
+        sendBLECompleteEvent(eventLen, event);
+    }
 }

-//*****************************************************************************
-// the function prototypes
-
-/*******************************************************************************
+/**
 * This generic function sends a Command Complete or a Vendor Specific Command
 * Complete Event to the Host.
 *
 */
-static void sendCommandCompleteEvent(uint8_t eventCode, uint16_t opcode,
-                                     uint8_t numParam, uint8_t *param)
-{
-  npiPkt_t *msg;
-  uint8_t   totalLength;
-  uint8_t   txLen = 0; // Length to transmit
+static void sendCommandCompleteEvent(uint8_t eventCode, uint16_t opcode, uint8_t numParam, uint8_t *param) {
+    // The initial length will be:
+    // OSAL message header(4) - not part of packet sent to HCI Host!
+    // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
+    // Return Parameters (0..N)
+    uint8_t totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + numParam;

-  // The initial length will be:
-  // OSAL message header(4) - not part of packet sent to HCI Host!
-  // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
-  // Return Parameters (0..N)
-  totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + numParam;
+    // adjust the size of the event packet based on event code
+    // Note: If not a vendor specific event, then the event includes:
+    //       Command Complete Data: Number of HCI Commands Allowed(1) + Command Opcode(2)
+    // Note: If a vendor specific event, then the event includes:
+    //       Vendor Specific Command Complete Data: Vendor Specific Event Opcode(2)
+    totalLength += ((eventCode != HCI_VE_EVENT_CODE) ? HCI_CMD_COMPLETE_EVENT_LEN : HCI_CMD_VS_COMPLETE_EVENT_LEN);

-  // adjust the size of the event packet based on event code
-  // Note: If not a vendor specific event, then the event includes:
-  //       Command Complete Data: Number of HCI Commands Allowed(1) + Command Opcode(2)
-  // Note: If a vendor specific event, then the event includes:
-  //       Vendor Specific Command Complete Data: Vendor Specific Event Opcode(2)
-  totalLength += ( (eventCode != HCI_VE_EVENT_CODE)  ?
-                   HCI_CMD_COMPLETE_EVENT_LEN        :
-                   HCI_CMD_VS_COMPLETE_EVENT_LEN );
+    // allocate memory for OSAL hdr + packet
+    npiPkt_t *message = (npiPkt_t *)ICall_allocMsg(totalLength);

-  // allocate memory for OSAL hdr + packet
-  msg = (npiPkt_t *)ICall_allocMsg(totalLength);
-  if (msg)
-  {
-    // OSAL message event, status, and pointer to packet
-    msg->hdr.event  = HCI_EVENT_PACKET;
-    msg->hdr.status = 0xFF;
-    msg->pData      = (uint8*)(msg+1);
+    uint8_t txLen = 0;  // Length to transmit

-    // fill in Command Complete Event data
-    msg->pData[0] = HCI_EVENT_PACKET;
-    msg->pData[1] = eventCode;
+    if (message) {
+        // OSAL message event, status, and pointer to packet
+        message->hdr.event  = HCI_EVENT_PACKET;
+        message->hdr.status = 0xFF;
+        message->pData      = (uint8 *)(message + 1);

-    txLen += 2;
+        // fill in Command Complete Event data
+        message->pData[0] = HCI_EVENT_PACKET;
+        message->pData[1] = eventCode;

-    // check if this isn't a vendor specific event
-    if ( eventCode != HCI_VE_EVENT_CODE )
-    {
-      msg->pData[2] = numParam + HCI_CMD_COMPLETE_EVENT_LEN;
-      msg->pData[3] = 1;// hciCtrlCmdToken;     // event parameter 1
-      msg->pData[4] = LO_UINT16( opcode ); // event parameter 2
-      msg->pData[5] = HI_UINT16( opcode ); // event parameter 2
+        txLen += 2;

-      txLen += 4;
+        // check if this isn't a vendor specific event
+        if (eventCode != HCI_VE_EVENT_CODE) {
+            message->pData[2] = numParam + HCI_CMD_COMPLETE_EVENT_LEN;
+            message->pData[3] = 1;                  // hciCtrlCmdToken;     // event parameter 1
+            message->pData[4] = LO_UINT16(opcode);  // event parameter 2
+            message->pData[5] = HI_UINT16(opcode);  // event parameter 2

-      // remaining event parameters
-      (void)memcpy(&msg->pData[6], param, numParam);
+            txLen += 4;

-      txLen += numParam;
+            // remaining event parameters
+            (void)memcpy(&message->pData[6], param, numParam);
+
+            txLen += numParam;
+        } else {
+            // it is a vendor specific event
+
+            // less one byte as number of complete packets not used in vendor specific event
+            message->pData[2] = numParam + HCI_CMD_VS_COMPLETE_EVENT_LEN;
+            message->pData[3] = param[0];           // event parameter 0: event opcode LSB
+            message->pData[4] = param[1];           // event parameter 1: event opcode MSB
+            message->pData[5] = param[2];           // event parameter 2: status
+            message->pData[6] = LO_UINT16(opcode);  // event parameter 3: command opcode LSB
+            message->pData[7] = HI_UINT16(opcode);  // event parameter 3: command opcode MSB
+
+            txLen += 6;
+
+            // remaining event parameters
+            // Note: The event opcode and status were already placed in the msg packet.
+            (void)memcpy(&message->pData[8], &param[3], numParam - HCI_EVENT_MIN_LENGTH);
+
+            txLen += (numParam - HCI_EVENT_MIN_LENGTH);
+        }
+
+        message->pktLen = txLen;
+
+        NPITask_sendToHost((uint8_t *)message);
    }
-    else // it is a vendor specific event
-    {
-      // less one byte as number of complete packets not used in vendor specific event
-      msg->pData[2] = numParam + HCI_CMD_VS_COMPLETE_EVENT_LEN;
-      msg->pData[3] = param[0];            // event parameter 0: event opcode LSB
-      msg->pData[4] = param[1];            // event parameter 1: event opcode MSB
-      msg->pData[5] = param[2];            // event parameter 2: status
-      msg->pData[6] = LO_UINT16( opcode ); // event parameter 3: command opcode LSB
-      msg->pData[7] = HI_UINT16( opcode ); // event parameter 3: command opcode MSB
-
-      txLen += 6;
-
-      // remaining event parameters
-      // Note: The event opcode and status were already placed in the msg packet.
-      (void)memcpy(&msg->pData[8], &param[3], numParam-HCI_EVENT_MIN_LENGTH);
-
-      txLen += (numParam-HCI_EVENT_MIN_LENGTH);
-    }
-
-    msg->pktLen = txLen;
-
-    NPITask_sendToHost((uint8_t *)msg);
-  }
 }

-/*******************************************************************************
+/**
 * This generic function sends a Command Complete or a Vendor Specific Command
 * Complete Event to the Host.
 *
 */
-static void sendCommandStatusEvent(uint8_t eventCode, uint16_t status,
-                                   uint16_t opcode)
-{
-  npiPkt_t *msg;
-  uint8_t   totalLength;
+static void sendCommandStatusEvent(uint8_t eventCode, uint16_t status, uint16_t opcode) {
+    // The initial length will be:
+    // OSAL message header(4) - not part of packet sent to HCI Host!
+    // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
+    // Command Status Event Data: Status (1) + Num HCI Cmd Pkt (1) + Cmd Opcode (2)
+    uint8_t totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;

-  // The initial length will be:
-  // OSAL message header(4) - not part of packet sent to HCI Host!
-  // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
-  // Command Status Event Data: Status (1) + Num HCI Cmd Pkt (1) + Cmd Opcode (2)
-  totalLength = sizeof(npiPkt_t)     +
-                HCI_EVENT_MIN_LENGTH +
-                HCI_CMD_STATUS_EVENT_LEN;
+    // allocate memory for OSAL hdr + packet
+    npiPkt_t *message = (npiPkt_t *)ICall_allocMsg(totalLength);
+    if (message) {
+        // OSAL message event, status, and pointer to packet
+        message->hdr.event  = HCI_EVENT_PACKET;
+        message->hdr.status = 0xFF;

-  // allocate memory for OSAL hdr + packet
-  msg = (npiPkt_t *)ICall_allocMsg(totalLength);
-  if (msg)
-  {
-    // OSAL message event, status, and pointer to packet
-    msg->hdr.event  = HCI_EVENT_PACKET;
-    msg->hdr.status = 0xFF;
+        // fill in length and data pointer
+        message->pktLen = HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
+        message->pData  = (uint8 *)(message + 1);

-    // fill in length and data pointer
-    msg->pktLen = HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
-    msg->pData  = (uint8*)(msg+1);
+        // fill in Command Complete Event data
+        message->pData[0] = HCI_EVENT_PACKET;
+        message->pData[1] = eventCode;
+        message->pData[2] = HCI_CMD_STATUS_EVENT_LEN;
+        message->pData[3] = status;
+        message->pData[4] = 1;                  // number of HCI command packets
+        message->pData[5] = LO_UINT16(opcode);  // opcode (LSB)
+        message->pData[6] = HI_UINT16(opcode);  // opcode (MSB)

-    // fill in Command Complete Event data
-    msg->pData[0] = HCI_EVENT_PACKET;
-    msg->pData[1] = eventCode;
-    msg->pData[2] = HCI_CMD_STATUS_EVENT_LEN;
-    msg->pData[3] = status;
-    msg->pData[4] = 1;                 // number of HCI command packets
-    msg->pData[5] = LO_UINT16(opcode); // opcode (LSB)
-    msg->pData[6] = HI_UINT16(opcode); // opcode (MSB)
-
-    NPITask_sendToHost((uint8_t *)msg);
-  }
+        NPITask_sendToHost((uint8_t *)message);
+    }
 }

-/*******************************************************************************
+/**
 * This is a generic function used to send BLE Complete Event to the
 * Host processor.
 *
 */
-static void sendBLECompleteEvent(uint8 eventLen, uint8 *pEvent)
-{
-  npiPkt_t *msg;
-  uint8_t   totalLength;
+static void sendBLECompleteEvent(uint8 eventLen, uint8 *pEvent) {
+    // The initial length will be:
+    // OSAL message header(4) - not part of packet sent to HCI Host!
+    // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
+    // Event Data: eventLen
+    uint8_t totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + eventLen;

-  // The initial length will be:
-  // OSAL message header(4) - not part of packet sent to HCI Host!
-  // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
-  // Event Data: eventLen
-  totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + eventLen;
+    // allocate memory for OSAL hdr + packet
+    npiPkt_t *message = (npiPkt_t *)ICall_allocMsg(totalLength);
+    if (message) {
+        // OSAL message event, status, and pointer to packet
+        message->hdr.event  = HCI_EVENT_PACKET;
+        message->hdr.status = 0xFF;

-  // allocate memory for OSAL hdr + packet
-  msg = (npiPkt_t *)ICall_allocMsg(totalLength);
-  if (msg)
-  {
-    // OSAL message event, status, and pointer to packet
-    msg->hdr.event  = HCI_EVENT_PACKET;
-    msg->hdr.status = 0xFF;
+        // fill in length and data pointer
+        message->pktLen = HCI_EVENT_MIN_LENGTH + eventLen;
+        message->pData  = (uint8 *)(message + 1);

-    // fill in length and data pointer
-    msg->pktLen = HCI_EVENT_MIN_LENGTH + eventLen;
-    msg->pData  = (uint8*)(msg+1);
+        // fill in BLE Complete Event data
+        message->pData[0] = HCI_EVENT_PACKET;
+        message->pData[1] = HCI_LE_EVENT_CODE;
+        message->pData[2] = eventLen;

-    // fill in BLE Complete Event data
-    msg->pData[0] = HCI_EVENT_PACKET;
-    msg->pData[1] = HCI_LE_EVENT_CODE;
-    msg->pData[2] = eventLen;
+        // populate event data
+        if (eventLen > 0) {
+            memcpy(&message->pData[3], pEvent, eventLen);
+        }

-    // populate event data
-    if (eventLen > 0)
-    {
-      memcpy(&msg->pData[3], pEvent, eventLen);
+        NPITask_sendToHost((uint8_t *)message);
    }
-
-    NPITask_sendToHost((uint8_t *)msg);
-  }
 }
-
-/*********************************************************************
-*********************************************************************/
@@ -9,7 +9,7 @@
 Target Device: CC2650, CC2640

 ******************************************************************************
- 
+
 Copyright (c) 2013-2018, Texas Instruments Incorporated
 All rights reserved.

@@ -49,37 +49,16 @@
 #define HOSTESTAPP_H

 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif

-/*********************************************************************
- * INCLUDES
- */
-
-/*********************************************************************
- * CONSTANTS
- */
-
-/*********************************************************************
- * MACROS
- */
-
-/*********************************************************************
- * FUNCTIONS
- */
-
 /*
 * Task creation function for the Host Test App.
 */
 extern void HostTestApp_createTask(void);

-
-/*********************************************************************
-*********************************************************************/
-
 #ifdef __cplusplus
 }
 #endif

-#endif /* HOSTESTAPP_H */
+#endif
@@ -1,707 +0,0 @@
-/******************************************************************************
-
- @file  host_test_app_pm.c
-
- @brief This file contains the HostTest sample application for use with the
-        CC2650 Bluetooth Low Energy Protocol Stack.
-
- Group: WCS, BTS
- Target Device: CC2650, CC2640
-
- ******************************************************************************
- 
- Copyright (c) 2013-2018, Texas Instruments Incorporated
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- *  Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
- *  Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
- *  Neither the name of Texas Instruments Incorporated nor the names of
-    its contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************
- Release Name: ble_sdk_2_02_02_25
- Release Date: 2018-04-02 18:03:35
- *****************************************************************************/
-
-/*********************************************************************
- * INCLUDES
- */
-#include <xdc/std.h>
-
-#include <xdc/runtime/Error.h>
-#include <xdc/runtime/System.h>
-
-#include <ti/sysbios/BIOS.h>
-#include <ti/sysbios/knl/Task.h>
-#include <ti/sysbios/hal/Hwi.h>
-#include <ti/sysbios/knl/Clock.h>
-#include <ti/sysbios/knl/Semaphore.h>
-#include <ti/sysbios/knl/Queue.h>
-#include <ti/drivers/UART.h> //For UART application
-
-#include <icall.h>
-#include <string.h>
-
-#include "hal_types.h"
-#include "hci_tl.h"
-#include "gatt.h"
-#include "hci.h"
-
-#include "gapgattserver.h"
-#include "gattservapp.h"
-
-#include "gapbondmgr.h"
-#include "osal_snv.h"
-#include "icall_apimsg.h"
-
-#include "util.h"
-#include <ti/mw/display/Display.h>
-
-#include "npi_pm.h"
-#include <inc/hw_types.h>
-#include "hal_defs.h"
-
-#if defined ( GATT_TEST ) || defined ( GATT_QUAL )
-  #include "gatttest.h"
-#endif
-
-#include "host_test_app.h"
-
-/*********************************************************************
- * CONSTANTS
- */
-
-// LE Event Lengths
-#define HCI_CMD_COMPLETE_EVENT_LEN              3
-#define HCI_CMD_VS_COMPLETE_EVENT_LEN           2
-#define HCI_CMD_STATUS_EVENT_LEN                4
-
-// Task configuration
-#define HTA_TASK_PRIORITY                       1
-#define HTA_TASK_STACK_SIZE                     644
-
-// NPI Events
-#define NPI_WRITECALLBACK_EVENT                 0x0002
-#define NPI_READ_EVENT                          0x0004
-#define NPI_MRDY_EVENT                          0x0008
-
-/*********************************************************************
- * GLOBAL VARIABLES
- */
-
-// Display Interface
-Display_Handle dispHandle = NULL;
-
-/*********************************************************************
- * LOCAL VARIABLES
- */
-// Entity ID globally used to check for source and/or destination of messages
-static ICall_EntityID selfEntity;
-
-// Semaphore globally used to post events to the application thread
-static ICall_Semaphore sem;
-
-// Queue object used for UART TX messages
-static Queue_Struct uartTx;
-static Queue_Handle uartTxQueue;
-
-// Task configuration
-Task_Struct htaTask;
-Char htaTaskStack[HTA_TASK_STACK_SIZE];
-
-#if !defined ( GATT_DB_OFF_CHIP )
-  static uint8 deviceName[GAP_DEVICE_NAME_LEN] = { 0 };
-  static uint16 appearance = 17;
-#endif
-
-// Pointer to last transmitted message
-npiPkt_t *pMsgLastBuf = NULL;
-
-// events for application
-static uint16_t events = NPI_WRITECALLBACK_EVENT;
-
-// Stack build revision
-buildRevision_t buildRev;
-
-/*********************************************************************
- * LOCAL FUNCTIONS
- */
-
-static void HostTestApp_init(void);
-static void HostTestApp_taskFxn(UArg a0, UArg a1);
-
-static void HostTestApp_processGapEvent(ICall_HciExtEvt *pMsg);
-
-//RTOS queue functions
-static void HostTestApp_sendMsg(npiPkt_t *pMsgBuf);
-
-//UART callback
-Void HostTestApp_writeCallBack(int size);
-Void HostTestApp_readCallBack(int size);
-
-static void sendCommandCompleteEvent(uint8 eventCode, uint16 opcode,
-                                     uint8 numParam, uint8 *param);
-
-/*********************************************************************
- * EXTERN FUNCTIONS
- */
-extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
-
-/*********************************************************************
- * PUBLIC FUNCTIONS
- */
-
-/*********************************************************************
- * @fn      HostTestApp_createTask
- *
- * @brief   Task creation function for the Host Test App.
- *
- * @param   none
- *
- * @return  none
- */
-void HostTestApp_createTask(void)
-{
-  Task_Params taskParams;
-
-  // Configure task
-  Task_Params_init(&taskParams);
-  taskParams.stack = htaTaskStack;
-  taskParams.stackSize = HTA_TASK_STACK_SIZE;
-  taskParams.priority = HTA_TASK_PRIORITY;
-
-  Task_construct(&htaTask, HostTestApp_taskFxn, &taskParams, NULL);
-}
-
-/*********************************************************************
- * @fn      HostTestApp_init
- *
- * @brief   Called during initialization and contains application
- *          specific initialization (ie. hardware initialization/setup,
- *          table initialization, power up notification, etc), and
- *          profile initialization/setup.
- *
- * @param   none
- *
- * @return  none
- */
-static void HostTestApp_init(void)
-{
-  // Register the current thread as an ICall dispatcher application
-  // so that the application can send and receive messages.
-  ICall_registerApp(&selfEntity, &sem);
-
-  // Set device's Sleep Clock Accuracy
-  //HCI_EXT_SetSCACmd(40);
-
-  // Create an RTOS queue for messages from stack to be sent to UART
-  uartTxQueue = Util_constructQueue(&uartTx);
-
-  dispHandle = Display_open(Display_Type_LCD, NULL);
-
-  // Register for unwanted HCI messages
-  GAP_RegisterForMsgs(selfEntity);
-
-  // Initialize GATT Client
-  VOID GATT_InitClient();
-
-  // Get build revision
-  VOID Util_buildRevision(&buildRev);
-
-#if !defined ( GATT_DB_OFF_CHIP )
-
-  #if defined ( GATT_QUAL )
-    VOID GATTQual_AddService( GATT_ALL_SERVICES ); // Includes GAP and GATT Services
-  #else
-    // Add our services to GATT Server
-    VOID GGS_AddService( GATT_ALL_SERVICES );
-    VOID GATTServApp_AddService( GATT_ALL_SERVICES );
-    #if defined ( GATT_TEST )
-      VOID GATTTest_AddService( GATT_ALL_SERVICES );
-    #endif
-  #endif
-
-  // Set device name
-  if ((buildRev.hostInfo & CENTRAL_CFG) && (buildRev.hostInfo & PERIPHERAL_CFG))
-  {
-    memcpy(deviceName, "TI BLE All", 10);
-  }
-  else if (buildRev.hostInfo & CENTRAL_CFG)
-  {
-    memcpy(deviceName, "TI BLE Central", 14);
-  }
-  else if (buildRev.hostInfo & PERIPHERAL_CFG)
-  {
-    memcpy(deviceName, "TI BLE Peripheral",  17);
-  }
-  else
-  {
-    memcpy(deviceName, "TI BLE Unknown",  14);
-  }
-
-  VOID GGS_SetParameter(GGS_DEVICE_NAME_ATT, strlen((char *)deviceName), deviceName);
-  VOID GGS_SetParameter(GGS_APPEARANCE_ATT, sizeof(uint16), (void*)&appearance);
-
-#endif // GATT_DB_OFF_CHIP
-
-#ifdef TI_DRIVERS_UART_INCLUDED
-  //Initialize the NPI layer
-  NPI_InitInterface(UART_INTERFACE, &HostTestApp_writeCallBack,
-                    &HostTestApp_readCallBack);
-#elif TI_DRIVERS_SPI_DMA_INCLUDED
-  //Initialize the NPI layer
-  NPI_InitInterface(SPI_INTERFACE, &HostTestApp_writeCallBack,
-                    &HostTestApp_readCallBack);
-#endif
-
-  //Register application with NPI for stack messages to be sent to UART
-  NPI_RegisterTask(selfEntity);
-
-  Display_print0(dispHandle, 0, 0, "TI BLEv2.0");
-  Display_print0(dispHandle, 1, 0, "HostTestApp");
-
-  // Display Host build configuration
-  if ((buildRev.hostInfo & CENTRAL_CFG) && (buildRev.hostInfo & PERIPHERAL_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "All");
-  }
-  else if ((buildRev.hostInfo & CENTRAL_CFG) &&
-           (buildRev.hostInfo & BROADCASTER_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "Cent+Bcast");
-  }
-  else if ((buildRev.hostInfo & PERIPHERAL_CFG) &&
-           (buildRev.hostInfo & OBSERVER_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "Peri+Observ");
-  }
-  else if (buildRev.hostInfo & CENTRAL_CFG)
-  {
-    Display_print0(dispHandle, 2, 0, "Central");
-  }
-  else if (buildRev.hostInfo & PERIPHERAL_CFG)
-  {
-    Display_print0(dispHandle, 2, 0, "Peripheral");
-  }
-  else
-  {
-    Display_print1(dispHandle, 2, 0, "Unknown build cfg %d", buildRev.hostInfo);
-  }
-}
-
-/*********************************************************************
- * @fn      HostTestApp_taskFxn
- *
- * @brief   Application task entry point for the Host Test App.
- *
- * @param   none
- *
- * @return  none
- */
-static void HostTestApp_taskFxn(UArg a0, UArg a1)
-{
-  // Initialize application
-  HostTestApp_init();
-
-  // Application main loop
-  for (;;)
-  {
-    // Waits for a signal to the semaphore associated with the calling thread.
-    // Note that the semaphore associated with a thread is signaled when a
-    // message is queued to the message receive queue of the thread or when
-    // ICall_signal() function is called onto the semaphore.
-    ICall_Errno errno = ICall_wait(ICALL_TIMEOUT_FOREVER);
-
-    if (errno == ICALL_ERRNO_SUCCESS)
-    {
-      ICall_EntityID dest;
-      ICall_ServiceEnum src;
-      ICall_HciExtEvt *pMsg = NULL;
-
-      if (ICall_fetchServiceMsg(&src, &dest,
-                                (void **)&pMsg) == ICALL_ERRNO_SUCCESS)
-      {
-        bool dealloc = true;
-
-        if ((src == ICALL_SERVICE_CLASS_BLE) && (dest == selfEntity))
-        {
-          // Process incoming messages
-          switch (pMsg->hdr.event)
-          {
-            case HCI_GAP_EVENT_EVENT:
-              HostTestApp_processGapEvent(pMsg);
-              break;
-
-            case HCI_ACL_DATA_PACKET:
-            case HCI_SCO_DATA_PACKET:
-            case HCI_EVENT_PACKET:
-              {
-                HostTestApp_sendMsg((npiPkt_t *)pMsg);
-                dealloc = false;
-              }
-              break;
-
-            default:
-              break;
-          }
-        }
-
-        if (dealloc == true)
-        {
-          ICall_freeMsg(pMsg);
-        }
-      }
-    }
-
-    if (events & NPI_READ_EVENT )
-    {
-      events &= ~NPI_READ_EVENT;
-      NPI_serialPacketParser(); //Call the parser..
-    }
-
-    if (events & NPI_MRDY_EVENT )
-    {
-      // This read is initiated to read again and again till you run out of
-      // bytes. This read was initiated in the callback but is actually done in
-      // this application thread
-      events &= ~NPI_MRDY_EVENT;
-#ifdef POWER_SAVING
-      NPI_MrdyEvent();
-#endif
-    }
-
-    // Check if write is complete and free the last written buffer
-    if(events & NPI_WRITECALLBACK_EVENT)
-    {
-      if (pMsgLastBuf)
-      {
-        ICall_freeMsg(pMsgLastBuf);  //Free the NPI/OSAL buffer which was sent
-        pMsgLastBuf = NULL;          //Need to have this to avoid memory leak
-      }
-
-      // If queue is not empty, we did add some frames to it
-      if (!Queue_empty(uartTxQueue))
-      {
-        pMsgLastBuf = (npiPkt_t *)Util_dequeueMsg(uartTxQueue);
-        if (pMsgLastBuf)
-        {
-          // send dequeued element to UART
-          events &= ~NPI_WRITECALLBACK_EVENT;
-          NPI_WriteTransport(pMsgLastBuf->pData, pMsgLastBuf->pktLen);
-        }
-      }
-    }
-  }
-}
-
-/*********************************************************************
- * @fn      HostTestApp_processGapEvent
- *
- * @brief   Process an incoming GAP Event.
- *
- * @param   pMsg - message to process
- *
- * @return  none
- */
-static void HostTestApp_processGapEvent(ICall_HciExtEvt *pMsg)
-{
-  switch(pMsg->hdr.status)
-  {
-    case HCI_COMMAND_COMPLETE_EVENT_CODE:
-      {
-        hciEvt_CmdComplete_t *pkt = (hciEvt_CmdComplete_t *)pMsg;
-
-        if (lastAppOpcodeSent == pkt->cmdOpcode)
-        {
-          // app processes this as it was embedded msg to stack
-
-          // Reset last opcode sent
-          lastAppOpcodeSent = 0xFFFF;
-        }
-        else
-        {
-          osal_msg_hdr_t *msgHdr;
-          uint8 len;
-
-          msgHdr = (osal_msg_hdr_t *)pMsg;
-          msgHdr--; // Backup to the msg header
-
-          len = (uint8)(msgHdr->len - sizeof ( hciEvt_CmdComplete_t ));
-
-          sendCommandCompleteEvent(HCI_COMMAND_COMPLETE_EVENT_CODE,
-                                   pkt->cmdOpcode, len, pkt->pReturnParam);
-        }
-      }
-      break;
-
-    case HCI_DISCONNECTION_COMPLETE_EVENT_CODE:
-      break;
-
-    case HCI_COMMAND_STATUS_EVENT_CODE:
-      {
-        hciEvt_CommandStatus_t *pkt = (hciEvt_CommandStatus_t *)pMsg;
-
-        if (lastAppOpcodeSent == pkt->cmdOpcode)
-        {
-          // app processes this as it was embedded msg to stack
-
-          // Reset last opcode sent
-          lastAppOpcodeSent = 0xFFFF;
-        }
-        // else - drop it for now
-      }
-      break;
-
-    case HCI_BLE_HARDWARE_ERROR_EVENT_CODE:
-      {
-        AssertHandler(HAL_ASSERT_CAUSE_HARDWARE_ERROR,0);
-      }
-      break;
-
-    case HCI_LE_EVENT_CODE:
-      break;
-
-    case HCI_VE_EVENT_CODE:
-      {
-        hciEvt_VSCmdComplete_t *pkt = (hciEvt_VSCmdComplete_t *)pMsg;
-
-        if (lastAppOpcodeSent == pkt->cmdOpcode)
-        {
-          // app processes this as it was embedded msg to stack
-
-          // Reset last opcode sent
-          lastAppOpcodeSent = 0xFFFF;
-        }
-        else
-        {
-          sendCommandCompleteEvent(HCI_VE_EVENT_CODE, pkt->cmdOpcode,
-                                   pkt->length, pkt->pEventParam);
-        }
-      }
-      break;
-
-    default:
-      break;
-  }
-}
-
-/*********************************************************************
- * @fn      HostTestApp_writeCallBack
- *
- * @brief   Callback for TX ISR
- *
- * @param   none
- *
- * @return  none
- */
-Void HostTestApp_writeCallBack(int size)
-{
-  events |= NPI_WRITECALLBACK_EVENT;
-  Semaphore_post(sem);
-}
-
-/*********************************************************************
- * @fn      HostTestApp_readCallBack
- *
- * @brief   Callback for RX ISR
- *
- * @param   none
- *
- * @return  none
- */
-Void HostTestApp_readCallBack(int size)
-{
-  if ( size == 0xFF )
-  {
-    events |= NPI_MRDY_EVENT;
-  }
-  else
-  {
-    events |= NPI_READ_EVENT;
-  }
-
-  Semaphore_post(sem);
-}
-
-/*********************************************************************
- * @fn      HostTestApp_sendMsg
- *
- * @brief   Sends packet to UART else queues it if not able to do so
- *
- * @param   none
- *
- * @return  none
- */
-static void HostTestApp_sendMsg(npiPkt_t *pMsgBuf)
-{
-  if ((events & NPI_WRITECALLBACK_EVENT) && (Queue_empty(uartTxQueue)))
-  {
-    events &= ~NPI_WRITECALLBACK_EVENT;
-
-    if (pMsgLastBuf)
-    {
-      ICall_freeMsg(pMsgLastBuf);  //Free the NPI/OSAL buffer which was sent
-      pMsgLastBuf = NULL;          //Need to have this to avoid memory leak
-    }
-
-    pMsgLastBuf = pMsgBuf;
-    NPI_WriteTransport(pMsgBuf->pData, pMsgBuf->pktLen);
-    return;
-  }
-
-  // Enqueue the message
-  Util_enqueueMsg(uartTxQueue, sem, (uint8*)pMsgBuf);
-}
-
-//*****************************************************************************
-// the function prototypes
-
-/*******************************************************************************
- * This generic function sends a Command Complete or a Vendor Specific Command
- * Complete Event to the Host.
- *
- */
-static void sendCommandCompleteEvent(uint8_t eventCode, uint16_t opcode,
-                                     uint8_t numParam, uint8_t *param)
-{
-  npiPkt_t *msg;
-  uint8_t   totalLength;
-  uint8_t   txLen = 0; // Length to transmit
-
-  // The initial length will be:
-  // OSAL message header(4) - not part of packet sent to HCI Host!
-  // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
-  // Return Parameters (0..N)
-  totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + numParam;
-
-  // adjust the size of the event packet based on event code
-  // Note: If not a vendor specific event, then the event includes:
-  //       Command Complete Data: Number of HCI Commands Allowed(1) + Command Opcode(2)
-  // Note: If a vendor specific event, then the event includes:
-  //       Vendor Specific Command Complete Data: Vendor Specific Event Opcode(2)
-  totalLength += ( (eventCode != HCI_VE_EVENT_CODE)  ?
-                   HCI_CMD_COMPLETE_EVENT_LEN        :
-                   HCI_CMD_VS_COMPLETE_EVENT_LEN );
-
-  // allocate memory for OSAL hdr + packet
-  msg = (npiPkt_t *)ICall_allocMsg(totalLength);
-  if (msg)
-  {
-    // OSAL message event, status, and pointer to packet
-    msg->hdr.event  = HCI_EVENT_PACKET;
-    msg->hdr.status = 0xFF;
-    msg->pData      = (uint8*)(msg+1);
-
-    // fill in Command Complete Event data
-    msg->pData[0] = HCI_EVENT_PACKET;
-    msg->pData[1] = eventCode;
-
-    txLen += 2;
-
-    // check if this isn't a vendor specific event
-    if ( eventCode != HCI_VE_EVENT_CODE )
-    {
-      msg->pData[2] = numParam + HCI_CMD_COMPLETE_EVENT_LEN;
-      msg->pData[3] = 1;// hciCtrlCmdToken;     // event parameter 1
-      msg->pData[4] = LO_UINT16( opcode ); // event parameter 2
-      msg->pData[5] = HI_UINT16( opcode ); // event parameter 2
-
-      txLen += 4;
-
-      // remaining event parameters
-      (void)memcpy(&msg->pData[6], param, numParam);
-
-      txLen += numParam;
-    }
-    else // it is a vendor specific event
-    {
-      // less one byte as number of complete packets not used in vendor specific event
-      msg->pData[2] = numParam + HCI_CMD_VS_COMPLETE_EVENT_LEN;
-      msg->pData[3] = param[0];            // event parameter 0: event opcode LSB
-      msg->pData[4] = param[1];            // event parameter 1: event opcode MSB
-      msg->pData[5] = param[2];            // event parameter 2: status
-      msg->pData[6] = LO_UINT16( opcode ); // event parameter 3: command opcode LSB
-      msg->pData[7] = HI_UINT16( opcode ); // event parameter 3: command opcode MSB
-
-      txLen += 6;
-
-      // remaining event parameters
-      // Note: The event opcode and status were already placed in the msg packet.
-      (void)memcpy(&msg->pData[8], &param[3], numParam-HCI_EVENT_MIN_LENGTH);
-
-      txLen += (numParam-HCI_EVENT_MIN_LENGTH);
-    }
-
-    msg->pktLen = txLen;
-
-    HostTestApp_sendMsg((npiPkt_t *)msg);
-  }
-}
-
-/*******************************************************************************
- * This generic function sends a Command Complete or a Vendor Specific Command
- * Complete Event to the Host.
- *
- */
-void sendCommandStatusEvent(uint8_t eventCode, uint16_t status, uint16_t opcode)
-{
-  npiPkt_t *msg;
-  uint8_t   totalLength;
-
-  // The initial length will be:
-  // OSAL message header(4) - not part of packet sent to HCI Host!
-  // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
-  // Command Status Event Data: Status (1) + Num HCI Cmd Pkt (1) + Cmd Opcode (2)
-  totalLength = sizeof(npiPkt_t)     +
-                HCI_EVENT_MIN_LENGTH +
-                HCI_CMD_STATUS_EVENT_LEN;
-
-  // allocate memory for OSAL hdr + packet
-  msg = (npiPkt_t *)ICall_allocMsg(totalLength);
-  if (msg)
-  {
-    // OSAL message event, status, and pointer to packet
-    msg->hdr.event  = HCI_EVENT_PACKET;
-    msg->hdr.status = 0xFF;
-
-    // fill in length and data pointer
-    msg->pktLen = HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
-    msg->pData  = (uint8*)(msg+1);
-
-    // fill in Command Complete Event data
-    msg->pData[0] = HCI_EVENT_PACKET;
-    msg->pData[1] = eventCode;
-    msg->pData[2] = HCI_CMD_STATUS_EVENT_LEN;
-    msg->pData[3] = status;
-    msg->pData[4] = 1;                 // number of HCI command packets
-    msg->pData[5] = LO_UINT16(opcode); // opcode (LSB)
-    msg->pData[6] = HI_UINT16(opcode); // opcode (MSB)
-
-    HostTestApp_sendMsg((npiPkt_t *)msg);
-  }
-}
-
-/*********************************************************************
-*********************************************************************/
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
weiting2	75c00332aa	enable DLE only	2020-03-27 11:37:46 +08:00
weiting2	cb1cbb3018	Merge remote-tracking branch 'origin/host_test/master' into host_test/master	2020-03-26 16:57:33 +08:00
weiting2	0dde580923	update BLE4.2 feature	2020-03-26 16:57:24 +08:00
yichin	74325f8df8	host test	2020-03-26 16:50:16 +08:00
yichin	2d1257db51	Merge remote-tracking branch 'origin/host_test/master' into host_test/master	2020-03-26 16:49:57 +08:00
weiting2	8b641217a1	modify SECURE_CONNS_CFG attempt to enable ATT_MTU size	2020-03-26 16:45:10 +08:00
yichin	60725cd9b3	using lauch pad	2020-01-30 18:50:04 +08:00
yichin	446fdafc35	Merge remote-tracking branch 'origin/host_test/master' into host_test/master	2019-12-18 15:48:03 +08:00
weiting2	549474041a	Neulive2.0 not_counter always = 4, WHY?	2019-12-18 15:47:18 +08:00
yichin	934a23e097	Merge remote-tracking branch 'origin/host_test/master' into host_test/master	2019-12-18 15:35:40 +08:00
weiting2	078973e62f	Neulive2.0 not_counter always = 4, WHY?	2019-12-18 15:35:12 +08:00
yichin	ae315c1b25	Merge remote-tracking branch 'origin/host_test/master' into host_test/master	2019-12-18 15:10:12 +08:00
weiting2	8ffb85ed26	Neulive2.0 not_counter always = 4, WHY?	2019-12-18 15:08:37 +08:00
yichin	a2971a1033	Merge remote-tracking branch 'origin/host_test/master' into host_test/master	2019-12-18 14:52:54 +08:00
weiting2	b107f0ffc3	Merge remote-tracking branch 'origin/host_test/master' into host_test/master	2019-12-18 14:43:17 +08:00
weiting2	b8dc0fa550	Neulive2.0 not_counter always = 4, WHY?	2019-12-18 14:43:07 +08:00
yichin	83b6c38ab2	Merge branch 'host_test/master' of C:\ti with conflicts.	2019-12-17 09:58:48 +08:00
yichin	57eb128960	Nothing should change	2019-12-16 11:08:22 +08:00
yichin	918f5b2461	Merge branch 'host_test/master' of C:\ti with conflicts.	2019-12-16 11:08:09 +08:00
yichin	565f814a0a	mtu exchange with some error	2019-12-12 18:07:12 +08:00
yichin	042262d9b3	char encode save	2019-10-14 10:29:20 +08:00
yichin	25f70afdbb	Sine wave connection bug fixed (output still wrong)(LED commit)	2019-10-14 09:58:22 +08:00
yichin	f367975d32	Sine wave connection bug fixed (output still wrong)(LED commit)	2019-09-03 12:11:05 +08:00
yichin	8649795122	host test final version	2019-09-03 12:10:35 +08:00
Ta-Shun Su	1249437b0e	fix event notify	2019-07-17 17:45:45 +08:00
Ta-Shun Su	13047b2e47	active switch memory if request	2019-07-17 17:16:02 +08:00
Ta-Shun Su	670e4e5b82	fix led pin number	2019-06-27 15:53:11 +08:00
Ta-Shun Su	c83ef3f8b0	update pin table	2019-05-20 09:45:51 +08:00
Ta-Shun Su	34a63a48c7	save	2019-05-19 18:29:52 +08:00
Ta-Shun Su	79c6ff9220	Merge branch 'master' into host_test/master	2019-05-19 18:19:29 +08:00
Ta-Shun Su	4632d3a2bc	fix uni rearrange_channel_mux_table	2019-05-19 17:55:13 +08:00
Ta-Shun Su	a16eebf2d8	refactor	2019-05-19 17:31:07 +08:00
Ta-Shun Su	59cffddc73	Merge remote-tracking branch 'origin/master'	2019-05-19 17:14:24 +08:00
YiChin2018	2bd14bd0fe	compile pass	2019-05-19 17:06:31 +08:00
Ta-Shun Su	942143ade5	reformat	2019-05-19 16:34:52 +08:00
YiChin2018	b901f1e18b	save	2019-05-19 16:32:51 +08:00
YiChin2018	6cdbb3e2eb	still with some bug	2019-05-17 19:00:31 +08:00
YiChin2018	a3161eeaae	fix debug function parameter type	2019-05-17 14:38:53 +08:00
YiChin2018	334f6eee37	fix vis command cause device crash	2019-05-17 14:37:05 +08:00
YiChin2018	e804a93e24	operation not correct	2019-05-16 18:07:34 +08:00
YiChin2018	f69d373f1e	scan success and uni functional fail	2019-05-16 16:22:34 +08:00
YiChin2018	8404a9b2c1	neulive pass but we can't scan it	2019-05-15 18:41:28 +08:00
Ta-Shun Su	6d2ed3bac4	fix led instruction buffer type	2019-05-14 11:07:13 +08:00
Ta-Shun Su	3f9e185183	Merge branch 'master' into host_test/master	2019-05-14 10:35:30 +08:00
Ta-Shun Su	93b7d2ebea	save	2019-05-14 10:08:20 +08:00
Ta-Shun Su	d6ef557cd3	Merge remote-tracking branch 'origin/elite_zm/alan'	2019-05-14 09:43:02 +08:00
alan	e0934045d2	power on test	2019-05-14 09:39:37 +08:00
YiChin	2180e7011b	GLED	2019-05-13 18:39:44 +08:00
YiChin	8de364dca3	Merge branch 'elite_zm/alan' of https://bitbucket.org/YiChin2018/bioprocc2650 into elite_zm/alan	2019-05-13 18:20:40 +08:00
YiChin	dc24e93681	sth idk	2019-05-13 18:10:45 +08:00
alan	d60633137a	GLED test	2019-05-13 18:09:02 +08:00
YiChin	de86c581fc	compile pass	2019-05-13 16:57:12 +08:00
alan	a2a192b421	value modify	2019-05-13 16:11:40 +08:00
Ta-Shun Su	c02472fedc	save	2019-05-13 13:14:42 +08:00
Ta-Shun Su	638c92912c	rename global variable	2019-05-13 00:14:59 +08:00
Ta-Shun Su	058ce18fe0	save	2019-05-13 00:09:13 +08:00
Ta-Shun Su	41bf1cc8bf	save	2019-05-11 23:49:43 +08:00
Ta-Shun Su	d691b7f6f3	headstage_sti	2019-05-11 23:39:01 +08:00
Ta-Shun Su	66b7f82339	headstage_sti	2019-05-11 22:05:19 +08:00
Ta-Shun Su	323ee6ee9f	headstage_sti	2019-05-11 20:37:44 +08:00
Ta-Shun Su	c057e057f4	save	2019-05-11 19:48:08 +08:00
Ta-Shun Su	122269fd7d	save	2019-05-11 19:41:09 +08:00
Ta-Shun Su	7cfbc61d60	Merge branch 'master' into host_test/master # Conflicts: # simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/host_test_app.c # simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/main.c # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/main.c # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/simple_peripheral.c # simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx/simple_gatt_profile.c # simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/simple_gatt_profile.h	2019-05-11 18:35:36 +08:00
Ta-Shun Su	b4219fe097	master main	2019-05-11 18:24:53 +08:00
Ta-Shun Su	6a11e0ccca	add host_test code from host_test/master	2019-05-11 18:16:45 +08:00
Ta-Shun Su	ad008f9a61	fix pin table	2019-05-10 17:24:51 +08:00
Ta-Shun Su	21b6fb3038	save	2019-05-10 00:19:19 +08:00
Ta-Shun Su	1708d32d49	save	2019-05-09 23:50:23 +08:00
Ta-Shun Su	aab152ba8c	save	2019-05-09 23:37:59 +08:00
Ta-Shun Su	6084a294a5	save	2019-05-09 23:07:55 +08:00
Ta-Shun Su	d7555c84dd	add document	2019-05-09 22:59:55 +08:00
Ta-Shun Su	b562d111b8	add copyright	2019-05-09 22:34:07 +08:00
Ta-Shun Su	787e98c9b1	add idea files	2019-05-09 22:28:48 +08:00
Ta-Shun Su	b81a3ff623	add README	2019-05-09 22:23:28 +08:00
YiChin2018	02a8696873	compile pass	2019-05-09 18:56:01 +08:00
YiChin2018	3ac0352ac3	Merge branch 'master' of https://bitbucket.org/YiChin2018/bioprocc2650 # Conflicts: # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_tni.h	2019-05-09 18:17:38 +08:00
YiChin2018	e9b7f2f90b	tni compile pass	2019-05-09 18:14:46 +08:00
Ta-Shun Su	6df42ea165	save	2019-05-09 18:12:41 +08:00
Ta-Shun Su	ecd558f138	save	2019-05-09 17:59:41 +08:00
Ta-Shun Su	13a7844327	save	2019-05-09 17:44:48 +08:00
Ta-Shun Su	c840b10d30	save	2019-05-09 16:57:36 +08:00
Ta-Shun Su	00d1f3539f	save	2019-05-09 16:24:34 +08:00
Ta-Shun Su	665b1beaa8	save	2019-05-09 00:25:33 +08:00
Ta-Shun Su	c344b5c1d1	save	2019-05-08 16:44:29 +08:00
Ta-Shun Su	2c36d20976	save	2019-05-08 16:41:03 +08:00
Ta-Shun Su	eaed2ca15f	save	2019-05-08 15:24:52 +08:00
Ta-Shun Su	28f17b7495	save	2019-05-08 13:28:51 +08:00
Ta-Shun Su	98329ba665	save	2019-05-08 12:38:27 +08:00
Ta-Shun Su	4a9bab8012	save	2019-05-08 11:46:47 +08:00
Ta-Shun Su	60dcc8ef7c	headstage_notify.h	2019-05-08 11:18:48 +08:00
Ta-Shun Su	1883718a3a	reformat	2019-05-08 10:51:31 +08:00
YiChin2018	2eed05577a	link pass	2019-05-08 10:46:59 +08:00
YiChin2018	44b4e249bb	compile pass	2019-05-08 10:37:17 +08:00
Ta-Shun Su	e7ba561277	save	2019-05-08 01:35:24 +08:00
Ta-Shun Su	bb12cc95d8	save	2019-05-08 01:25:08 +08:00
Ta-Shun Su	e335a53b0c	pwm	2019-05-08 01:02:20 +08:00
Ta-Shun Su	ff0d0a7e56	save	2019-05-08 00:44:39 +08:00
Ta-Shun Su	bb9711ed6a	save	2019-05-08 00:31:02 +08:00
Ta-Shun Su	1015afb5d9	Merge branch 'tss/0101'	2019-05-08 00:23:08 +08:00
Ta-Shun Su	b8bcf3acc4	save	2019-05-08 00:18:19 +08:00
Ta-Shun Su	db0e149192	save	2019-05-08 00:17:37 +08:00
Ta-Shun Su	a2d41bd680	save	2019-05-08 00:14:57 +08:00
Ta-Shun Su	e485d54102	save	2019-05-08 00:14:04 +08:00
Ta-Shun Su	1eb10e9fe8	save	2019-05-07 23:46:26 +08:00
Ta-Shun Su	a9bff07401	add uni	2019-05-07 23:41:37 +08:00
Ta-Shun Su	2ca42aa666	save	2019-05-07 23:34:11 +08:00
Ta-Shun Su	ae080d798b	save	2019-05-07 23:31:39 +08:00
Ta-Shun Su	2fa4300f8e	arm ramp	2019-05-07 23:21:46 +08:00
Ta-Shun Su	70b1bff19a	led	2019-05-07 23:13:35 +08:00
Ta-Shun Su	bf2b1b1b98	save	2019-05-07 14:57:52 +08:00
Ta-Shun Su	a04c82b07d	save	2019-05-07 12:45:50 +08:00
Ta-Shun Su	50ec272125	save	2019-05-07 12:35:30 +08:00
Ta-Shun Su	c34f7befc0	save	2019-05-07 12:18:47 +08:00
Ta-Shun Su	7531af6a48	save	2019-05-07 12:11:36 +08:00
Ta-Shun Su	1453da201c	save	2019-05-07 11:43:32 +08:00
Ta-Shun Su	846e4938e4	save	2019-05-07 09:31:16 +08:00
Ta-Shun Su	b55e595a67	led	2019-05-07 01:46:25 +08:00
Ta-Shun Su	69c71112c7	cis	2019-05-07 01:20:00 +08:00
Ta-Shun Su	61f7df84ac	save	2019-05-07 00:22:03 +08:00
Ta-Shun Su	0022512f44	refactor simple_peripheral.c	2019-05-06 23:19:16 +08:00
Ta-Shun Su	8b74c327e3	Merge branch 'master' into host_test/master	2019-05-06 13:47:20 +08:00
Ta-Shun Su	8ed188a923	Merge branch 'master' into host_test/master	2019-05-06 11:35:21 +08:00
Ta-Shun Su	ea4cb3a8d9	copy from host_test/master	2019-05-06 11:20:33 +08:00
Ta-Shun Su	1819e47db6	Merge branch 'master' into host_test/master	2019-04-30 18:05:30 +08:00
Ta-Shun Su	6346d9e8a0	change version to 0.6	2019-04-30 17:32:49 +08:00
Ta-Shun Su	9f9be624cf	version 0.5	2019-04-30 17:32:38 +08:00
Ta-Shun Su	84afb22d93	version 0.4	2019-04-30 17:32:24 +08:00
Ta-Shun Su	3ca5c026c9	version 0.3	2019-04-30 17:32:15 +08:00
Ta-Shun Su	0bd4b66104	version 0.2	2019-04-30 17:31:35 +08:00
				`@@ -1 +0,0 @@`
				`../simplelink/ble_sdk_2_02_02_25/src/common/cc26xx/`
				`@@ -1 +0,0 @@`
				`../tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272/`
				`@@ -1 +0,0 @@`
				`../simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/`
				`@@ -1 +0,0 @@`
				`../simplelink/ble_sdk_2_02_02_25/src/icall/inc/`
				`@@ -1 +0,0 @@`
				`../simplelink/ble_sdk_2_02_02_25/src/profiles/roles/`
				`@@ -1 +0,0 @@`
				`../simplelink/ble_sdk_2_02_02_25/src/target/`