Merge remote-tracking branch 'origin/HostTest_developement' into HostTest_developement

using CC2650F128
add throughput_example_central.c, throughput_example_peripheral.c
2020-03-24 10:16:28 +08:00 · 2020-03-24 10:16:11 +08:00 · 2020-03-23 17:52:04 +08:00 · 2020-02-04 15:01:11 +08:00 · 2020-02-04 14:26:39 +08:00 · 2020-02-04 11:07:36 +08:00
150 changed files with 9870 additions and 12118 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,39 +0,0 @@
-#!/bin/bash
-
-#path=$(pwd)
-#folder=$($path | awk -F"/" '{$NF}')
-folder=$(basename "$(pwd)")
-
-if [ "$folder" == "bioprocc2650" ]; then
-    year=$(date +%-y)
-    month=$(date +%-m)
-    day=$(date +%-d)
-    hour=$(date +%-H)
-    minute=$(date +%-M)
-
-    hash=$(git rev-parse HEAD)
-    branch=$(git rev-parse --abbrev-ref HEAD)
-
-    sed -i "5c #define VERSION_DATE_YEAR      ${year}"\
-        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
-
-    sed -i "6c #define VERSION_DATE_MONTH     ${month}"\
-        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
-
-    sed -i "7c #define VERSION_DATE_DAY       ${day}"\
-        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
-
-    sed -i "8c #define VERSION_DATE_HOUR      ${hour}"\
-        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
-
-    sed -i "9c #define VERSION_DATE_MINUTE    ${minute}"\
-        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
-
-    sed -i "13c #define VERSION_HASH           ${hash}"\
-        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
-
-    sed -i "14c #define VERSION_GIT_BRANCH     ${branch}"\
-        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
-
-    #cat ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
-fi
@@ -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.1173081242"
+								   name="TI Build Tools"
+								   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
+								   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1800796783">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.693831027"
+									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.1023148574"
+									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.41460164"
+									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.819418377"
+									 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.144859800"
+								  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.756442743"
+										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.1850874246"
+										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.1985865490"
+										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.1566672213"
+										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.269771165"
+										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.1117024701"
+										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.1121975273"
+										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\cc2650"/>
 									<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.792206649"
+										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"/>
@@ -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.197877363"
+										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.456910676"
+										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.1971171356"
+										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.573196199"
+										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.1629960274"
+										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.1584231423"
+										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.1151584779"
+										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.1845691272"
+										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.53583423"
+										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.692368130"
+										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.1164085053"
+										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.1800796783"
+								  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.1031712469"
+										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.1778813394"
+										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.375846461"
+										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.1302090817"
+										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.878755625"
+										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.1127290509"
+										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.1512149397"
+										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.42405609"
+										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.171469423"
+										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.814200934"
+										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.889162304"
+										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.1426063564"
+										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.2126816627"
+										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.675637584"
+										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.1643778133"
+										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.1476570691"
+								  name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.5522776"
+										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.658584028"
+										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.85831100"
+										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.1596276548" name="XDCtools"
+								  superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1881437539"
+										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.670802148"
+										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.1100456719"
+										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.2129755708"
+										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.1148967838"
+										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.382428425"
+										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.1227130265"
+										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,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/

@@ -22,8 +22,8 @@ CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I
 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,24 +0,0 @@
-eclipse.preferences.version=1
-encoding//FlashROM/HAL/Common/subdir_rules.mk=UTF-8
-encoding//FlashROM/HAL/Common/subdir_vars.mk=UTF-8
-encoding//FlashROM/HAL/Target/CC2650/Drivers/subdir_rules.mk=UTF-8
-encoding//FlashROM/HAL/Target/CC2650/Drivers/subdir_vars.mk=UTF-8
-encoding//FlashROM/HAL/Target/CC2650/_common/subdir_rules.mk=UTF-8
-encoding//FlashROM/HAL/Target/CC2650/_common/subdir_vars.mk=UTF-8
-encoding//FlashROM/ICallBLE/subdir_rules.mk=UTF-8
-encoding//FlashROM/ICallBLE/subdir_vars.mk=UTF-8
-encoding//FlashROM/LIB/subdir_rules.mk=UTF-8
-encoding//FlashROM/LIB/subdir_vars.mk=UTF-8
-encoding//FlashROM/NPI/subdir_rules.mk=UTF-8
-encoding//FlashROM/NPI/subdir_vars.mk=UTF-8
-encoding//FlashROM/OSAL/subdir_rules.mk=UTF-8
-encoding//FlashROM/OSAL/subdir_vars.mk=UTF-8
-encoding//FlashROM/PROFILES/subdir_rules.mk=UTF-8
-encoding//FlashROM/PROFILES/subdir_vars.mk=UTF-8
-encoding//FlashROM/Startup/subdir_rules.mk=UTF-8
-encoding//FlashROM/Startup/subdir_vars.mk=UTF-8
-encoding//FlashROM/TOOLS/subdir_rules.mk=UTF-8
-encoding//FlashROM/TOOLS/subdir_vars.mk=UTF-8
-encoding//FlashROM/makefile=UTF-8
-encoding//FlashROM/objects.mk=UTF-8
-encoding//FlashROM/sources.mk=UTF-8
@@ -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>
@@ -1,167 +1,325 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?>
 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-  <storageModule configRelations="2" moduleId="org.eclipse.cdt.core.settings">
-    <cconfiguration id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115">
-      <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115" moduleId="org.eclipse.cdt.core.settings" name="FlashROM">
-        <externalSettings/>
-        <extensions>
-          <extension id="com.ti.ccstudio.errorparser.CoffErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-          <extension id="com.ti.ccstudio.errorparser.LinkErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-          <extension id="com.ti.ccstudio.errorparser.AsmErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-          <extension id="com.ti.rtsc.XDCtools.parsers.ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-          <extension id="org.eclipse.rtsc.xdctools.parsers.ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-          <extension id="com.ti.ccstudio.binaryparser.CoffParser" point="org.eclipse.cdt.core.BinaryParser"/>
-        </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.1291753115" 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.1291753115." name="/" resourcePath="">
-            <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.DebugToolchain.1418073980" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug.1380025885">
-              <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1582688306" 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="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="OUTPUT_TYPE=rtscApplication:executable"/>
-              </option>
-              <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.739662419" 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.634338313" 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.1783170872" name="GNU Make.FlashROM" 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.853360855" 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.205081197" 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.1562370453" 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.54100387" 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.776513622" 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.1445673478" 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.484926802" 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.1112813014" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.INCLUDE_PATH" valueType="includePath">
-                  <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-                  <listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_central/cc26xx/app"/>
-                  <listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
-                  <listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
-                  <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles/cc26xx"/>
-                  <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
-                  <listOptionValue builtIn="false" value="${SRC_EX}/profiles/simple_profile"/>
-                  <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
-                  <listOptionValue builtIn="false" value="${SRC_COMMON}/heapmgr"/>
-                  <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/inc"/>
-                  <listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
-                  <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/sdata"/>
-                  <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
-                  <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="${CC26XXWARE}"/>
-                </option>
-                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT.863938432" 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.DEFINE.1446784470" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEFINE" valueType="definedSymbols">
-                  <listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
-                  <listOptionValue builtIn="false" value="CC2650DK_7ID"/>
-                  <listOptionValue builtIn="false" value="CC26XX"/>
-                  <listOptionValue builtIn="false" value="GAPCENTRALROLE_NUM_RSSI_LINKS=1"/>
-                  <listOptionValue builtIn="false" value="HEAPMGR_SIZE=0"/>
-                  <listOptionValue builtIn="false" value="ICALL_MAX_NUM_ENTITIES=6"/>
-                  <listOptionValue builtIn="false" value="ICALL_MAX_NUM_TASKS=3"/>
-                  <listOptionValue builtIn="false" value="POWER_SAVING"/>
-                  <listOptionValue builtIn="false" value="USE_ICALL"/>
-                  <listOptionValue builtIn="false" value="xBOARD_DISPLAY_EXCLUDE_LCD"/>
-                  <listOptionValue builtIn="false" value="xDisplay_DISABLE_ALL"/>
-                  <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.1982088211" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WARNING" valueType="stringList">
-                  <listOptionValue builtIn="false" value="225"/>
-                </option>
-                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DISPLAY_ERROR_NUMBER.1446305355" 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.1394384102" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_SUPPRESS" valueType="stringList">
-                  <listOptionValue builtIn="false" value="48"/>
-                </option>
-                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WRAP.850367854" 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.1893776167" 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.2006401530" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.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.339372296" 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.1684283158" 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.876227203" 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.1353139879" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM2_SRCS"/>
-              </tool>
-              <tool id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug.1380025885" 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.266547265" 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.1467179876" 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.1547400525" 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.2000240221" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.OUTPUT_FILE" value="&quot;${ProjName}.out&quot;" valueType="string"/>
-                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.LIBRARY.1982802675" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.LIBRARY" valueType="libs">
-                  <listOptionValue builtIn="false" value="&quot;libc.a&quot;"/>
-                  <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.1904712364" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.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.2092354689" 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.747202646" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.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.1660885810" 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.1420411176" 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.1346463382" 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.770157989" 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.421661570" 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.1231976535" 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.604048880" 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.2015157039" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex"/>
-              <tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1717747287" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1962556839" 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.807920375" 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.1248595667" 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.444999592" 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.1186365171" 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.430694521" 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.136330490" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
-              </tool>
-            </toolChain>
-          </folderInfo>
-          <sourceEntries>
-            <entry excluding="cc26x0f128.cmd" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-          </sourceEntries>
-        </configuration>
-      </storageModule>
-      <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-    </cconfiguration>
-  </storageModule>
-  <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-  <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-    <project id="SimpleBLECentral.com.ti.ccstudio.buildDefinitions.TMS470.ProjectType.293217533" name="ARM" projectType="com.ti.ccstudio.buildDefinitions.TMS470.ProjectType"/>
-  </storageModule>
-  <storageModule moduleId="scannerConfiguration"/>
-  <storageModule moduleId="org.eclipse.cdt.core.language.mapping">
-    <project-mappings>
-      <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.asmSource" language="com.ti.ccstudio.core.TIASMLanguage"/>
-      <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cHeader" language="com.ti.ccstudio.core.TIGCCLanguage"/>
-      <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cSource" language="com.ti.ccstudio.core.TIGCCLanguage"/>
-      <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cxxHeader" language="com.ti.ccstudio.core.TIGPPLanguage"/>
-      <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cxxSource" language="com.ti.ccstudio.core.TIGPPLanguage"/>
-    </project-mappings>
-  </storageModule>
+    <storageModule configRelations="2" moduleId="org.eclipse.cdt.core.settings">
+        <cconfiguration id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115">
+            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider"
+                           id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115"
+                           moduleId="org.eclipse.cdt.core.settings" name="FlashROM">
+                <externalSettings/>
+                <extensions>
+                    <extension id="com.ti.ccstudio.binaryparser.CoffParser" point="org.eclipse.cdt.core.BinaryParser"/>
+                    <extension id="com.ti.ccstudio.errorparser.CoffErrorParser"
+                               point="org.eclipse.cdt.core.ErrorParser"/>
+                    <extension id="com.ti.ccstudio.errorparser.LinkErrorParser"
+                               point="org.eclipse.cdt.core.ErrorParser"/>
+                    <extension id="com.ti.ccstudio.errorparser.AsmErrorParser"
+                               point="org.eclipse.cdt.core.ErrorParser"/>
+                    <extension id="com.ti.rtsc.XDCtools.parsers.ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                    <extension id="org.eclipse.rtsc.xdctools.parsers.ErrorParser"
+                               point="org.eclipse.cdt.core.ErrorParser"/>
+                    <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                </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.1291753115" 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.1291753115." name="/"
+                                resourcePath="">
+                        <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.2079916299"
+                                   name="TI Build Tools"
+                                   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
+                                   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.359281383">
+                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1403802377"
+                                    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="LINKER_COMMAND_FILE=cc26x0f128.cmd"/>
+                                <listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
+                                <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="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.1953808956"
+                                    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.1180497951"
+                                    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.2070551780"
+                                     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.1306366958"
+                                  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.2037905754"
+                                        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.1812404024"
+                                        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.77486684"
+                                        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.1708087181"
+                                        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.591572597"
+                                        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.669408849"
+                                        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.1919802378"
+                                        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/simple_central/cc26xx/app"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/simple_profile"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/heapmgr"/>
+                                    <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/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/sdata"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
+                                    <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="${CC26XXWARE}"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1979964544"
+                                        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.DEFINE.1973710961"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
+                                        valueType="definedSymbols">
+                                    <listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
+                                    <listOptionValue builtIn="false" value="CC2650DK_7ID"/>
+                                    <listOptionValue builtIn="false" value="CC26XX"/>
+                                    <listOptionValue builtIn="false" value="GAPCENTRALROLE_NUM_RSSI_LINKS=1"/>
+                                    <listOptionValue builtIn="false" value="HEAPMGR_SIZE=0"/>
+                                    <listOptionValue builtIn="false" value="ICALL_MAX_NUM_ENTITIES=6"/>
+                                    <listOptionValue builtIn="false" value="ICALL_MAX_NUM_TASKS=3"/>
+                                    <listOptionValue builtIn="false" value="POWER_SAVING"/>
+                                    <listOptionValue builtIn="false" value="USE_ICALL"/>
+                                    <listOptionValue builtIn="false" value="xBOARD_DISPLAY_EXCLUDE_LCD"/>
+                                    <listOptionValue builtIn="false" value="xDisplay_DISABLE_ALL"/>
+                                    <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.DIAG_WARNING.1101619710"
+                                        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_SUPPRESS.745132727"
+                                        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_WRAP.1192012182"
+                                        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.1448106382"
+                                        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.228032026"
+                                        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.1744014687"
+                                        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.527515133"
+                                        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.157524795"
+                                        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.254881474"
+                                        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.1260545957"
+                                        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.359281383"
+                                  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.1791815751"
+                                        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.853152076"
+                                        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.1631632024"
+                                        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.817209809"
+                                        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.1392949840"
+                                        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.2035350756"
+                                        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_WRAP.855578978"
+                                        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.2038149205"
+                                        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.1111299871"
+                                        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.XML_LINK_INFO.1791098043"
+                                        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.1933643679"
+                                        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.1036145279"
+                                        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.577375655"
+                                        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.884146734"
+                                        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.202893273"
+                                        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.437714635" name="ARM Hex Utility"
+                                  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.822506424"
+                                        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.1556809750"
+                                        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.906796827"
+                                        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.468794920" name="XDCtools"
+                                  superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1737311321"
+                                        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.1154106658"
+                                        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.191996622"
+                                        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.248478595"
+                                        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.1641024594"
+                                        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.538416893"
+                                        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.193006169"
+                                        superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS"
+                                        value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
+                            </tool>
+                        </toolChain>
+                    </folderInfo>
+                    <sourceEntries>
+                        <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+                    </sourceEntries>
+                </configuration>
+            </storageModule>
+            <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+        </cconfiguration>
+    </storageModule>
+    <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+    <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+        <project id="SimpleBLECentral.com.ti.ccstudio.buildDefinitions.TMS470.ProjectType.293217533" name="ARM"
+                 projectType="com.ti.ccstudio.buildDefinitions.TMS470.ProjectType"/>
+    </storageModule>
+    <storageModule moduleId="scannerConfiguration"/>
+    <storageModule moduleId="org.eclipse.cdt.core.language.mapping">
+        <project-mappings>
+            <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.asmSource"
+                                  language="com.ti.ccstudio.core.TIASMLanguage"/>
+            <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cHeader"
+                                  language="com.ti.ccstudio.core.TIGCCLanguage"/>
+            <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cSource"
+                                  language="com.ti.ccstudio.core.TIGCCLanguage"/>
+            <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cxxHeader"
+                                  language="com.ti.ccstudio.core.TIGPPLanguage"/>
+            <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>
@@ -0,0 +1,124 @@
+//*****************************************************************************
+//! @file       cc26x0f128.cmd
+//! @brief      CC26x0F128 rev2 linker file for Code Composer Studio.
+//!
+//! Revised     $Date$
+//! Revision    $Revision$
+//
+//  This file is auto-generated.
+//
+//  Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
+//
+//
+//  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.
+//****************************************************************************/
+
+/* Retain interrupt vector table variable                                    */
+--retain=g_pfnVectors
+/* Override default entry point.                                             */
+--entry_point ResetISR
+/* Allow main() to take args                                                 */
+--args 0x8
+/* Suppress warnings and errors:                                             */
+/* - 10063: Warning about entry point not being _c_int00                     */
+/* - 16011, 16012: 8-byte alignment errors. Observed when linking in object  */
+/*   files compiled using Keil (ARM compiler)                                */
+--diag_suppress=10063,16011,16012
+
+/* The following command line options are set as part of the CCS project.    */
+/* If you are building using the command line, or for some reason want to    */
+/* define them here, you can uncomment and modify these lines as needed.     */
+/* If you are using CCS for building, it is probably better to make any such */
+/* modifications in your CCS project and leave this file alone.              */
+/*                                                                           */
+/* --heap_size=0                                                             */
+/* --stack_size=256                                                          */
+/* --library=rtsv7M3_T_le_eabi.lib                                           */
+
+/* The starting address of the application.  Normally the interrupt vectors  */
+/* must be located at the beginning of the application.                      */
+#define FLASH_BASE              0x0
+#define FLASH_SIZE              0x20000
+#define RAM_BASE                0x20000000
+#define RAM_SIZE                0x5000
+#define GPRAM_BASE              0x11000000
+#define GPRAM_SIZE              0x2000
+
+
+/* System memory map */
+
+MEMORY
+{
+    /* Application stored in and executes from internal flash */
+    FLASH (RX) : origin = FLASH_BASE, length = FLASH_SIZE
+    /* Application uses internal RAM for data */
+    SRAM (RWX) : origin = RAM_BASE, length = RAM_SIZE
+    /* Application can use GPRAM region as RAM if cache is disabled in the CCFG
+    (DEFAULT_CCFG_SIZE_AND_DIS_FLAGS.SET_CCFG_SIZE_AND_DIS_FLAGS_DIS_GPRAM = 0) */
+    GPRAM (RWX): origin = GPRAM_BASE, length = GPRAM_SIZE
+}
+
+/* Section allocation in memory */
+
+SECTIONS
+{
+    .intvecs        :   > FLASH_BASE
+    .text           :   > FLASH
+    .const          :   > FLASH
+    .constdata      :   > FLASH
+    .rodata         :   > FLASH
+    .binit          :   > FLASH
+    .cinit          :   > FLASH
+    .pinit          :   > FLASH
+    .init_array     :   > FLASH
+    .emb_text       :   > FLASH
+    .ccfg           :   > FLASH (HIGH)
+
+    .vtable         :   > SRAM
+    .vtable_ram     :   > SRAM
+     vtable_ram     :   > SRAM
+    .data           :   > SRAM
+    .bss            :   > SRAM
+    .sysmem         :   > SRAM
+    .stack          :   > SRAM (HIGH)
+    .nonretenvar    :   > SRAM
+    .TI.noinit      :   > SRAM
+    .gpram          :   > GPRAM
+
+#ifdef __TI_COMPILER_VERSION__
+#if __TI_COMPILER_VERSION__ >= 15009000
+/*  Hide section from older compilers not supporting the "ramfunc" attribute.
+    See http://processors.wiki.ti.com/index.php/Placing_functions_in_RAM */
+    .TI.ramfunc : {} load=FLASH, run=SRAM, table(BINIT)
+#endif
+#endif
+}
+
+/* Create global constant that points to top of stack */
+/* CCS: Change stack size under Project Properties    */
+__STACK_TOP = __stack + __STACK_SIZE;
@@ -1,9 +0,0 @@
-The 'targetConfigs' folder contains target-configuration (.ccxml) files, automatically generated based
-on the device and connection settings specified in your project on the Properties > General page.
-
-Please note that in automatic target-configuration management, changes to the project's device and/or
-connection settings will either modify an existing or generate a new target-configuration file. Thus,
-if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
-you may create your own target-configuration file for this project and manage it manually. You can
-always switch back to automatic target-configuration management by checking the "Manage the project's
-target-configuration automatically" checkbox on the project's Properties > General page.
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<configurations XML_version="1.2" id="configurations_0">
-    <configuration XML_version="1.2" id="configuration_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe">
-            <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"/>
-                </choice>
-            </property>
-            <platform XML_version="1.2" id="platform_0">
-                <instance XML_version="1.2" desc="CC2640F128" href="devices/cc2640f128.xml" id="CC2640F128" xml="cc2640f128.xml" xmlpath="devices"/>
-            </platform>
-        </connection>
-    </configuration>
-</configurations>
@@ -1,9 +0,0 @@
-The 'targetConfigs' folder contains target-configuration (.ccxml) files, automatically generated based
-on the device and connection settings specified in your project on the Properties > General page.
-
-Please note that in automatic target-configuration management, changes to the project's device and/or
-connection settings will either modify an existing or generate a new target-configuration file. Thus,
-if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
-you may create your own target-configuration file for this project and manage it manually. You can
-always switch back to automatic target-configuration management by checking the "Manage the project's
-target-configuration automatically" checkbox on the project's Properties > General page.
@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>
@@ -18,8 +18,8 @@
 			<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.410623502" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1351821865">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1751124300" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.444422184" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1330732365">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1540699960" 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"/>
@@ -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.277675815" 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.1593934674" 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.632414212" 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.154623462" 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.974280107" 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.1783826131" 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.1536570599" 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.1895413316" 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.322983319" 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.1305400753" 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.1468985930" 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.1414041701" 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.129069465" 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.896834824" 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.125712613" 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.1372243856" 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.2122837792" 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.1195332370" 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.618174488" 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.1755393337" 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.371697957" 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.686399483" name="Add dir to #include search path (--include_path, -I)" 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,11 +70,12 @@
 									<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.1897088" 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.784417628" name="Pre-define NAME (--define, -D)" 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_UNI_H"/>
+									<listOptionValue builtIn="false" value="HEADSTAGE_MA_USE_SPI2"/>
 									<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"/>
@@ -86,71 +87,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.871011287" 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.863089168" 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.1454248503" 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.1965115059" 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.571279713" 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.281544410" 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.250251326" 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.2060899973" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" 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.1638011093" 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.1942076915" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" 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.1920170652" 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.2038786257" 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.811478344" 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.1229809338" 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.834573500" 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.195059603" 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.2020372146" 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.999239773" name="Read options from specified file (--cmd_file, -@)" 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.1540775079" 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.319000695" 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.270651019" 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.463094612" 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.715176094" 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.1144773376" 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.1482099620" 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.1464468386" 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.1351821865" 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.174129193" 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.567300083" 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.1800982811" 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.1091211742" 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.1479599481" 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.1330732365" 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.505117678" 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.1666572203" 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.735813737" 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.1831786229" 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.1415642475" name="Include library file or command file as input (--library, -l)" 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.672837228" 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.1551539095" 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">
 									<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.544523272" 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.1633469628" name="Suppress diagnostic &lt;id&gt; (--diag_suppress)" 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.1281207998" 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.468817864" 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.1679096029" 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.254835397" 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.1848192295" 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.1999849945" 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.25027104" 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.888093741" 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.1043837738" 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.744951807" 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.1083456720" 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.1378440824" 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.937801301" 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.1610224531" 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.449429516" 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.693413847" 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.19288898" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.11734737" 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.466140455" 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.824070691" 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.430022974" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1461218441" 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.385381392" 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.1950693056" 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>
-							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1392704063" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.225737408" 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.74242513" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.2041877412" name="Package repositories (--xdcpath)" 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.571281110" 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.205178830" 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.1097777495" 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.744121344" 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.165807018" 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.391961861" 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.215751123" 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.1966943903" 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.2050291678" 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.1120380121" 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.972212328" 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.1732037300" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
@@ -3,20 +3,16 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/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\cc2650em\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_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/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.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/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\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\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\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_app"/>
 </listAttribute>
@@ -1,20 +1,19 @@
 <?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 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"/>
+<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"/>
                </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.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_02_25_core/packages/../bin/rm -f
 CP = C:/ti/xdctools_3_32_02_25_core/packages/../bin/cp -f
@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>
@@ -15,8 +15,8 @@
 			<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.1209999684" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postannouncebuildStep="" 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" preannouncebuildStep="" 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.1209999684." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.958553711" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.2088015050">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.2112506999" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.929750171" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1008890994">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1479696404" 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,17 +26,17 @@
 								<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.101349069" 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.572884961" 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.50794417" 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.783335843" 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.341974501" 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.274225680" 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.529764162" 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.1837039616" 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.1393115220" 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.2112471580" 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.152832201" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.201372544" 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.1951196199" 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.20903631" 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.1176131016" 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.647279085" 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.1443871767" 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.227818129" 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.784155377" 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.494285153" 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.581550859" 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.1288777730" 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/simple_peripheral/cc26xx/stack"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
@@ -60,7 +60,7 @@
 									<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.1361895403" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.986125825" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CC26XX"/>
 									<listOptionValue builtIn="false" value="POWER_SAVING"/>
 									<listOptionValue builtIn="false" value="CC26XXWARE"/>
@@ -81,60 +81,60 @@
 									<listOptionValue builtIn="false" value="xTESTMODES"/>
 									<listOptionValue builtIn="false" value="xTEST_BLEBOARD"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1555958931" 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.1144396572" 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.372638078" 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.201347726" 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.1546809951" 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.73314177" 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.12083718" 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.1432753391" 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.1345637669" 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.1126279750" 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.1492280006" 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.538453952" 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.1884548091" 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.682104615" 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.662317863" 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.728508440" 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.313905687" 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.1129729173" 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.156783227" 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.538375181" 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.2088015050" 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.1079333148" 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.1347544490" 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.136883143" 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.1510359183" 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.1331488920" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1008890994" 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.1873600405" 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.1359172875" 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.1355177509" 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.829303802" 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.1078356909" 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.1835383942" 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.1707930214" 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.821225577" 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.59164041" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="16002-D"/>
 									<listOptionValue builtIn="false" value="10247-D"/>
 									<listOptionValue builtIn="false" value="10325-D"/>
 									<listOptionValue builtIn="false" value="10229-D"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1390204935" 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.1601082213" 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.351715800" 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.90863272" 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.1779672459" 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.1701763005" 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.687564793" 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.1056923280" 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.73723664" 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.11567165" 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.1727810233" 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.1385277262" 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.1153340314" 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.450995330" 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.1827942626" 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.1279238428" 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.526125450" 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.581803256" 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.1766088709" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.494132983" 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.1603693219" 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.1153492005" 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.947560992" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1295209583" 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.110293046" 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.1122561921" 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>
@@ -3,20 +3,15 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/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\cc2650em\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_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/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.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/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\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\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\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_stack"/>
 </listAttribute>
@@ -1,20 +1,19 @@
 <?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 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"/>
+<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"/>
                </choice>
            </property>
            <platform XML_version="1.2" id="platform_0">
@@ -16,7 +16,7 @@
 # sources were generated) is:
 #    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\host_test\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/host_test/ccs/config/src
+GEN_SRC_DIR ?= ../../config/src

 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
@@ -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_16.9.4.LTS/include" --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.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/ 

-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.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
@@ -16,33 +16,74 @@
 				<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.1431601382" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.716596257">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.112107036" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.112107036"
+									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="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.1393968817" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.3.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1399984445" 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.346699308" 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.379907802" 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.1188897895" 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.260270385" 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.1061165831" 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.1637311026" 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.343640745" 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.1935603639" 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.248832673" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1393968817"
+									name="Compiler version"
+									superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
+									value="18.1.3.LTS" valueType="string"/>
+							<targetPlatform
+									id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1399984445"
+									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.346699308"
+									 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.379907802"
+								  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.1188897895"
+										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.260270385"
+										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.1061165831"
+										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.1637311026"
+										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.343640745"
+										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.1935603639"
+										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.248832673"
+										name="Add dir to #include search path (--include_path, -I)"
+										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/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"/>
@@ -60,7 +101,10 @@
 									<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.311838370" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.311838370"
+										name="Pre-define NAME (--define, -D)"
+										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="/>
@@ -78,60 +122,159 @@
 									<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.1530414089" 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.346769402" 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.1530414089"
+										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.DIAG_SUPPRESS.346769402"
+										name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)"
+										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.985906813" 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.985906813"
+										name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)"
+										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.1900794497" 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.1472554041" 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.1875467634" 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.1900794497"
+										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.1472554041"
+										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.CMD_FILE.1875467634"
+										name="Read options from specified file (--cmd_file, -@)"
+										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.1068856348" 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.283329144" 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.1505921526" 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.1598563167" 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.1068856348"
+										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.283329144"
+										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.1505921526"
+										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.1598563167"
+										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.716596257" 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.994355013" 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.286610833" 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.548001976" 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.1905400443" 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.130553737" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.716596257"
+								  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.994355013"
+										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.286610833"
+										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.548001976"
+										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.1905400443"
+										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.130553737"
+										name="Include library file or command file as input (--library, -l)"
+										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"/>
+									<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.378169544" 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.378169544"
+										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">
 									<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.2009050246" 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.2009050246"
+										name="Suppress diagnostic &lt;id&gt; (--diag_suppress)"
+										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.399480161" 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.761961046" 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.1877655749" 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.73948152" 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.1946326793" 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.658048172" 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.1470975849" 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.2130492020" 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.199028729" 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.399480161"
+										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.761961046"
+										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.1877655749"
+										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.ENTRY_POINT.73948152"
+										name="Specify program entry point for the output module (--entry_point, -e)"
+										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.1946326793"
+										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.658048172"
+										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.1470975849"
+										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.2130492020"
+										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.199028729"
+										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.1264701033" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.747122944" 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.97263130" 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.970460733" 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.1264701033"
+								  name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.747122944"
+										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.97263130"
+										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.970460733"
+										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>
 						</toolChain>
 					</folderInfo>
@@ -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"
@@ -16,7 +16,7 @@
 # sources were generated) is:
 #    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/src
+GEN_SRC_DIR ?= ../../config/src

 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
@@ -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,20 +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
+    //
 };
 /*============================================================================*/

@@ -97,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 ====================================
@@ -127,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 =====================================
 */
@@ -170,26 +177,104 @@ 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 =====================================
 */

+/*
+ *  ========================== SPI DMA begin ===================================
+ */
+/* Place into subsections to allow the TI linker to remove items properly */
+#if defined(__TI_COMPILER_VERSION__)
+#pragma DATA_SECTION(SPI_config, ".const:SPI_config")
+#pragma DATA_SECTION(spiCC26XXDMAHWAttrs, ".const:spiCC26XXDMAHWAttrs")
+#endif
+
+/* Include drivers */
+#include <ti/drivers/spi/SPICC26XXDMA.h>
+
+/* SPI objects */
+SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
+
+/* SPI configuration structure, describing which pins are to be used */
+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
+        //
+    },
+#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[] = {  //
+    {
+        //
+        .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+        .object      = &spiCC26XXDMAObjects[0],
+        .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
+        //
+    },
+    {
+        //
+        .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+        .object      = &spiCC26XXDMAObjects[1],
+        .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
+        //
+    },
+    {NULL, NULL, NULL}};
+/*
+ *  ========================== SPI DMA end =====================================
+ */

 /*
 *  ========================== Crypto begin ====================================
@@ -209,28 +294,28 @@ const UDMACC26XX_Config UDMACC26XX_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 ==================================
 */
@@ -244,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,
+    //
 };

 /*
@@ -270,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 ====================================
@@ -301,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..) */
@@ -316,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},
 };

 /*
@@ -341,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 */
@@ -358,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 ======================================
@@ -89,71 +89,73 @@ extern const PIN_Config BoardGpioInitTable[];
 */

 /* Connector J1 */
-#define Board_BP_Pin_J1_2              IOID_UNUSED
+#define Board_BP_Pin_J1_2              DIO7
 #define Board_BP_Pin_J1_3              DIO0
 #define Board_BP_Pin_J1_4              DIO1
 #define Board_BP_Pin_J1_5              DIO2
 #define Board_BP_Pin_J1_6              DIO3
-#define Board_BP_Pin_J1_7              DIO11        /* SCLK */
+#define Board_BP_Pin_J1_7              DIO10
 #define Board_BP_Pin_J1_8              DIO4
 #define Board_BP_Pin_J1_9              DIO5
 #define Board_BP_Pin_J1_10             DIO6

 /* Connector J2 */
-#define Board_BP_Pin_J2_19             IOID_UNUSED
-#define Board_BP_Pin_J2_18             IOID_UNUSED
-#define Board_BP_Pin_J2_17             IOID_UNUSED   /* NC */
-#define Board_BP_Pin_J2_15             DIO8         /* MOSI */
-#define Board_BP_Pin_J2_14             DIO7         /* MISO */
-#define Board_BP_Pin_J2_13             DIO9         /* DAC_CS */
-#define Board_BP_Pin_J2_12             DIO12        /* ADC_CS */
-#define Board_BP_Pin_J2_11             IOID_UNUSED   /* NC */
+#define Board_BP_Pin_J2_19             DIO8
+#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

 /* 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       PIN_UNASSIGNED
-#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        PIN_UNASSIGNED
-#define Board_BP_SPI_CS_Other          PIN_UNASSIGNED
-#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 */
 #define Board_UART_RX                  Board_BP_UART_Tx          /* TXD */

+/* SPI Board */
+#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_MISO                PIN_UNASSIGNED
-//#define Board_SPI0_MOSI                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,16 +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
@@ -184,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
@@ -209,7 +219,19 @@ typedef enum BOOSTXL_CC2650MA_CryptoName {
 } BOOSTXL_CC2650MA_CryptoName;


+/*!
+ *  @def    BOOSTXL_CC2650MA_SPIName
+ *  @brief  Enum of SPI names on the CC2650 Booster Pack
+ */
+typedef enum BOOSTXL_CC2650MA_SPIName {
+    BOOSTXL_CC2650MA_SPI0 = 0,

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

 /*!
 *  @def    BOOSTXL_CC2650MA_TRNGName
@@ -287,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
@@ -39,7 +39,6 @@ extern "C" {

 #include <ti/drivers/Power.h>

-//#include "BOOSTXL_CC2650MA.h"
 #include "BOOSTXL_CC2650MA.h"

 /* These #defines allow us to reuse TI-RTOS across other device families */
@@ -79,22 +79,23 @@ extern const PIN_Config BoardGpioInitTable[];

 /* UART Board */
 #define Board_UART_RX               IOID_2          /* RXD  */
-#define Board_UART_TX               PIN_UNASSIGNED  /* TXD  */
+#define Board_UART_TX               IOID_3          /* TXD  */
 #define Board_UART_CTS              IOID_19         /* CTS  */
 #define Board_UART_RTS              IOID_18         /* RTS */

 /* SPI Board */
-#define Board_SPI0_MISO             IOID_0          /* RF1.20 */
-#define Board_SPI0_MOSI             IOID_1          /* RF1.18 */
-#define Board_SPI0_CLK              IOID_3         /* 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             IOID_8          /* LED_MOSI */
-#define Board_SPI1_CLK              IOID_9          /* LED_CLK */
-
-
+#define Board_SPI1_MOSI             PIN_UNASSIGNED
+#define Board_SPI1_CLK              PIN_UNASSIGNED
 #define Board_SPI1_CSN              PIN_UNASSIGNED

+/* I2C */
+#define Board_I2C0_SCL0             IOID_4
+#define Board_I2C0_SDA0             IOID_5

 /* SPI */
 #define Board_SPI_FLASH_CS          IOID_20
@@ -102,8 +103,8 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_FLASH_CS_OFF          1

 /* Booster pack generic */
-#define Board_DIO0                  PIN_UNASSIGNED
-#define Board_DIO1_RFSW             PIN_UNASSIGNED
+#define Board_DIO0                  IOID_0
+#define Board_DIO1_RFSW             IOID_1
 #define Board_DIO12                 IOID_12
 #define Board_DIO15                 IOID_15
 #define Board_DIO16_TDO             IOID_16
@@ -143,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
@@ -159,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
@@ -45,87 +45,105 @@
 Release Date: 2018-04-02 18:03:35
 *****************************************************************************/

+/*================
+ ==== include ====
+ ===============*/
+
+// clang-format off
 #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 <string.h>

 #include "hal_types.h"
-
 #include "hci_tl.h"
-
 #include "hci_ext.h"
-
 #include "gatt.h"
-
 #include "hci.h"

 #include "gapgattserver.h"
-
 #include "gattservapp.h"

 #include "gapbondmgr.h"
-
-#define OSAL_SNV 0
-
 #include "osal_snv.h"
-
+#include "icall.h"
 #include "icall_apimsg.h"

 #include "util.h"

 #include "inc/npi_ble.h"
-
 #include "inc/npi_task.h"
-
 #include <inc/hw_types.h>
-
 #include "hal_defs.h"

-#if defined(GATT_TEST) || defined(GATT_QUAL)
-#include "gatttest.h"
+#if defined ( USE_RCOSC )
+#include "rcosc_calibration.h"
+#endif // USE_RCOSC
+
+#if defined ( GATT_TEST ) || defined ( GATT_QUAL )
+  #include "gatttest.h"
 #endif

 #include "host_test_app.h"

-//#define PERIODIC_USE_GPTIMER
+#include "master/cc2650_master.h"

-#include "cc2650/cc2650_util.h"
+// clang-format on

-//#include "cc2650/cc2650_slave.h"
+/*=================
+ ==== constant ====
+ =================*/

-#include "cc2650/cc2650_master.h"
-
-// 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
-#define HCI_PHY_UPDATE_COMPLETE_EVENT_LEN 6
-
-static void HTA_init(void);
-static void HTA_main(UArg a0, UArg a1);
-static void HTA_handle_gap_event(ICall_HciExtEvt *message);
-static void HTA_handle_att_event(gattMsgEvent_t *message);
-static void HTA_handle_ble_event(ICall_HciExtEvt *message);
-static void send_command_complete_event(uint8 eventCode, uint16 opcode, uint8 numParam, uint8 *param);
-static void send_command_status_event(uint8_t eventCode, uint16_t status, uint16_t opcode);
-static void send_ble_complete_event(uint8 eventLen, uint8 *pEvent);
-
-extern void AssertHandler(uint8 assertCause, uint8 assertSubCause);
-
-// Task configuration
-#define HTA_TASK_STACK_SIZE 512
-Task_Struct hta_task;
-Char        hta_task_stack[HTA_TASK_STACK_SIZE];
+// clang-format off

 /*
+ * GAP GATT Attributes
+ */
+#define DEVICE_NAME "BioProController"
+
+// 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
+#define HCI_PHY_UPDATE_COMPLETE_EVENT_LEN       6
+
+// Task configuration
+#define HTA_TASK_PRIORITY                       1
+#define HTA_TASK_STACK_SIZE                     844
+
+// data length extension
+#define APP_SUGGESTED_PDU_SIZE                  251
+#define APP_SUGGESTED_TX_TIME                   2120
+
+// clang-format on
+
+// Entity ID globally used to check for source and/or destination of messages
+static ICall_EntityID self;
+
+// Semaphore globally used to post events to the application thread
+ICall_Semaphore semaphore;
+
+// Task configuration
+Task_Struct htaTask;
+Char        htaTaskStack[HTA_TASK_STACK_SIZE];
+
+/*=========================
+ ==== function declare ====
+ ========================*/
+
+static void HostTestApp_init(void);
+static void HostTestApp_taskFxn(UArg a0, UArg a1);
+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);
+
+/**
 * @fn      HostTestApp_createTask
 *
 * @brief   Task creation function for the Host Test App.
@@ -135,29 +153,19 @@ Char        hta_task_stack[HTA_TASK_STACK_SIZE];
 * @return  none
 */
 void HostTestApp_createTask(void) {
-    /* main task */
-    Task_Params task_main_parameter;
-    Task_Params_init(&task_main_parameter);
-    task_main_parameter.stack     = hta_task_stack;
-    task_main_parameter.stackSize = HTA_TASK_STACK_SIZE;
-    task_main_parameter.priority  = 1;
+    Task_Params taskParams;

-    Task_construct(&hta_task, HTA_main, &task_main_parameter, NULL);
+    // 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);
 }

-// Entity ID globally used to check for source and/or destination of messages
-static ICall_EntityID self;
-
-// Semaphore globally used to post events to the application thread
-extern ICall_Semaphore semaphore;
-
-extern uint16_t event_flags;
-
-// Stack build revision
-ICall_BuildRevision build_reversion;
-
-/*
- * @fn      HTA_init
+/**
+ * @fn      HostTestApp_init
 *
 * @brief   Called during initialization and contains application
 *          specific initialization (ie. hardware initialization/setup,
@@ -168,30 +176,35 @@ ICall_BuildRevision build_reversion;
 *
 * @return  none
 */
-static void HTA_init(void) {
+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);

+    // Set device's Sleep Clock Accuracy
+    // HCI_EXT_SetSCACmd(40);
+
+#if defined(USE_RCOSC)
+    RCOSC_enableCalibration();
+#endif  // USE_RCOSC
+
    // Initialize GATT Client
    VOID GATT_InitClient();

    // Register to receive incoming ATT Indications or Notifications of attribute values.
    GATT_RegisterForInd(self);

-    // Register for GATT local events and ATT Responses pending for transmission.
-    GATT_RegisterForMsgs(self);
-
-    // Add our services to GATT Server
-    GGS_AddService(GATT_ALL_SERVICES);
-    GATTServApp_AddService(GATT_ALL_SERVICES);
-
    // Register for unprocessed HCI/Host event messages
    GAP_RegisterForMsgs(self);
+
+    GGS_SetParameter(GGS_DEVICE_NAME_ATT, strlen(DEVICE_NAME), (void *)DEVICE_NAME);
+
+    // extend PDU size
+    HCI_LE_WriteSuggestedDefaultDataLenCmd(APP_SUGGESTED_PDU_SIZE, APP_SUGGESTED_TX_TIME);
 }

-/*
- * @fn      HTA_main
+/**
+ * @fn      HostTestApp_taskFxn
 *
 * @brief   Application task entry point for the Host Test App.
 *
@@ -199,11 +212,10 @@ static void HTA_init(void) {
 *
 * @return  none
 */
-static void HTA_main(UArg a0, UArg a1) {
+static void HostTestApp_taskFxn(UArg a0, UArg a1) {
    // Initialize application
-    HTA_init();
-    HTA_util_init();
-    HTA_main_init();
+    HostTestApp_init();
+    master_init();

    // Application main loop
    for (;;) {
@@ -219,113 +231,125 @@ static void HTA_main(UArg a0, UArg a1) {
            ICall_HciExtEvt * message = NULL;

            if (ICall_fetchServiceMsg(&src, &dest, (void **)&message) == ICALL_ERRNO_SUCCESS) {
-                bool dealloc = true;
-
                if ((src == ICALL_SERVICE_CLASS_BLE) && (dest == self)) {
                    // Process incoming messages
                    switch (message->hdr.event) {
-                    case HCI_GAP_EVENT_EVENT:
-                        HTA_handle_gap_event(message);
-                        break;
+                        case HCI_GAP_EVENT_EVENT:
+                            HostTestApp_processGapEvent(message);
+                            #ifdef CC2650_LAUNCHXL
+                                PIN_setOutputValue(master_pins_handle, PIN_LED_RED, 1);
+                                PIN_setOutputValue(master_pins_handle, PIN_LED_RED, 0);
+                            #endif
+                            break;

-                    case GATT_MSG_EVENT:
-                        HTA_handle_att_event((gattMsgEvent_t *)message);
-                        break;
+                        case GATT_MSG_EVENT:
+                            HostTestApp_processAttEvent((gattMsgEvent_t *)message);
+                            break;

-                    case GAP_MSG_EVENT:
-                        break;
+                        default:
+                            break;
                    }
                }

-                if (dealloc && message) {
+                if (message) {
                    ICall_freeMsg(message);
                }
            }
        }

-        if (event_flags > 0) {
-            HTA_event_call();
+        if (EVENT_MASK > 0) {
+            master_event_handle();
        }
    }
 }

-/*
- * @fn      HTA_handle_gap_event
+/**
+ * @fn      HostTestApp_processGapEvent
 *
 * @brief   Process an incoming GAP Event.
 *
- * @param   message - message to process
+ * @param   pMsg - message to process
 *
 * @return  none
 */
-static void HTA_handle_gap_event(ICall_HciExtEvt *message) {
+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;
+        case HCI_COMMAND_COMPLETE_EVENT_CODE: {
+            hciEvt_CmdComplete_t *pkt = (hciEvt_CmdComplete_t *)message;

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

-            // Reset last opcode sent
-            lastAppOpcodeSent = 0xFFFF;
-        } else {
-            osal_msg_hdr_t *msgHdr;
-            uint8           len;
+                // 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
+                msgHdr = (osal_msg_hdr_t *)message;
+                msgHdr--;  // Backup to the message header

-            len = (uint8)(msgHdr->len - sizeof(hciEvt_CmdComplete_t));
+                len = (uint8)(msgHdr->len - sizeof(hciEvt_CmdComplete_t));

-            send_command_complete_event(HCI_COMMAND_COMPLETE_EVENT_CODE, pkt->cmdOpcode, len, pkt->pReturnParam);
+                sendCommandCompleteEvent(HCI_COMMAND_COMPLETE_EVENT_CODE, pkt->cmdOpcode, len, pkt->pReturnParam);
+            }
+            break;
        }
-        break;
-    }

-    case HCI_DISCONNECTION_COMPLETE_EVENT_CODE:
-        break;
+        case HCI_DISCONNECTION_COMPLETE_EVENT_CODE:
+            break;

-    case HCI_COMMAND_STATUS_EVENT_CODE: {
-        hciEvt_CommandStatus_t *pkt = (hciEvt_CommandStatus_t *)message;
+        case HCI_COMMAND_STATUS_EVENT_CODE: {
+            hciEvt_CommandStatus_t *pkt = (hciEvt_CommandStatus_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 msg to stack

-            // Reset last opcode sent
-            lastAppOpcodeSent = 0xFFFF;
-        } else if (pkt->cmdOpcode == HCI_LE_SET_PHY) {
-            send_command_status_event(HCI_COMMAND_STATUS_EVENT_CODE, pkt->cmdStatus, pkt->cmdOpcode);
+                // 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_LE_EVENT_CODE: {
-        HTA_handle_ble_event(message);
-        break;
-    }
+        case HCI_LE_EVENT_CODE:
+            HostTestApp_processBLEEvent(message);
+            break;

-    case HCI_BLE_HARDWARE_ERROR_EVENT_CODE: {
-        AssertHandler(HAL_ASSERT_CAUSE_HARDWARE_ERROR, 0);
-        break;
-    }
+        case HCI_BLE_HARDWARE_ERROR_EVENT_CODE:
+            break;

-    case HCI_VE_EVENT_CODE: {
-        hciEvt_VSCmdComplete_t *pkt = (hciEvt_VSCmdComplete_t *)message;
+        case HCI_VE_EVENT_CODE: {
+            hciEvt_VSCmdComplete_t *pkt = (hciEvt_VSCmdComplete_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 msg to stack

-            // Reset last opcode sent
-            lastAppOpcodeSent = 0xFFFF;
-        } else {
-            send_command_complete_event(HCI_VE_EVENT_CODE, pkt->cmdOpcode, pkt->length, pkt->pEventParam);
+                // Reset last opcode sent
+                lastAppOpcodeSent = 0xFFFF;
+            } else {
+                sendCommandCompleteEvent(HCI_VE_EVENT_CODE, pkt->cmdOpcode, pkt->length, pkt->pEventParam);
+            }
+            break;
        }
-        break;
-    }
+
+        default:
+            break;
    }
 }

-static void HTA_handle_att_event(gattMsgEvent_t *message) {
+/**
+ * @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) {
@@ -335,70 +359,64 @@ static void HTA_handle_att_event(gattMsgEvent_t *message) {
    } 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) {
-#ifdef HTA_PIN_RS
-        if (!PIN_getInputValue(HTA_PIN_RS)) {
-#endif
-            attHandleValueNoti_t *att_notify = (attHandleValueNoti_t *)(&message->msg);
-            HTA_main_handle_notify(att_notify->len, att_notify->pValue);
-#ifdef HTA_PIN_RS
-        }
-#endif
+        #ifdef CC2650_LAUNCHXL
+            PIN_setOutputValue(master_pins_handle, PIN_LED_GRN, 1);
+            PIN_setOutputValue(master_pins_handle, PIN_LED_GRN, 0);
+        #endif
+        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      HTA_handle_ble_event
+/**
+ * @fn      HostTestApp_processBLEEvent
 *
 * @brief   Process an incoming BLE Event.

- * @param   message - message to process
+ * @param   pMsg - message to process
 *
 * @return  None.
 */
-static void HTA_handle_ble_event(ICall_HciExtEvt *message) {
+static void HostTestApp_processBLEEvent(ICall_HciExtEvt *message) {
    hciEvt_BLEPhyUpdateComplete_t *pEvt = (hciEvt_BLEPhyUpdateComplete_t *)message;

    uint8 event[HCI_PHY_UPDATE_COMPLETE_EVENT_LEN];
    uint8 eventLen = 0;

    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
+        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

-        eventLen = HCI_PHY_UPDATE_COMPLETE_EVENT_LEN;
-        break;
-    }
+            eventLen = HCI_PHY_UPDATE_COMPLETE_EVENT_LEN;
+            break;
+        }
    }

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

-/*
+/**
 * This generic function sends a Command Complete or a Vendor Specific Command
 * Complete Event to the Host.
 *
 */
-static void send_command_complete_event(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)
-    totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + numParam;
+    uint8_t 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:
@@ -408,131 +426,130 @@ static void send_command_complete_event(uint8_t eventCode, uint16_t opcode, uint
    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);
+    npiPkt_t *message = (npiPkt_t *)ICall_allocMsg(totalLength);

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

        // fill in Command Complete Event data
-        msg->pData[0] = HCI_EVENT_PACKET;
-        msg->pData[1] = eventCode;
+        message->pData[0] = HCI_EVENT_PACKET;
+        message->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
+            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

            txLen += 4;

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

            txLen += numParam;
+        } else {
+            // it is a vendor specific event

-        } 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
+            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(&msg->pData[8], &param[3], numParam - HCI_EVENT_MIN_LENGTH);
+            (void)memcpy(&message->pData[8], &param[3], numParam - HCI_EVENT_MIN_LENGTH);

            txLen += (numParam - HCI_EVENT_MIN_LENGTH);
        }

-        msg->pktLen = txLen;
+        message->pktLen = txLen;

-        NPITask_sendToHost((uint8_t *)msg);
+        NPITask_sendToHost((uint8_t *)message);
    }
 }

-/*
+/**
 * This generic function sends a Command Complete or a Vendor Specific Command
 * Complete Event to the Host.
 *
 */
-static void send_command_status_event(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)
-    totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
+    uint8_t 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) {
+    npiPkt_t *message = (npiPkt_t *)ICall_allocMsg(totalLength);
+    if (message) {
        // OSAL message event, status, and pointer to packet
-        msg->hdr.event  = HCI_EVENT_PACKET;
-        msg->hdr.status = 0xFF;
+        message->hdr.event  = HCI_EVENT_PACKET;
+        message->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);
+        message->pktLen = HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
+        message->pData  = (uint8 *)(message + 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)
+        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)

-        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.
+/**
+ * This is a generic function used to send BLE Complete Event to the
+ * Host processor.
+ *
 */
-static void send_ble_complete_event(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
-    totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + eventLen;
+    uint8_t totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + eventLen;

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

        // fill in length and data pointer
-        msg->pktLen = HCI_EVENT_MIN_LENGTH + eventLen;
-        msg->pData  = (uint8 *)(msg + 1);
+        message->pktLen = HCI_EVENT_MIN_LENGTH + eventLen;
+        message->pData  = (uint8 *)(message + 1);

        // fill in BLE Complete Event data
-        msg->pData[0] = HCI_EVENT_PACKET;
-        msg->pData[1] = HCI_LE_EVENT_CODE;
-        msg->pData[2] = eventLen;
+        message->pData[0] = HCI_EVENT_PACKET;
+        message->pData[1] = HCI_LE_EVENT_CODE;
+        message->pData[2] = eventLen;

        // populate event data
        if (eventLen > 0) {
-            memcpy(&msg->pData[3], pEvent, eventLen);
+            memcpy(&message->pData[3], pEvent, eventLen);
        }

-        NPITask_sendToHost((uint8_t *)msg);
+        NPITask_sendToHost((uint8_t *)message);
    }
 }
@@ -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);
-  }
-}
-
-/*********************************************************************
-*********************************************************************/
@@ -44,28 +44,26 @@
 Release Date: 2018-04-02 18:03:35
 *****************************************************************************/

+/*================
+ ==== include ====
+ ===============*/
+
+// clang-format off
 #include <xdc/runtime/Error.h>
-
 #include <ti/drivers/Power.h>
-
 #include <ti/drivers/power/PowerCC26XX.h>
-
 #include <ti/sysbios/BIOS.h>

-#include "board.h"
-
-#include "hal_assert.h"
-
 #include "icall.h"
-
+#include "board.h"
 #include "inc/npi_task.h"

 #include "host_test_app.h"

 /* Header files required to enable instruction fetch cache */
-#include <driverlib/vims.h>
-
 #include <inc/hw_memmap.h>
+#include <driverlib/vims.h>
+// clang-format on

 #ifndef USE_DEFAULT_USER_CFG

@@ -76,10 +74,7 @@ bleUserCfg_t user0Cfg = BLE_USER_CFG;

 #endif  // USE_DEFAULT_USER_CFG

-
-extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
-
-/*
+/**
 * @fn          Main
 *
 * @brief       Application Main
@@ -95,10 +90,6 @@ extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
 * @return      None.
 */
 int main() {
-
-    /* Register Application callback to trap asserts raised in the Stack */
-    RegisterAssertCback(AssertHandler);
-
    PIN_init(BoardGpioInitTable);

    // Enable iCache prefetching
@@ -124,79 +115,3 @@ int main() {

    return 0;
 }
-
-/*
- * @fn          AssertHandler
- *
- * @brief       This is the Application's callback handler for asserts raised
- *              in the stack.  When EXT_HAL_ASSERT is defined in the Stack
- *              project this function will be called when an assert is raised,
- *              and can be used to observe or trap a violation from expected
- *              behavior.
- *
- *              As an example, for Heap allocation failures the Stack will raise
- *              HAL_ASSERT_CAUSE_OUT_OF_MEMORY as the assertCause and
- *              HAL_ASSERT_SUBCAUSE_NONE as the assertSubcause.  An application
- *              developer could trap any malloc failure on the stack by calling
- *              HAL_ASSERT_SPINLOCK under the matching case.
- *
- *              An application developer is encouraged to extend this function
- *              for use by their own application.  To do this, add hal_assert.c
- *              to your project workspace, the path to hal_assert.h (this can
- *              be found on the stack side). Asserts are raised by including
- *              hal_assert.h and using macro HAL_ASSERT(cause) to raise an
- *              assert with argument assertCause.  the assertSubcause may be
- *              optionally set by macro HAL_ASSERT_SET_SUBCAUSE(subCause) prior
- *              to asserting the cause it describes. More information is
- *              available in hal_assert.h.
- *
- * input parameters
- *
- * @param       assertCause    - Assert cause as defined in hal_assert.h.
- * @param       assertSubcause - Optional assert subcause (see hal_assert.h).
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void AssertHandler(uint8 assertCause, uint8 assertSubcause) {}
-
-/*
- * @fn          exceptionHandler
- *
- * @brief       Generic spinlock to trap RTOS raised errors.
- *
- * input parameters
- *
- * @param       None.
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void exceptionHandler(void) {
-     for (;;);
-}
-
-/*
- * @fn          smallErrorHook
- *
- * @brief       Error handler to be hooked into TI-RTOS.
- *
- * input parameters
- *
- * @param       eb - Pointer to Error Block.
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void smallErrorHook(Error_Block *eb) {
-    for (;;);
-}
@@ -0,0 +1,194 @@
+#ifndef CC2650_MASTER_H
+#define CC2650_MASTER_H
+
+/*================
+ ==== include ====
+ ================*/
+
+#include <ti/sysbios/knl/Semaphore.h>
+
+#include "master_mem.h"
+#include "master_pin.h"
+#include "master_spi.h"
+
+/*======================
+ ==== event control ====
+ =====================*/
+
+uint16_t               EVENT_MASK = 0;
+extern ICall_Semaphore semaphore;
+
+#define EVT_PIN_RESET 0x0010
+#define EVT_PIN_REQST 0x0020
+
+/**
+ * test event [flag] has been enabled.
+ */
+#define flag_mask(flag) ((EVENT_MASK & (flag)) != 0)
+
+/**
+ * enable event [flag].
+ */
+#define flag_enable(flag)               \
+    do {                                \
+        uint8 __key = Hwi_disable();    \
+        EVENT_MASK |= (uint16_t)(flag); \
+        Hwi_restore(__key);             \
+    } while (0)
+
+/**
+ * disable event [flag].
+ */
+#define flag_disable(flag)                 \
+    do {                                   \
+        uint8 __key = Hwi_disable();       \
+        EVENT_MASK &= ~((uint16_t)(flag)); \
+        Hwi_restore(__key);                \
+    } while (0)
+
+/**
+ * fire a event with [flag].
+ */
+#define flag_notify(flag)               \
+    do {                                \
+        uint8 __key = Hwi_disable();    \
+        EVENT_MASK |= (uint16_t)(flag); \
+        Hwi_restore(__key);             \
+        Semaphore_post(semaphore);      \
+    } while (0)
+
+/*======================
+ ==== utility macro ====
+ =====================*/
+
+#define unsafe_memcpy(p, src, len) \
+    do {                           \
+        memcpy(p, src, len);       \
+        p += len;                  \
+    } while (0)
+
+/*=========================
+ ==== function declare ====
+ ========================*/
+
+static void master_init();
+static void master_event_handle();
+static void master_handle_notify(uint16 length, uint8 *value);
+static void master_switch_memory();
+
+/*========================
+ ==== notify variable ====
+ =======================*/
+
+#define MEM_META_LENGTH 4
+
+static uint8    mem_sel     = 0;
+static uint16_t not_counter = 0;  // writing counter, increase when notify
+static uint16_t not_offset  = 0;  // writing pointer, current not writing index
+
+/*===========================
+ ==== function implement ====
+ ==========================*/
+
+#define master_reset()                 \
+    do {                               \
+        not_counter = 0;               \
+        not_offset  = MEM_META_LENGTH; \
+        mem_sel     = 0;               \
+        master_mem_select(mem_sel);    \
+    } while (0)
+
+static void master_init() {
+    master_pin_open();
+    master_spi_open();
+    master_mem_init();
+    master_reset();
+}
+
+static void master_event_handle() {
+    if (flag_mask(EVT_PIN_RESET)) {
+        flag_disable(EVT_PIN_RESET);
+        master_reset();
+    } else if (flag_mask(EVT_PIN_REQST)) {
+        flag_disable(EVT_PIN_REQST);
+        master_switch_memory();
+    }
+}
+
+static void master_pin_callback(PIN_Handle handle, PIN_Id pin) {
+    switch (pin) {
+        case PIN_MEM_RST:
+            // memory reset
+            flag_notify(EVT_PIN_RESET);
+            break;
+
+        case PIN_MEM_REQ:
+            // memory switch request
+            flag_notify(EVT_PIN_REQST);
+            break;
+    }
+}
+
+static void master_handle_notify(uint16 length, uint8 *value) {
+    if (master_pi3_resetting() || flag_mask(EVT_PIN_RESET)) {
+        // ignore all incoming notify;
+        flag_disable(EVT_PIN_RESET);
+        master_reset();
+        return;
+    }
+
+    uint8_t counter = not_counter++;
+
+    // localize current buffer
+    uint8_t *p = master_mem_buffer;
+
+    // update offset
+    uint32_t cnt_offset = not_offset;
+    not_offset          = cnt_offset + 3 + length;
+
+    *p++ = MEM_INS_WRITE;                        // instruction
+    *p++ = (uint8_t)((cnt_offset >> 8) & 0xFF);  // address
+    *p++ = (uint8_t)(cnt_offset & 0xFF);         // address
+    *p++ = 0xFF;                                 // data header
+    *p++ = counter;                              // data counter
+    *p++ = length;                               // data content length
+    unsafe_memcpy(p, value, length);             // data content
+
+    master_mem_submit(p - master_mem_buffer);
+
+    if (master_pi3_not_busy() && ((not_offset >= MEM_SWITCH_THRESHOLD) || flag_mask(EVT_PIN_REQST))) {
+        flag_disable(EVT_PIN_REQST);
+        master_switch_memory();
+    }
+//    #ifdef CC2650_LAUNCHXL
+//      master_pin_output(PIN_LED_GRN, not_counter & 0x10);
+//    #endif
+}
+
+static void master_switch_memory() {
+    uint16_t cnt_offset = not_offset;
+    not_offset          = MEM_META_LENGTH;
+
+    // localize current buffer
+    uint8_t *p = master_mem_buffer;
+
+    *p++ = MEM_INS_WRITE;                        // instruction
+    *p++ = 0;                                    // address
+    *p++ = 0;                                    // address
+    *p++ = (uint8_t)((cnt_offset >> 8) & 0xFF);  // data: notify data length
+    *p++ = (uint8_t)(cnt_offset & 0xFF);         // data: notify data length
+    *p++ = 0;
+    *p++ = 0;
+
+    master_mem_submit(p - master_mem_buffer);
+
+    // switch memory
+    mem_sel++;
+    master_mem_select(mem_sel & 0x01);
+
+//    #ifdef CC2650_LAUNCHXL
+//        master_pin_output(PIN_LED_RED, mem_sel & 0x10);
+//    #endif
+}
+
+#endif  // CC2650_MASTER_H
@@ -0,0 +1,26 @@
+#ifndef MASTER_PIN_LP_H
+#define MASTER_PIN_LP_H
+
+#ifndef CC2650_LAUNCHXL
+#error "CC2650_LAUNCHXL not defined"
+#endif
+
+#define PIN_LED_RED IOID_6
+#define PIN_LED_GRN IOID_7
+
+#define PIN_MEM_RST IOID_10
+#define PIN_MEM_BZY IOID_11
+#define PIN_MEM_REQ IOID_12
+#define PIN_MEM_SEL IOID_15
+
+#define PIN_SPI_CS IOID_14
+#define PIN_SPI_CK Board_SPI0_CLK
+#define PIN_SPI_DI Board_SPI0_MISO
+#define PIN_SPI_DO Board_SPI0_MOSI
+
+#define PIN_DEBUG_1 IOID_4
+#define PIN_DEBUG_2 IOID_5
+#define PIN_DEBUG_3 IOID_21
+#define PIN_DEBUG_4 IOID_22
+
+#endif MASTER_PIN_LP_H
@@ -0,0 +1,26 @@
+#ifndef MASTER_PIN_MA_H
+#define MASTER_PIN_MA_H
+
+#ifndef BOOSTXL_CC2650MA
+#error "BOOSTXL_CC2650MA not defined"
+#endif
+
+#define PIN_LED_RED IOID_UNUSED
+#define PIN_LED_GRN IOID_UNUSED
+
+#define PIN_MEM_RST DIO4
+#define PIN_MEM_SEL DIO8
+#define PIN_MEM_BZY DIO13
+#define PIN_MEM_REQ DIO14
+
+#define PIN_SPI_CS DIO9
+#define PIN_SPI_CK DIO10
+#define PIN_SPI_DO DIO11
+#define PIN_SPI_DI DIO12
+
+#define PIN_DEBUG_1 IOID_UNUSED
+#define PIN_DEBUG_2 IOID_UNUSED
+#define PIN_DEBUG_3 IOID_UNUSED
+#define PIN_DEBUG_4 IOID_UNUSED
+
+#endif MASTER_PIN_MA_H
@@ -0,0 +1,33 @@
+#ifndef MASTER_MEM_H
+#define MASTER_MEM_H
+
+#include "master_pin.h"
+#include "master_spi.h"
+
+// clang-format off
+#define MEM_BUFFER_SIZE         SPI_TX_BUFFER_SIZE
+#define MEM_SWITCH_THRESHOLD    0x0800
+
+#define MSM_REG_WRITE 0x01
+#define MEM_INS_WRITE 0x02
+#define MEM_INS_READ  0x03
+#define MEM_REG_READ  0x05
+// clang-format on
+
+#define master_mem_buffer master_tx_buffer
+
+#define master_mem_select(value) master_pin_output(PIN_MEM_SEL, (value) ? 1 : 0)
+
+#define master_mem_submit(len) master_spi_transaction(len)
+
+#define master_mem_init()                     \
+    do {                                      \
+        master_mem_buffer[0] = MSM_REG_WRITE; \
+        master_mem_buffer[1] = 0b01000011;    \
+        master_mem_select(1);                 \
+        master_mem_submit(2);                 \
+        master_mem_select(0);                 \
+        master_mem_submit(2);                 \
+    } while (0)
+
+#endif  // MASTER_MEM_H
@@ -0,0 +1,66 @@
+#ifndef MASTER_PIN_H
+#define MASTER_PIN_H
+
+#include <Board.h>
+#include <ti/drivers/PIN.h>
+
+#if defined(CC2650_LAUNCHXL)
+#include "lp/master_pin.h"
+#elif defined(BOOSTXL_CC2650MA)
+#include "ma/master_pin.h"
+#endif
+
+static PIN_State  master_pins_state;
+static PIN_Handle master_pins_handle;
+
+static PIN_Config master_pin_config_table[] = {  //
+
+    // memory select
+    PIN_MEM_SEL | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+
+    // master side is reading buffer.
+    PIN_MEM_BZY | PIN_INPUT_EN | PIN_PULLUP | PIN_HYSTERESIS,
+
+    // master side request to switch buffer
+    PIN_MEM_REQ | PIN_INPUT_EN | PIN_PULLUP | PIN_HYSTERESIS,
+
+    // memory reset reset
+    PIN_MEM_RST | PIN_INPUT_EN | PIN_PULLUP | PIN_HYSTERESIS,
+
+    // spi chip select, deprecate native CS pin
+    PIN_SPI_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,
+
+    // debug  pin
+    PIN_DEBUG_1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,
+    PIN_DEBUG_2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,
+    PIN_DEBUG_3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,
+    PIN_DEBUG_4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,
+
+    // LED
+    PIN_LED_RED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    PIN_LED_GRN | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+
+    //
+    PIN_TERMINATE};
+
+static void master_pin_callback(PIN_Handle handle, PIN_Id pin);
+
+#define master_pin_open()                                                           \
+    do {                                                                            \
+        master_pins_handle = PIN_open(&master_pins_state, master_pin_config_table); \
+        PIN_registerIntCb(master_pins_handle, master_pin_callback);                 \
+        PIN_setInterrupt(master_pins_handle, PIN_MEM_RST | PIN_IRQ_NEGEDGE);        \
+        PIN_setInterrupt(master_pins_handle, PIN_MEM_REQ | PIN_IRQ_NEGEDGE);        \
+    } while (0)
+
+#define master_pin_add(configuration) PIN_add(master_pins_handle, configuration)
+#define master_pin_remove(pin) PIN_remove(master_pins_handle, pin)
+#define master_pin_close() PIN_close(master_pins_handle)
+
+#define master_pin_output(pin, value) PIN_setOutputValue(master_pins_handle, PIN_ID(pin), (value))
+#define master_pin_input(pin) PIN_getInputValue(PIN_ID(pin))
+
+#define master_pi3_resetting()  !master_pin_input(PIN_MEM_RST)
+#define master_pi3_not_busy() master_pin_input(PIN_MEM_BZY)
+
+#endif MASTER_PIN_H
@@ -0,0 +1,43 @@
+#ifndef MASTER_SPI_H
+#define MASTER_SPI_H
+
+// clang-format off
+#include <ti/drivers/SPI.h>
+#include <ti/drivers/dma/UDMACC26XX.h>
+#include <ti/drivers/spi/SPICC26XXDMA.h>
+// clang-format on
+
+#include "master_pin.h"
+
+#define SPI_TX_BUFFER_SIZE 250
+
+static uint8_t master_tx_buffer[SPI_TX_BUFFER_SIZE] = {0};
+
+static SPI_Handle      master_spi_handle;
+static SPI_Transaction master_spi_transaction;
+
+#define master_spi_open()                                                     \
+    do {                                                                      \
+        SPI_init();                                                           \
+        SPI_Params spi_parameter;                                             \
+        SPI_Params_init(&spi_parameter);                                      \
+        spi_parameter.transferMode    = SPI_MODE_BLOCKING;                    \
+        spi_parameter.mode            = SPI_MASTER;                           \
+        spi_parameter.bitRate         = 12000000;                             \
+        spi_parameter.transferTimeout = 1000;                                 \
+        spi_parameter.dataSize        = 8;                                    \
+        spi_parameter.frameFormat     = SPI_POL0_PHA0;                        \
+        master_spi_handle             = SPI_open(Board_SPI0, &spi_parameter); \
+    } while (0)
+
+#define master_spi_transaction(len)                               \
+    do {                                                          \
+        master_spi_transaction.txBuf = master_tx_buffer;          \
+        master_spi_transaction.rxBuf = NULL;                      \
+        master_spi_transaction.count = (len);                     \
+        master_pin_output(PIN_SPI_CS, 0);                         \
+        SPI_transfer(master_spi_handle, &master_spi_transaction); \
+        master_pin_output(PIN_SPI_CS, 1);                         \
+    } while (0)
+
+#endif  // MASTER_SPI_H
@@ -1,247 +0,0 @@
-
-#ifndef AD5940
-#define AD5940
-
-static void AD5940_init(){
-    select_REG(0x0908);//initiation
-    w16_REG(0x02C9);
-    select_REG(0x0C08);
-    w16_REG(0x206C);
-    select_REG(0x21F0);
-    w16_REG(0x0010);
-    select_REG(0x0410);
-    w16_REG(0x02C9);
-    select_REG(0x0A28);
-    w16_REG(0x0009);
-    select_REG(0x238C);
-    w16_REG(0x0104);
-    select_REG(0x0A04);
-    w16_REG(0x4859);
-    select_REG(0x0A04);
-    w16_REG(0xF27B);
-    select_REG(0x0A00);
-    w16_REG(0x8009);
-    select_REG(0x0A04);
-    w16_REG(0x4859);
-    select_REG(0x22F0);
-    w16_REG(0x0000);
-}
-
-static void AD5940_sftreset(){
-    select_REG(0x0424);
-    w16_REG(0xA158);
-    CPUdelay(200);
-}
-
-static void AD5940_HWReset(){
-    PIN_setOutputValue(pin_handle, AD_reset, 0);
-    CPUdelay(2000); // 200us
-    PIN_setOutputValue(pin_handle, AD_reset, 1);
-    CPUdelay(5000); // 500us
-}
-
-static void setEIS_EIS (void)
-{
-    select_REG(LPDACCON0);  //2128 //DC on
-    w32_REG(0x00000001); //LPDAC enabled
-    select_REG(LPDACSW0);  //2124  //operation
-    w32_REG(0b111111); //0b101011
-
-    select_REG(HSRTIACON);
-    w32_REG(0x00000000); //200R //1pF
-
-    select_REG(ADCCON);  //21A8
-    w32_REG(0x00000101);
-    select_REG(DFTCON);
-    w32_REG(0x00000091);
-    select_REG(SWCON);  //200C
-    w32_REG(0x00026355); //D5 | P5 | N3 | T6 | T9   0b010 0110 0011 0101 0101
-
-    if (instru.ADCGainLv != HSRTIA_GAIN_AUTO) {
-        instru.AutoGainEnable = 0;
-        HSTIAGainCtrl(instru.ADCGainLv);
-    } else {
-        instru.AutoGainEnable = 1;
-        instru.ADCGainLv = HSRTIA_200R;
-        HSTIAGainCtrl(instru.ADCGainLv);
-    }
-
-    DAC_outputV(instru.dcbias + CaliTable.DAC_offset * 200);
-    SetWGAmp(instru.acamp);
-
-    select_REG(0x2000);  //2000
-    w32_REG(0x0031CFC0);
-
-    //HIGH POWER MODE
-    select_REG(0x22F0); //PWMB
-    w32_REG(0x0000000D); //switch to active high power mode
-    select_REG(0x0414);
-    w16_REG(0x0000);
-    select_REG(0x0420);
-    w16_REG(0xA815);
-    select_REG(0x0408); //16bit system clock divider
-    w16_REG(0x0442); //set divider = 2
-    select_REG(0x20BC); //HSOSCCON
-    w32_REG(0x00000000); //switch to 32MHz output
-    select_REG(0x2044);
-    w32_REG(0x00000311);
-    select_REG(0x2010); //HSDACCON
-    w32_REG(0x0000000E); //DAC gain = 2, > 80 kHz
-    select_REG(0x238C); //ADCBUFCON
-    w32_REG(0x005F3D0F); //recommended
-    SetEISHIGHZ(0);
-}
-
-static void setEIS_CV (void)
-{
-   //Clock and Ref
-    select_REG(0x0414); //CLKSEL
-    w16_REG(0x0);
-    select_REG(0x20BC); //HSOSCCON
-    w32_REG(0x00000004); //16 MHz output
-    select_REG(0x2180); //BUFSENCON
-    w32_REG(0x00000037); //0b110110
-
-    //Configure LPDAC LPTIA
-    select_REG(0x2050); //LPREFBUFCON
-    w32_REG(0x0); //enable lpref and lp 2.5V buffer
-    select_REG(0x2124); //LPDACSW0
-    w32_REG(0x0000003E);
-    select_REG(0x20E4); //LPTIASW0
-    w32_REG(0x00008034); // SW2 | SW4 | SW5
-    select_REG(0x20EC); //LPTIACON0
-    w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
-    select_REG(0x2128); //LPDACCON0
-    w32_REG(0x00000001);
-
-    //Configure ADC | ADCDAT (0x2074)
-    select_REG(0x21A8); //ADCCON
-    w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
-    select_REG(0x2044); //ADCFILTERCON
-    w32_REG(0x00002011); // Sinc3 En | SINC3OSR2 | SINC2OSR22
-    select_REG(0x20D0); //DFTCON
-    w32_REG(0x00000001); // Sinc2 to DFT | DFTNUM4
-
-    //AFE and PWMB
-    select_REG(0x2000); //AFECON
-    w32_REG(0x00098780); //ADC on //0b10011000011110000000
-    select_REG(0x22F0); //PWMB
-    w32_REG(0x00000005);//fc 50kHz, low power mode
-
-
-//    //Clock and Ref
-//    select_REG(CLKSEL); //CLKSEL
-//    w16_REG(0x0);
-//    select_REG(HSOSCCON); //HSOSCCON
-//    w32_REG(0x00000004); //16 MHz output
-//    select_REG(0x2180); //BUFSENCON
-//    w32_REG(0x00000037); //0b110110
-//
-//    //Configure LPDAC LPTIA
-//    select_REG(LPREFBUFCON); //LPREFBUFCON
-//    w32_REG(0x0); //enable lpref and lp 2.5V buffer
-//    select_REG(LPDACSW0); //LPDACSW0
-//    w32_REG(0x0000003E);
-//    select_REG(LPTIASW0); //LPTIASW0
-//    w32_REG(0x00008034); // SW2 | SW4 | SW5
-//    select_REG(LPTIACON0); //LPTIACON0
-//    w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
-//    select_REG(LPDACCON0); //LPDACCON0
-//    w32_REG(0x00000001);
-//
-//    //Configure ADC | ADCDAT (0x2074)
-//    select_REG(ADCCON); //ADCCON
-//    w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
-//    select_REG(ADCFILTERCON); //ADCFILTERCON
-//    w32_REG(0x00014091); //AVR 4 | Sinc3 En | OSR 5
-////    w32_REG(0x00012011); //Disable avr | sinc3 enable | osr 2
-//    select_REG(DFTCON); //DFTCON
-//    w32_REG(0x00100031); //sinc3 + average input for DFT | DFTNUM 32
-//
-//    //AFE and PMWB
-//    select_REG(AFECON); //AFECON
-//    w32_REG(0x00098780); //ADC on //0b10011000011110000000
-//    select_REG(PMBW); //PMWB
-//    w32_REG(0x00000005);//fc 50kHz, low power mode
-}
-
-static void HS_cali_config (void)
-{
-    select_REG(LPDACCON0);  //2128 //DC on
-    w32_REG(0x00000001); //LPDAC enabled
-    select_REG(LPDACSW0);  //2124  //operation
-    w32_REG(0b111111); //0b101011
-
-    select_REG(DE0RESCON);  //20F8 //DE0's gain
-    w32_REG(0x000000FF);
-//    select_REG(HSRTIACON);
-//    w32_REG(0x00000200); //4pF + 200R
-
-    select_REG(ADCCON);  //21A8
-    w32_REG(0x00000101);
-    select_REG(DFTCON);  //20D0
-    w32_REG(0x00000091);
-    select_REG(SWCON);  //200C
-    w32_REG(0x00026355); //D5 | P5 | N3 | T6 | T9   0b010 0110 0011 0101 0101
-//    w32_REG(0x00026905); //0b010 0110 1001 0000 0101
-
-    select_REG(AFECON);  //2000
-    w32_REG(0x0030CFC0);
-
-    //HIGH POWER MODE
-    select_REG(PMBW); //PMWB
-    w32_REG(0x0000000D); //switch to active high power mode
-    select_REG(CLKSEL);
-    w16_REG(0x0000);
-    select_REG(CLKCON0KEY);
-    w16_REG(0xA815);
-    select_REG(CLKCON0); //16bit system clock divider
-    w16_REG(0x0442); //set divider = 2
-    select_REG(HSOSCCON); //HSOSCCON
-    w32_REG(0x00000000); //switch to 32MHz output
-    select_REG(ADCFILTERCON); //ADCFILTERCON
-    w32_REG(0x000000D0); //ADC data rate = 1.6MHz // 2 samples to average
-    select_REG(HSDACCON); //HSDACCON
-    w32_REG(0x0000000E); //DAC gain = 2, > 80 kHz
-    select_REG(ADCBUFCON); //ADCBUFCON
-    w32_REG(0x005F3D0F); //recommended
-}
-static void LP_cali_config (void)
-{
-   //Clock and Ref
-    select_REG(0x0414); //CLKSEL
-    w16_REG(0x0);
-    select_REG(0x20BC); //HSOSCCON
-    w32_REG(0x00000004); //16 MHz output
-    select_REG(0x2180); //BUFSENCON
-    w32_REG(0x00000037); //0b110110
-
-    //Configure LPDAC LPTIA
-    select_REG(0x2050); //LPREFBUFCON
-    w32_REG(0x0); //enable lpref and lp 2.5V buffer
-    select_REG(0x2124); //LPDACSW0
-    w32_REG(0x0000003E);
-    select_REG(0x20E4); //LPTIASW0
-    w32_REG(0x00008034); // SW2 | SW4 | SW5
-    select_REG(0x20EC); //LPTIACON0
-    w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
-    select_REG(0x2128); //LPDACCON0
-    w32_REG(0x00000001);
-
-    //Configure ADC | ADCDAT (0x2074)
-    select_REG(0x21A8); //ADCCON
-    w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
-    select_REG(0x2044); //ADCFILTERCON
-    w32_REG(0x00006091); //AVR 4 | Sinc3 En | OSR 2
-//    w32_REG(0x00012011); //Disable avr | sinc3 enable | osr 2
-    select_REG(0x20D0); //DFTCON
-    w32_REG(0x001000C1); //sinc3 + average input for DFT | dftnum max
-
-    //AFE and PWMB
-    select_REG(0x2000); //AFECON
-    w32_REG(0x00098780); //ADC on //0b10011000011110000000
-    select_REG(0x22F0); //PWMB
-    w32_REG(0x00000005);//fc 50kHz, low power mode
-}
-
-#endif
@@ -1,179 +0,0 @@
-{
-  "name": "Elite-ZM",
-  "version": "1.2.30",
-  "match_rule": {
-    "local_name_pattern": "Elite-ZM.+",
-    "major_product_number": 0,
-    "minor_product_number": 2,
-    "major_version_number": 1,
-    "minor_version_number": 2
-  },
-  "constant": {
-    "ADC_CHANNEL_NUMBER": [
-      12,
-      13,
-      14,
-      15
-    ],
-    "VOLT_MAX": 4095
-  },
-  "parameters": {
-    "CHANNEL": {
-      "description": "record channels",
-      "record_meta": true,
-      "domain": "property",
-      "value": [
-        0,
-        1,
-        2
-      ]
-    },
-    "SAMPLE_RATE": {
-      "description": "data sampling rate",
-      "record_meta": true,
-      "domain": "constant",
-      "value": 1
-    },
-    "AMP_GAIN": {
-      "description": "amp gain",
-      "record_meta": true,
-      "domain": "constant",
-      "value": 1
-    },
-    "MODE": {
-      "description": "working mode",
-      "value": [
-        "I-V Curve",
-        "Cyclic Voltammetry",
-        "Function Generator",
-        "Z-T Curve",
-        "V-T Curve",
-        "I-T Curve",
-        "ADC test"
-      ]
-    },
-    "VOLT_ORIGIN": {
-      "description": "Origin Voltage of Scan",
-      "domain": [
-        "VOLT_MAX"
-      ]
-    },
-    "VOLT_FINAL": {
-      "description": "The last Voltage of Scan",
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": "1365 * VALUE"
-    },
-    "VOLT_STEP": {
-      "description": "Voltage Step",
-      "domain": [
-        5
-      ]
-    },
-    "STEP_TIME": {
-      "description": "How much time between two step",
-      "domain": [
-        4
-      ]
-    },
-    "DAC_VOLT": {
-      "description": "DAC output Voltage",
-      "domain": [
-        "VOLT_MAX"
-      ]
-    },
-    "ADC_CHANNEL": {
-      "description": "read ADC data",
-      "value": [
-        "ANA0",
-        "ANA1",
-        "ANA2",
-        "ANA3"
-      ]
-    }
-  },
-  "instruction": {
-    "start": [
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "curve_iv",
-          "1": "curve_cv",
-          "2": "func_gen",
-          "6": "adc_test"
-        }
-      }
-    ],
-    "data_format": [
-      "_data_format('TDC4VAF2')"
-    ],
-    "curve_iv": [
-      "data_format",
-      "_notify(True)",
-      "curve_iv0",
-      "_sync(True)",
-      "VIS_STI"
-    ],
-    "curve_iv0": {
-      "type": "RIS",
-      "parameter": {
-        "va": "(VOLT_ORIGIN + 1) * 0x0010",
-        "vb": "(VOLT_FINAL + 1) * 0x0010",
-        "dv": "VOLT_STEP * 0x40",
-        "dt": "STEP_TIME * 0x12"
-      },
-      "data": [
-        "1X10;2B>va;2B>vb;B>dv;B>dt"
-      ]
-    },
-    "curve_cv": [
-      "data_format",
-      "_notify(True)",
-      "curve_cv0",
-      "_sync(True)",
-      "VIS_STI"
-    ],
-    "curve_cv0": {
-      "type": "RIS",
-      "parameter": {
-        "va": "(VOLT_ORIGIN + 1) * 0x0010",
-        "vb": "(VOLT_FINAL + 1) * 0x0010",
-        "dv": "VOLT_STEP * 0x40",
-        "dt": "STEP_TIME * 0x12"
-      },
-      "data": [
-        "1X20;2B>va;2B>vb;B>dv;B>dt"
-      ]
-    },
-    "func_gen": [
-      "data_format",
-      "func_gen0",
-      "VIS_STI"
-    ],
-    "func_gen0": {
-      "type": "RIS",
-      "parameter": {
-        "v": "(DAC_VOLT + 1) * 0x0010"
-      },
-      "data": [
-        "X30;X30;2B>v"
-      ]
-    },
-    "adc_test": [
-      "data_format",
-      "_notify(True)",
-      "adc_test0",
-      "_sync(True)",
-      "VIS_STI"
-    ],
-    "adc_test0": {
-      "type": "RIS",
-      "data": [
-        "X90;B>ADC_CHANNEL"
-      ]
-    }
-  }
-}
-
-
@@ -1,246 +0,0 @@
-//
-//#ifndef Elite15_PIN
-//#define Elite_15PIN
-//
-//#include "Elite_PIN.h"
-//
-//static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow) {
-//    switch (latch_num) {
-//        case LOAD0: {
-//            switch (elite_pin) {
-//                case D0: {
-//                    LH.LATCH0[0] = highlow;
-//                    break;
-//                }
-//                case D1: {
-//                    LH.LATCH0[1] = highlow;
-//                    break;
-//                }
-//                case D2: {
-//                    LH.LATCH0[2] = highlow;
-//                    break;
-//                }
-//                case D3: {
-//                    LH.LATCH0[3] = highlow;
-//                    break;
-//                }
-//                case D4: {
-//                    LH.LATCH0[4] = highlow;
-//                    break;
-//                }
-//                case D5: {
-//                    LH.LATCH0[5] = highlow;
-//                    break;
-//                }
-//                case D6: {
-//                    LH.LATCH0[6] = highlow;
-//                    break;
-//                }
-//                case D7: {
-//                    LH.LATCH0[7] = highlow;
-//                    break;
-//                }
-//                default: {
-//                    break;
-//                }
-//            }
-//            break;
-//        }
-//        case LOAD1: {
-//            switch (elite_pin) {
-//                case D0: {
-//                    LH.LATCH1[0] = highlow;
-//                    break;
-//                }
-//                case D1: {
-//                    LH.LATCH1[1] = highlow;
-//                    break;
-//                }
-//                case D2: {
-//                    LH.LATCH1[2] = highlow;
-//                    break;
-//                }
-//                case D3: {
-//                    LH.LATCH1[3] = highlow;
-//                    break;
-//                }
-//                case D4: {
-//                    LH.LATCH1[4] = highlow;
-//                    break;
-//                }
-//                case D5: {
-//                    LH.LATCH1[5] = highlow;
-//                    break;
-//                }
-//                case D6: {
-//                    LH.LATCH1[6] = highlow;
-//                    break;
-//                }
-//                case D7: {
-//                    LH.LATCH1[7] = highlow;
-//                    break;
-//                }
-//                default: {
-//                    break;
-//                }
-//            }
-//            break;
-//        }
-//        case LOAD2: {
-//            switch (elite_pin) {
-//                case D0: {
-//                    LH.LATCH2[0] = highlow;
-//                    break;
-//                }
-//                case D1: {
-//                    LH.LATCH2[1] = highlow;
-//                    break;
-//                }
-//                case D2: {
-//                    LH.LATCH2[2] = highlow;
-//                    break;
-//                }
-//                case D3: {
-//                    LH.LATCH2[3] = highlow;
-//                    break;
-//                }
-//                case D4: {
-//                    LH.LATCH2[4] = highlow;
-//                    break;
-//                }
-//                case D5: {
-//                    LH.LATCH2[5] = highlow;
-//                    break;
-//                }
-//                case D6: {
-//                    LH.LATCH2[6] = highlow;
-//                    break;
-//                }
-//                case D7: {
-//                    LH.LATCH2[7] = highlow;
-//                    break;
-//                }
-//                default: {
-//                    break;
-//                }
-//            }
-//             break;
-//        }
-//        default: {
-//            break;
-//        }
-//    }
-//}
-//
-//static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow) {
-//    ELITE15_SPI_CLOSE();
-//    add_elite_pin();
-//    update_latch_status (latch_num, pin_num, highlow);
-////    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
-//
-//    switch (latch_num) {
-//        case LOAD0: {
-////            PIN_setOutputValue(&ZM_rst, D0, LH.LATCH0[0]);
-////            PIN_setOutputValue(&ZM_rst, D1, LH.LATCH0[1]);
-////            PIN_setOutputValue(&ZM_rst, D2, LH.LATCH0[2]);
-////            PIN_setOutputValue(&ZM_rst, D3, LH.LATCH0[3]);
-//            PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);
-//            PIN_setOutputValue(pin_handle, D5, LH.LATCH0[5]);
-//            PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);
-//            PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);
-//            break;
-//        }
-//        case LOAD1: {
-//            PIN_setOutputValue(pin_handle, D0, LH.LATCH1[0]);
-//            PIN_setOutputValue(pin_handle, D1, LH.LATCH1[1]);
-//            PIN_setOutputValue(pin_handle, D2, LH.LATCH1[2]);
-//            PIN_setOutputValue(pin_handle, D3, LH.LATCH1[3]);
-//            PIN_setOutputValue(pin_handle, D4, LH.LATCH1[4]);
-//            PIN_setOutputValue(pin_handle, D5, LH.LATCH1[5]);
-//            PIN_setOutputValue(pin_handle, D6, LH.LATCH1[6]);
-//            PIN_setOutputValue(pin_handle, D7, LH.LATCH1[7]);
-//            break;
-//        }
-//        case LOAD2: {
-//            PIN_setOutputValue(pin_handle, D0, LH.LATCH2[0]);
-//            PIN_setOutputValue(pin_handle, D1, LH.LATCH2[1]);
-//            PIN_setOutputValue(pin_handle, D2, LH.LATCH2[2]);
-//            PIN_setOutputValue(pin_handle, D3, LH.LATCH2[3]);
-//            PIN_setOutputValue(pin_handle, D4, LH.LATCH2[4]);
-//            PIN_setOutputValue(pin_handle, D5, LH.LATCH2[5]);
-//            PIN_setOutputValue(pin_handle, D6, LH.LATCH2[6]);
-//            PIN_setOutputValue(pin_handle, D7, LH.LATCH2[7]);
-//            break;
-//        }
-//        default: {
-//            break;
-//        }
-//    }
-//    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
-////    CPUdelay(10);
-//    PIN_setOutputValue(&ZM_rst, latch_num, 0);               // Turn off latch
-//    remove_elite_pin();
-//    ELITE15_SPI_HOLD();
-//}
-//
-//static void Init_Elite15_PIN () {
-//    InitLH();
-//    add_elite_pin();
-//
-//    PIN_setOutputValue(pin_handle, D0, 0);
-//    PIN_setOutputValue(pin_handle, D1, 0);
-//    PIN_setOutputValue(pin_handle, D2, 0);
-//    PIN_setOutputValue(pin_handle, D3, 0);
-//    PIN_setOutputValue(pin_handle, D4, 0);
-//    PIN_setOutputValue(pin_handle, D5, 0);
-//    PIN_setOutputValue(pin_handle, D6, 0);
-//    PIN_setOutputValue(pin_handle, D7, 0);
-//    PIN_setOutputValue(pin_handle, LOAD0, 0);
-//    PIN_setOutputValue(pin_handle, LOAD1, 1);
-//    PIN_setOutputValue(pin_handle, LOAD2, 1);
-//    CPUdelay(10);
-//    PIN_setOutputValue(pin_handle, LOAD1, 0);
-//    PIN_setOutputValue(pin_handle, LOAD2, 0);
-//
-//
-//    PIN_setOutputValue(pin_handle, D0, 0);
-//    PIN_setOutputValue(pin_handle, D1, 0);
-//    PIN_setOutputValue(pin_handle, D2, 0);
-//    PIN_setOutputValue(pin_handle, D3, 0);
-//    PIN_setOutputValue(pin_handle, D4, 1);
-//    PIN_setOutputValue(pin_handle, D5, 1);
-//    PIN_setOutputValue(pin_handle, D6, 1);
-//    PIN_setOutputValue(pin_handle, D7, 1);
-//    CPUdelay(10);
-//    PIN_setOutputValue(pin_handle, LOAD0, 1);
-//    PIN_setOutputValue(pin_handle, LOAD0, 0);
-//
-//    remove_elite_pin();
-//
-////    InitLH();
-////    add_elite_pin();
-////
-////    PIN_setOutputValue(pin_handle, LOAD0, 1);
-////    PIN_setOutputValue(pin_handle, LOAD1, 1);
-////    PIN_setOutputValue(pin_handle, LOAD2, 1);
-////    CPUdelay(10);
-////    PIN_setOutputValue(pin_handle, D0, 0);
-////    PIN_setOutputValue(pin_handle, D1, 0);
-////    PIN_setOutputValue(pin_handle, D2, 0);
-////    PIN_setOutputValue(pin_handle, D3, 0);
-////    PIN_setOutputValue(pin_handle, D4, 0);
-////    PIN_setOutputValue(pin_handle, D5, 0);
-////    PIN_setOutputValue(pin_handle, D6, 0);
-////    PIN_setOutputValue(pin_handle, D7, 0);
-////    CPUdelay(10);
-////    PIN_setOutputValue(pin_handle, LOAD0, 0);
-////    PIN_setOutputValue(pin_handle, LOAD1, 0);
-////    PIN_setOutputValue(pin_handle, LOAD2, 0);
-////
-////    remove_elite_pin();
-//}
-//
-//
-//
-//
-//#endif
@@ -1,111 +0,0 @@
-#ifndef ELITECV3
-#define ELITECV3
-
-#define Vset instru.Vset
-
-static void cv_vscan(void)
-{
-    struct wm_cv_ctx_t *cv = (struct wm_cv_ctx_t *)wm_get();
-    static bool VminCounter;
-    static bool VmaxCounter;
-
-    NotifyCycleNumber = (instru.cycleNumber - cv->_cycleNumber + 1);
-
-    if (vscanReset) {
-        VmaxCounter = false;
-        VminCounter = false;
-
-        if (instru.directionInit == 1) {
-            cv->_direction_up         = true;
-            cv->_current_direction_up = true;
-        } else {
-            cv->_direction_up         = false;
-            cv->_current_direction_up = false;
-        }
-
-//        Vstep = x * 20 * N, x=xmV ; N=VscanRate   Vstep unit [5nV]/[0.1ms]
-        if (instru.step <= 10) {
-            cv->_Vstep = instru.step *  instru.VsetRate / 5;
-        } else {
-            cv->_Vstep = instru.step / 5 *  instru.VsetRate;
-        }
-
-
-        if (cv->_Vmin == cv->_Vinit) {
-            VminCounter = true;
-        }
-        if (cv->_Vmax == cv->_Vinit) {
-            VmaxCounter = true;
-        }
-
-        Vset = cv->_Vinit;
-    }
-
-    if (!vscanReset) {
-        cv->bFirst = false;
-        if ((instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) ||
-        (instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2)
-        ) {
-            if (cv->_current_direction_up) {
-                Vset = Vset + cv->_Vstep; //* GPT.GptimerMultiple;
-            } else {
-                Vset = Vset - cv->_Vstep; //* GPT.GptimerMultiple;
-            }
-
-            if (instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) {
-                if (Vset == cv->_Vmin) {
-                    VminCounter = true;
-                    instru.Vinit = instru.Vmin;
-                    cv->_Vinit = cv->_Vmin;
-                }
-            } else if (instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2) {
-                if (Vset == cv->_Vmax) {
-                    VmaxCounter = true;
-                    instru.Vinit = instru.Vmax;
-                    cv->_Vinit = cv->_Vmax;
-                }
-            }
-        } else {
-            if (Vset >= cv->_Vmax) {
-                VmaxCounter = true;
-            } else if (Vset <= cv->_Vmin) {
-                VminCounter = true;
-            }
-
-            if (cv->_current_direction_up) {
-                Vset = Vset + cv->_Vstep;// * GPT.GptimerMultiple;
-            } else {
-                Vset = Vset - cv->_Vstep;// * GPT.GptimerMultiple;
-            }
-
-            if (VmaxCounter && VminCounter) {
-                if (cv->_direction_up && cv->_current_direction_up) {
-                    if (Vset >= cv->_Vinit) {
-                        cv->_cycleNumber--;
-                        VminCounter = false;
-                        VmaxCounter = false;
-                    }
-                }
-                if (!cv->_direction_up && !cv->_current_direction_up) {
-                    if (Vset <= cv->_Vinit) {
-                        cv->_cycleNumber--;
-                        VminCounter = false;
-                        VmaxCounter = false;
-                    }
-                }
-            }
-
-            if (Vset >= cv->_Vmax) {
-                cv->_current_direction_up = false;
-            } else if (Vset <= cv->_Vmin) {
-                cv->_current_direction_up = true;
-            }
-
-            /*stop condition*/
-            if (cv->_cycleNumber == 0) {
-                PeriodicEvent = false;
-            }
-        }
-    }
-}
-#endif
@@ -1,365 +0,0 @@
-
-#ifndef EliteDAC
-#define EliteDAC
-
-static bool DACReset;
-
-
-//#ifdef ELITE_VERSION_1_3
-//#define DACOUT 0x30
-//
-//static void DAC_outputV(uint16_t voltLV) {
-//    // C = command, X = don't care, D = data
-//    // CCCC XXXX = command
-//    // DDDD DDDD = v1
-//    // DDDD XXXX = v2
-//
-//    uint8_t v1, v2 = 0;
-//    v1 = (uint8_t) (voltLV >> 4) & 0xFF;
-//    v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
-//
-//    spi_DACtxbuf[0] = command;
-//    spi_DACtxbuf[1] = v1;
-//    spi_DACtxbuf[2] = v2;
-//    for (int i = 3; i < SPI_DAC_SIZE; i++) {
-//        spi_DACtxbuf[i] = 0;
-//    }
-//
-//    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
-//}
-//#endif
-
-//#ifdef ELITE_VERSION_1_4
-//#define DACCLS 0x02
-//#define DACOUT 0x31
-//
-//static uint16_t DAC_outputV(uint16_t voltLV) {
-//    // C = command, X = don't care, D = data
-//    // CCCC CCCC = command
-//    // DDDD DDDD = v1
-//    // DDDD DDDD = v2
-//
-//    // command
-//    // 0x02 = clear
-//    // 0x31 = output voltage
-//
-//    uint8_t v1, v2 = 0;
-//    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
-//    v2 = (uint8_t) (voltLV & 0x00FF);
-//
-//    spi_DACtxbuf[0] = DACOUT;
-//    spi_DACtxbuf[1] = v1;
-//    spi_DACtxbuf[2] = v2;
-//
-//    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
-//
-//    return voltLV;
-//}
-//#endif
-
-
-#define VBIAS_LSB       107422          // 2200/4096 [mV] = 107422 [5nV]
-#define VZERO_LSB       6875008         // VBIAS_LSB * 64
-#define DAC12BIT_LSB    107422
-
-static int32_t DAC_outputV(int32_t voltLV) {   // LPDAC output, voltLV = Vbias-Vzero
-    static int32_t vztemp, vscan;
-    static uint32_t vb, vz, vbcode, vzcode, DACOutCode = 0;
-
-    vztemp = (-0.45 * voltLV) + 249000000;
-    if (voltLV < 0) {
-        vztemp -= DAC12BIT_LSB;
-    }
-    vzcode = (vztemp - 40000000 + VZERO_LSB / 2) / VZERO_LSB;
-    vz = vzcode * VZERO_LSB + 40000000;
-
-    vb = voltLV + vz;
-    vbcode = ((vb - 40000000 + VBIAS_LSB / 2) / VBIAS_LSB);
-    DACOutCode = (0x0003FFFF & ((vzcode << 12) + vbcode));
-
-    DACOutCode = Cali_LPDAC(DACOutCode);
-
-    select_REG(LPDACDAT0);
-    w32_REG(DACOutCode);
-
-    vscan = (int32_t)(vb - vz) / 200;
-    return vscan;
-}
-
-static uint32_t DAC_outputF(uint32_t freq) {
-    select_REG(WGFCW);
-    w32_REG(freq);
-    return freq;
-}
-
-static void VoutGainControl(uint8_t VOUTLevel){
-    if(VOUTLevel == 0){
-        // VOUT gain level = 0, using 240K resister
-        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 0);
-    }
-    else if(VOUTLevel == 1){
-        // VOUT gain level = 1, using 15K resister
-        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
-    }
-    else if(VOUTLevel == 2){
-        // VOUT gain level = 2, using 15K resister
-        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
-    }
-    else{
-        // default using 15K resister
-        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
-    }
-    record_flag = false;
-}
-
-static uint32_t CalcPeriod(uint32_t freq){ //One Second = 10000
-
-    uint32_t period;
-
-    if (freq == 1) {
-        period = 666667;
-    } else {
-        period = (1000000 + freq / 2) / freq; // [sec]
-    }
-
-    if (period < 20){
-        period = 20;
-    }
-
-    return period;
-}
-
-static uint32_t CalcDelayTime(uint32_t freq){
-    uint32_t delayTime, decadeSamplingTime;
-    delayTime = CalcPeriod(freq) * instru.delay;    //get delay time
-    if (delayTime < 20) {
-        delayTime = 20;
-    } else {
-        delayTime = (delayTime + 5) / 10;
-    }
-
-    // 1000Hz
-    if (freq >= 100000) {
-        decadeSamplingTime = 1025;
-    }
-
-    // 100Hz
-    else if (freq >= 10000) {
-        decadeSamplingTime = 1025;
-    }
-
-    // 10Hz
-    else if (freq >= 1000) {
-        decadeSamplingTime = 11393;
-    }
-
-    // 1Hz
-    else if (freq >= 100) {
-        decadeSamplingTime = 91034;
-    }
-
-    //0.1Hz
-    else if (freq >= 10) {
-        decadeSamplingTime = 550000;
-    }
-
-    // 0.015Hz | 136s
-    else if (freq >= 1) {
-        decadeSamplingTime = 1360000;
-    }
-
-    delayTime += decadeSamplingTime; //delay+reading time
-
-    return delayTime;
-}
-
-static uint32_t User2Freq(uint32_t UserCode){
-    uint32_t freq;
-    freq = (UserCode * 149 + 50)/ 100;
-    return freq; //[100mHz]
-}
-
-static uint32_t Freq2DAC(uint32_t freq){
-    uint32_t code;
-    code = (freq * 100 + 75) / 149;
-    return code; //return code
-}
-
-// DAC Vout theoretical boundary <300, 100~ (mV)
-#define DAC_VOUT_GAIN_SMALL_BOUNDARY           100000  // 25500(usercode) = 100 mV
-#define DAC_VOUT_GAIN_LARGE_BOUNDARY           300000  // 26500(usercode) = 300 mV
-#define DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE   26500  // 26500(usercode) = 300 mV
-#define DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE  23500  // 23500(usercode) = -300 mV
-
-static void AutoGainChangeVout(int32_t userCode){
-    int32_t RealVolt = (userCode - 25000) * 200; // (userCode - 25000) / 5 * 1000  [1uV]
-    // switch to 1 level volt(small)   15K
-    // switch to 2 level volt(large)   240K
-
-    if(instru.VoutGainLevel == VOUT_GAIN_AUTO){
-        instru.VoutGainLevel = VOUT_GAIN_15K;
-        VoutGainControl(instru.VoutGainLevel);
-    }
-
-    if(instru.VoutGainLevel == VOUT_GAIN_15K){
-        if(RealVolt > DAC_VOUT_GAIN_LARGE_BOUNDARY || RealVolt < -1 * DAC_VOUT_GAIN_LARGE_BOUNDARY){
-            // switch to 2 level volt(large)
-            instru.VoutGainLevel = VOUT_GAIN_240K;
-            VoutGainControl(instru.VoutGainLevel);
-        }
-    }
-    else if(instru.VoutGainLevel == VOUT_GAIN_240K){
-        if(RealVolt < DAC_VOUT_GAIN_SMALL_BOUNDARY && RealVolt > -1 * DAC_VOUT_GAIN_SMALL_BOUNDARY ){
-            // switch to 1 level volt(small)
-            instru.VoutGainLevel = VOUT_GAIN_15K;
-            VoutGainControl(instru.VoutGainLevel);
-        }
-    }
-}
-
-static void SetWGAmp(uint16_t ampcode){
-//    uint32_t amplitude = Cali_HSAMP(ampcode);
-
-//    static uint64_t amp_cutoff = 40000000;
-//    uint32_t corrected_amp;
-//
-//    corrected_amp = ((uint64_t)ampcode * 800 * 1000 / 2047) * (1 + ((uint64_t)instru.fset * (uint64_t)instru.fset) / (amp_cutoff * amp_cutoff)); //[uV]
-//
-//    ampcode = corrected_amp * 2047 / 800000;
-
-    select_REG(WGCON);
-    w32_REG(0x0); // 0x0: DC disable ac first
-    select_REG(WGAMPLITUDE);
-    w32_REG(ampcode);
-    select_REG(WGCON);
-    w32_REG(0x00000004); //0x4: Sinusoid
-}
-
-static void SetEISHIGHZ(uint8_t ret){
-    uint32_t code;
-
-    select_REG(LPTIASW0); //LPTIASW0
-    code = r32_REG();
-    code = (code & (~(1 << 2))) | (ret << 2); //ret = 0 HighZ on | ret = 1 HighZ off
-    w32_REG(code);
-}
-
-static void HSDAC_GainControl(uint8_t G_EXA_PGA) {
-/* Set the Gain value of PGA and Excitation amp */
-    uint32_t reg = 0;
-    uint8_t DACUpdateRate = 0x07;
-
-    switch (G_EXA_PGA) {
-        case 0x00:{
-            reg = 0x00000000;
-            break;
-        }
-        case 0x01:{
-            reg = 0x00000001;
-            break;
-        }
-        case 0x10:{
-            reg = 0x00001000;
-            break;
-        }
-        case 0x11:{
-            reg = 0x00001001;
-            break;
-        }
-        default:{
-            reg = 0x0000000E;       // Default update rate = 7
-            break;
-        }
-    }
-
-    reg = reg | ((uint32_t)(DACUpdateRate) << 1);
-    select_REG(HSDACCON);                 // HSDACCON address
-    w32_REG(reg);
-}
-
-static void HSDAC_output(uint16_t amp) {
-/* Set and write the amplitude of HSDAC. Full scale: 0x0200 ~ 0x0E00, 0x0800 = 0V */
-/* Set and write the amplitude of HSDAC. Full scale: 512 ~ 3584, 2048 = 0V */
-    uint32_t amplitude = 0;
-
-    if (amp > 0x0E00) {
-        amplitude = 0x00000E00;
-    } else if (amp < 0x0200) {
-        amplitude = 0x00000200;
-    } else {
-        amplitude = (uint32_t) (amp & 0x0FFF);
-    }
-
-    select_REG(HSDACDAT);                 // HSDACDAT address
-    w32_REG(amplitude);
-}
-
-static void PowerMode_CutoffFrequencyControl (uint8_t bandwidth, uint8_t PowerMode) {
-    uint32_t reg = 0;
-
-    switch (bandwidth) {
-        case cutoff_auto :{
-            reg = (((uint32_t)(cutoff_auto)) & 0x0000000F) << 2;
-            break;
-        }
-        case cutoff_50k :{
-            reg = (((uint32_t)(cutoff_50k)) & 0x0000000F) << 2;
-            break;
-        }
-        case cutoff_100k :{
-            reg = (((uint32_t)(cutoff_100k)) & 0x0000000F) << 2;
-            break;
-        }
-        case cutoff_250k :{
-            reg = (((uint32_t)(cutoff_250k)) & 0x0000000F) << 2;
-            break;
-        }
-        default :{
-            reg = (((uint32_t)(cutoff_auto)) & 0x0000000F) << 2;
-            break;
-        }
-    }
-
-    switch (PowerMode) {
-        case LOW_PW_MODE :{
-            reg = reg | ((uint32_t)(LOW_PW_MODE) & 0x00000000F);
-            break;
-        }
-        case HIGH_PW_MODE :{
-            reg = reg | ((uint32_t)(HIGH_PW_MODE) & 0x00000000F);
-            break;
-        }
-        default :{
-            break;
-        }
-    }
-
-    select_REG(PMBW);
-    w32_REG(reg);
-}
-
-static int32_t cali_DAC_outputV(int32_t voltLV) {   // LPDAC output, voltLV = Vbias-Vzero
-    static int32_t vztemp, vscan;
-    static uint32_t vb, vz, vbcode, vzcode, DACOutCode = 0;
-
-    vztemp = (-0.45 * voltLV) + 249000000;
-    if (voltLV < 0) {
-        vztemp -= DAC12BIT_LSB;
-    }
-    vzcode = (vztemp - 40000000 + VZERO_LSB / 2) / VZERO_LSB;
-    vz = vzcode * VZERO_LSB + 40000000;
-
-    vb = voltLV + vz;
-    vbcode = ((vb - 40000000 + VBIAS_LSB / 2) / VBIAS_LSB);
-    DACOutCode = (0x0003FFFF & ((vzcode << 12) + vbcode));
-
-    select_REG(LPDACDAT0);
-    w32_REG(DACOutCode);
-
-    vscan = (int32_t)(vb - vz) / 200;
-//    InputNotify(NOTIFY_VOLT, voltLV);
-//    InputNotify(NOTIFY_CURRENT, vztemp);
-    return vscan;
-}
-
-#endif
@@ -1,150 +0,0 @@
-
-#ifndef ELITEEIS
-#define ELITEEIS
-
-static void eis_fscan(void)
-{
-    struct wm_eis_ctx_t *eis = (struct wm_eis_ctx_t *)wm_get();
-
-    if (vscanReset) {
-        eis->_in_reset_flag = true;
-
-        eis->_f1 = User2Freq(eis->_f1);
-        eis->_f2 = User2Freq(eis->_f2);
-        eis->_fmax = User2Freq(eis->_fmax);
-        eis->_fmin = User2Freq(eis->_fmin);
-
-        if (instru.directionInit == 1) {
-            eis->_direction_up         = true;
-        } else if (instru.directionInit == 0) {
-            eis->_direction_up         = false;
-        }
-
-        eis->_decades = CalcDecade(instru.fmin, instru.fmax);
-
-        instru.fset = eis->_f1;
-
-        vscanReset = false;
-    }
-
-    if (!vscanReset) {
-        if(eis->_direction_up) {
-            if(eis->_sweepIndex == 0){
-                if(eis->_decadeIndex < eis->_decades) {
-                    eis->_fd1 = eis->_f1 * TenPowerTable[eis->_decadeIndex];
-                    eis->_fd2 = eis->_f1 * TenPowerTable[eis->_decadeIndex + 1];
-                } else if (eis->_decadeIndex == eis->_decades) {
-                    eis->_fd1 = eis->_fd2;//eis->_f1 * TenPowerTable[decadeIndex];
-                    eis->_fd2 = eis->_fmax;
-                }
-            }
-
-            if(eis->_decadeIndex != 0 && eis->_sweepIndex == 0){
-                eis->_sweepIndex++;
-            }
-
-            if(instru.scale == 0) { // logarithm
-                if (eis->_ppd == 10) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable10[eis->_sweepIndex] + 500)/ 1000;
-                }
-                else if (eis->_ppd == 9){
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable9[eis->_sweepIndex] + 500)/ 1000;
-                }
-                else if (eis->_ppd == 8) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable8[eis->_sweepIndex] + 500)/ 1000;
-                }
-                else if (eis->_ppd == 7) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable7[eis->_sweepIndex] + 500)/ 1000;
-                }
-                else if (eis->_ppd == 6) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable6[eis->_sweepIndex] + 500)/ 1000;
-                }
-                else if (eis->_ppd == 5) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable5[eis->_sweepIndex] + 500)/ 1000;
-                }
-                else if (eis->_ppd == 4) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable4[eis->_sweepIndex] + 500)/ 1000;
-                }
-                else if (eis->_ppd == 3) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable3[eis->_sweepIndex] + 500)/ 1000;
-                }
-                else if (eis->_ppd == 2) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable2[eis->_sweepIndex] + 500)/ 1000;
-                }
-            }
-            else if (instru.scale == 1) { // linear
-                instru.fset = eis->_fd1 + eis->_sweepIndex * ((eis->_fd2 - eis->_fd1) / (eis->_ppd - 1));
-            }
-
-            if(instru.fset > eis->_fmax){
-                instru.fset = eis->_fmax;
-            }
-
-        } else { //reverse
-            if(eis->_sweepIndex == 0){
-                if(eis->_decadeIndex < eis->_decades){
-                    eis->_fd1 = eis->_f1 / TenPowerTable[eis->_decadeIndex];
-                    eis->_fd2 = eis->_f1 / TenPowerTable[eis->_decadeIndex + 1];
-                } else if (eis->_decadeIndex == eis->_decades){
-                    eis->_fd1 = eis->_fd2; //eis->_f1 / TenPowerTable[eis->_decadeIndex];
-                    eis->_fd2 = eis->_fmin;
-                }
-            }
-
-            if(eis->_decadeIndex != 0 && eis->_sweepIndex == 0){
-                eis->_sweepIndex++;
-            }
-
-            if(instru.scale == 0) { // logarithm
-                if (eis->_ppd == 10) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable10[9 - eis->_sweepIndex] + 5000)/ 10000;
-                }
-                else if (eis->_ppd == 9) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable9[8 - eis->_sweepIndex] + 5000)/ 10000;
-                }
-                else if (eis->_ppd == 8) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable8[7 - eis->_sweepIndex] + 5000)/ 10000;
-                }
-                else if (eis->_ppd == 7) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable7[6 - eis->_sweepIndex] + 5000)/ 10000;
-                }
-                else if (eis->_ppd == 6) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable6[5 - eis->_sweepIndex] + 5000)/ 10000;
-                }
-                else if (eis->_ppd == 5) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable5[4 - eis->_sweepIndex] + 5000)/ 10000;
-                }
-                else if (eis->_ppd == 4) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable4[3 - eis->_sweepIndex] + 5000)/ 10000;
-                }
-                else if (eis->_ppd == 3) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable3[2 - eis->_sweepIndex] + 5000)/ 10000;
-                }
-                else if (eis->_ppd == 2) {
-                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable2[1 - eis->_sweepIndex] + 5000)/ 10000;
-                }
-            }
-            else if(instru.scale == 1) { // linear
-                instru.fset = eis->_fd1 - eis->_sweepIndex * ((eis->_fd1 - eis->_fd2) / (eis->_ppd - 1));
-            }
-
-            if(instru.fset < eis->_fmin){
-                instru.fset = eis->_fmin;
-            }
-        }
-        if (!gainChange_flag) {
-            if (++eis->_sweepIndex == eis->_ppd) {
-                eis->_sweepIndex = 0;
-                eis->_decadeIndex ++;
-            }
-        }
-    }
-
-
-    SetSamplingTime(instru.fset);
-
-    instru.sampleRate = 2000;
-}
-
-#endif
-
@@ -1,41 +0,0 @@
-
-#ifndef ELITE_FLAG_CT_INIT
-#define ELITE_FLAG_CT_INIT
-
-// CT counter
-struct _CT{
-    uint32_t SampleRate_counter;
-    uint16_t StepTimeCounter;
-    uint16_t NotifyCounter;
-}CT = {0};
-
-// GPT counter
-struct _GPT{
-    uint32_t GptimerCounter;
-    uint32_t GptimerCounter0;
-    uint8_t  DeltaGptimerCounter;
-    uint32_t SampleRateCounter;
-    uint32_t NotifyCounter;
-    uint32_t VscanRateCounter;
-    uint32_t LeadTimeCounter;
-    uint32_t DelayTimeCounter;
-    uint32_t BatteryADCCounter;
-    uint32_t BatteryCheckCounter;
-    uint32_t GptimerMultiple;
-    uint32_t StiCounter;
-}GPT = {0};
-
-static void InitGPT(){
-    GPT.GptimerCounter      = 0;
-    GPT.GptimerCounter0     = 0;
-    GPT.DeltaGptimerCounter = 0;
-    GPT.SampleRateCounter   = 0;
-    GPT.NotifyCounter       = 0;
-    GPT.VscanRateCounter    = 0;
-    GPT.LeadTimeCounter     = 0;
-    GPT.DelayTimeCounter    = 0;
-    GPT.BatteryADCCounter   = 0;
-    GPT.BatteryCheckCounter = 0;
-    GPT.StiCounter          = 0;
-}
-#endif
@@ -1,38 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_GPTIMER_H
-#define HEADSTAGE_GPTIMER_H
-
-#include <Board.h>
-#include <ti/drivers/timer/GPTimerCC26XX.h>
-#include <ti/sysbios/BIOS.h>
-#include <xdc/runtime/Types.h>
-
-#define EVT_PERIODIC_GPTIMER EVT_PERIODIC_0
-
-static GPTimerCC26XX_Handle gptimer_handle;
-
-static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask);
-
-#define elite_gptimer_start() GPTimerCC26XX_start(gptimer_handle)
-#define elite_gptimer_stop() GPTimerCC26XX_stop(gptimer_handle)
-#define elite_gptimer_close() GPTimerCC26XX_close(gptimer_handle)
-#define CLOCK_FREQ 4769  // clock freq = 0.1 ms(4800), Measured(4769)
-
-#define elite_gptimer_open()                                                                          \
-    do {                                                                                              \
-        GPTimerCC26XX_Params params;                                                                  \
-        GPTimerCC26XX_Params_init(&params);                                                           \
-        params.width          = GPT_CONFIG_16BIT;                                                     \
-        params.mode           = GPT_MODE_PERIODIC_DOWN;                                               \
-        params.debugStallMode = GPTimerCC26XX_DEBUG_STALL_OFF;                                        \
-        gptimer_handle        = GPTimerCC26XX_open(Board_GPTIMER0A, &params);                         \
-        Types_FreqHz  freq;                                                                           \
-        BIOS_getCpuFreq(&freq);                                                                       \
-        GPTimerCC26XX_Value loadVal = freq.lo / 1000 - 1; /*47999*/                                   \
-        GPTimerCC26XX_setLoadValue(gptimer_handle, loadVal);                                          \
-        GPTimerCC26XX_setLoadValue(gptimer_handle, CLOCK_FREQ); /* 0.1 ms*/                           \
-        GPTimerCC26XX_registerInterrupt(gptimer_handle, elite_gptimer_callback, GPT_INT_TIMEOUT);     \
-    } while (0)
-
-#endif  // HEADSTAGE_GPTIMER_H
@@ -1,95 +0,0 @@
-
-#ifndef ELITE_I2C
-#define ELITE_I2C
-
-/*
-* Read I2C example in
-* http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/tirtos/2_14_02_22/
-*        exports/tirtos_full_2_14_02_22/docs/doxygen/html/_i2_c_c_c26_x_x_8h.html
-*
-*/
-
-#include <ti/drivers/I2C.h>
-#include <ti/drivers/Power.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-// I2C
-static I2C_Handle I2Chandle;
-static I2C_Params I2Cparams;
-static I2C_Transaction i2cTrans;
-
-#define I2CBufSize 4
-static uint8_t I2CtxBuf[I2CBufSize];      // Transmit buffer
-static uint8_t I2CrxBuf[I2CBufSize];      // Receive buffer
-bool transferDone = false;
-
-static void I2CCallbackFunction(I2C_Handle handle, I2C_Transaction *msg, bool transfer) {
-    if(transfer){
-        transferDone = true;
-    }
-}
-
-static void I2Cinit(){
-    I2C_init();
-
-    // Configure I2C parameters.
-    I2C_Params_init(&I2Cparams);
-
-    I2Cparams.transferMode  = I2C_MODE_CALLBACK;
-    I2Cparams.transferCallbackFxn = I2CCallbackFunction;
-    I2Cparams.bitRate  = I2C_100kHz;
-
-    // Initialize master I2C transaction structure
-    i2cTrans.writeCount   = I2CBufSize;
-    i2cTrans.writeBuf     = I2CtxBuf;
-    i2cTrans.readCount    = I2CBufSize;
-    i2cTrans.readBuf      = I2CrxBuf;
-    i2cTrans.slaveAddress = 0xA0;
-
-    for(int i=0 ; i<10 ; i++){
-        I2CtxBuf[i] = 0;
-        I2CrxBuf[i] = 0;
-    }
-
-    // Open I2C
-    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
-
-}
-#define WriteMem 0b10100001
-#define ReadMem  0b10100000
-
-static void I2CWrite(uint8_t addr, uint8_t data){
-    for(int i=0 ; i<I2CBufSize ; i++){
-        I2CtxBuf[i] = 0;
-        I2CrxBuf[i] = 0;
-    }
-
-    I2CtxBuf[0] = WriteMem;
-    I2CtxBuf[1] = addr;
-    I2CtxBuf[2] = data;
-
-//    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
-    I2C_transfer(I2Chandle, &i2cTrans);
-//    I2C_close(I2Chandle);
-}
-
-
-static void I2CRead(uint8_t addr){
-    for(int i=0 ; i<I2CBufSize ; i++){
-        I2CtxBuf[i] = 0;
-        I2CrxBuf[i] = 0;
-    }
-
-    I2CtxBuf[0] = ReadMem;
-    I2CtxBuf[1] = addr;
-
-//    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
-    I2C_transfer(I2Chandle, &i2cTrans);
-//    I2C_close(I2Chandle);
-}
-
-
-#endif  // ELITE_I2C
-
@@ -1,20 +0,0 @@
-
-#ifndef ELITEIV
-#define ELITEIV
-
-#define Vset instru.Vset
-
-static void vo_vscan(void)
-{
-    struct wm_vo_ctx_t *vo = (struct wm_vo_ctx_t *)wm_get();
-
-    if (vscanReset) {
-        Vset = vo->_Vinit;
-    }
-
-    if(!vscanReset) {
-        Vset = vo->_Vinit;
-    }
-}
-
-#endif
@@ -1,305 +0,0 @@
-#ifndef __INSTR_H__
-#define __INSTR_H__
-
-#ifdef __cpulsplus
-extern "C" {
-#endif
-
-/*==============================
- ==== headstage instruction ====
- =============================*/
-struct HEADSTAGE_INSTRUCTION {
-    uint8_t  chip_id;
-    uint8_t  eliteFxn;
-
-    /** DAC parameter **/
-    uint8_t  VsetRateIndex;
-    uint32_t VsetRate;
-    int32_t  Vset;
-    uint16_t VoltConstant;
-    uint8_t  directionInit;
-    uint32_t step;
-    uint16_t Ve1;
-    uint16_t Ve2;
-    int32_t  Vinit;
-    int32_t  Vmax;
-    int32_t  Vmin;
-
-    /** EIS **/
-    uint32_t f1;
-    uint32_t f2;
-    uint32_t fmax;
-    uint32_t fmin;
-    uint32_t fset;
-    uint16_t dcbias;
-    uint16_t delay;
-    uint16_t acamp;
-    uint8_t  avgnum;
-    uint8_t  rtia;
-    uint16_t ppd;
-    uint8_t  scale;
-    int32_t  real;
-    int32_t  imag;
-    uint8_t  periodIndex;
-    uint32_t delayTime;
-    uint8_t  settingIndex;
-
-
-    /** ADC parameter **/
-    uint8_t  notifyRateIndex;
-    uint32_t sampleRate;
-    uint8_t  VoViSwitch;
-    uint8_t  AutoGainEnable;
-    uint8_t  VinAutoGainEnable;
-    uint8_t  VoutAutoGainEnable;
-    uint8_t  ADCGainLv;
-
-     // voltage output gain
-    uint16_t VoutGainLevel;
-    uint8_t  VinADCGainLv;
-
-    /** Notify parameter **/
-    uint32_t notifyRate;
-
-    /** mode parameter **/
-    uint16_t cycleNumber;
-    uint8_t  charge;
-    int32_t  constantCurrent;
-    int32_t  Currentmax;
-    int32_t  sti_v1;
-    int32_t  sti_v2;
-    int32_t  sti_v3;
-    int32_t  sti_v4;
-    int32_t  sti_v5;
-    int32_t  sti_v6;
-    int32_t  sti_v7;
-    int32_t  sti_t1;
-    int32_t  sti_t2;
-    int32_t  sti_t3;
-    int32_t  sti_t4;
-    int32_t  sti_t5;
-    int32_t  sti_t6;
-    int32_t  sti_t7;
-    uint16_t sti_cy;
-    uint16_t sti_loop;
-
-    uint16_t StepTime;
-
-    uint8_t AdcChannel;
-
-    /* EIS DAC parameter */
-    uint8_t DAC_type;
-    uint16_t VAmpSet;          // DAC Voltage Amplitude
-
-    /* EIS ADC parameter */
-    uint8_t  HSTIAGainLv;
-    uint8_t  HSTIAAutoGainEnable;
-    uint8_t  LPTIAGainLv;
-    uint8_t  LPTIAAutoGainEnable;
-} instru = {0};
-
-/** Iin, Vin, Vout **/
-#define EIS_HSTIA           0x00
-#define EIS_LPTIA           0x01
-#define EIS_HSDAC           0x02
-#define EIS_LPDAC           0x03
-#define VOUT_DAC            0x04
-#define IIN_ADC             0x05
-#define VIN_ADC             0x06
-#define HIGH_Z              0x07
-
-/** ADC Iin gain level **/
-#define I_GAIN_3M           0x07    // largest gain
-#define I_GAIN_100K         0x08
-#define I_GAIN_3K           0x09
-#define I_GAIN_100R         0x0A    // the least gain
-#define I_GAIN_AUTO         0x04
-
-// EIS LPTIA Iin Gain Level //
-#define LPRTIA_512K         0x00
-#define LPRTIA_12K          0x01
-#define LPRTIA_4K           0x02
-#define LPRTIA_200R         0x03
-#define LPRTIA_GAIN_AUTO    0x04
-
-// EIS HSTIA Iin Gain Level
-#define HSRTIA_160K         0x00
-#define HSRTIA_20K          0x01
-#define HSRTIA_5K           0x02
-#define HSRTIA_200R         0x03
-#define HSRTIA_GAIN_AUTO    0x04
-
-/** ADC Vin gain level **/
-#define VIN_GAIN_1M         0x00
-#define VIN_GAIN_30K        0x01
-#define VIN_GAIN_1K         0x02
-#define VIN_GAIN_AUTO       0x03
-
-/** Vout gain level **/
-#define VOUT_GAIN_240K      0x00
-#define VOUT_GAIN_15K       0x01
-#define VOUT_GAIN_AUTO      0x02
-
-/* DAC reset parameter */
-#define DAC_ZERO            25000
-#define EIS_HSDAC_ZERO      0x0800
-
-// Step time macro
-#define STEPTIME_HALF_SEC   5000
-#define STEPTIME_ONE_SEC    10000
-#define STEPTIME_TWO_SEC    20000
-
-/* AVG Number */
-#define AVG2               0
-#define AVG4               1
-#define AVG8               2
-#define AVG16              3
-
-#define ADC1M6sps          0
-#define ADC800Ksps         1
-
-#define Sinc3OSR5          0
-#define Sinc3OSR4          1
-#define Sinc3OSR2          2
-
-#define Sinc2OSR22         0
-#define Sinc2OSR44         1
-#define Sinc2OSR89         2
-#define Sinc2OSR178        3
-#define Sinc2OSR267        4
-#define Sinc2OSR533        5
-#define Sinc2OSR640        6
-#define Sinc2OSR667        7
-#define Sinc2OSR800        8
-#define Sinc2OSR889        9
-#define Sinc2OSR1067      10
-#define Sinc2OSR1333      11
-
-#define DFTNUM4            0
-#define DFTNUM8            1
-#define DFTNUM16           2
-#define DFTNUM32           3
-#define DFTNUM64           4
-#define DFTNUM128          5
-#define DFTNUM256          6
-#define DFTNUM512          7
-#define DFTNUM1024         8
-#define DFTNUM2048         9
-#define DFTNUM4096        10
-#define DFTNUM8192        11
-#define DFTNUM16384       12
-
-#define AD5940_SYS_CLOCK    16000000
-#define Cutoff_Freq         37000000  // 210kHz
-
-///* LPTIA gain Level */
-//#define LPRTIA200R         1        //Max 3mA
-//#define LPRTIA4K           5        //Max 220uA
-//#define LPRTIA12K          9        //Max 74uA
-//#define LPRTIA512K        26        //Max 1.76uA
-
-static uint32_t HSRTIATable[4] = {160000, 20000, 5000, 200};
-
-/* HSTIA gain level (feedback R value) */
-#define RTIA200R            0x00        // 200R
-#define RTIA1k              0x01        // 1k
-#define RTIA5k              0x02        // 5k
-#define RTIA10k             0x03        // 10k
-#define RTIA20k             0x04        // 20k
-#define RTIA40k             0x05        // 40k
-#define RTIA80k             0x06        // 80k
-#define RTIA160k            0x07        // 160k
-#define RTIAopen            0x08        // RTIA is open
-/*********************************************************************
- * @fn      InitEliteInstruction
- *
- * @brief   Init all INSTRUCTION variable.
- *
- * @param   None.
- *
- * @return  None.
- */
-static void InitEliteInstruction(){
-    instru.chip_id              = 0;
-    instru.eliteFxn             = 0;         //default is a null event
-    instru.VsetRateIndex        = 0;
-    instru.VsetRate             = 2;
-    instru.Vset                 = 0;
-    instru.VoltConstant         = DAC_ZERO; //DAC_ZERO is about 0V
-    instru.directionInit        = 1;        //0:reverse        1:forward
-    instru.step                 = 0;
-    instru.Ve1                  = DAC_ZERO;
-    instru.Ve2                  = DAC_ZERO;
-    instru.Vinit                = 0;
-    instru.Vmax                 = 0;
-    instru.Vmin                 = 0;
-    instru.notifyRateIndex      = 100;
-    instru.sampleRate           = 15;
-    instru.VoViSwitch           = 0x01;    //0:user see Vo     1: user see Vi
-    instru.AutoGainEnable       = 1;
-    instru.VinAutoGainEnable    = 1;
-    instru.VoutAutoGainEnable   = 1;
-    instru.ADCGainLv            = I_GAIN_AUTO;
-    instru.VoutGainLevel        = VOUT_GAIN_AUTO;
-    instru.VinADCGainLv         = VIN_GAIN_AUTO;
-    instru.notifyRate           = STEPTIME_ONE_SEC;
-    instru.cycleNumber          = 1;
-    instru.charge               = 1;      //0:discharge        1:charge
-    instru.constantCurrent      = 0;
-    instru.Currentmax           = 0;
-    instru.StepTime             = STEPTIME_ONE_SEC;
-    instru.AdcChannel           = 0;
-
-    //EIS
-    instru.f1                   = 0;
-    instru.f2                   = 0;
-    instru.fset                 = 0;
-    instru.fmax                 = 0;
-    instru.fmin                 = 0;
-    instru.delay                = 0;
-    instru.scale                = 0;
-    instru.avgnum               = 0;
-    instru.dcbias               = 0;
-    instru.acamp                = 0;
-    instru.rtia                 = 0;
-    instru.ppd                  = 1;
-    instru.periodIndex          = 0;
-    instru.delayTime            = 0;
-    instru.settingIndex         = 0;
-
-
-    //pulse mode
-    instru.sti_t1          = 0;
-    instru.sti_t2          = 0;
-    instru.sti_t3          = 0;
-    instru.sti_t4          = 0;
-    instru.sti_t5          = 0;
-    instru.sti_t6          = 0;
-    instru.sti_t7          = 0;
-    instru.sti_v1          = DAC_ZERO;
-    instru.sti_v2          = DAC_ZERO;
-    instru.sti_v3          = DAC_ZERO;
-    instru.sti_v4          = DAC_ZERO;
-    instru.sti_v5          = DAC_ZERO;
-    instru.sti_v6          = DAC_ZERO;
-    instru.sti_v7          = DAC_ZERO;
-    instru.sti_loop        = 1;
-    instru.sti_cy          = 0;
-
-    // EIS DAC
-    instru.VAmpSet              = EIS_HSDAC_ZERO;
-    instru.DAC_type             = EIS_HSDAC;
-
-    // EIS ADC
-    instru.HSTIAGainLv            = 0;
-    instru.HSTIAAutoGainEnable    = 1;
-    instru.LPTIAGainLv            = 0;
-    instru.LPTIAAutoGainEnable    = 1;
-}
-
-#ifdef __cpulsplus
-}
-#endif
-#endif
-
-
@@ -1,77 +0,0 @@
-
-#ifndef ELITEKEYDETECT
-#define ELITEKEYDETECT
-
-static bool TurnOnElite(uint8_t key) {
-    static uint16_t TurnOnCounter = 0;
-
-    if (key == 0) {
-        // press 1 sec, power on LED, read bat power
-        if (TurnOnCounter >= CLOCK_ONE_SECOND) {
-//            headstage_battery_volt();
-//            uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
-//                           ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-//            if( bat < 768 && bat > 20){
-//                PIN_setOutputValue(pin_handle, enable_5v, 0);
-//                return false;
-//            }else{
-                PIN_setOutputValue(pin_handle, enable_5v, 1);  // enable 5V
-                Elite_SPI_init();
-                // TurnOn10V();
-                ModeLED(BT_WAIT);
-                AD5940_init();
-                return true;
-//            }
-        } else {
-            TurnOnCounter++;
-            return false;
-        }
-    } else {
-        TurnOnCounter = 0;
-        PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
-        return false;
-    }
-}
-
-static void EliteKeyPress(uint8_t key) {
-    static uint16_t ShutDownCounter = 0;
-    static uint8_t OriginEliteFxn  = 0;
-
-    if (key == 0) {
-        // key = 0 if press
-        // press key => bight LED
-
-        if (ShutDownCounter == CLOCK_ONE_SECOND) {
-            KEYLED();
-        }
-
-        // press 3~4 sec, shutdown 2650
-        else if (ShutDownCounter > (CLOCK_ONE_SECOND*3) ) {
-            LED_color(DARKLED, 0xFF, 0xFF, 0x00);
-            PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
-        }
-        ShutDownCounter ++;
-    } else {
-        if (OriginEliteFxn == instru.eliteFxn) {  // old function == currunt instruction
-            if (ShutDownCounter != 0) {
-                // dark LED
-                checkFlafLED();
-                ShutDownCounter = 0;
-            }
-        } else {  // old function != currunt instruction
-            OriginEliteFxn = instru.eliteFxn;
-            if (ShutDownCounter != 0) {
-                ShutDownCounter = 0;
-            }
-            checkFlafLED();
-        }
-    }
-}
-
-static void TurnOn10V() {
-    If10Von = true;
-    PIN_setOutputValue(pin_handle, enable_10v, 1);
-    CPUdelay(8000);
-}
-
-#endif
@@ -1,188 +0,0 @@
-
-#ifndef ELITELED
-#define ELITELED
-
-#define DARKLED                  0xE1
-#define LIGHTLED                 0xE8
-
-static void WorkModeLED();
-
-static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
-    spi_LEDtxbuf[0] = 0x0000;
-    spi_LEDtxbuf[1] = 0x0000;
-    for (int i = 2; i < SPI_LED_SIZE - 2; i += 2) {
-        spi_LEDtxbuf[i]     = 0xE000 | ((uint16_t)bright << 8) | blue;
-        spi_LEDtxbuf[i + 1] = ((uint16_t)green << 8) | red;
-    }
-
-    spi_LEDtxbuf[SPI_LED_SIZE - 2] = 0xffff;
-    spi_LEDtxbuf[SPI_LED_SIZE - 1] = 0xffff;
-
-    LED_SPI(SPI_LED_SIZE, spi_LEDtxbuf, spi_LEDrxbuf);
-}
-
-static void Elite_led_color(uint16_t color){
-    switch (color) {
-        case COLOR_RED: {
-            LED_color(DARKLED, 0xFF, 0x00, 0x00);
-            break;
-        }
-        case COLOR_ORANGE: {
-            LED_color(DARKLED, 0xFF, 0x58, 0x09);
-            break;
-        }
-        case COLOR_YELLOW: {
-            LED_color(LIGHTLED, 0xFF, 0x80, 0x00);
-            break;
-        }
-        case COLOR_GREEN: {
-            LED_color(DARKLED, 0x00, 0xFA, 0x00);
-            break;
-        }
-        case COLOR_YELLOWGREEN: {
-            LED_color(DARKLED, 0x64, 0xA6, 0x00);
-            break;
-        }
-        case COLOR_BLUE: {
-            LED_color(DARKLED, 0x00, 0x00, 0xAA);
-            break;
-        }
-        case COLOR_CYAN: {
-            LED_color(DARKLED, 0x00, 0x40, 0x40);
-            break;
-        }
-        case COLOR_MAGENTA: {
-            LED_color(DARKLED, 0xFF, 0x00, 0x80);
-            break;
-        }
-        case COLOR_PURPLE: {
-            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
-            break;
-        }
-        case COLOR_WHITE: {
-            LED_color(DARKLED, 0xCA, 0xFF, 0xFF);
-            break;
-        }
-        case COLOR_BLACK: {
-            LED_color(0x00, 0x00, 0x00, 0x00);
-            break;
-        }
-        //dark LED
-        case COLOR_YELLOW_DARK: {
-            LED_color(DARKLED, 0xFF, 0x80, 0x00);
-            break;
-        }
-        case COLOR_GREEN_DARK: {
-            LED_color(DARKLED, 0x00, 0x33, 0x00);
-            break;
-        }
-        case COLOR_BLUE_DARK: {
-            LED_color(DARKLED, 0x00, 0x00, 0x33);
-            break;
-        }
-        case COLOR_CYAN_DARK: {
-            LED_color(DARKLED, 0x00, 0x10, 0x10);
-            break;
-        }
-        case COLOR_PURPLE_DARK: {
-            LED_color(DARKLED, 0x55, 0x00, 0x55);
-            break;
-        }
-        default: {
-            break;
-        }
-    }
-}
-
-static void ModeLED(uint16_t modeStatus) {
-    btWaitLedFlag   = 0;
-    noEventLedFlag  = 0;
-    preWorkLedFlag  = 0;
-    workingLedFlag  = 0;
-    postWorkLedFlag = 0;
-
-    switch (modeStatus) {
-    case BT_WAIT: {
-        btWaitLedFlag = 1;
-        BT_WAIT_LED();
-        break;
-    }
-    case NO_EVENT: {
-        noEventLedFlag = 1;
-        LEDPowerON();
-        break;
-    }
-    case PRE_WORK: {
-        preWorkLedFlag = 1;
-        Elite_led_color(COLOR_BLUE);
-        break;
-    }
-    case WORKING: {
-        workingLedFlag = 1;
-        WorkModeLED();
-        break;
-    }
-    case POST_WORK: {
-        postWorkLedFlag = 1;
-        Elite_led_color(COLOR_BLUE);
-        break;
-    }
-    default: {
-        LEDPowerON();
-        break;
-    }
-    }
-}
-
-static void checkFlafLED()
-{
-    if(btWaitLedFlag == 1){
-        ModeLED(BT_WAIT);
-    }
-    else if(noEventLedFlag == 1){
-        ModeLED(NO_EVENT);
-    }
-    else if(preWorkLedFlag == 1){
-        ModeLED(PRE_WORK);
-    }
-    else if(workingLedFlag == 1){
-        ModeLED(WORKING);
-    }
-    else if(postWorkLedFlag == 1){
-        ModeLED(POST_WORK);
-    }
-}
-
-static void WorkModeLED()
-{
-    switch (instru.eliteFxn) {
-        case CURVE_EIS:
-        case CURVE_EIS_CV:
-            WORKLED();
-            break;
-
-        case CURVE_CALI_ADC:
-            if (instru.AdcChannel == IIN_ADC) {
-                Elite_led_color(COLOR_RED);
-            } else if (instru.AdcChannel == VIN_ADC) {
-                Elite_led_color(COLOR_ORANGE);
-            } else if (instru.AdcChannel == VOUT_DAC) {
-                Elite_led_color(COLOR_BLUE);
-            }else if (instru.AdcChannel == EIS_HSDAC) {
-                Elite_led_color(COLOR_PURPLE_DARK);
-            } else if (instru.AdcChannel == EIS_HSTIA) {
-                Elite_led_color(COLOR_WHITE);
-            } else if (instru.AdcChannel == EIS_LPTIA) {
-                Elite_led_color(COLOR_RED);
-            } else if (instru.AdcChannel == EIS_LPDAC) {
-                Elite_led_color(COLOR_BLUE);
-            }
-            break;
-
-        default:
-            break;
-
-    }
-}
-
-#endif
@@ -1,16 +0,0 @@
-
-#ifndef ELITE_LATCH_INIT
-#define ELITE_LATCH_INIT
-
-static void InitLH() {
-    for (int i=0; i<LATCH_BUFF_SIZE; i++) {
-        LH.LATCH0[i]       = 0;
-        LH.LATCH1[i]       = 0;
-        LH.LATCH2[i]       = 0;
-    }
-    LH.LoadState    = 0;
-}
-
-
-#endif
-
@@ -1,192 +0,0 @@
-/**
- * notify data buffer.
- * the length equals to the characteristic 4 which value is 20 bytes.
- *
- */
-
-#ifndef ELITENOTIFY
-#define ELITENOTIFY
-
-#include "headstage.h"
-
-/*notify's input type*/
-#define NOTIFY_CURRENT   0
-#define NOTIFY_VOLT      1
-#define NOTIFY_IMPEDANCE 2
-#define NOTIFY_VOLT_BAT  3
-
-#define NOT_BUF_OFFSET_INIT 8
-
-/**
- * the index where to start insert data into buffer.
- * start from 6.
- */
-static size_t   not_buf_offset = NOT_BUF_OFFSET_INIT;
-static uint32_t not_time_stamp;
-
-static uint8_t  NotifyCurrent[4]   = {0};
-static uint8_t  NotifyVolt[4]      = {0};
-static uint8_t  NotifyImpedance[4] = {0};
-static uint8_t  NotifyVoltBat[4]   = {0};
-static uint16_t NotifyCycleNumber  = 0;
-static uint8_t  finishMode         = 0;
-
-// ****************** New Notify Format ******************************** //
-/*
- * Notify format
- *
- *
-         |               |   1           |       2       |           3   |
-         0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2
-         -----------------------------------------------------------------
-         |    header     |
-         |    current                                                    |
-         | voltage or impedance                                          |
-         |  mode & gain  |
-         |    time stamp                                                 |
-         |  cycle number |
-
-
-    mode & gain
-        this byte include Elite working mode and ADC gain level
-        we use "(mode & 0xF0) | (gain & 0x0F)" to encode these two information
-
-     cycle number
-         for cyclic voltammetry use, we save it as channel number.
-         0xFF
-
-  * header = device ID
-  * I = current (0.001nA), V = voltage (mV),
-  * Z = impedance (k ohm), T = time (ms)
-  *
-  *
-*/
-// ********* End New Format Notify ***************************************** //
-
-/*
- * Notify format
- *
- *
-         |               |   1           |       2       |           3   |
-         0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2
-         -----------------------------------------------------------------
-         |    header     |
-         |    current                                                    |
-         |    voltage                                                    |
-         |    impedance                                                  |
-         |    time stamp                                                 |
-         |  cycle number |
-
-     cycle number
-         for cyclic voltammetry use, we save it as channel number.
-         0xFF
-
-  * header = device ID
-  * I = current (nA),    V = voltage (uV),
-  * Z = impedance (ohm), T = time (ms)
-  *
-  *
-*/
-static void SendNotify() {
-    initDATBuf();
-
-    not_buf[0] = instru.chip_id;
-
-    for (int i = 0; i < 4; i++) {
-        not_buf[i + 1] = NotifyCurrent[i]; // 1 2 3 4
-        not_buf[i + 5] = NotifyVolt[i]; // 5 6 7 8
-        not_buf[i + 9] = NotifyImpedance[i]; //9 10 11 12
-    }
-
-    // 1 Timestamp = 32 usec;  31 Timestamp ~= 1 msec
-    not_time_stamp = (Timestamp_get32()) / 31;  // msec
-
-    not_buf[13] = not_time_stamp & 0xff;
-    not_buf[14] = (not_time_stamp >> 8) & 0xff;
-    not_buf[15] = (not_time_stamp >> 16) & 0xff;
-    not_buf[16] = (not_time_stamp >> 24) & 0xff;
-
-    not_buf[17] = (NotifyCycleNumber >> 8) & 0xff;
-    not_buf[18] = NotifyCycleNumber & 0xff;
-
-    not_buf[19] = (finishMode << 7) & 0x80 | instru.ADCGainLv & 0x0F;
-
-    for (int i = 20; i < BLE_DAT_BUFF_SIZE; i++){
-        not_buf[i] = 0;
-    }
-
-    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
-}
-
-static void initDATBuf(){
-    for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++){
-        not_buf[i] = 0;
-    }
-}
-
-static void initINSBuf(){
-    for (int i = 0; i < BLE_INS_BUFF_SIZE; i++){
-        ins_buf[i] = 0;
-    }
-}
-
-static void initCISBuf(){
-    for (int i = 0; i < BLE_CIS_BUFF_SIZE; i++){
-        cis_buf[i] = 0;
-    }
-}
-
-static void initRawDataBuf(){
-    not_time_stamp    = 0;
-    NotifyCycleNumber = 0;
-    finishMode        = 0;
-
-    for (int i = 0; i < 4; i++){
-        NotifyCurrent[i]   = 0;
-        NotifyVolt[i]      = 0;
-        NotifyImpedance[i] = 0;
-    }
-}
-
-static void FlushNotify(){
-    initRawDataBuf();
-    initDATBuf();
-
-    not_buf[0] = instru.chip_id;
-
-    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
-}
-
-static void InputNotify(int NotifyType, int32_t Data){
-
-    switch (NotifyType) {
-        case NOTIFY_CURRENT:
-            NotifyCurrent[0] = (uint8_t)((Data & 0xFF000000) >> 24);
-            NotifyCurrent[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
-            NotifyCurrent[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
-            NotifyCurrent[3] = (uint8_t)(Data & 0x000000FF);
-            break;
-
-        case NOTIFY_IMPEDANCE:
-            NotifyImpedance[0] = (uint8_t)((Data & 0xFF000000) >> 24);
-            NotifyImpedance[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
-            NotifyImpedance[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
-            NotifyImpedance[3] = (uint8_t)(Data & 0x000000FF);
-            break;
-
-        case NOTIFY_VOLT :
-            NotifyVolt[0] = (uint8_t)((Data & 0xFF000000) >> 24);
-            NotifyVolt[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
-            NotifyVolt[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
-            NotifyVolt[3] = (uint8_t)(Data & 0x000000FF);
-            break;
-
-        case NOTIFY_VOLT_BAT :
-            NotifyVoltBat[0] = (uint8_t)((Data & 0xFF000000) >> 24);
-            NotifyVoltBat[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
-            NotifyVoltBat[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
-            NotifyVoltBat[3] = (uint8_t)(Data & 0x000000FF);
-            break;
-    }
-}
-#endif
@@ -1,84 +0,0 @@
-
-#ifndef ELITERESET
-#define ELITERESET
-
-static void reset() {
-    mode_init = true;
-    megaStiEnable = false;
-    PeriodicEvent = false;     // is there an PeriodicEvent?
-    Free_Work_Mode = true;      // Free(WorkModeData)
-    InitPeriodicEvent = true;      // need to create a WorkModeData?
-
-    InitGPT();
-    initINSBuf();
-    initDATBuf();
-
-    AD5940_HWReset();
-    AD5940_init();
-//    AD5940_sftreset();
-
-//    PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
-
-    HSTIAGainCtrl(HSRTIA_200R);
-    LPTIAGainCtrl(LPRTIA_200R);
-    HSDAC_GainControl(0x00);
-    HSDAC_output(0x0800);
-
-    for (int i = 0; i < SPI_LED_SIZE; i++) {
-        spi_LEDtxbuf[i] = 0;
-        spi_LEDrxbuf[i] = 0;
-    }
-
-    for (int i = 0; i < SPI_DAC_SIZE; i++) {
-        spi_DACtxbuf[i] = 0;
-        spi_rxbuf[i]    = 0;
-    }
-
-    for (int i = 0; i < SPI_ADC_SIZE; i++) {
-        spi_ADC_txbuf[i] = 0;
-        spi_ADC_rxbuf[i] = 0;
-    }
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
-    ModeLED(NO_EVENT);
-    CPUdelay(1600);
-}
-
-static void Eliteinterrupt() {
-    mode_init = true;
-    megaStiEnable = false;
-    PeriodicEvent = false;     // is there an PeriodicEvent?
-    Free_Work_Mode = true;      // Free(WorkModeData)
-    InitPeriodicEvent = true;      // need to create a WorkModeData?
-
-    InitGPT();
-    initINSBuf();
-    initDATBuf();
-    AD5940_HWReset();
-    AD5940_init();
-
-//    HSTIAGainCtrl(HSRTIA_200R);
-//    LPTIAGainCtrl(LPRTIA_200R);
-//    HSDAC_GainControl(0x00);
-//    HSDAC_output(0x0800);
-
-    for (int i = 0; i < SPI_LED_SIZE; i++) {
-        spi_LEDtxbuf[i] = 0;
-        spi_LEDrxbuf[i] = 0;
-    }
-
-    for (int i = 0; i < SPI_DAC_SIZE; i++) {
-        spi_DACtxbuf[i] = 0;
-        spi_rxbuf[i]    = 0;
-    }
-
-    for (int i = 0; i < SPI_ADC_SIZE; i++) {
-        spi_ADC_txbuf[i] = 0;
-        spi_ADC_rxbuf[i] = 0;
-    }
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
-    ModeLED(NO_EVENT);
-    CPUdelay(8000);
-}
-#endif
@@ -1,272 +0,0 @@
-
-#ifndef ELITE_SPI
-#define ELITE_SPI
-
-/*
-* Read SPI example in
-* http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/tirtos/2_14_02_22/
-*        exports/tirtos_full_2_14_02_22/docs/doxygen/html/_s_p_i_c_c26_x_x_d_m_a_8h.html
-*/
-
-#include <Board.h>
-#include <ti/drivers/SPI.h>
-#include <ti/drivers/dma/UDMACC26XX.h>
-#include <ti/drivers/spi/SPICC26XXDMA.h>
-#include "Elite_PIN.h"
-
-/* application use SPI parameters and buffers */
-#define SPI_LED_SIZE 28
-#define SPI_DAC_SIZE 6
-#define SPI_ADC_SIZE 4
-
-static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
-static uint16_t spi_LEDrxbuf[SPI_LED_SIZE] = {0};
-
-static uint8_t spi_DACtxbuf[SPI_DAC_SIZE] = {0};
-static uint8_t spi_rxbuf[SPI_DAC_SIZE]    = {0};
-
-static uint8_t spi_ADC_txbuf[SPI_ADC_SIZE] = {0};
-static uint8_t spi_ADC_rxbuf[SPI_ADC_SIZE] = {0};
-//
-//static uint32_t SeqCmdBuff;
-
-/* system use SPI parameters */
-static SPI_Handle      spiHandle0 = NULL;  // SPI0  = LED
-static SPI_Handle      spiHandle1 = NULL;  // SPI1  = ADC +DAC
-static SPI_Params      spiParams0;
-static SPI_Params      spiParams1;
-static SPI_Transaction LED_transaction;
-static SPI_Transaction ADC_DAC_transaction;
-
-static void ELITE15_SPI_HOLD();
-static void ELITE15_SPI_CLOSE();
-
-static void Elite_SPI_init(){
-    SPI_init();
-    SPI_Params_init(&spiParams0);
-    spiParams0.bitRate     = 2000;  // 2k
-    spiParams0.mode        = SPI_MASTER;
-    spiParams0.dataSize    = 16;
-    spiParams0.frameFormat = SPI_POL0_PHA1;
-    spiHandle0 = SPI_open(Board_SPI0, &spiParams0);  // LED SPI
-
-    SPI_Params_init(&spiParams1);
-    spiParams1.bitRate     = 1000000;  // 1M
-    spiParams1.mode        = SPI_MASTER;
-    spiParams1.dataSize    = 8;
-    spiParams1.frameFormat = SPI_POL0_PHA0;
-
-    spiHandle1 = SPI_open(Board_SPI1, &spiParams1);  // ADC DAC SPI
-}
-
-static void LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
-    LED_transaction.count = length;
-    LED_transaction.txBuf = spi_txbuf;
-    LED_transaction.rxBuf = spi_rxbuf;
-
-    SPI_transfer(spiHandle0, &LED_transaction);
-}
-
-static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-    PIN_setOutputValue(pin_handle, AD_CS, 0);      // CS_ADC
-
-    ADC_DAC_transaction.count = length;
-    ADC_DAC_transaction.txBuf = spi_txbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
-}
-
-static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-    ADC_DAC_transaction.count = length;
-    ADC_DAC_transaction.txBuf = spi_txbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-}
-
-static void ELITE15_SPI_HOLD() {
-    Elite_SPI_init();
-//    #ifdef ELITE_PIN_1_5_RE
-//    PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);   // ADC_CS
-//    PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);   // DAC_CS
-//    PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);   // update HIGH_Z_MODE
-//    #endif
-//
-//    PIN_setOutputValue(pin_handle, LOAD0, 1);
-//    PIN_setOutputValue(pin_handle, LOAD1, 0);
-//    PIN_setOutputValue(pin_handle, LOAD2, 0);
-}
-static void ELITE15_SPI_CLOSE() {
-//    PIN_setOutputValue(pin_handle, LOAD0, 0);
-//    PIN_setOutputValue(pin_handle, LOAD1, 0);
-//    PIN_setOutputValue(pin_handle, LOAD2, 0);
-
-    SPI_close(spiHandle0);
-    SPI_close(spiHandle1);
-}
-
-/* Elite1.5 Calibration SPI */
-static void CAL_ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-    ADC_DAC_transaction.count = length;
-    ADC_DAC_transaction.txBuf = spi_txbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
-}
-
-static void CAL_LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
-    LED_transaction.count = length;
-    LED_transaction.txBuf = spi_txbuf;
-    LED_transaction.rxBuf = spi_rxbuf;
-
-    SPI_transfer(spiHandle0, &LED_transaction);
-}
-
-
-
-#ifdef ELITE_VERSION_EIS
-/* define SPI command */
-// datasheet page 98
-#define SPICMD_SETADDR  0x20
-#define SPICMD_WRITEREG 0x2D
-#define SPICMD_READREG  0x6D
-
-//define REG
-#define LPDACCON0       0x2128
-#define LPDACSW0        0x2124
-#define LPDACDAT0       0x2120
-#define LPREFBUFCON     0x2050
-#define SWMUX           0x235C
-#define LPTIASW0        0x20E4
-#define SWCON           0x200C
-#define HSDACCON        0x2010
-#define HSDACDAT        0x2048
-#define LPTIACON0       0x20EC
-#define HSTIACON        0x20FC
-#define AFECON          0x2000
-#define DSWFULLCON      0x2150
-#define NSWFULLCON      0x2154
-#define PSWFULLCON      0x2158
-#define TSWFULLCON      0x215C
-#define WGFCW           0x2030
-#define WGPHASE         0x2034
-#define WGOFFSET        0x2038
-#define WGAMPLITUDE     0x203C
-#define WGCON           0x2014
-#define DE0RESCON       0x20F8
-#define ADCCON          0x21A8
-#define DFTCON          0x20D0
-#define ADCFILTERCON    0x2044
-#define PMBW            0x22F0
-#define CLKSEL          0x0414
-#define CLKCON0         0x0408
-#define CLKCON0KEY      0x0420
-#define HSOSCCON        0x20BC
-#define ADCBUFCON       0x238C
-#define HSRTIACON       0x20F0
-#define ADCDAT          0x2074
-#define DFTREAL         0x2078
-#define DFTIMAG         0x207C
-
-static void select_REG(uint16_t addr){
-    PIN_setOutputValue(pin_handle, AD_CS, 0);
-//    CPUdelay(16000);
-
-    spi_DACtxbuf[0] = SPICMD_SETADDR;
-    spi_DACtxbuf[1] = (uint8_t)((addr & 0xFF00) >> 8);
-    spi_DACtxbuf[2] = (uint8_t)(addr & 0x00FF);
-
-    ADC_DAC_transaction.count = 3;
-    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-//    CPUdelay(16000);
-    PIN_setOutputValue(pin_handle, AD_CS, 1);
-}
-
-static void w16_REG(uint16_t data){
-    PIN_setOutputValue(pin_handle, AD_CS, 0);
-    spi_DACtxbuf[0] = SPICMD_WRITEREG;
-    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF00) >> 8);
-    spi_DACtxbuf[2] = (uint8_t)(data & 0x00FF);
-
-    ADC_DAC_transaction.count = 3;
-    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);
-}
-
-static int16_t r16_REG(){
-    int16_t ret;
-
-    PIN_setOutputValue(pin_handle, AD_CS, 0);
-    spi_DACtxbuf[0] = SPICMD_READREG;
-    spi_DACtxbuf[1] = 0x00;
-    spi_DACtxbuf[2] = 0x00;
-    spi_DACtxbuf[3] = 0x00;
-
-    ADC_DAC_transaction.count = 4;
-    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    ret = (int16_t)spi_rxbuf[2] << 8 |    \
-          (int16_t)spi_rxbuf[3];
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);
-
-    return ret;
-}
-
-static void w32_REG(uint32_t data){
-    PIN_setOutputValue(pin_handle, AD_CS, 0);
-    spi_DACtxbuf[0] = SPICMD_WRITEREG;
-    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF000000) >> 24);
-    spi_DACtxbuf[2] = (uint8_t)((data & 0x00FF0000) >> 16);
-    spi_DACtxbuf[3] = (uint8_t)((data & 0x0000FF00) >> 8);
-    spi_DACtxbuf[4] = (uint8_t)(data & 0x000000FF);
-
-    ADC_DAC_transaction.count = 5;
-    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);
-}
-
-static int32_t r32_REG(){
-    int32_t ret;
-
-    PIN_setOutputValue(pin_handle, AD_CS, 0);
-    spi_DACtxbuf[0] = SPICMD_READREG;
-    spi_DACtxbuf[1] = 0x00;
-    spi_DACtxbuf[2] = 0x00;
-    spi_DACtxbuf[3] = 0x00;
-    spi_DACtxbuf[4] = 0x00;
-    spi_DACtxbuf[5] = 0x00;
-
-    ADC_DAC_transaction.count = 6;
-    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    ret = (int32_t)spi_rxbuf[2] << 24 |    \
-          (int32_t)spi_rxbuf[3] << 16 |    \
-          (int32_t)spi_rxbuf[4] << 8 |     \
-          (int32_t)spi_rxbuf[5];
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);
-
-    return ret;
-}
-
-#endif // ELITE_EIS
-
-#endif // ELITE_SPI
@@ -1,618 +0,0 @@
-/*=============================================================================
- =                          wm.h                                              =
- =============================================================================*/
-#ifndef ELITE_WORK_DATA
-#define ELITE_WORK_DATA
-
-#define CLOCK_ONE_SECOND 10000 // 1s
-
-#include "EliteInstruction.h"
-
-/***** Template of Measure and VoltOut parameter *****/
-#define VOUT_PARA                    \
-    int32_t  _Vinit;                 \
-    int32_t  _Vmax;                  \
-    int32_t  _Vmin;                  \
-    int32_t  _Vset;                  \
-    uint32_t _Vstep;                 \
-    bool     _direction_up;          \
-    bool     _current_direction_up;  \
-    uint16_t _cycleNumber
-
-//#define FOUT_PARA                     \
-//    uint32_t _f1;                     \
-//    uint32_t _f2;                     \
-//    uint32_t _fd1;                    \
-//    uint32_t _fd2;                    \
-//    uint32_t _fmax;                   \
-//    uint32_t _fmin;                   \
-//    uint32_t _fset;                   \
-//    uint8_t  _decades;                \ //num of decades in whole
-//    uint16_t _ppd;                    \
-//    uint8_t  _decadeIndex;            \ //index of decade max is 8
-//    uint16_t _sweepIndex;             \ //index of smaller decade max is 10
-//    bool     _direction_up
-
-#define MEAS_CURR(_m)      (((struct wm_meas_t *)(_m))->_measureCurrent)
-#define MEAS_VIN(_m)       (((struct wm_meas_t *)(_m))->_measureVin)
-#define MEAS_VOUT(_m)      (((struct wm_meas_t *)(_m))->_measureVout)
-#define MEAS_BAT(_m)       (((struct wm_meas_t *)(_m))->_measureBat)
-#define VOLT_SW(_m)        (((struct wm_meas_t *)(_m))->_VoViSwitch)
-
-struct wm_meas_t {
-    int32_t  _measureCurrent;
-    int32_t  _measureVin;
-    int32_t  _measureVout;
-    int32_t  _measureBat;
-    uint8_t  _VoViSwitch;
-};
-
-/* member of mode */
-struct wm_eis_ctx_t {
-    struct wm_meas_t measure;
-    int16_t  _phase;
-    int32_t  _mag;
-    int32_t  _real;
-    int32_t  _imag;
-    uint32_t _f1;
-    uint32_t _f2;
-    uint32_t _fd1;
-    uint32_t _fd2;
-    uint32_t _fmax;
-    uint32_t _fmin;
-    uint32_t _fset;
-    uint8_t  _decades;                 //num of decades in whole
-    uint16_t _ppd;
-    uint8_t  _cnt;
-    int8_t   _decadeIndex;             //index of decade max is 8
-    int16_t  _sweepIndex;              //index of smaller decade max is 10
-    bool     _direction_up;
-    bool     _switchNeg;
-    bool     _switchPos;
-    bool     _firstSwitch;
-    bool     _in_reset_flag;
-};
-
-struct wm_vo_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    int32_t _Vset;
-    int32_t _Vinit;
-};
-
-struct wm_it_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-};
-
-struct wm_vt_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-};
-
-struct wm_rt_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    int32_t _Vset;
-    int32_t _Vinit;
-};
-
-struct wm_iv_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    VOUT_PARA;
-};
-
-struct wm_iv_cy_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    VOUT_PARA;
-};
-
-struct wm_cc_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    int32_t _Vmax;
-    int32_t _Vmin;
-    int32_t _Vset;
-    int32_t _Iset;
-    uint8_t _charge;
-};
-
-struct wm_cv_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    VOUT_PARA;
-    int32_t _LPRtia;
-    bool bFirst;
-};
-
-struct wm_lsv_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    VOUT_PARA;
-};
-
-struct wm_ca_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    int32_t _Vinit;
-    int32_t _Vset;
-};
-
-struct wm_pulse_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    int32_t  _Vset;
-    int32_t  _sti_v1;
-    int32_t  _sti_v2;
-    int32_t  _sti_v3;
-    int32_t  _sti_v4;
-    int32_t  _sti_v5;
-    int32_t  _sti_v6;
-    int32_t  _sti_v7;
-    int32_t  _sti_t1;
-    int32_t  _sti_t2;
-    int32_t  _sti_t3;
-    int32_t  _sti_t4;
-    int32_t  _sti_t5;
-    int32_t  _sti_t6;
-    int32_t  _sti_t7;
-    int32_t  _sti_t;
-    int32_t  _sti_v;         //output voltage now
-    int32_t  _sti_t_flag;    //Where's the time stage turn
-    uint16_t _sti_cy;
-    uint16_t _sti_lp;
-};
-
-struct wm_ocp_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-};
-
-int wm_init(void); //(void *instr_ctx);
-int wm_deinit(void);
-void *wm_get(void);
-
-/*=============================================================================
- =                          wm.c                                              =
- =============================================================================*/
-
-static void *workMode_p = NULL;
-static bool Free_Work_Mode = false;
-
-/* init mode func */
-static int __eis_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_eis_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_eis_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_phase          = 0;
-    p->_mag            = 0;
-    p->_real           = 0;
-    p->_imag           = 0;
-    p->_f1             = instru.f1;
-    p->_f2             = instru.f2;
-    p->_fmax           = instru.fmax;
-    p->_fmin           = instru.fmin;
-    p->_fd1            = 0; //decade freq 1
-    p->_fd2            = 0; //decade freq 2
-    p->_fset           = 0;
-    p->_cnt            = 0;
-    p->_ppd            = instru.ppd; //points per decade
-    p->_decades        = 0;
-    p->_sweepIndex     = 0;
-    p->_decadeIndex    = 0;
-    p->_direction_up   = true;
-    p->_switchPos      = false;
-    p->_switchNeg      = false;
-    p->_firstSwitch    = true;
-    p->_in_reset_flag  = false;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __vo_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_vo_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_vo_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
-    p->_Vset           = 0;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __it_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_it_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_it_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __vt_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_vt_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_vt_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __rt_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_rt_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_rt_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
-    p->_Vset           = 0;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __iv_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_iv_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_iv_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vinit          = instru.Vinit; //(instru.Vinit - 25000) * 4 * 10000; //[5nV]
-    p->_Vmax           = instru.Vmax; //(instru.Vmax  - 25000) * 4 * 10000; //[5nV]
-    p->_Vmin           = instru.Vmin; //(instru.Vmin  - 25000) * 4 * 10000; //[5nV]
-    p->_Vset           = 0;
-    p->_Vstep          = 0;
-    p->_direction_up   = true;
-    p->_current_direction_up = true;
-    p->_cycleNumber    = instru.cycleNumber;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __iv_cy_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_iv_cy_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_iv_cy_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
-    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
-    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
-    p->_Vset           = 0;
-    p->_Vstep          = 0;
-    p->_direction_up   = true;
-    p->_current_direction_up = true;
-    p->_cycleNumber    = instru.cycleNumber;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __cc_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_cc_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_cc_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
-    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
-    p->_Vset           = 0;
-    p->_charge         = instru.charge;
-    p->_Iset           = instru.constantCurrent * 200 ;
-    //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA]
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __cv_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_cv_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_cv_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vinit          = (instru.Vinit - 25000) * 4 * 4000; //[5nV]
-    p->_Vmax           = (instru.Vmax - 25000) * 4 * 4000; //[5nV]
-    p->_Vmin           = (instru.Vmin - 25000) * 4 * 4000; //[5nV]
-//    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
-//    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
-//    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
-    p->_Vset           = 0;
-    p->_Vstep          = 0;
-    p->bFirst          = true;
-    p->_direction_up   = true;
-    p->_current_direction_up = true;
-    p->_cycleNumber    = instru.cycleNumber;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __lsv_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_lsv_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_lsv_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-	p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
-    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
-    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
-    p->_Vset           = 0;
-    p->_Vstep          = 0;
-    p->_direction_up   = true;
-    p->_current_direction_up = true;
-    p->_cycleNumber    = instru.cycleNumber;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __ca_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_ca_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_ca_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
-    p->_Vset           = 0;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __pulse_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_pulse_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_pulse_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vset           = 0;
-    p->_sti_v1         = instru.sti_v1;
-    p->_sti_v2         = instru.sti_v2;
-    p->_sti_v3         = instru.sti_v3;
-    p->_sti_v4         = instru.sti_v4;
-    p->_sti_v5         = instru.sti_v5;
-    p->_sti_v6         = instru.sti_v6;
-    p->_sti_v7         = instru.sti_v7;
-    p->_sti_t1         = instru.sti_t1;
-    p->_sti_t2         = instru.sti_t2;
-    p->_sti_t3         = instru.sti_t3;
-    p->_sti_t4         = instru.sti_t4;
-    p->_sti_t5         = instru.sti_t5;
-    p->_sti_t6         = instru.sti_t6;
-    p->_sti_t7         = instru.sti_t7;
-    p->_sti_t          = instru.sti_t1;
-    p->_sti_v          = instru.sti_v1;
-    p->_sti_t_flag     = 1;
-    p->_sti_cy         = instru.sti_cy;
-    p->_sti_lp         = instru.sti_loop;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __ocp_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_ocp_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_ocp_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    *wm = p;
-
-    return 0;
-}
-
-int wm_init(void)
-{
-    int mode = instru.eliteFxn;
-    void **wm = &workMode_p;
-
-    if (*wm) return -1;
-
-    switch (mode) {
-        case CURVE_EIS:
-            if (__eis_create()) return -2;
-            break;
-
-        case CURVE_EIS_CV:
-            if (__cv_create()) return -2;
-            break;
-
-        default:
-            // printf("DO NOT support!!");
-            return -3;
-    };
-
-    return 0;
-}
-
-int wm_deinit(void)
-{
-    void **wm = &workMode_p;
-
-    if (*wm) {
-        free(*wm);
-        *wm = NULL;
-    } else {
-        return -1;
-    }
-
-    return 0;
-}
-
-void *wm_get(void)
-{
-    void *wm = workMode_p;
-
-    return wm;
-}
-
-/*  CC Mode parameter
-*   @ Measure : measure current value (nA)
-*   @ Charge : Charge or Discharge
-*   @ BatteryV : Vin measure battery voltage (mV)
-*   @ value : constant current setting.
-*             Current value divide current level into 3,000,001 pieces
-*             1,500,000 is zero point; 3,000,000 is 15mA
-*             Current = (value - 1,500,000)/100,000 mA
-*   @ Done : Done = false => Ignore Vmin condition;
-*            Done will be true, if BatteryV <= Vmin last for about 12sec in discharge mode
-*   @ VMax : voltage upper bound in charge mode
-*            CC->value will set to zero if BatteryV >= VMax in charge mode
-*   @ VMin : voltage lower bound in charge mode
-*            CC->value will set to zero if BatteryV <=> VMin in charge mode
-*            Note that VMax and VMin are always larger or equal to zero
-*/
-#endif
@@ -1,309 +0,0 @@
-
-#ifndef Elite_PIN
-#define Elite_PIN
-
-#include <ti/drivers/pin/PINCC26XX.h>
-#include <Board.h>
-#include <ti/drivers/PIN.h>
-
-//#define ELITE_PIN_1_5
-//#define ELITE_PIN_1_5_RE
-#define ELITE_PIN_EIS
-
-#ifdef ELITE_PIN_EIS
-/* SPI Board */
-#define Board_SPI0_MISO                 PIN_UNASSIGNED
-#define Board_SPI0_MOSI                 IOID_4
-#define Board_SPI0_CLK                  IOID_3
-#define Board_SPI0_CS                   PIN_UNASSIGNED
-
-#define Board_SPI1_MISO                 IOID_1
-#define Board_SPI1_MOSI                 IOID_6
-#define Board_SPI1_CLK                  IOID_5
-#define Board_SPI1_CS                   PIN_UNASSIGNED
-
-#define AD_CS                           IOID_10
-
-//#define SD_MISO                         IOID_11
-//#define SD_CS                           IOID_8
-//#define SD_CLK                          IOID_7
-//#define SD_MOSI                         IOID_13
-
-#define switch_on                       IOID_14
-#define enable_5v                       IOID_9
-#define AD_reset                        IOID_13
-#define enable_10v                      PIN_UNASSIGNED
-#define HIGH_Z_MODE                     PIN_UNASSIGNED
-#define shutdown_6994                   PIN_UNASSIGNED
-
-#define Turnon_I_LARGE                  PIN_UNASSIGNED
-#define Turnon_I_MID                    PIN_UNASSIGNED
-#define Turnon_I_SMALL                  PIN_UNASSIGNED
-
-#define Turnon_V_MID                    PIN_UNASSIGNED
-#define Turnon_V_SMALL                  PIN_UNASSIGNED
-
-#define Turon_VOUT_SMALL                PIN_UNASSIGNED
-
-
-PIN_Handle       pin_handle;
-static PIN_State ZM_rst;
-
-const PIN_Config BLE_IO[] = {
-    enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,// 5V_enable
-    AD_reset | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,
-    AD_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    PIN_TERMINATE
-};
-
-static void remove_elite_pin() {
-    PIN_close(pin_handle);
-    pin_handle = PIN_open(&ZM_rst, BLE_IO);
-}
-#endif
-
-
-#ifdef ELITE_PIN_1_5_RE
-/* SPI Board */
-#define Board_SPI0_MISO                 PIN_UNASSIGNED
-#define Board_SPI0_MOSI                 D1
-#define Board_SPI0_CLK                  D0
-#define Board_SPI0_CS                   PIN_UNASSIGNED
-
-#define Board_SPI1_MISO                 IOID_1
-#define Board_SPI1_MOSI                 D3
-#define Board_SPI1_CLK                  D2
-#define Board_SPI1_CS                   PIN_UNASSIGNED
-
-#define D0                              IOID_3
-#define D1                              IOID_4
-#define D2                              IOID_5
-#define D3                              IOID_6
-#define D4                              IOID_7
-#define D5                              IOID_8
-#define D6                              IOID_9
-#define D7                              IOID_10
-
-#define LOAD0                           IOID_13
-#define LOAD1                           IOID_12
-#define LOAD2                           IOID_11
-
-#define ADC_CS                          LOAD0, D6
-#define DAC_CS                          LOAD0, D7
-#define ADC_DAC_SPI_MOSI                LOAD0, D3
-#define ADC_DAC_SPI_CLK                 LOAD0, D2
-#define LED_MOSI                        LOAD0, D1
-#define LED_CLK                         LOAD0, D0
-#define MEM_CS                          LOAD0, D5
-
-#ifdef ELITE_PIN_1_5
-#define MEM_HOLD                        LOAD0, D4
-#define HIGH_Z_MODE                     LOAD2, D5
-#endif
-#ifdef ELITE_PIN_1_5_RE
-#define MEM_HOLD                        LOAD1, D0
-#define HIGH_Z_MODE                     LOAD0, D4
-#endif
-
-#define Turnon_I_MID                    LOAD2, D0
-#define Turnon_I_SMALL                  LOAD2, D4
-#define Turnon_I_LARGE                  LOAD2, D1
-#define Turnon_V_SMALL                  LOAD2, D2
-#define Turnon_V_MID                    LOAD2, D3
-#define Turon_VOUT_SMALL                LOAD2, D7
-#define shutdown_6994                   LOAD2, D6
-
-//#define Turnon10K                       Turnon_I_MID
-//#define Turnon200R                      Turnon_I_LARGE
-
-/* I2C */
-#ifdef ELITE_VERSION_1_4
-#define Board_I2C0_SCL0                 PIN_UNASSIGNED
-#define Board_I2C0_SDA0                 PIN_UNASSIGNED
-#endif
-
-#define switch_on                       IOID_14
-#define enable_10v                      LOAD1, D5
-#define enable_5v                       LOAD1, D6
-
-PIN_Handle       pin_handle;
-static PIN_State ZM_rst;
-
-const PIN_Config BLE_IO[] = {
-//    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-//    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-//    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-//    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-
-    LOAD0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    LOAD1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    LOAD2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-
-    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,                                    // to sense switch
-
-    PIN_TERMINATE
-};
-
-static void add_elite_pin() {
-//    PIN_Status elite15_status;
-    PIN_add(pin_handle,
-    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-    PIN_add(pin_handle,
-    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-    PIN_add(pin_handle,
-    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-    PIN_add(pin_handle,
-    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-
-//    if(elite15_status != PIN_SUCCESS) {
-//        LED_color(DARKLED, 0x0F, 0x0F, 0x0F);
-//    }
-}
-
-static void remove_elite_pin() {
-    PIN_close(pin_handle);
-    pin_handle = PIN_open(&ZM_rst, BLE_IO);
-}
-#endif
-
-/*!
- *  @def    BOOSTXL_CC2650MA_SPIName
- *  @brief  Enum of SPI names on the CC2650 Booster Pack
- */
-typedef enum BOOSTXL_CC2650MA_SPIName {
-    BOOSTXL_CC2650MA_SPI0 = 0,
-    BOOSTXL_CC2650MA_SPI1 = 1,
-
-    BOOSTXL_CC2650MA_SPICOUNT
-} BOOSTXL_CC2650MA_SPIName;
-
-/*
- *  ========================== SPI DMA begin ===================================
- */
-/* Place into subsections to allow the TI linker to remove items properly */
-#if defined(__TI_COMPILER_VERSION__)
-#pragma DATA_SECTION(SPI_config, ".const:SPI_config")
-#pragma DATA_SECTION(spiCC26XXDMAHWAttrs, ".const:spiCC26XXDMAHWAttrs")
-#endif
-
-/* Include drivers */
-#include <ti/drivers/spi/SPICC26XXDMA.h>
-
-/* SPI objects */
-SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
-
-/* SPI configuration structure, describing which pins are to be used */
-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           = 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
-    },
-};
-
-/* SPI configuration structure */
-const SPI_Config SPI_config[] = {
-    {
-         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-         .object      = &spiCC26XXDMAObjects[0],
-         .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
-    },
-    {
-         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-         .object      = &spiCC26XXDMAObjects[1],
-         .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
-    },
-    {NULL, NULL, NULL}
-};
-/*
- *  ========================== SPI DMA end =====================================
-*/
-
-
-/*
- *  ============================= I2C Begin=====================================
-*/
-
-#ifdef ELITE_VERSION_1_4
-
-/* Generic I2C instance identifiers */
-#define Board_I2C                   CC2650_MA_I2C0
-/*!
- *  @def    CC2650_LAUNCHXL_I2CName
- *  @brief  Enum of I2C names on the CC2650 dev board
- */
-typedef enum CC2650_MA_I2CName {
-    CC2650_MA_I2C0 = 0,
-
-    CC2650_MA_I2CCOUNT
-} CC2650_MA_I2CName;
-
-/* Place into subsections to allow the TI linker to remove items properly */
-#if defined(__TI_COMPILER_VERSION__)
-#pragma DATA_SECTION(I2C_config, ".const:I2C_config")
-#pragma DATA_SECTION(i2cCC26xxHWAttrs, ".const:i2cCC26xxHWAttrs")
-#endif
-
-/* Include drivers */
-#include <ti/drivers/i2c/I2CCC26XX.h>
-
-/* I2C objects */
-I2CCC26XX_Object i2cCC26xxObjects[CC2650_MA_I2CCOUNT];
-
-/* I2C configuration structure, describing which pins are to be used */
-const I2CCC26XX_HWAttrsV1 i2cCC26xxHWAttrs[CC2650_MA_I2CCOUNT] = {
-    {
-        .baseAddr = I2C0_BASE,
-        .powerMngrId = PowerCC26XX_PERIPH_I2C0,
-        .intNum = INT_I2C_IRQ,
-        .intPriority = ~0,
-        .swiPriority = 0,
-        .sdaPin = Board_I2C0_SDA0,
-        .sclPin = Board_I2C0_SCL0,
-    }
-};
-
-/* I2C configuration structure */
-const I2C_Config I2C_config[] = {
-    {
-        .fxnTablePtr = &I2CCC26XX_fxnTable,
-        .object = &i2cCC26xxObjects[0],
-        .hwAttrs = &i2cCC26xxHWAttrs[0]
-    },
-    {NULL, NULL, NULL}
-};
-/*
- *  ========================== I2C end =========================================
- */
-#endif
-
-#endif
-
@@ -1,88 +0,0 @@
-/*
-***********************************************************
-    Read battery's method
-***********************************************************
-1.ReadADCBat(spi_ADC_rxbuf)
-  let "spi_ADC_rxbuf" be 8000
-  8000 * 187.5uV * 2 = 3000000uV = 3V ;
-2.AONBatMonBatteryVoltageGet()
-  let "AONBatMonBatteryVoltageGet()" be 768
-  768 * 125 / 320 / 100 = 768 / 256 = 3V ;
-
-if you want to use first method, and get value 768
-conversion: 8000 * 187.5 * 1e-6 * 2 / 125 * 320 * 100 = 768
-         => 8000 * 12 / 125 = 768
-*/
-
-#ifndef HEADSTAGE_BATT_H
-#define HEADSTAGE_BATT_H
-
-#include <driverlib/aon_batmon.h>
-#define MAX_BATTERY_CAPACITY 4200
-
-static uint8_t headstage_battery_percent() {
-    static uint8_t battery_percent = 100;
-    uint8_t  internal_battery_percent;
-    uint32_t internal_batt_sense = AONBatMonBatteryVoltageGet();
-    internal_batt_sense          = (internal_batt_sense * 125) >> 5;
-    internal_batt_sense          = (internal_batt_sense * 100) / MAX_BATTERY_CAPACITY;
-    internal_battery_percent     = internal_batt_sense & 0xFF;
-    if (internal_battery_percent < battery_percent) battery_percent = internal_battery_percent;
-    return battery_percent;
-}
-
-static void headstage_battery_volt(){
-    uint32_t bat_volt = 0;
-
-    ReadADCBat(spi_ADC_rxbuf);
-    bat_volt = (uint32_t) (spi_ADC_rxbuf[0] << 8) | (uint32_t) (spi_ADC_rxbuf[1]);
-    bat_volt = bat_volt * 12 / 125; //x  * 187.5 * 1e-6 * 2 / 125 * 320 * 100 ;
-    InputNotify(NOTIFY_VOLT_BAT, bat_volt);
-}
-
-static void EliteADCBattery(){
-    static uint8_t ADCSwitch = 0;
-    if(ADCSwitch == 0){ /**read V**/
-        ReadADCBat(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 1){ /**read V**/
-        ReadADCBat(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 2){ /**read V(buffer)**/
-        headstage_battery_volt();
-        batteryCheck_flag = false;
-        ADCSwitch = 0;
-    }
-}
-
-static void measureBat(){
-    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-    GPT.GptimerCounter0 = GPT.GptimerCounter;
-
-    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-
-    if(GPT.BatteryCheckCounter >= 50000){//5min=3000000, 5s=50000
-        GPT.BatteryCheckCounter = 0;
-        batteryCheck_flag = true;
-    }
-
-    if(GPT.BatteryADCCounter >= 15 && batteryCheck_flag){
-        GPT.BatteryADCCounter = 0; //To get the data right, ADC must be delay 1.5ms
-        batteryADC_flag = true;
-        if(batteryADC_flag){
-            EliteADCBattery();
-            batteryADC_flag = false;
-        }
-    }
-
-    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
-                   ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-    if( bat < 768 && bat > 20){
-        PIN_setOutputValue(pin_handle, enable_5v, 0);
-    }
-}
-
-#endif  // HEADSTAGE_BATT_H
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yichin	63abdeaf1a	Merge remote-tracking branch 'origin/HostTest_developement' into HostTest_developement	2020-03-24 10:16:28 +08:00
yichin	e074d47af4	using CC2650F128	2020-03-24 10:16:11 +08:00
weiting2	f805b6ac50	add throughput_example_central.c, throughput_example_peripheral.c	2020-03-23 17:52:04 +08:00
yichin	325b8507a8	warning fix	2020-02-04 15:01:11 +08:00
yichin	70987cd803	use LED only on LP board	2020-02-04 14:26:39 +08:00
weiting2	e39343ef02	delete LED on 2650ma (real mem board)	2020-02-04 11:07:36 +08:00
weiting2	d07932dbdd	connect evt = RED LED	2020-02-04 10:40:48 +08:00
yichin	79c4a87eb2	using launch pad	2020-01-31 18:44:15 +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