Fill w32_REG in with 0 to 4 bytes.

# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteSPI.h
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_def.h
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h

.clang-format

@@ -8,6 +8,6 @@ AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortFunctionsOnASingleLine: Empty
 BinPackArguments: false
 BinPackParameters: false
-IndentCaseLabels: true
+IndentCaseLabels: false
 SortIncludes: true
 TabWidth: 4

.idea/copyright/BioProSci.xml

@@ -1,7 +0,0 @@
-<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>

.idea/copyright/profiles_settings.xml

@@ -1,7 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="BioProSci">
-    <module2copyright>
-      <element module="SimplePeripheral" copyright="BioProSci" />
-    </module2copyright>
-  </settings>
-</component>

.idea/scopes/HostTest.xml

@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="HostTest" pattern="file[BioProCC2650]:simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master//*" />
-</component>

.idea/scopes/SimplePeripheral.xml

@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="SimplePeripheral" pattern="file[BioProCC2650]:simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage//*" />
-</component>

README.md

@@ -1,63 +0,0 @@
-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.

get_date.sh

@@ -0,0 +1,39 @@
+#!/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

python_test_code/uni/rearrange_channel.py

@@ -1,83 +0,0 @@
-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()

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/app/.ccsproject

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

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/app/.cproject

@@ -15,21 +15,10 @@
 				</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.1537255176"
-								   name="TI Build Tools"
-								   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
-								   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1109092833">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1528413609"
-									superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+				<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">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
@@ -37,58 +26,26 @@
 								<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.1750727892"
-									superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
-									value="18.1.5.LTS" valueType="string"/>
-							<targetPlatform
-									id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1816818114"
-									name="Platform"
-									superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}"
-									 id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.642479704"
-									 name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal"
-									 superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.479338557"
-								  name="ARM Compiler"
-								  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.994949198"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1779598874"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.721307142"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.125246157"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN"
-										value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.2012061320"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.476352492"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.168539226"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH"
-										valueType="includePath">
+							<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">
 									<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\master"/>
+									<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"/>
@@ -100,8 +57,7 @@
 									<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"/>
@@ -111,9 +67,7 @@
 									<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.363193887"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
-										valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.2012350267" 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"/>
@@ -123,7 +77,7 @@
 									<listOptionValue builtIn="false" value="ICALL_MAX_NUM_ENTITIES=6"/>
 									<listOptionValue builtIn="false" value="ICALL_MAX_NUM_TASKS=3"/>
 									<listOptionValue builtIn="false" value="MAX_NUM_BLE_CONNS=8"/>
-									<listOptionValue builtIn="false" value="MAX_PDU_SIZE=251"/>
+									<listOptionValue builtIn="false" value="MAX_PDU_SIZE=255"/>
 									<listOptionValue builtIn="false" value="NPI_USE_UART"/>
 									<listOptionValue builtIn="false" value="USE_ICALL"/>
 									<listOptionValue builtIn="false" value="xBOARD_DISPLAY_EXCLUDE_LCD"/>
@@ -131,162 +85,69 @@
 									<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.1311940013"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.2064874038"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS"
-										valueType="stringList">
+								<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">
 									<listOptionValue builtIn="false" value="48"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1434051367"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING"
-										valueType="stringList">
+								<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">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.799465540"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.517472866"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER"
-										value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.507310624"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.2049396471"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE"
-										valueType="stringList">
+								<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">
 									<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.2110223277"
-										name="C Sources"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.918000918"
-										name="C++ Sources"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.641978750"
-										name="Assembly Sources"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1409087668"
-										name="Assembly Sources"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+								<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"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1109092833"
-								  name="ARM Linker"
-								  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1678442973"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE"
-										value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.367075675"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE"
-										value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1837422418"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE"
-										value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.917185204"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE"
-										value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.892817829"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY"
-										valueType="libs">
+							<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">
 									<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.974559234"
-										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.2037194602" 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.27476708"
-										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.983516893" 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.235707068"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.282108168"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER"
-										value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1474361267"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO"
-										value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.839523781"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.556382195"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on"
-										valueType="enumerated"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.893707763"
-										name="Linker Command Files"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.347090872"
-										name="Linker Command Files"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1986196973"
-										name="Generated Linker Command Files"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+								<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"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1217013712"
-								  name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.2005021581"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8"
-										valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.843817789"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8"
-										valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.444921916"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL"
-										valueType="enumerated"/>
+							<tool 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>
-							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1206125950" name="XDCtools"
-								  superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1447176325"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH"
-										valueType="stringList">
+							<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">
 									<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.278021553"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET"
-										value="ti.targets.arm.elf.M3" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.1259072406"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM"
-										value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1080552633"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW"
-										value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1728380155"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE"
-										value="release" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1621099990"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR"
-										value="${CG_TOOL_ROOT}" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.355879919"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS"
-										value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
+								<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"/>
 							</tool>
 						</toolChain>
 					</folderInfo>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/app/targetConfigs/CC2650F128.ccxml

@@ -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">

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/config/ccs_compiler_defines.bcfg

@@ -1,10 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2019-10-01 14:44:57.758000)
+** Stack Frontier Generator 1.1.0 (2019-04-28 18:23:23.057000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */
 
 --define=ICALL_STACK0_ADDR=0x8001
 --define=ICALL_STACK0_START=0x8000
---define=ICALL_RAM0_START=0x20004310
+--define=ICALL_RAM0_START=0x20004340
 

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/config/ccs_linker_defines.cmd

@@ -1,10 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2019-10-01 14:44:57.758000)
+** Stack Frontier Generator 1.1.0 (2019-04-28 18:23:23.057000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */
 
---define=ICALL_RAM0_START=0x20004310
+--define=ICALL_RAM0_START=0x20004340
 --define=ICALL_STACK0_START=0x8000
 --define=ICALL_STACK0_ADDR=0x8001
 

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/config/lib_linker.cmd

@@ -4,5 +4,5 @@
  */
 
 "C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\host\host_pcxx.a"
-"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\ctrl\cc2640\cc2640_ctrl_pcxx_41c_ext.a"
-"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_full_v41_v42.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\ctrl\cc2640\cc2640_ctrl_pcxx_41c.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_full_v41.a"

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/config/src/sysbios/makefile

@@ -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.5.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
+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_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armar rq
+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

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/stack/.ccsproject

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

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/stack/.cproject

@@ -13,254 +13,133 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties=""
-                               cleanCommand="${CG_CLEAN_CMD}" description=""
-                               id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658" name="FlashROM"
-                               parent="com.ti.ccstudio.buildDefinitions.TMS470.Default"
-                               postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;${TOOLS_BLE}/frontier/frontier.exe ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd "
-                               prebuildStep="&quot;${TOOLS_BLE}/lib_search/lib_search.exe&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
-                    <folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658." name="/"
-                                resourcePath="">
-                        <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.475246864"
-                                   name="TI Build Tools"
-                                   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
-                                   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.786665632">
-                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1030725040"
-                                    superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
-                                <listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
-                                <listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
-                                <listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
-                                <listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
-                                <listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
-                                <listOptionValue builtIn="false"
-                                                 value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_ble_stack.cmd;"/>
-                                <listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
-                                <listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
-                            </option>
-                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1972562543"
-                                    superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
-                                    value="18.1.4.LTS" valueType="string"/>
-                            <targetPlatform
-                                    id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.169579217"
-                                    name="Platform"
-                                    superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-                            <builder buildPath="${BuildDirectory}"
-                                     id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.1467594372"
-                                     name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal"
-                                     superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1117062776"
-                                  name="ARM Compiler"
-                                  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.737537651"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.2122298168"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.922316537"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.686520452"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN"
-                                        value="true" valueType="boolean"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1306361468"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.570791435"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1996254735"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH"
-                                        valueType="includePath">
-                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/examples/host_test/cc26xx/stack"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target"/>
-                                    <listOptionValue builtIn="false"
-                                                     value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/aes/cc26xx"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv/cc26xx"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/icall/src/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
-                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/npi/src"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx/npi/stack"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
-                                    <listOptionValue builtIn="false" value="${CC26XXWARE}"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1424063549"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
-                                        valueType="definedSymbols">
-                                    <listOptionValue builtIn="false" value="CC26XX"/>
-                                    <listOptionValue builtIn="false" value="CC26XXWARE"/>
-                                    <listOptionValue builtIn="false" value="DATA="/>
-                                    <listOptionValue builtIn="false" value="EXT_HAL_ASSERT"/>
-                                    <listOptionValue builtIn="false" value="FLASH_ROM_BUILD"/>
-                                    <listOptionValue builtIn="false" value="INCLUDE_AES_DECRYPT"/>
-                                    <listOptionValue builtIn="false" value="NEAR_FUNC="/>
-                                    <listOptionValue builtIn="false" value="OSAL_CBTIMER_NUM_TASKS=1"/>
-                                    <listOptionValue builtIn="false" value="OSAL_SNV=1"/>
-                                    <listOptionValue builtIn="false" value="POWER_SAVING"/>
-                                    <listOptionValue builtIn="false" value="USE_ICALL"/>
-                                    <listOptionValue builtIn="false" value="xDEBUG"/>
-                                    <listOptionValue builtIn="false" value="xDEBUG_ENC"/>
-                                    <listOptionValue builtIn="false" value="xDEBUG_GPIO"/>
-                                    <listOptionValue builtIn="false" value="xDEBUG_SW_TRACE"/>
-                                    <listOptionValue builtIn="false" value="xTESTMODES"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.754989819"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1080092437"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS"
-                                        valueType="stringList">
-                                    <listOptionValue builtIn="false" value="48"/>
-                                    <listOptionValue builtIn="false" value="16004"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.999024864"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING"
-                                        valueType="stringList">
-                                    <listOptionValue builtIn="false" value="225"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1556840847"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1818892958"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER"
-                                        value="true" valueType="boolean"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1434574785"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE"
-                                        valueType="stringList">
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
-                                    <listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
-                                </option>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1986725920"
-                                        name="C Sources"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1096088215"
-                                        name="C++ Sources"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1564058248"
-                                        name="Assembly Sources"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.745772697"
-                                        name="Assembly Sources"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
-                            </tool>
-                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.786665632"
-                                  name="ARM Linker"
-                                  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1677233886"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE"
-                                        value="256" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.689154633"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE"
-                                        value="0" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1820684332"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE"
-                                        value="&quot;${ProjName}.map&quot;" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1938454486"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE"
-                                        value="${ProjName}.out" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1081456336"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY"
-                                        valueType="libs">
-                                    <listOptionValue builtIn="false" value="libc.a"/>
-                                    <listOptionValue builtIn="false"
-                                                     value="${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"/>
-                                    <listOptionValue builtIn="false"
-                                                     value="${ROM}/ble_rom_releases/04242014/ble_rom_patch.symbols"/>
-                                    <listOptionValue builtIn="false"
-                                                     value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1520088784"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH"
-                                        valueType="libPaths">
-                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
-                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.416149148"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS"
-                                        valueType="stringList">
-                                    <listOptionValue builtIn="false" value="16002-D"/>
-                                    <listOptionValue builtIn="false" value="10325-D"/>
-                                    <listOptionValue builtIn="false" value="10247-D"/>
-                                    <listOptionValue builtIn="false" value="10229-D"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.256169156"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.899497414"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER"
-                                        value="true" valueType="boolean"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1750046018"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO"
-                                        value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.1884235777"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT"
-                                        value="startup_entry" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1126585282"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.917059863"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on"
-                                        valueType="enumerated"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.329975596"
-                                        name="Linker Command Files"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.30261043"
-                                        name="Linker Command Files"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.498724975"
-                                        name="Generated Linker Command Files"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
-                            </tool>
-                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1533021831"
-                                  name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.958672258"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8"
-                                        valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.148593719"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8"
-                                        valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1639548187"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL"
-                                        valueType="enumerated"/>
-                            </tool>
-                        </toolChain>
-                    </folderInfo>
-                    <sourceEntries>
-                        <entry excluding="cc26x0f128.cmd|TOOLS/buildConfig-4.0.opt"
-                               flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-                    </sourceEntries>
-                </configuration>
-            </storageModule>
+				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;${TOOLS_BLE}/frontier/frontier.exe ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd " prebuildStep="&quot;${TOOLS_BLE}/lib_search/lib_search.exe&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
+					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658." name="/" resourcePath="">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.862906140" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1373763881">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.749555863" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
+								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
+								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
+								<listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
+								<listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
+								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_ble_stack.cmd;"/>
+								<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
+								<listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
+							</option>
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1226924946" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
+							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.666439040" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
+							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.1487778905" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.352371900" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.1312023808" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.342082829" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.348530318" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1738096723" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1803929349" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.327756378" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.84498721" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
+									<listOptionValue builtIn="false" value="${SRC_EX}/examples/host_test/cc26xx/stack"/>
+									<listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
+									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common"/>
+									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target"/>
+									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
+									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
+									<listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
+									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
+									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/aes/cc26xx"/>
+									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv/cc26xx"/>
+									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv"/>
+									<listOptionValue builtIn="false" value="${SRC_COMMON}/icall/src/inc"/>
+									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/inc"/>
+									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
+									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
+									<listOptionValue builtIn="false" value="${SRC_COMMON}/npi/src"/>
+									<listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx/npi/stack"/>
+									<listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
+									<listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
+									<listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
+									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
+								</option>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.449036407" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CC26XX"/>
+									<listOptionValue builtIn="false" value="CC26XXWARE"/>
+									<listOptionValue builtIn="false" value="DATA="/>
+									<listOptionValue builtIn="false" value="EXT_HAL_ASSERT"/>
+									<listOptionValue builtIn="false" value="FLASH_ROM_BUILD"/>
+									<listOptionValue builtIn="false" value="INCLUDE_AES_DECRYPT"/>
+									<listOptionValue builtIn="false" value="NEAR_FUNC="/>
+									<listOptionValue builtIn="false" value="OSAL_CBTIMER_NUM_TASKS=1"/>
+									<listOptionValue builtIn="false" value="OSAL_SNV=1"/>
+									<listOptionValue builtIn="false" value="POWER_SAVING"/>
+									<listOptionValue builtIn="false" value="USE_ICALL"/>
+									<listOptionValue builtIn="false" value="xDEBUG"/>
+									<listOptionValue builtIn="false" value="xDEBUG_ENC"/>
+									<listOptionValue builtIn="false" value="xDEBUG_GPIO"/>
+									<listOptionValue builtIn="false" value="xDEBUG_SW_TRACE"/>
+									<listOptionValue builtIn="false" value="xTESTMODES"/>
+								</option>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.242123959" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.601259316" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+									<listOptionValue builtIn="false" value="48"/>
+									<listOptionValue builtIn="false" value="16004"/>
+								</option>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.911375671" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
+									<listOptionValue builtIn="false" value="225"/>
+								</option>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.897642261" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.916023731" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1852873766" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
+									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
+									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
+								</option>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.977794136" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.980317392" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1333878599" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.289210215" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+							</tool>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1373763881" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1720562086" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.1630117678" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1302394488" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1128043424" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.137622820" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+									<listOptionValue builtIn="false" value="libc.a"/>
+									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"/>
+									<listOptionValue builtIn="false" value="${ROM}/ble_rom_releases/04242014/ble_rom_patch.symbols"/>
+									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
+								</option>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.790272373" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
+									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
+									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
+								</option>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.1324992868" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
+									<listOptionValue builtIn="false" value="16002-D"/>
+									<listOptionValue builtIn="false" value="10325-D"/>
+									<listOptionValue builtIn="false" value="10247-D"/>
+									<listOptionValue builtIn="false" value="10229-D"/>
+								</option>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.216507169" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1382163767" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1890909858" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.830512447" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT" value="startup_entry" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1081803857" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.249638271" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.407917293" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.2031489241" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1616606673" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+							</tool>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1647667237" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1600156533" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.360730399" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1462981440" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+					<sourceEntries>
+						<entry excluding="cc26x0f128.cmd|TOOLS/buildConfig-4.0.opt" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
@@ -278,5 +157,4 @@
 			<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>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/stack/targetConfigs/CC2650F128.ccxml

@@ -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">

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/iar/stack/build_config.opt

@@ -132,7 +132,7 @@
 /* -DBLE_V42_FEATURES=SECURE_CONNS_CFG+EXT_DATA_LEN_CFG */
 /* -DBLE_V42_FEATURES=SECURE_CONNS_CFG */
 /* -DBLE_V42_FEATURES=PRIVACY_1_2_CFG */
--DBLE_V42_FEATURES=EXT_DATA_LEN_CFG
+/* -DBLE_V42_FEATURES=EXT_DATA_LEN_CFG */
 
 /* Include Transport Layer (Full or PTM) */
 /* -DHCI_TL_NONE */

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/app/targetConfigs/CC2640F128.ccxml

@@ -0,0 +1,24 @@
+<?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>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/app/targetConfigs/readme.txt

@@ -0,0 +1,9 @@
+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.

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/stack/targetConfigs/CC2640F128.ccxml

@@ -0,0 +1,24 @@
+<?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>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/stack/targetConfigs/readme.txt

@@ -0,0 +1,9 @@
+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.

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/app/.cproject

@@ -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.536293627" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1328470467">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1061664661" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<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">
 								<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.2084243755" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.5.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1236753639" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.1381454801" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.2063552776" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.594357075" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.504957460" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1747270972" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1386053724" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1376904847" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.342602630" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1946350142" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.277675815" 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" 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.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" 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" 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" 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" 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" 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" 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" 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,12 +70,8 @@
 									<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.259148203" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1897088" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
-									<listOptionValue builtIn="false" value="HEADSTAGE_NOTIFY_USE_ATT"/>
-									<listOptionValue builtIn="false" value="HEADSTAGE_MA_USE_ADC"/>
-									<listOptionValue builtIn="false" value="HEADSTAGE_RECORD_BATTERY"/>
-									<listOptionValue builtIn="false" value="HEADSTAGE_CIS_VOLT_H"/>
 									<listOptionValue builtIn="false" value="POWER_SAVING"/>
 									<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
 									<listOptionValue builtIn="false" value="HEADSTAGE_MA_USE_SPI2"/>
@@ -90,71 +86,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.1377489319" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.810447435" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1546172563" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1129160325" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.871011287" 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" 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" 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" 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.1901410490" 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.1638011093" 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.1748751449" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1658744892" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.56285355" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1505757478" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1920170652" 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" 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" 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" 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.1150300143" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1811767088" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.415137767" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.955985868" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+								<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"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1328470467" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1662620538" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.579378067" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.196713908" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.168703039" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1498581331" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+							<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" 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" 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" 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" 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" 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.227752631" 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.672837228" 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.1367501028" 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.544523272" 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.319771365" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.2135582732" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.143179661" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.457546062" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.271609992" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.102155116" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.1345965953" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1103706103" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1281207998" 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" 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" 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" 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" 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"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.544897445" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1579936466" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.1774538757" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.63898863" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
+							<tool 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" 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" 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" 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.1467642076" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.70584091" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
+							<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" 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.1938529965" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.1056462866" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.972116281" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1987724074" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.469560275" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1799115265" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.571281110" 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" 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" 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" 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" 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" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src/sysbios/makefile

@@ -16,11 +16,11 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa
 
 TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
 
-INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/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.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/
 
-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq
+CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.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
 
 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

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/.ccsproject

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

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/.cproject

@@ -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.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">
+						<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">
 								<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.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">
+							<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">
 									<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.986125825" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1361895403" 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.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">
+								<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">
 									<listOptionValue builtIn="false" value="48"/>
 									<listOptionValue builtIn="false" value="16004"/>
 								</option>
-								<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">
+								<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">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<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">
+								<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">
 									<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.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"/>
+								<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"/>
 							</tool>
-							<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">
+							<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">
 									<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.1707930214" 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.1835383942" 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.59164041" 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.821225577" 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.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"/>
+								<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"/>
 							</tool>
-							<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 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>
 						</toolChain>
 					</folderInfo>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/.launches/simple_peripheral_cc2650em_stack.launch

@@ -12,6 +12,7 @@
 <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"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_stack"/>
 </listAttribute>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/targetConfigs/CC2650F128.ccxml

@@ -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">

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/host_test/ccs/config/src/makefile.libs

@@ -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 ?= ../../config/src
+GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/host_test/ccs/config/src
 
 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/host_test/ccs/config/src/sysbios/makefile

@@ -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.5.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/cc2650" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
+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/ 
 
-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armar rq
+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
 
 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

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/app/.cproject

@@ -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;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="">
+				<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="">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137.1867331134." name="/" resourcePath="">
-						<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">
+						<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">
 								<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="XDC_VERSION=3.32.2.25_core"/>
+								<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="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"/>
+								<listOptionValue builtIn="false" value="OUTPUT_TYPE=rtscApplication:executable"/>
 							</option>
-							<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">
+							<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">
 									<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_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">
+								<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">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_LCD"/>
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
 									<listOptionValue builtIn="false" value="CC2650_LAUNCHXL"/>
@@ -89,68 +89,64 @@
 									<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.918239795" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
+								<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">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<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">
+								<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">
 									<listOptionValue builtIn="false" value="48"/>
 								</option>
-								<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">
+								<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">
 									<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.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"/>
+								<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"/>
 							</tool>
-							<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"/>
+							<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;"/>
 									<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.1109423160" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
+								<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">
 									<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.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">
+								<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">
 									<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.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"/>
+								<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"/>
 							</tool>
-							<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">
+							<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">
 									<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.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"/>
+								<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"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
@@ -296,8 +292,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=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.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.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">

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/app/.launches/simple_peripheral_cc2650lp_app.launch

@@ -1,13 +1,9 @@
 <?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"/>

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/ccs_compiler_defines.bcfg

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

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/ccs_linker_defines.cmd

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

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/lib_linker.cmd

@@ -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.a"
-"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_none.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"

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/src/makefile.libs

@@ -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 ?= ../../config/src
+GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/src
 
 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/src/sysbios/makefile

@@ -1,12 +1,12 @@
 
-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
+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
 
 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_02_25_core/packages/
+vpath %.c C:/ti/xdctools_3_32_00_06_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_02_25_core/packages/
+XDC_ROOT  = C:/ti/xdctools_3_32_00_06_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.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/ 
+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/ 
 
-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq
+CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.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
 
-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
+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
 
 define RM
 	$(if $(wildcard $1),$(DEL) $1,:)

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/stack/.launches/simple_peripheral_cc2650lp_stack.launch

@@ -1,13 +1,9 @@
 <?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"/>

simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/BOOSTXL_CC2650MA.c

@@ -36,11 +36,10 @@
  *  CC2650 Booster Pack.
  */
 
+
 /*
  *  ====================== Includes ============================================
  */
-
-// clang-format off
 #include <xdc/std.h>
 #include <xdc/runtime/System.h>
 
@@ -57,7 +56,6 @@
 #include <inc/hw_ints.h>
 #include <driverlib/ioc.h>
 #include <driverlib/udma.h>
-// clang-format on
 
 #include "Board.h"
 
@@ -67,7 +65,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__)
@@ -75,20 +73,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
-    //
 };
 /*============================================================================*/
 
@@ -99,14 +97,13 @@ 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 ====================================
@@ -130,32 +127,28 @@ 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 =====================================
  */
@@ -177,104 +170,26 @@ 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 ====================================
@@ -294,28 +209,28 @@ const SPI_Config SPI_config[] = {  //
 CryptoCC26XX_Object cryptoCC26XXObjects[BOOSTXL_CC2650MA_CRYPTOCOUNT];
 
 /* Crypto configuration structure, describing which pins are to be used */
-const CryptoCC26XX_HWAttrs cryptoCC26XXHWAttrs[BOOSTXL_CC2650MA_CRYPTOCOUNT] = {{
-    //
-    .baseAddr    = CRYPTO_BASE,
-    .powerMngrId = PowerCC26XX_PERIPH_CRYPTO,
-    .intNum      = INT_CRYPTO_RESULT_AVAIL_IRQ,
-    .intPriority = ~0,
-    //
-}};
+const CryptoCC26XX_HWAttrs cryptoCC26XXHWAttrs[BOOSTXL_CC2650MA_CRYPTOCOUNT] = {
+    {
+        .baseAddr       = CRYPTO_BASE,
+        .powerMngrId    = PowerCC26XX_PERIPH_CRYPTO,
+        .intNum         = INT_CRYPTO_RESULT_AVAIL_IRQ,
+        .intPriority    = ~0,
+    }
+};
 
 /* Crypto configuration structure */
-const CryptoCC26XX_Config CryptoCC26XX_config[] = {  //
+const CryptoCC26XX_Config CryptoCC26XX_config[] = {
     {
-        //
-        .object  = &cryptoCC26XXObjects[0],
-        .hwAttrs = &cryptoCC26XXHWAttrs[0]
-        //
+         .object  = &cryptoCC26XXObjects[0],
+         .hwAttrs = &cryptoCC26XXHWAttrs[0]
     },
-    {NULL, NULL}};
+    {NULL, NULL}
+};
 /*
  *  ========================== Crypto end ======================================
  */
 
+
 /*
  *  ========================= RF driver begin ==================================
  */
@@ -329,12 +244,10 @@ 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,
 };
 
 /*
@@ -357,21 +270,20 @@ 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 ====================================
@@ -389,62 +301,14 @@ 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..) */
@@ -452,15 +316,14 @@ 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 },
 };
 
 /*
@@ -478,15 +341,14 @@ 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 */
@@ -496,16 +358,17 @@ 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 ======================================

simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/BOOSTXL_CC2650MA.h

@@ -89,73 +89,71 @@ extern const PIN_Config BoardGpioInitTable[];
 */
 
 /* Connector J1 */
-#define Board_BP_Pin_J1_2              DIO7
+#define Board_BP_Pin_J1_2              IOID_UNUSED
 #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              DIO10
+#define Board_BP_Pin_J1_7              DIO11        /* SCLK */
 #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             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
+#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        /* AD_CS */
+#define Board_BP_Pin_J2_11             IOID_UNUSED   /* NC */
 
 /* Mapping of BoosterPack Connector Pins to BoosterPack Standard Functions (reflecting the BoosterPack Standard)
 */
 
-/* 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
+/* 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
+
 
 /* Mapping of application specific functionality of the BoosterPack to BoosterPack Pins (application dependent)
 */
 
 /* On-board LEDs */
-#define Board_GLED                     PIN_UNASSIGNED            /* Green LED */
-#define Board_RLED                     PIN_UNASSIGNED            /* Red LED */
+#define Board_GLED                     DIO2                      /* Green LED */
+#define Board_RLED                     DIO4                      /* 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                  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
+
+//#define Board_SPI0_MISO                PIN_UNASSIGNED
+//#define Board_SPI0_MOSI                PIN_UNASSIGNED
+
 
 /* Power Management Board */
-#define Board_SRDY                     PIN_UNASSIGNED
-#define Board_MRDY                     PIN_UNASSIGNED
+#define Board_SRDY                     Board_BP_Pin_J2_19
+#define Board_MRDY                     Board_BP_Pin_J1_2
 
 /* PWM outputs */
 #define Board_PWMPIN0                  PIN_UNASSIGNED
@@ -167,23 +165,16 @@ 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
@@ -193,7 +184,6 @@ 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
@@ -219,19 +209,7 @@ 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
@@ -309,29 +287,6 @@ 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

simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/Board.h

@@ -39,6 +39,7 @@ 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 */

simplelink/ble_sdk_2_02_02_25/src/boards/CC2650_LAUNCHXL/CC2650_LAUNCHXL.h

@@ -79,23 +79,22 @@ extern const PIN_Config BoardGpioInitTable[];
 
 /* UART Board */
 #define Board_UART_RX               IOID_2          /* RXD  */
-#define Board_UART_TX               IOID_3          /* TXD  */
+#define Board_UART_TX               PIN_UNASSIGNED  /* TXD  */
 #define Board_UART_CTS              IOID_19         /* CTS  */
 #define Board_UART_RTS              IOID_18         /* RTS */
 
 /* SPI Board */
-#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_MISO             IOID_0          /* RF1.20 */
+#define Board_SPI0_MOSI             IOID_1          /* RF1.18 */
+#define Board_SPI0_CLK              IOID_3         /* RF1.16 */
 #define Board_SPI0_CSN              PIN_UNASSIGNED
 #define Board_SPI1_MISO             PIN_UNASSIGNED
-#define Board_SPI1_MOSI             PIN_UNASSIGNED
-#define Board_SPI1_CLK              PIN_UNASSIGNED
+#define Board_SPI1_MOSI             IOID_8          /* LED_MOSI */
+#define Board_SPI1_CLK              IOID_9          /* LED_CLK */
+
+
 #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
@@ -103,8 +102,8 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_FLASH_CS_OFF          1
 
 /* Booster pack generic */
-#define Board_DIO0                  IOID_0
-#define Board_DIO1_RFSW             IOID_1
+#define Board_DIO0                  PIN_UNASSIGNED
+#define Board_DIO1_RFSW             PIN_UNASSIGNED
 #define Board_DIO12                 IOID_12
 #define Board_DIO15                 IOID_15
 #define Board_DIO16_TDO             IOID_16
@@ -144,17 +143,13 @@ 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
@@ -164,7 +159,6 @@ 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

simplelink/ble_sdk_2_02_02_25/src/components/npi/src/inc/npi_config.h

@@ -66,7 +66,7 @@ extern "C"
 // ****************************************************************************
 
 #if !defined(NPI_SPI_CONFIG)
-#define NPI_SPI_CONFIG Board_SPI0
+#define NPI_SPI_CONFIG Board_SPI1
 #endif
 
 #ifndef NPI_FLOW_CTRL

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/host_test_app.c

@@ -45,105 +45,87 @@
  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 ( USE_RCOSC )
-#include "rcosc_calibration.h"
-#endif // USE_RCOSC
-
-#if defined ( GATT_TEST ) || defined ( GATT_QUAL )
-  #include "gatttest.h"
+#if defined(GATT_TEST) || defined(GATT_QUAL)
+#include "gatttest.h"
 #endif
 
 #include "host_test_app.h"
 
-#include "master/cc2650_master.h"
+//#define PERIODIC_USE_GPTIMER
 
-// clang-format on
+#include "cc2650/cc2650_util.h"
 
-/*=================
- ==== constant ====
- =================*/
+//#include "cc2650/cc2650_slave.h"
 
-// clang-format off
-
-/*
- * GAP GATT Attributes
- */
-#define DEVICE_NAME "BioProController"
+#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
+#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_PRIORITY                       1
-#define HTA_TASK_STACK_SIZE                     844
+#define HTA_TASK_STACK_SIZE 512
+Task_Struct hta_task;
+Char        hta_task_stack[HTA_TASK_STACK_SIZE];
 
-// 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.
@@ -153,19 +135,29 @@ static void sendBLECompleteEvent(uint8 eventLen, uint8 *pEvent);
  * @return  none
  */
 void HostTestApp_createTask(void) {
-    Task_Params taskParams;
+    /* 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;
 
-    // Configure task
-    Task_Params_init(&taskParams);
-    taskParams.stack     = htaTaskStack;
-    taskParams.stackSize = HTA_TASK_STACK_SIZE;
-    taskParams.priority  = HTA_TASK_PRIORITY;
-
-    Task_construct(&htaTask, HostTestApp_taskFxn, &taskParams, NULL);
+    Task_construct(&hta_task, HTA_main, &task_main_parameter, NULL);
 }
 
-/**
- * @fn      HostTestApp_init
+// 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
  *
  * @brief   Called during initialization and contains application
  *          specific initialization (ie. hardware initialization/setup,
@@ -176,34 +168,30 @@ void HostTestApp_createTask(void) {
  *
  * @return  none
  */
-static void HostTestApp_init(void) {
+static void HTA_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);
-
-    HCI_LE_WriteSuggestedDefaultDataLenCmd(APP_SUGGESTED_PDU_SIZE, APP_SUGGESTED_TX_TIME);
 }
 
-/**
- * @fn      HostTestApp_taskFxn
+/*
+ * @fn      HTA_main
  *
  * @brief   Application task entry point for the Host Test App.
  *
@@ -211,10 +199,11 @@ static void HostTestApp_init(void) {
  *
  * @return  none
  */
-static void HostTestApp_taskFxn(UArg a0, UArg a1) {
+static void HTA_main(UArg a0, UArg a1) {
     // Initialize application
-    HostTestApp_init();
-    master_init();
+    HTA_init();
+    HTA_util_init();
+    HTA_main_init();
 
     // Application main loop
     for (;;) {
@@ -230,121 +219,113 @@ static void HostTestApp_taskFxn(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:
-                            HostTestApp_processGapEvent(message);
-                            break;
+                    case HCI_GAP_EVENT_EVENT:
+                        HTA_handle_gap_event(message);
+                        break;
 
-                        case GATT_MSG_EVENT:
-                            HostTestApp_processAttEvent((gattMsgEvent_t *)message);
-                            break;
+                    case GATT_MSG_EVENT:
+                        HTA_handle_att_event((gattMsgEvent_t *)message);
+                        break;
 
-                        default:
-                            break;
+                    case GAP_MSG_EVENT:
+                        break;
                     }
                 }
 
-                if (message) {
+                if (dealloc && message) {
                     ICall_freeMsg(message);
                 }
             }
         }
 
-        if (EVENT_MASK > 0) {
-            master_event_handle();
+        if (event_flags > 0) {
+            HTA_event_call();
         }
     }
 }
 
-/**
- * @fn      HostTestApp_processGapEvent
+/*
+ * @fn      HTA_handle_gap_event
  *
  * @brief   Process an incoming GAP Event.
  *
- * @param   pMsg - message to process
+ * @param   message - message to process
  *
  * @return  none
  */
-static void HostTestApp_processGapEvent(ICall_HciExtEvt *message) {
+static void HTA_handle_gap_event(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) {
-                // app processes this as it was embedded message to stack
+        if (lastAppOpcodeSent == pkt->cmdOpcode) {
+            // application 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));
 
-                sendCommandCompleteEvent(HCI_COMMAND_COMPLETE_EVENT_CODE, pkt->cmdOpcode, len, pkt->pReturnParam);
-            }
-            break;
+            send_command_complete_event(HCI_COMMAND_COMPLETE_EVENT_CODE, pkt->cmdOpcode, len, pkt->pReturnParam);
         }
+        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) {
-                sendCommandStatusEvent(HCI_COMMAND_STATUS_EVENT_CODE, pkt->cmdStatus, pkt->cmdOpcode);
-            }
-            break;
+            // 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);
         }
+        break;
+    }
 
-        case HCI_LE_EVENT_CODE:
-            HostTestApp_processBLEEvent(message);
-            break;
+    case HCI_LE_EVENT_CODE: {
+        HTA_handle_ble_event(message);
+        break;
+    }
 
-        case HCI_BLE_HARDWARE_ERROR_EVENT_CODE:
-            break;
+    case HCI_BLE_HARDWARE_ERROR_EVENT_CODE: {
+        AssertHandler(HAL_ASSERT_CAUSE_HARDWARE_ERROR, 0);
+        break;
+    }
 
-        case HCI_VE_EVENT_CODE: {
-            hciEvt_VSCmdComplete_t *pkt = (hciEvt_VSCmdComplete_t *)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 {
-                sendCommandCompleteEvent(HCI_VE_EVENT_CODE, pkt->cmdOpcode, pkt->length, pkt->pEventParam);
-            }
-            break;
+            // Reset last opcode sent
+            lastAppOpcodeSent = 0xFFFF;
+        } else {
+            send_command_complete_event(HCI_VE_EVENT_CODE, pkt->cmdOpcode, pkt->length, pkt->pEventParam);
         }
-
-        default:
-            break;
+        break;
+    }
     }
 }
 
-/**
- * @fn      HostTestApp_processAttEvent
- *
- * @brief   Process an incoming ATT Event.
-
- * @param   pMsg - message to process
- *
- * @return  None.
- */
-static void HostTestApp_processAttEvent(gattMsgEvent_t *message) {
+static void HTA_handle_att_event(gattMsgEvent_t *message) {
     uint8_t method = message->method;
 
     if (message->hdr.status == blePending) {
@@ -354,60 +335,70 @@ static void HostTestApp_processAttEvent(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) {
-        attHandleValueNoti_t *att_notify = (attHandleValueNoti_t *)(&message->msg);
-        master_handle_notify(att_notify->len, att_notify->pValue);
+#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
     }
 
     // Free message. Needed only for ATT Protocol messages
     GATT_bm_free(&message->msg, message->method);
 }
 
-/**
- * @fn      HostTestApp_processBLEEvent
+/*
+ * @fn      HTA_handle_ble_event
  *
  * @brief   Process an incoming BLE Event.
 
- * @param   pMsg - message to process
+ * @param   message - message to process
  *
  * @return  None.
  */
-static void HostTestApp_processBLEEvent(ICall_HciExtEvt *message) {
+static void HTA_handle_ble_event(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 > 0) {
+    if (eventLen) {
         // Send BLE Complete Event
-        sendBLECompleteEvent(eventLen, event);
+        send_ble_complete_event(eventLen, event);
     }
 }
 
-/**
+/*
  * 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) {
+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
+
     // The initial length will be:
     // OSAL message header(4) - not part of packet sent to HCI Host!
     // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
     // Return Parameters (0..N)
-    uint8_t totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + numParam;
+    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:
@@ -417,130 +408,131 @@ static void sendCommandCompleteEvent(uint8_t eventCode, uint16_t opcode, uint8_t
     totalLength += ((eventCode != HCI_VE_EVENT_CODE) ? HCI_CMD_COMPLETE_EVENT_LEN : HCI_CMD_VS_COMPLETE_EVENT_LEN);
 
     // allocate memory for OSAL hdr + packet
-    npiPkt_t *message = (npiPkt_t *)ICall_allocMsg(totalLength);
+    msg = (npiPkt_t *)ICall_allocMsg(totalLength);
 
-    uint8_t txLen = 0;  // Length to transmit
-
-    if (message) {
+    if (msg) {
         // OSAL message event, status, and pointer to packet
-        message->hdr.event  = HCI_EVENT_PACKET;
-        message->hdr.status = 0xFF;
-        message->pData      = (uint8 *)(message + 1);
+        msg->hdr.event  = HCI_EVENT_PACKET;
+        msg->hdr.status = 0xFF;
+        msg->pData      = (uint8 *)(msg + 1);
 
         // fill in Command Complete Event data
-        message->pData[0] = HCI_EVENT_PACKET;
-        message->pData[1] = eventCode;
+        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) {
-            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
+            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(&message->pData[6], param, numParam);
+            (void)memcpy(&msg->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
-            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
+            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(&message->pData[8], &param[3], numParam - HCI_EVENT_MIN_LENGTH);
+            (void)memcpy(&msg->pData[8], &param[3], numParam - HCI_EVENT_MIN_LENGTH);
 
             txLen += (numParam - HCI_EVENT_MIN_LENGTH);
         }
 
-        message->pktLen = txLen;
+        msg->pktLen = txLen;
 
-        NPITask_sendToHost((uint8_t *)message);
+        NPITask_sendToHost((uint8_t *)msg);
     }
 }
 
-/**
+/*
  * This generic function sends a Command Complete or a Vendor Specific Command
  * Complete Event to the Host.
  *
  */
-static void sendCommandStatusEvent(uint8_t eventCode, uint16_t status, uint16_t opcode) {
+static void send_command_status_event(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)
-    uint8_t totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
+    totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
 
     // allocate memory for OSAL hdr + packet
-    npiPkt_t *message = (npiPkt_t *)ICall_allocMsg(totalLength);
-    if (message) {
+    msg = (npiPkt_t *)ICall_allocMsg(totalLength);
+    if (msg) {
         // OSAL message event, status, and pointer to packet
-        message->hdr.event  = HCI_EVENT_PACKET;
-        message->hdr.status = 0xFF;
+        msg->hdr.event  = HCI_EVENT_PACKET;
+        msg->hdr.status = 0xFF;
 
         // fill in length and data pointer
-        message->pktLen = HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
-        message->pData  = (uint8 *)(message + 1);
+        msg->pktLen = HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
+        msg->pData  = (uint8 *)(msg + 1);
 
         // fill in Command Complete Event data
-        message->pData[0] = HCI_EVENT_PACKET;
-        message->pData[1] = eventCode;
-        message->pData[2] = HCI_CMD_STATUS_EVENT_LEN;
-        message->pData[3] = status;
-        message->pData[4] = 1;                  // number of HCI command packets
-        message->pData[5] = LO_UINT16(opcode);  // opcode (LSB)
-        message->pData[6] = HI_UINT16(opcode);  // opcode (MSB)
+        msg->pData[0] = HCI_EVENT_PACKET;
+        msg->pData[1] = eventCode;
+        msg->pData[2] = HCI_CMD_STATUS_EVENT_LEN;
+        msg->pData[3] = status;
+        msg->pData[4] = 1;                  // number of HCI command packets
+        msg->pData[5] = LO_UINT16(opcode);  // opcode (LSB)
+        msg->pData[6] = HI_UINT16(opcode);  // opcode (MSB)
 
-        NPITask_sendToHost((uint8_t *)message);
+        NPITask_sendToHost((uint8_t *)msg);
     }
 }
 
-/**
- * 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 sendBLECompleteEvent(uint8 eventLen, uint8 *pEvent) {
+static void send_ble_complete_event(uint8 eventLen, uint8 *pEvent) {
+    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)
     // Event Data: eventLen
-    uint8_t totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + eventLen;
+    totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + eventLen;
 
     // allocate memory for OSAL hdr + packet
-    npiPkt_t *message = (npiPkt_t *)ICall_allocMsg(totalLength);
-    if (message) {
+    msg = (npiPkt_t *)ICall_allocMsg(totalLength);
+    if (msg) {
         // OSAL message event, status, and pointer to packet
-        message->hdr.event  = HCI_EVENT_PACKET;
-        message->hdr.status = 0xFF;
+        msg->hdr.event  = HCI_EVENT_PACKET;
+        msg->hdr.status = 0xFF;
 
         // fill in length and data pointer
-        message->pktLen = HCI_EVENT_MIN_LENGTH + eventLen;
-        message->pData  = (uint8 *)(message + 1);
+        msg->pktLen = HCI_EVENT_MIN_LENGTH + eventLen;
+        msg->pData  = (uint8 *)(msg + 1);
 
         // fill in BLE Complete Event data
-        message->pData[0] = HCI_EVENT_PACKET;
-        message->pData[1] = HCI_LE_EVENT_CODE;
-        message->pData[2] = eventLen;
+        msg->pData[0] = HCI_EVENT_PACKET;
+        msg->pData[1] = HCI_LE_EVENT_CODE;
+        msg->pData[2] = eventLen;
 
         // populate event data
         if (eventLen > 0) {
-            memcpy(&message->pData[3], pEvent, eventLen);
+            memcpy(&msg->pData[3], pEvent, eventLen);
         }
 
-        NPITask_sendToHost((uint8_t *)message);
+        NPITask_sendToHost((uint8_t *)msg);
     }
 }

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/host_test_app_pm.c

@@ -0,0 +1,707 @@
+/******************************************************************************
+
+ @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);
+  }
+}
+
+/*********************************************************************
+*********************************************************************/

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/main.c

@@ -44,26 +44,28 @@
  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 "icall.h"
 #include "board.h"
+
+#include "hal_assert.h"
+
+#include "icall.h"
+
 #include "inc/npi_task.h"
 
 #include "host_test_app.h"
 
 /* Header files required to enable instruction fetch cache */
-#include <inc/hw_memmap.h>
 #include <driverlib/vims.h>
-// clang-format on
+
+#include <inc/hw_memmap.h>
 
 #ifndef USE_DEFAULT_USER_CFG
 
@@ -74,7 +76,10 @@ bleUserCfg_t user0Cfg = BLE_USER_CFG;
 
 #endif  // USE_DEFAULT_USER_CFG
 
-/**
+
+extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
+
+/*
  * @fn          Main
  *
  * @brief       Application Main
@@ -90,6 +95,10 @@ bleUserCfg_t user0Cfg = BLE_USER_CFG;
  * @return      None.
  */
 int main() {
+
+    /* Register Application callback to trap asserts raised in the Stack */
+    RegisterAssertCback(AssertHandler);
+
     PIN_init(BoardGpioInitTable);
 
     // Enable iCache prefetching
@@ -115,3 +124,79 @@ 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 (;;);
+}

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/cc2650_master.h

@@ -1,191 +0,0 @@
-#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();
-    }
-
-    master_pin_output(PIN_LED_GRN, not_counter & 0x10);
-}
-
-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);
-
-    master_pin_output(PIN_LED_RED, mem_sel & 0x10);
-}
-
-#endif  // CC2650_MASTER_H

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/lp/master_pin.h

@@ -1,26 +0,0 @@
-#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

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/ma/master_pin.h

@@ -1,26 +0,0 @@
-#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

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/master_mem.h

@@ -1,33 +0,0 @@
-#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

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/master_pin.h

@@ -1,66 +0,0 @@
-#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

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/master_spi.h

@@ -1,43 +0,0 @@
-#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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite.json

@@ -0,0 +1,179 @@
+{
+  "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"
+      ]
+    }
+  }
+}
+
+

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteADC.h

@@ -0,0 +1,518 @@
+
+#ifndef EliteADC
+#define EliteADC
+
+#include "Elite_PIN.h"
+#include "EliteSPI.h"
+#include "EliteNotify.h"
+
+// Elite ADC macro
+// ADC command, Elite will use these cmd to control ADC
+#define CMD_CURRENT_MEASURE 0xC5
+#define CMD_VOLT_MEASURE    0xD5
+#define CMD_DAC_MEASURE     0xE5
+#define CMD_BATTERY_MEASURE 0xF1
+
+// controller command, these are command from control box
+#define ADC_CH_CURRENT      0x00
+#define ADC_CH_VOLT         0x01
+#define ADC_CH_DAC          0x02
+#define ADC_CH_BAT          0x03
+
+static void ADC_write(uint8_t ADCin) {
+   /*
+    *   This function can only define [15]~[8] through ADCin
+    *   [7]~[0] should always be 0b11101011
+    *
+    *   [15]        : SS, 0 = no effect, 1 = start work, default 0b0
+    *   [14]~[12]   : MUX[2:0], default 0b000
+    *   [11]~[9]    : PGA[2:0], default 0b010 = FSR is ±2.048
+    *   [8]         : mode, 0 = continuous, 1 = one shot, default 0b1 (Power-down and single-shot mode )
+    *
+    *   [7]~[5]     : data rate, default 0b100 = 128 SPS
+    *   [4]         : Temperature? default 0b0 = ADC mode
+    *   [3]         : Pullup enable, default 0b1 = Pullup resistor enabled
+    *   [2]~[1]     : NOP, default 0b01
+    *   [0]         : reserved, default 0b1
+    *
+    */
+
+//    spi_ADC_txbuf[0] = 0b00000101;
+    for(int i=0 ; i<SPI_ADC_SIZE ; i++){
+        spi_ADC_txbuf[i] = 0;
+        spi_ADC_rxbuf[i] = 0;
+    }
+
+    spi_ADC_txbuf[0] = ADCin;
+    spi_ADC_txbuf[1] = 0b11101011;
+
+    ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
+}
+
+static void ADC_read(uint8_t *ADCdata){
+    for(int i=0 ; i<SPI_ADC_SIZE ; i++){
+        spi_ADC_txbuf[i] = 0;
+        spi_ADC_rxbuf[i] = 0;
+    }
+
+    ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
+}
+
+/* Elite1.5 Calibration Usage */
+static void CAL_ADC_read(uint8_t *ADCdata){
+     for(int i=0 ; i<SPI_ADC_SIZE ; i++){
+         spi_ADC_txbuf[i] = 0;
+         spi_ADC_rxbuf[i] = 0;
+     }
+
+     CAL_ADC_SPI(SPI_ADC_SIZE, spi_ADC_txbuf, ADCdata);
+ }
+
+static void CAL_ADC_write(uint8_t ADCin) {
+    for(int i=0 ; i<SPI_ADC_SIZE ; i++){
+        spi_ADC_txbuf[i] = 0;
+        spi_ADC_rxbuf[i] = 0;
+    }
+
+    spi_ADC_txbuf[0] = ADCin;
+    spi_ADC_txbuf[1] = 0b11101011;
+
+    CAL_ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
+}
+
+static void ADCChannelSelect(uint8_t ADCChannel){
+    // set ADC parameter
+    // 0xC1~F1 = reading AIN0~AIN3. Using FSR+-6V, resolution = 187.5uV
+    // 0xC5~F5 = reading AIN0~AIN3. Using FSR+-2V, resolution = 62.5 uV
+    switch(ADCChannel){
+        // AINp is AIN0; AINn is GND
+        // measure AIN0, which is a current measure
+        case ADC_CH_CURRENT :{
+            ADC_write(CMD_CURRENT_MEASURE);
+            break;
+        }
+
+        // AINp is AIN1; AINn is GND
+        // AIN1, which is a volt measure
+        case ADC_CH_VOLT :{
+            ADC_write(CMD_VOLT_MEASURE);
+            break;
+        }
+
+        // AINp is AIN2; AINn is GND
+        // AIN2, measure DAC voltage (Note that this is NOT DAC real output value!!)
+        case ADC_CH_DAC :{
+            ADC_write(CMD_DAC_MEASURE);
+            break;
+        }
+
+        // measure battery volt
+        case ADC_CH_BAT :{
+            ADC_write(CMD_BATTERY_MEASURE);
+            break;
+        }
+        default :{
+            break;
+        }
+    }
+}
+
+static void ReadADCIin(uint8_t *buf){
+    // Read data twice since the first data we get is previous data
+//    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+    ADCChannelSelect(ADC_CH_CURRENT);
+    ADC_read(buf);
+
+    ADCChannelSelect(ADC_CH_CURRENT);
+    ADC_read(buf);
+}
+
+static void ReadADCVin(uint8_t *buf){
+    // Read data twice since the first data we get is previous data
+
+//    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+    ADCChannelSelect(ADC_CH_VOLT);
+    ADC_read(buf);
+
+    ADCChannelSelect(ADC_CH_VOLT);
+    ADC_read(buf);
+}
+
+static void ReadADCVout(uint8_t *buf){
+    // Read data twice since the first data we get is previous data
+    ADCChannelSelect(ADC_CH_DAC);
+    ADC_read(buf);
+
+    ADCChannelSelect(ADC_CH_DAC);
+    ADC_read(buf);
+}
+
+static void ReadADCBat(uint8_t *buf){
+    // Read data twice since the first data we get is previous data
+    ADCChannelSelect(ADC_CH_BAT);
+    ADC_read(buf);
+
+    ADCChannelSelect(ADC_CH_BAT);
+    ADC_read(buf);
+}
+
+/* for Elite1.5-re */
+// Iin theoretical boundary <2.67, 1.89~80, 63~2600, >1900 (uA)
+#define I_GAIN_SMALL_BOUNDARY     4000  // 4    uA =     4,000,000 pA
+#define I_GAIN_MID1_BOUNDARY1     2000  // 2    uA =     2,000,000 pA
+#define I_GAIN_MID1_BOUNDARY2    90000  // 90   uA =    90,000,000 pA
+#define I_GAIN_MID2_BOUNDARY1    70000  // 70   uA =    70,000,000 pA
+#define I_GAIN_MID2_BOUNDARY2  1800000  // 1800 uA =     1,800,000 nA
+#define I_GAIN_LARGE_BOUNDARY   950000  // 950  uA =       950,000 nA
+
+// Vin theoretical boundary <7, 5~200, >100 (mV)
+#define VIN_GAIN_SMALL_BOUNDARY   7000  // 7    mV =     7,000,000 nV
+#define VIN_GAIN_MID1_BOUNDARY1   5000  // 5    mV =     5,000,000 nV
+#define VIN_GAIN_MID1_BOUNDARY2 300000  // 300  mV =   300,000,000 nV
+#define VIN_GAIN_LARGE_BOUNDARY 250000  // 250  mV =   250,000,000 nV
+
+static int32_t AutoGainReadIin(uint8_t *buf){
+     int32_t RealCurrent = 0;
+
+     ReadADCIin(spi_ADC_rxbuf);
+     RealCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+
+     return RealCurrent;
+ }
+
+static int32_t AutoGainReadVin(uint8_t *buf){
+    int32_t RealVolt = 0;
+
+    ReadADCVin(spi_ADC_rxbuf);
+    RealVolt = DecodeADCValue(INSTRUCTION.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+
+    return RealVolt;
+}
+
+//static void AutoGainChangeIin(int32_t RealCurrent){
+//    // switch to 1 level current(small)   3M
+//    // switch to 2 level current        100K
+//    // switch to 3 level current          3K
+//    // switch to 4 level current(large) 100R
+//    if(INSTRUCTION.ADCGainLevel == I_GAIN_100R){
+//        if(RealCurrent < I_GAIN_LARGE_BOUNDARY && RealCurrent > -1*I_GAIN_LARGE_BOUNDARY){
+//            // switch to 1 level current(small)
+//            if (RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+//                I_GAIN_3M_counter++;
+//                if(I_GAIN_3M_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level current
+//            else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
+//                I_GAIN_100K_counter++;
+//                if(I_GAIN_100K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 3 level current
+//            else{
+//                I_GAIN_3K_counter++;
+//                if(I_GAIN_3K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(I_GAIN_3K_counter > 0){
+//                I_GAIN_3K_counter--;
+//            }
+//            if(I_GAIN_100K_counter > 0){
+//                I_GAIN_100K_counter--;
+//            }
+//            if(I_GAIN_3M_counter > 0){
+//                I_GAIN_3M_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3K){
+//        // switch to 4 level current(large)
+//        if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+//            I_GAIN_100R_counter++;
+//            if(I_GAIN_100R_counter > 2){
+//                INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//                IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                I_GAIN_100R_counter = 0;
+//                record_flag = false;
+//            }
+//        }
+//        else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
+//            // switch to 1 level current(small)
+//            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+//                I_GAIN_3M_counter++;
+//                if(I_GAIN_3M_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level current
+//            else{
+//                I_GAIN_100K_counter++;
+//                if(I_GAIN_100K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(I_GAIN_100R_counter > 0){
+//                I_GAIN_100R_counter--;
+//            }
+//            if(I_GAIN_100K_counter > 0){
+//                I_GAIN_100K_counter--;
+//            }
+//            if(I_GAIN_3M_counter > 0){
+//                I_GAIN_3M_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_100K){
+//            // switch to 1 level current(small)
+//            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+//                I_GAIN_3M_counter++;
+//                if(I_GAIN_3M_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            else if (RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
+//                 // switch to 4 level current(large)
+//                 if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+//                    I_GAIN_100R_counter++;
+//                    if(I_GAIN_100R_counter > 2){
+//                        INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                        I_GAIN_100R_counter = 0;
+//                        record_flag = false;
+//                    }
+//                }
+//                 // switch to 3 level current
+//                 else{
+//                    I_GAIN_3K_counter++;
+//                    if(I_GAIN_3K_counter > 2){
+//                        INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+//                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                        I_GAIN_3K_counter = 0;
+//                        record_flag = false;
+//                    }
+//                }
+//            }else{
+//                if(I_GAIN_100R_counter > 0){
+//                    I_GAIN_100R_counter--;
+//                }
+//                if(I_GAIN_3K_counter > 0){
+//                    I_GAIN_3K_counter--;
+//                }
+//                if(I_GAIN_3M_counter > 0){
+//                    I_GAIN_3M_counter--;
+//                }
+//            }
+//        }
+//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3M){
+//        if(RealCurrent > I_GAIN_SMALL_BOUNDARY || RealCurrent < -1*I_GAIN_SMALL_BOUNDARY){
+//            // switch to 4 level current(large)
+//            if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+//                I_GAIN_100R_counter++;
+//                if(I_GAIN_100R_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100R_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 3 level current
+//            else if(RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
+//                I_GAIN_3K_counter++;
+//                if(I_GAIN_3K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level current
+//            else{
+//                I_GAIN_100K_counter++;
+//                if(I_GAIN_100K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100K_counter = 0;
+//                    record_flag = false;
+//                }
+//
+//            }
+//        }else{
+//            if(I_GAIN_100R_counter > 0){
+//                I_GAIN_100R_counter--;
+//            }
+//            if(I_GAIN_3K_counter > 0){
+//                I_GAIN_3K_counter--;
+//            }
+//            if(I_GAIN_100K_counter > 0){
+//                I_GAIN_100K_counter--;
+//            }
+//        }
+//    }
+//}
+
+//static void AutoGainChangeVin(int32_t RealVin){
+//    // switch to 1 level volt(small)      1M
+//    // switch to 2 level volt            30K
+//    // switch to 3 level volt(large)      1K
+//    if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_1M){
+//        if(RealVin > VIN_GAIN_SMALL_BOUNDARY || RealVin < -1*VIN_GAIN_SMALL_BOUNDARY){
+//            // switch to 3 level volt(large)
+//            if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
+//                VIN_GAIN_1K_counter++;
+//                if(VIN_GAIN_1K_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_1K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level volt
+//            else{
+//                VIN_GAIN_30K_counter++;
+//                if(VIN_GAIN_30K_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_30K;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_30K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(VIN_GAIN_1K_counter > 0){
+//                VIN_GAIN_1K_counter--;
+//            }
+//            if(VIN_GAIN_30K_counter > 0){
+//                VIN_GAIN_30K_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_30K){
+//        // switch to 1 level volt(small)
+//        if(RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
+//            VIN_GAIN_1M_counter++;
+//            if(VIN_GAIN_1M_counter > 2){
+//                INSTRUCTION.VinADCGainLevel = VIN_GAIN_1M;
+//                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                VIN_GAIN_1M_counter = 0;
+//                record_flag = false;
+//            }
+//        }
+//        else if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
+//            // switch to 3 level volt
+//            VIN_GAIN_1K_counter++;
+//            if(VIN_GAIN_1K_counter > 2){
+//                INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
+//                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                VIN_GAIN_1K_counter = 0;
+//                record_flag = false;
+//            }
+//        }else{
+//            if(VIN_GAIN_1K_counter > 0){
+//                VIN_GAIN_1K_counter--;
+//            }
+//            if(VIN_GAIN_1M_counter > 0){
+//                VIN_GAIN_1M_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_1K){
+//        if(RealVin < VIN_GAIN_LARGE_BOUNDARY && RealVin > -1*VIN_GAIN_LARGE_BOUNDARY){
+//            // switch to 1 level volt(small)
+//            if (RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
+//                VIN_GAIN_1M_counter++;
+//                if(VIN_GAIN_1M_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_1M;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_1M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level volt
+//            else{
+//                VIN_GAIN_30K_counter++;
+//                if(VIN_GAIN_30K_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_30K;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_30K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(VIN_GAIN_1M_counter > 0){
+//                VIN_GAIN_1M_counter--;
+//            }
+//            if(VIN_GAIN_30K_counter > 0){
+//                VIN_GAIN_30K_counter--;
+//            }
+//        }
+//    }
+//}
+
+static uint16_t ADC_CURRENT_AVG_calibration (uint8_t ADC_channel) {
+    uint32_t ADCValueTemp           = 0;
+    uint32_t ADCValueSUM            = 0;
+    uint32_t ADCValueAVG            = 0;
+    uint16_t ADCValueAVG_RAW        = 0;
+    #define avgcount   10000
+
+    // Red light for start acquiring data
+    Elite_led_color(COLOR_RED);
+//    CPUdelay(10);
+    for(int i=0; i<avgcount; i++){
+        CAL_ADC_write(ADC_channel);
+        CAL_ADC_read(spi_ADC_rxbuf);
+        CPUdelay(10);
+        CAL_ADC_write(ADC_channel);
+        CAL_ADC_read(spi_ADC_rxbuf);
+        CPUdelay(500);
+
+        ADCValueTemp = 0x0000FFFF & (((uint32_t) (spi_ADC_rxbuf[0]) << 8) | ((uint32_t) (spi_ADC_rxbuf[1])));
+        ADCValueSUM = ADCValueSUM + ADCValueTemp;
+    }
+
+    ADCValueAVG = ADCValueSUM / avgcount;
+    ADCValueAVG_RAW = (uint16_t) (ADCValueAVG & 0x0000FFFF);
+
+    // Blue light for data acquire done
+    Elite_led_color(COLOR_BLUE);
+
+    if (ADCValueAVG_RAW > 0x7FFF) {
+        ADCValueAVG_RAW = 0x0000;
+    }
+
+    // clean data
+    ADCValueAVG = 0;
+    ADCValueSUM = 0;
+    ADCValueTemp = 0;
+
+//    // Blue light for data acquire done
+//    Elite_led_color(COLOR_BLUE);
+
+
+
+    return ADCValueAVG_RAW;
+}
+
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCCMode.h

@@ -0,0 +1,32 @@
+
+#ifndef ELITECCC
+#define ELITECCC
+
+#include "EliteCCMode.h"
+
+
+// XXX : should we reset DAC output after STOP?
+static void CCModeReverseCurrent(CCCMode *CCC){
+    if(CCC->StandBy){
+        if(CT.StandByCounter == CCC->StandByTime){
+            CCC->StandBy = false;
+            CT.StandByCounter = 0;
+        }
+        else{
+            CT.StandByCounter ++;
+        }
+    }
+    else{
+        // reverse charge/discharge
+        if(CCC->BatteryV == CCC->VMax){
+            CCC->StandBy = true;
+            CCC->value = CCC->DischargeCurrent;
+        }
+        else if(CCC->BatteryV == CCC->VMin){
+            CCC->StandBy = true;
+            CCC->value = CCC->ChargeCurrent;
+        }
+    }
+}
+
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h

@@ -0,0 +1,83 @@
+
+#ifndef ELITECCMODE
+#define ELITECCMODE
+
+#define Vset INSTRUCTION.Vset
+#define DELTAVOLTMAX 100000
+
+/* Transform setting CC into IUC
+*
+* User code in CC mode : 0 ~ 3000000
+* Real current value : -15.00000 ~ 15.00000 mA
+*  => user code = 1500000 mapping to 0.00000 mA
+*/
+static void CC_Vscan(CCMode *CC){
+    static int32_t Iin = 0;
+    static int32_t deltaI = 0;
+    static int32_t deltaV = 0;
+    uint16_t divisionRate;
+
+    if(vscanReset){
+        Vset = 0;
+
+        if(CC->_charge == 0){
+            CC->_Iset *= -1;
+        }
+
+        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
+        deltaI = Iin - CC->_Iset;
+
+        if(deltaI > 20000000 || deltaI < -20000000){ //1mA
+            divisionRate = 1000;
+        }else{
+            divisionRate = 10;
+        }
+
+        deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
+
+        if(deltaV > DELTAVOLTMAX){ //100000 = 500uV
+            deltaV = DELTAVOLTMAX;
+        }else if(deltaV < (-DELTAVOLTMAX)){
+            deltaV = (-DELTAVOLTMAX);
+        }
+
+        Vset = Vset + deltaV; //[5nV]
+
+        if(Vset <= CC->_Vmin){
+            Vset = CC->_Vmin;
+        }else if(Vset >= CC->_Vmax){
+            Vset = CC->_Vmax;
+        }
+    }
+
+    if(!vscanReset){
+        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
+        deltaI = Iin - CC->_Iset;
+
+        if(deltaI > 20000000 || deltaI < -20000000){ //1mA
+            divisionRate = 1000;
+        }else{
+            divisionRate = 10;
+        }
+
+        deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
+
+        if(deltaV > DELTAVOLTMAX){ //100000 = 500uV
+            deltaV = DELTAVOLTMAX;
+        }else if(deltaV < (-DELTAVOLTMAX)){
+            deltaV = (-DELTAVOLTMAX);
+        }
+
+        Vset = Vset + deltaV; //[5nV]
+
+        if(Vset <= CC->_Vmin){
+            Vset = CC->_Vmin;
+        }else if(Vset >= CC->_Vmax){
+            Vset = CC->_Vmax;
+        }
+    }
+//    int32_t RealV;
+//    RealV = (int32_t)(deltaV);
+//    InputNotify(NOTIFY_IMPEDANCE, RealV);
+}
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCV3Mode.h

@@ -0,0 +1,156 @@
+#ifndef ELITECV3
+#define ELITECV3
+
+#define Vset INSTRUCTION.Vset
+
+static uint16_t CV3Curve(CV3Mode *CV3){
+    static uint16_t DACOutCode;
+    static int32_t Vin;
+    static int32_t Vout;
+    static int32_t DeltaVout;
+
+    Vin = CV3->_measureVin * 200;//[5nV]
+    if(DACReset){
+        Vout = Vset + Vin;
+        DACReset = false;
+    }else{
+        DeltaVout = Vset - (Vout - Vin);
+        Vout = Vout + DeltaVout;
+    }
+
+    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
+
+    int32_t RealV2;
+    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
+    InputNotify(NOTIFY_VOLT, RealV2);
+
+    int32_t RealV;
+    RealV = (int32_t)(Vout / 200);//[1uV]
+    InputNotify(NOTIFY_IMPEDANCE, RealV);
+
+    DAC_outputV(DACOutCode);
+
+     return DACOutCode;
+}
+
+static void CV3_Vscan(CV3Mode *CV3){
+    static int16_t VminCounter;
+    static int16_t VmaxCounter;
+    static uint16_t CycleCounter;
+
+    NotifyCycleNumber = (INSTRUCTION.cycleNumber - CV3->_cycleNumber + 1);
+
+    if(vscanReset){
+        VmaxCounter = 0;
+        VminCounter = 0;
+        CycleCounter = 0;
+
+        if(INSTRUCTION.directionInit == 1){
+            CV3->_direction_up         = true;
+            CV3->_current_direction_up = true;
+        }else{
+            CV3->_direction_up         = false;
+            CV3->_current_direction_up = false;
+        }
+
+        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+        if(INSTRUCTION.step <= 10){
+            CV3->_Vstep = INSTRUCTION.step *  INSTRUCTION.VsetRate / 5;
+        }else{
+            CV3->_Vstep = INSTRUCTION.step / 5 *  INSTRUCTION.VsetRate;
+        }
+
+        if(CV3->_Vmin == CV3->_Vinit){
+            VminCounter = -1;
+        }
+        if(CV3->_Vmax == CV3->_Vinit){
+            VmaxCounter = -1;
+        }
+
+        Vset = CV3->_Vinit;
+    }
+
+    if(!vscanReset){
+        if((INSTRUCTION.Vinit < INSTRUCTION.Ve1 && INSTRUCTION.Vinit < INSTRUCTION.Ve2) ||
+        (INSTRUCTION.Vinit > INSTRUCTION.Ve1 && INSTRUCTION.Vinit > INSTRUCTION.Ve2)
+        ){
+            if (CV3->_current_direction_up){
+                Vset = Vset + CV3->_Vstep;
+            }else{
+                Vset = Vset - CV3->_Vstep;
+            }
+
+            if(INSTRUCTION.Vinit < INSTRUCTION.Ve1 && INSTRUCTION.Vinit < INSTRUCTION.Ve2){
+                if(Vset == CV3->_Vmin){
+                    VminCounter = -1;
+                    INSTRUCTION.Vinit = INSTRUCTION.Vmin;
+                    CV3->_Vinit = CV3->_Vmin;
+                }
+            }else if(INSTRUCTION.Vinit > INSTRUCTION.Ve1 && INSTRUCTION.Vinit > INSTRUCTION.Ve2){
+                if(Vset == CV3->_Vmax){
+                    VmaxCounter = -1;
+                    INSTRUCTION.Vinit = INSTRUCTION.Vmax;
+                    CV3->_Vinit = CV3->_Vmax;
+                }
+            }
+        }else{
+            if (Vset >= CV3->_Vmax){
+                VmaxCounter++;
+            }else if (Vset <= CV3->_Vmin){
+                VminCounter++;
+            }
+
+            if (CV3->_current_direction_up){
+                Vset = Vset + CV3->_Vstep * GPT.GptimerMultiple;
+            }else{
+                Vset = Vset - CV3->_Vstep * GPT.GptimerMultiple;
+            }
+
+            if(VmaxCounter != 0 && VminCounter != 0){
+                if(VmaxCounter == VminCounter && CV3->_direction_up && CV3->_current_direction_up){
+                    if(CycleCounter != VmaxCounter){
+                        if(Vset >= CV3->_Vinit){
+                            CV3->_cycleNumber--;
+                            CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
+                        }
+                    }
+                }
+                if(VmaxCounter == VminCounter && !CV3->_direction_up && !CV3->_current_direction_up){
+                    if(CycleCounter != VmaxCounter){
+                        if(Vset <= CV3->_Vinit){
+                            CV3->_cycleNumber--;
+                            CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
+                        }
+                    }
+                }
+            }
+
+            if (Vset >= CV3->_Vmax){
+                CV3->_current_direction_up = false;
+            }else if (Vset <= CV3->_Vmin){
+                CV3->_current_direction_up = true;
+            }
+
+            /*stop condition*/
+            if(CV3->_cycleNumber == 0){
+    //            PeriodicEvent = false;
+                ModeLED(POST_WORK);
+                InitEliteFlag();
+                INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
+                INSTRUCTION.sampleRate = 15;
+                INSTRUCTION.charge     = 0x01;
+                INSTRUCTION.constantCurrent = 0x00;
+                INSTRUCTION.Vmax       = 0xC350;
+                INSTRUCTION.Vmin       = 0x0000;
+                INSTRUCTION.notifyRate = 500;
+                INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
+            }
+        }
+
+    }
+//    int32_t RealV;
+//    RealV = (int32_t)(Vset / 500);//[1uV]
+//    InputNotify(NOTIFY_VOLT, RealV);
+}
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCVCurve.h

@@ -0,0 +1,217 @@
+
+#ifndef ELITECV
+#define ELITECV
+
+static uint16_t SWVCurve(WorkMode *WorkModeData) {
+    static uint8_t  counter;
+    static uint16_t outputV;
+    static uint16_t Volt;
+    static bool     direction_up;
+
+    // reset origin volt at the begin
+    if (DACReset) {
+        Volt    = INSTRUCTION.Ve1;
+        outputV = INSTRUCTION.Ve1;
+        if (INSTRUCTION.Ve1 < INSTRUCTION.Ve2)
+            direction_up = true;
+        else
+            direction_up = false;
+        counter  = 1;
+        DACReset = false;
+    }
+
+    if (counter == 2 * PulseWidth)
+        counter = 1;
+    else
+        counter++;
+
+    // output a certain volt
+    outputV = Volt;
+    DAC_outputV(outputV);
+
+    // VoltValue = (ramp1*16 + ramp0/16) * 3.05;
+
+    // check if we reach the final volt
+    if ((outputV >= INSTRUCTION.Ve2 && direction_up) || (outputV <= INSTRUCTION.Ve2 && !direction_up)) {
+        PeriodicEvent = false;
+        DACReset      = true;
+    }
+
+    // prepare the next output volt
+    if (direction_up) {
+        if (counter == PulseWidth)
+            Volt = Volt + Amplitude;
+        else if (counter == 2 * PulseWidth)
+            Volt = Volt - (Amplitude - INSTRUCTION.step);
+        else
+            Volt = Volt;
+    } else {
+        if (counter == PulseWidth)
+            Volt = Volt - Amplitude;
+        else if (counter == 2 * PulseWidth)
+            Volt = Volt + (Amplitude - INSTRUCTION.step);
+        else
+            Volt = Volt;
+    }
+
+    return outputV;
+}
+
+static uint16_t DPVCurve(WorkMode *WorkModeData) {
+    static uint8_t  counter;
+    static uint16_t Volt1;
+    static uint16_t Volt2;
+    static uint16_t outputV;
+    static bool     direction_up;
+
+    // reset origin volt at the begin
+    if (DACReset) {
+        if (INSTRUCTION.Ve1 < INSTRUCTION.Ve2)
+            direction_up = true;
+        else
+            direction_up = false;
+
+        Volt1 = INSTRUCTION.Ve1;
+        if (direction_up)
+            Volt2 = INSTRUCTION.Ve1 + Amplitude;
+        else
+            Volt2 = INSTRUCTION.Ve1 - Amplitude;
+
+        counter  = 1;
+        DACReset = false;
+    }
+
+    if (counter == PulsePeriod)
+        counter = 1;
+    else
+        counter++;
+
+    // output a certain volt
+    if (counter <= (PulsePeriod - PulseWidth)) {
+        outputV = Volt1;
+        DAC_outputV(Volt1);
+    } else {
+        outputV = Volt2;
+        DAC_outputV(Volt2);
+    }
+
+
+    // VoltValue = (ramp1*16 + ramp0/16) * 3.05;
+
+    // check if we reach the final volt
+    if (((outputV >= INSTRUCTION.Ve2) && direction_up) || ((outputV <= INSTRUCTION.Ve2) && !direction_up)) {
+        PeriodicEvent = false;
+        DACReset      = true;
+    }
+
+    // check overflow/underflow and prepare for next output
+    if (direction_up) {
+        if (Volt1 + INSTRUCTION.step < Volt1)
+            Volt1 = 0xffff;
+        else
+            Volt1 = Volt1 + INSTRUCTION.step;
+        if (Volt2 + INSTRUCTION.step < Volt2)
+            Volt2 = 0xffff;
+        else
+            Volt2 = Volt2 + INSTRUCTION.step;
+    } else {
+        if (Volt1 - INSTRUCTION.step > Volt1)
+            Volt1 = 0x0000;
+        else
+            Volt1 = Volt1 - INSTRUCTION.step;
+        if (Volt2 - INSTRUCTION.step > Volt2)
+            Volt2 = 0x0000;
+        else
+            Volt2 = Volt2 - INSTRUCTION.step;
+    }
+
+    if (counter + 1 <= (PulsePeriod - PulseWidth)) {
+        return Volt1;
+    } else {
+        return Volt2;
+    }
+}
+
+static void CV_Vscan(CVMode *CV){
+    static int16_t VminCounter;
+    static int16_t VmaxCounter;
+    static uint16_t CycleCounter;
+
+    NotifyCycleNumber = (INSTRUCTION.cycleNumber - CV->_cycleNumber + 1);
+
+    if(vscanReset){
+        VmaxCounter = 0;
+        VminCounter = 0;
+        CycleCounter = 0;
+
+        if(INSTRUCTION.directionInit == 1){
+            CV->_direction_up         = true;
+            CV->_current_direction_up = true;
+        }else if(INSTRUCTION.directionInit == 0){
+            CV->_direction_up         = false;
+            CV->_current_direction_up = false;
+        }
+
+        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+        if(INSTRUCTION.step <= 10){
+            CV->_Vstep = INSTRUCTION.step * INSTRUCTION.VsetRate / 5;
+        }else{
+            CV->_Vstep = INSTRUCTION.step / 5 * INSTRUCTION.VsetRate;
+        }
+
+        if(CV->_Vmin == CV->_Vinit){
+            VminCounter = -1;
+        }
+        if(CV->_Vmax == CV->_Vinit){
+            VmaxCounter = -1;
+        }
+
+        Vset = CV->_Vinit;
+    }
+
+    if(!vscanReset){
+        if (Vset >= CV->_Vmax){
+            VmaxCounter++;
+        }else if (Vset <= CV->_Vmin){
+            VminCounter++;
+        }
+
+        if (CV->_current_direction_up){
+            Vset = Vset + CV->_Vstep * GPT.GptimerMultiple;
+        }else{
+            Vset = Vset - CV->_Vstep * GPT.GptimerMultiple;
+        }
+
+        if(VmaxCounter != 0 && VminCounter != 0){
+            if(VmaxCounter == VminCounter && CV->_direction_up && CV->_current_direction_up){
+                if(CycleCounter != VmaxCounter){
+                    if(Vset >= CV->_Vinit){
+                        CV->_cycleNumber--;
+                        CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
+                    }
+                }
+            }
+            if(VmaxCounter == VminCounter && !CV->_direction_up && !CV->_current_direction_up){
+                if(CycleCounter != VmaxCounter){
+                    if(Vset <= CV->_Vinit){
+                        CV->_cycleNumber--;
+                        CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
+                    }
+                }
+            }
+        }
+
+        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;
+            ModeLED(NO_EVENT);
+        }
+    }
+}
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCVSCANMode.h

@@ -0,0 +1,47 @@
+#ifndef ELITECVSCAN
+#define ELITECVSCAN
+
+#define Vset INSTRUCTION.Vset
+
+static uint16_t CVSCANCurve(CVSCANMode *CVSCAN){
+    static uint16_t DACOutCode;
+    static int32_t Vin;
+    static int32_t Vout;
+    static int32_t DeltaVout;
+
+    Vin = CVSCAN->_measureVin * 200;//[5nV]
+    if(DACReset){
+        Vout = Vset + Vin;
+        DACReset = false;
+    }else{
+        DeltaVout = Vset - (Vout - Vin);
+        Vout = Vout + DeltaVout;
+    }
+
+    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
+
+    int32_t RealV2;
+    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
+    InputNotify(NOTIFY_VOLT, RealV2);
+
+    int32_t RealV;
+    RealV = (int32_t)(Vout / 200);//[1uV]
+    InputNotify(NOTIFY_IMPEDANCE, RealV);
+
+    DAC_outputV(DACOutCode);
+
+    return DACOutCode;
+}
+
+static void CVSCAN_Vscan(CVSCANMode *CVSCAN){
+
+    if(vscanReset){
+        Vset = CVSCAN->_Vinit;
+    }
+
+    if(!vscanReset){
+        Vset = CVSCAN->_Vinit;
+    }
+}
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDAC.h

@@ -0,0 +1,105 @@
+
+#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 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
+
+#ifdef ELITE_VERSION_EIS
+static uint32_t DAC_outputV(uint32_t voltLV) {
+
+//    uint8_t v1, v2 = 0;
+//    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
+//    v2 = (uint8_t) (voltLV & 0x00FF);
+
+    EIS_LPDAC_SPI(voltLV);
+
+    return voltLV;
+}
+#endif
+
+static int32_t User2Real(uint16_t UserCode){
+    /* transfer usercode to real voltage value (mV) */
+    return (int32_t)((UserCode - 25000) / 5);
+}
+
+
+// DAC Vout theoretical boundary <300, 100~ (mV)
+#define DAC_VOUT_GAIN_SMALL_BOUNDARY  100000  // 100  mV =    25500(usercode)
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY  300000  // 300  mV =    26500(usercode)
+
+static void AutoGainChangeVout(int32_t RealVolt){
+    RealVolt = (RealVolt - 25000) * 200; // (RealVolt - 25000) / 5 * 1000
+    // switch to 1 level volt(small)   15K
+    // switch to 2 level volt(large)   240K
+
+    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_AUTO){
+        INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+    }
+
+    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_15K){
+        if(RealVolt > DAC_VOUT_GAIN_LARGE_BOUNDARY || RealVolt < -1 * DAC_VOUT_GAIN_LARGE_BOUNDARY){
+            // switch to 2 level volt(large)
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
+            record_flag = false;
+        }
+    }
+    else if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_240K){
+        if(RealVolt < DAC_VOUT_GAIN_SMALL_BOUNDARY && RealVolt > -1 * DAC_VOUT_GAIN_SMALL_BOUNDARY ){
+            // switch to 1 level volt(small)
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+            record_flag = false;
+        }
+    }
+}
+
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h

@@ -0,0 +1,289 @@
+#ifndef EliteCorrection
+#define EliteCorrection
+
+#include "EliteDAC.h"
+#include "EliteADC.h"
+
+
+
+/*
+*   Correction Array include all the correction coeff and offset
+*
+*   Correction formula format is " RealValue = coeff * code + offset "
+*   RealValue can be RealCurrent, RealVolt, or RealResister ...
+*   code is the code we read from ADC buffer
+*
+*   ADC measure Voltage
+*   RealVolt = Correction.ADC_volt.coeff * code + Correction.ADC_volt.offset
+*
+*   ADC measure Current
+*   ADCGain:  0 => 200k, 1 => 10k, 2 => 200R
+*   RealCurrent = Correction.ADC_current[ADCGain].coeff * code + Correction.ADC_current[ADCGain].offset
+*
+*   DAC output Voltage
+*   RealVolt = Correction.DAC2RealV.coeff * DACcode + Correction.DAC2RealV.offset
+*
+*   Usercode to DACcode
+*   DACcode = Correction.Usercode2DAC.coeff * code + Correction.Usercode2DAC.offset
+*
+*/
+
+
+#define BOARD_C6D4
+
+typedef struct _formula{
+
+    long long coeff;
+    long long offset;
+
+}Formula;
+
+struct _correction{
+
+    Formula ADC_volt[3];
+    Formula ADC_current[4];
+    Formula Usercode2DAC[2];
+    uint16_t Gain0Boundary[2];
+    uint16_t Gain1Boundary[4];
+    uint16_t Gain2Boundary[2];
+
+} Correction =
+
+#ifdef BOARD_C6E1
+{
+.ADC_volt[0].coeff = (-6251051),
+.ADC_volt[0].offset = 102081366120,
+
+.ADC_volt[1].coeff = (-6251051),
+.ADC_volt[1].offset = 102081366120,
+
+.ADC_volt[2].coeff = (-6251051),
+.ADC_volt[2].offset = 102081366120,
+
+.ADC_current[0].coeff = 2079230,
+.ADC_current[0].offset = (-34256067906),
+
+.ADC_current[1].coeff = 64550018,
+.ADC_current[1].offset = (-1063052554820),
+
+.ADC_current[2].coeff = 2096336928,
+.ADC_current[2].offset = (-34514344284104),
+
+.ADC_current[3].coeff = 60200953965,
+.ADC_current[3].offset = (-991270580672004),
+
+.Usercode2DAC[0].coeff = (-10511469),
+.Usercode2DAC[0].offset = 563770560100,
+
+.Usercode2DAC[1].coeff = (-10511469),
+.Usercode2DAC[1].offset = 563770560100,
+};
+#endif
+
+#ifdef BOARD_C7A1
+{
+.ADC_volt[0].coeff = (6204),
+.ADC_volt[0].offset = -100237253,
+
+.ADC_volt[1].coeff = (214511),
+.ADC_volt[1].offset = -3485722036,
+
+.ADC_volt[2].coeff = (6213224),
+.ADC_volt[2].offset = -101104189300,
+
+.ADC_current[0].coeff = 2078892,
+.ADC_current[0].offset = (-33685110900),
+
+.ADC_current[1].coeff = 64769469,
+.ADC_current[1].offset = (-1048938859469),
+
+.ADC_current[2].coeff = 2090182091,
+.ADC_current[2].offset = (-33847893234994),
+
+.ADC_current[3].coeff = 60030468992,
+.ADC_current[3].offset = (-972275155887907),
+
+.Usercode2DAC[0].coeff = (-10512772),
+.Usercode2DAC[0].offset = 581302323013,
+
+.Usercode2DAC[1].coeff = (-178991273),
+.Usercode2DAC[1].offset = 4794464882260,
+};
+#endif
+
+#ifdef BOARD_C6D4
+{
+.ADC_volt[0].coeff = (6226),
+.ADC_volt[0].offset = -100075170,
+
+.ADC_volt[1].coeff = (215972),
+.ADC_volt[1].offset = -3484380085,
+
+.ADC_volt[2].coeff = (6223818),
+.ADC_volt[2].offset = -100571214617,
+
+.ADC_current[0].coeff = 3136256,
+.ADC_current[0].offset = (-50747854551),
+
+.ADC_current[1].coeff = 72219340,
+.ADC_current[1].offset = (-1168719058378),
+
+.ADC_current[2].coeff = 1450319129,
+.ADC_current[2].offset = (-23465744053517),
+
+.ADC_current[3].coeff = 30710734735,
+.ADC_current[3].offset = (-496978137538345),
+
+.Usercode2DAC[0].coeff = (-10543212),
+.Usercode2DAC[0].offset = 582976692942,
+
+.Usercode2DAC[1].coeff = (-178746005),
+.Usercode2DAC[1].offset = 4789272862069,
+};
+#endif
+
+// this function turn ADC measure value (0xXXXX) into real voltage
+// unit should be uV
+static int32_t DecodeADCVolt(uint8_t ADCGain, uint16_t ADC_measure){
+    long long ADCRealVolt = 0;
+
+    ADCRealVolt = (Correction.ADC_volt[ADCGain].coeff * ADC_measure + Correction.ADC_volt[ADCGain].offset)/1e4;
+
+    return (int32_t) (ADCRealVolt);
+}
+
+// this function turn ADC measure value (0xXXXX) into Vout voltage
+// unit should be mV
+static int32_t DecodeADCVoutVolt(uint16_t ADC_measure){
+    long long ADCVoutVolt = 0;
+
+    ADCVoutVolt = ((-62658782380) * ADC_measure + 1020118014900000);
+    ADCVoutVolt = ADCVoutVolt / 1e11;
+    return (int32_t) (ADCVoutVolt);
+}
+
+// this function turn ADC measure value (0xXXXX) into Battery voltage
+// unit should be mV
+static int32_t DecodeADCBatVolt(uint16_t ADC_measure){
+    long long ADCBatVolt = 0;
+
+    ADCBatVolt = (47362594 * ADC_measure + 290422184577);
+    ADCBatVolt = ADCBatVolt / 1e8;
+    return (int32_t) (ADCBatVolt);
+}
+
+// this function turn ADC measure value (0xXXXX) into real current
+// unit should be nA
+static int32_t DecodeADCCurrent(uint8_t ADCGain, uint16_t ADC_measure){
+    long long ADCRealCurrent = 0;
+
+    ADCRealCurrent = (Correction.ADC_current[ADCGain].coeff * ADC_measure + Correction.ADC_current[ADCGain].offset)/1e7;
+
+    // Current unit is pA;
+    // If ADCGain is I_GAIN_100R unit is nA
+    return (int32_t) (ADCRealCurrent);
+}
+
+// Decode ADC measure value (could be a volt or current) and put it into notify buffer
+static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_raw){
+
+    uint16_t ADC_measure = (uint16_t) (ADC_raw[0] << 8) | (uint16_t) (ADC_raw[1]);
+    int32_t ADCRealVolt = 0, ret = 0, ADCRealCurrent = 0, ADCVoutVolt = 0, ADCBatVolt = 0;
+
+//    InputNotify(NOTIFY_VOLT, (uint32_t)(ADC_measure));//
+    // return real volt to controller
+    if(ADCChannel == ADC_CH_VOLT){
+        ADCRealVolt = DecodeADCVolt(ADCGain, ADC_measure);
+        ret = ADCRealVolt;
+    }
+
+    // return real current to controller
+    else if(ADCChannel == ADC_CH_CURRENT){
+        ADCRealCurrent = DecodeADCCurrent(ADCGain, ADC_measure);
+        ret = ADCRealCurrent;
+    }
+
+    // return real VoutVolt to controller
+    else if(ADCChannel == ADC_CH_DAC){
+        ADCVoutVolt = DecodeADCVoutVolt(ADC_measure);
+        ret = ADCVoutVolt;
+    }
+
+    // return real Battery Volt to controller
+    else if(ADCChannel == ADC_CH_BAT){
+        ADCBatVolt = DecodeADCBatVolt(ADC_measure);
+        ret = ADCBatVolt;
+    }
+
+    else{
+        // not support AIN2 / AIN3 yet
+    }
+    return ret;
+}
+
+// #0 board, (0x5f75 <= rawdata) && (rawdata <= 0x5fb2)
+//           ((0x5f97 < rawdata) && (rawdata < 0x6589)) || ((0x5999 < rawdata) && (rawdata < 0x5f93))
+
+//static void ADC_overflow(uint8_t gain, uint8_t *rawdata){
+//
+//    // Gain boundary defines different ADC gain level working area
+//    // Gain0Boundary = {lowerbound, upperbound}, is the lower and upper bound of gain level 0 working area.
+//
+//    uint16_t U16Rawdata = 0;
+//    U16Rawdata = (((uint16_t) (rawdata[0]))<<8) | ((uint16_t) (rawdata[1]));
+//
+//    if(gain == I_GAIN_3M){
+//        if( U16Rawdata <= Correction.Gain0Boundary[0]){
+//            rawdata[0] = Correction.Gain0Boundary[0] >> 4;
+//            rawdata[1] = (uint8_t) (Correction.Gain0Boundary[0] & 0x00FF);
+//        }
+//        else if(U16Rawdata >= Correction.Gain0Boundary[1]){
+//            rawdata[0] = (uint8_t) (Correction.Gain0Boundary[1] >> 4);
+//            rawdata[1] = (uint8_t) (Correction.Gain0Boundary[1] & 0x00FF);
+//        }
+//    }
+//    else if(gain == I_GAIN_100K){
+//        if( U16Rawdata <= Correction.Gain1Boundary[0]){
+//            rawdata[0] = Correction.Gain1Boundary[0] >> 4;
+//            rawdata[1] = (uint8_t) (Correction.Gain1Boundary[0] & 0x00FF);
+//        }
+//        else if(U16Rawdata >= Correction.Gain1Boundary[1]){
+//            rawdata[0] = (uint8_t) (Correction.Gain1Boundary[1] >> 4);
+//            rawdata[1] = (uint8_t) (Correction.Gain1Boundary[1] & 0x00FF);
+//        }
+//    }
+//}
+
+// User will enter -5V~+5V in UI.
+// websever and controler use 0~50000 represent -5~+5V
+// this function should turn 0~50000 into DACcode which output the exactly voltage user want
+static uint16_t Usercode_Correction_to_DAC(uint8_t DACGain, uint16_t usercode)
+{
+    AutoGainChangeVout(usercode);
+
+    long long usercode_32;
+    uint16_t DACcode = 0;
+
+    usercode_32 = (long long)(usercode);
+
+    DACcode = (uint16_t) ((Correction.Usercode2DAC[DACGain].coeff * usercode_32 + Correction.Usercode2DAC[DACGain].offset)/1e7);
+
+    return DACcode;
+}
+
+
+static int32_t DAC_to_realV(uint8_t DACGain, uint16_t DACcode)
+{
+    int32_t RealV = 0;
+    long long usercode_32;
+
+    usercode_32 = ((DACcode * 1e7) - Correction.Usercode2DAC[DACGain].offset) / Correction.Usercode2DAC[DACGain].coeff;
+
+    RealV = (int32_t) ((usercode_32 / 5) - 5000) * 1000;
+//    RealV = (int32_t) usercode_32;
+    // return nV
+    return RealV;
+}
+
+
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteFlagCTInit.h

@@ -0,0 +1,46 @@
+
+#ifndef ELITE_FLAG_CT_INIT
+#define ELITE_FLAG_CT_INIT
+
+// CT counter
+struct _CT{
+    uint32_t SampleRate_counter;
+    uint16_t StepTimeCounter;
+    uint16_t NotifyCounter;
+    uint32_t StandByCounter;
+}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 BatteryADCCounter;
+    uint32_t BatteryCheckCounter;
+    uint32_t GptimerMultiple;
+    uint32_t TestCounter;
+}GPT = {0};
+
+static void InitCT(){
+    CT.SampleRate_counter = 1;
+    CT.StepTimeCounter = 1;
+    CT.NotifyCounter = 1;
+    CT.StandByCounter = 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.BatteryADCCounter   = 0;
+    GPT.BatteryCheckCounter = 0;
+}
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteGPTimer.h

@@ -0,0 +1,38 @@
+/* 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 4800  // clock freq = 0.1 ms
+
+#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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteI2C.h

@@ -0,0 +1,95 @@
+
+#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
+

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteIVCurve.h

@@ -0,0 +1,48 @@
+
+#ifndef ELITEIV
+#define ELITEIV
+
+#define Vset INSTRUCTION.Vset
+
+static void IV_Vscan(IVMode *IV){
+    if(vscanReset){
+        if(INSTRUCTION.directionInit == 1){
+            IV->_direction_up         = true;
+            IV->_current_direction_up = true;
+        }else if(INSTRUCTION.directionInit == 0){
+            IV->_direction_up         = false;
+            IV->_current_direction_up = false;
+        }
+
+        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+        if(INSTRUCTION.step <= 10){
+            IV->_Vstep = INSTRUCTION.step * INSTRUCTION.VsetRate / 5;
+        }else{
+            IV->_Vstep = INSTRUCTION.step / 5 * INSTRUCTION.VsetRate;
+        }
+
+        Vset       = IV->_Vinit;
+    }
+
+    if(!vscanReset){
+        if(IV->_current_direction_up){
+            if(Vset >= IV->_Vmax){
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
+            }
+        }else{
+            if(Vset <= IV->_Vmin){
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
+            }
+        }
+
+        if (IV->_current_direction_up){
+            Vset = Vset + IV->_Vstep * GPT.GptimerMultiple;
+        }else{
+            Vset = Vset - IV->_Vstep * GPT.GptimerMultiple;
+        }
+    }
+}
+
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteInstruction.h

@@ -0,0 +1,125 @@
+
+#ifndef ELITEINSTRUCTION
+#define ELITEINSTRUCTION
+
+/** Iin, Vin, Vout **/
+#define IIN_ADC         0x00
+#define VIN_ADC         0x01
+#define VOUT_DAC        0x02
+#define HIGH_Z          0x03
+
+/** ADC Iin gain level **/
+#define I_GAIN_3M       0x00    // largest gain
+#define I_GAIN_100K     0x01
+#define I_GAIN_3K       0x02
+#define I_GAIN_100R     0x03    // the least gain
+#define I_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
+
+// Step time macro
+#define STEPTIME_HALF_SEC 5000
+#define STEPTIME_ONE_SEC 10000
+#define STEPTIME_TWO_SEC 20000
+
+/*==============================
+ ==== 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;
+
+    /** ADC parameter **/
+    uint8_t  sampleRateIndex;
+    uint32_t sampleRate;
+    uint8_t  VoViSwitch;
+    uint8_t  AutoGainEnable;
+    uint8_t  VinAutoGainEnable;
+    uint8_t  VoutAutoGainEnable;
+    uint8_t  ADCGainLevel;
+     // voltage output gain
+    uint16_t VoutGainLevel;
+    uint8_t  VinADCGainLevel;
+
+    /** Notify parameter **/
+    uint32_t notifyRate;
+
+    /** mode parameter **/
+    uint16_t cycleNumber;
+    uint8_t  charge;
+    int32_t  constantCurrent;
+    int32_t  Currentmax;
+
+    uint16_t StepTime;
+
+    uint8_t AdcChannel;
+
+} INSTRUCTION = {0};
+
+/*********************************************************************
+ * @fn      InitEliteInstruction
+ *
+ * @brief   Init all INSTRUCTION variable.
+ *
+ * @param   None.
+ *
+ * @return  None.
+ */
+static void InitEliteInstruction(){
+    INSTRUCTION.chip_id         = 0;
+    INSTRUCTION.eliteFxn        = 0;         //default is a null event
+    INSTRUCTION.VsetRateIndex   = 0;
+    INSTRUCTION.VsetRate        = 2;
+    INSTRUCTION.Vset            = 0;
+    INSTRUCTION.VoltConstant    = DAC_ZERO; //DAC_ZERO is about 0V
+    INSTRUCTION.directionInit   = 1;        //0:reverse        1:forward
+    INSTRUCTION.step            = 0;
+    INSTRUCTION.Ve1             = DAC_ZERO;
+    INSTRUCTION.Ve2             = DAC_ZERO;
+    INSTRUCTION.Vinit           = 0;
+    INSTRUCTION.Vmax            = 0;
+    INSTRUCTION.Vmin            = 0;
+    INSTRUCTION.sampleRateIndex = 1;
+    INSTRUCTION.sampleRate      = 100;
+    INSTRUCTION.VoViSwitch      = 0x01;    //0:user see Vo     1: user see Vi
+    INSTRUCTION.AutoGainEnable  = 1;
+    INSTRUCTION.VinAutoGainEnable = 1;
+    INSTRUCTION.VoutAutoGainEnable = 1;
+    INSTRUCTION.ADCGainLevel    = I_GAIN_AUTO;
+    INSTRUCTION.VoutGainLevel   = VOUT_GAIN_AUTO;
+    INSTRUCTION.VinADCGainLevel = VIN_GAIN_AUTO;
+    INSTRUCTION.notifyRate      = STEPTIME_ONE_SEC;
+    INSTRUCTION.cycleNumber     = 1;
+    INSTRUCTION.charge          = 1;      //0:discharge        1:charge
+    INSTRUCTION.constantCurrent = 0;
+    INSTRUCTION.Currentmax      = 0;
+    INSTRUCTION.StepTime        = STEPTIME_ONE_SEC;
+    INSTRUCTION.AdcChannel      = 0;
+}
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteKeyDetect.h

@@ -0,0 +1,63 @@
+
+#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) {
+            PIN_setOutputValue(pin_handle, enable_5v, 1);// enable 5V
+            Elite_SPI_init();
+            ModeLED(BT_WAIT);
+            AD5940_init();
+            // DAC_outputV(0x3FFFF);
+            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 == INSTRUCTION.eliteFxn) {  // old function == currunt instruction
+            if (ShutDownCounter != 0) {
+                // dark LED
+                checkFlafLED();
+                ShutDownCounter = 0;
+            }
+        } else {  // old function != currunt instruction
+            OriginEliteFxn = INSTRUCTION.eliteFxn;
+            if (ShutDownCounter != 0) {
+                ShutDownCounter = 0;
+            }
+            checkFlafLED();
+        }
+    }
+}
+
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteLED.h

@@ -0,0 +1,176 @@
+
+#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, 0x50, 0x00, 0x00);
+            break;
+        }
+        case COLOR_ORANGE: {
+            LED_color(DARKLED, 0x50, 0x58, 0x09);
+            break;
+        }
+        case COLOR_YELLOW: {
+            LED_color(LIGHTLED, 0x50, 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, 0x50, 0x00, 0x80);
+            break;
+        }
+        case COLOR_PURPLE: {
+            LED_color(DARKLED, 0x50, 0x00, 0xFF);
+            break;
+        }
+        case COLOR_WHITE: {
+            LED_color(DARKLED, 0x50, 0xFF, 0xFF);
+            break;
+        }
+        case COLOR_BLACK: {
+            LED_color(0x00, 0x00, 0x00, 0x00);
+            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 (INSTRUCTION.eliteFxn) {
+    case IV_CURVE:
+    case CV_CURVE:
+    case DIFFERENTIAL_PULSE_VOLTAMMETRY:
+    case SQUARE_WAVE_VOLTAMMETRY:
+    case VOLT_OUTPUT:
+    case ZT_CURVE:
+    case VT_CURVE:
+    case IT_CURVE:
+    case ADC_TEST:
+    case CYCLIC_VOLTAMMETRY:
+    case LINEAR_SWEEP_VOLTAMMETRY:
+    case CONSTANT_VSCAN:{
+        WORKLED();
+        break;
+    }
+    case CONSTANT_CURRENT:{
+        WORKLED();
+        break;
+    }
+    case CALI_ADC_MODE:{
+        if(INSTRUCTION.AdcChannel == IIN_ADC){
+            Elite_led_color(COLOR_RED);
+        }else if(INSTRUCTION.AdcChannel == VIN_ADC){
+            Elite_led_color(COLOR_ORANGE);
+        }
+
+        break;
+    }
+//    case VIS_RST: {
+//        LEDPowerON();
+//        break;
+//    }
+    default: {
+        WORKLED();
+        break;
+    }
+    }
+}
+
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteLSVMode.h

@@ -0,0 +1,98 @@
+#ifndef ELITELSV
+#define ELITELSV
+
+#define Vset INSTRUCTION.Vset
+
+static uint16_t LSVCurve(LSVMode *LSV){
+    static uint16_t DACOutCode;
+    static int32_t Vin;
+    static int32_t Vout;
+    static int32_t DeltaVout;
+
+    Vin = LSV->_measureVin * 200;//[5nV]
+    if(DACReset){
+        Vout = Vset + Vin;
+        DACReset = false;
+    }else{
+        DeltaVout = Vset - (Vout - Vin);
+        Vout = Vout + DeltaVout;
+    }
+
+    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
+
+    int32_t RealV2;
+    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
+    InputNotify(NOTIFY_VOLT, RealV2);
+
+    int32_t RealV;
+    RealV = (int32_t)(Vout / 200);//[1uV]
+    InputNotify(NOTIFY_IMPEDANCE, RealV);
+
+    DAC_outputV(DACOutCode);
+//
+     return DACOutCode;
+}
+
+static void LSV_Vscan(LSVMode *LSV){
+
+    NotifyCycleNumber = (INSTRUCTION.cycleNumber - LSV->_cycleNumber + 1);
+
+    if(vscanReset){
+        if(INSTRUCTION.directionInit == 1){
+            LSV->_direction_up         = true;
+            LSV->_current_direction_up = true;
+        }else{
+            LSV->_direction_up         = false;
+            LSV->_current_direction_up = false;
+        }
+
+         //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+        if(INSTRUCTION.step <= 10){
+            LSV->_Vstep = INSTRUCTION.step *  INSTRUCTION.VsetRate / 5;
+        }else{
+            LSV->_Vstep = INSTRUCTION.step / 5 *  INSTRUCTION.VsetRate;
+        }
+
+        Vset = LSV->_Vinit;
+    }
+
+    if(!vscanReset){
+
+        if (LSV->_current_direction_up){
+            Vset = Vset + LSV->_Vstep * GPT.GptimerMultiple;
+        }else{
+            Vset = Vset - LSV->_Vstep * GPT.GptimerMultiple;
+        }
+
+        /*stop condition*/
+        if (Vset >= LSV->_Vmax){
+            ModeLED(POST_WORK);
+//            PeriodicEvent = false;
+            Vset = LSV->_Vmin;
+            InitEliteFlag();
+            INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
+            INSTRUCTION.sampleRate = 15;
+            INSTRUCTION.charge     = 0x01;
+            INSTRUCTION.constantCurrent = 0x00;
+            INSTRUCTION.Vmax       = 0xC350;
+            INSTRUCTION.Vmin       = 0x0000;
+            INSTRUCTION.notifyRate = 500;
+            INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
+        }else if (Vset <= LSV->_Vmin){
+            ModeLED(POST_WORK);
+//            PeriodicEvent = false;
+            Vset = LSV->_Vmax;
+            InitEliteFlag();
+            INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
+            INSTRUCTION.sampleRate = 15;
+            INSTRUCTION.charge     = 0x01;
+            INSTRUCTION.constantCurrent = 0x00;
+            INSTRUCTION.Vmax       = 0xC350;
+            INSTRUCTION.Vmin       = 0x0000;
+            INSTRUCTION.notifyRate = 500;
+            INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
+        }
+    }
+}
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteLatchInit.h

@@ -0,0 +1,16 @@
+
+#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
+

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteNotify.h

@@ -0,0 +1,188 @@
+/**
+ * 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;
+
+// ****************** 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] = INSTRUCTION.chip_id;
+
+    for (int i = 0; i < 4; i++) {
+        not_buf[i + 1] = NotifyCurrent[i];
+        not_buf[i + 5] = NotifyVolt[i];
+        not_buf[i + 9] = NotifyImpedance[i];
+    }
+
+    // 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;
+
+    for (int i = 19; 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;
+
+    for (int i = 0; i < 4; i++){
+        NotifyCurrent[i]   = 0;
+        NotifyVolt[i]      = 0;
+        NotifyImpedance[i] = 0;
+    }
+}
+
+static void FlushNotify(){
+    initRawDataBuf();
+    initDATBuf();
+
+    not_buf[0] = INSTRUCTION.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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteReset.h

@@ -0,0 +1,72 @@
+
+#ifndef ELITERESET
+#define ELITERESET
+
+static void reset() {
+    ModeLED(NO_EVENT);
+    InitEliteFlag();
+    InitFlag();
+    InitCT();
+    InitGPT();
+    InitLH();
+
+//    VinADCGainControl(VIN_GAIN_AUTO);
+//    IinADCGainControl(I_GAIN_AUTO);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+    initINSBuf();
+    initDATBuf();
+
+    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
+//    PIN15_setOutputValue(DAC_CS, 1);  // DAC_CS HIGH
+    CPUdelay(1600);
+}
+
+static void Eliteinterrupt() {
+    InitFlag();
+    ModeLED(NO_EVENT);
+
+    InitEliteFlag();
+    InitCT();
+    InitGPT();
+    InitLH();
+
+//    VinADCGainControl(VIN_GAIN_AUTO);
+//    IinADCGainControl(I_GAIN_AUTO);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+    initINSBuf();
+    initDATBuf();
+
+    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
+    CPUdelay(8000);
+}
+#endif