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

130mA working

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

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_peripheral/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/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.1908313898" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.386599542">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.836926385" 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.122716742" 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.1735152675" 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.1517137938" 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.1013466299" 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.396590895" 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.262043189" 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.254163999" 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.381645511" 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.1216668029" 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.1214157007" 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.468937421" 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.1137328477" 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.1789637681" 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.2082096800" 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.1554315956" 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.1848633962" 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.480730772" 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.178571272" 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.338764900" 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.1956079968" 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.2028584467" 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.2035192044" 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.1517879760" 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.1697794062" 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.201373433" 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.386599542" 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.1224573433" 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.948723823" 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.1985734106" 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.1743500897" 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.541343209" 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.1291624254" 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.1592780619" 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.1218213371" 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.776879740" 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.131905523" 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.1323842668" 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.1293587957" 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.1830409084" 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.269002188" 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.2047351004" 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.1441212378" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.870893049" 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.1008247221" 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.1456819213" 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.1587885823" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1887629154" 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.380082739" 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.1123991861" 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.781131062" 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.2139588547" 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.1692895039" 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.1555119371" 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/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/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\cc2650em\simple_peripheral\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../config/src
+GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/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/cc2650em/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/
 
@@ -22,8 +22,8 @@ CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I
 ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
 AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq
 
-DEL = C:/ti/xdctools_3_32_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/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_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/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,5 +1,5 @@
 /*
-** Stack Frontier Generator 1.1.0 (2019-05-13 17:33:59.404000)
+** Stack Frontier Generator 1.1.0 (2019-05-30 16:41:28.535000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */

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

@@ -1,5 +1,5 @@
 /*
-** Stack Frontier Generator 1.1.0 (2019-05-13 17:33:59.404000)
+** Stack Frontier Generator 1.1.0 (2019-05-30 16:41:28.535000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */

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.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/components/npi" --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
 
-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,21 @@
 #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 */
+   Board_SPI1_MOSI | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+   Board_SPI1_CLK | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    PIN_TERMINATE
+};
 
 const PINCC26XX_HWAttrs PINCC26XX_hwAttrs = {
-    //
     .intPriority = ~0,
     .swiPriority = 0
-    //
 };
 /*============================================================================*/
 
@@ -99,14 +98,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 +128,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,27 +171,22 @@ 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 =====================================
  */
@@ -219,62 +208,54 @@ SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
 
 /* SPI configuration structure, describing which pins are to be used */
 const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_SPICOUNT] = {
-    //
     {
-        //
-        .baseAddr          = SSI0_BASE,
-        .intNum            = INT_SSI0_COMB,
-        .intPriority       = ~0,
-        .swiPriority       = 0,
-        .powerMngrId       = PowerCC26XX_PERIPH_SSI0,
-        .defaultTxBufValue = 0,
-        .rxChannelBitMask  = 1 << UDMA_CHAN_SSI0_RX,
-        .txChannelBitMask  = 1 << UDMA_CHAN_SSI0_TX,
-        .mosiPin           = Board_SPI0_MOSI,
-        .misoPin           = Board_SPI0_MISO,
-        .clkPin            = Board_SPI0_CLK,
-        .csnPin            = Board_SPI0_CS
-        //
+        .baseAddr           = 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  //
+        .baseAddr           = SSI1_BASE,
+        .intNum             = INT_SSI1_COMB,
+        .intPriority        = ~0,
+        .swiPriority        = 0,
+        .powerMngrId        = PowerCC26XX_PERIPH_SSI1,
+        .defaultTxBufValue  = 0,
+        .rxChannelBitMask   = 1<<UDMA_CHAN_SSI1_RX,
+        .txChannelBitMask   = 1<<UDMA_CHAN_SSI1_TX,
+        .mosiPin            = Board_SPI1_MOSI,
+        .misoPin            = Board_SPI1_MISO,
+        .clkPin             = Board_SPI1_CLK,
+        .csnPin             = Board_SPI1_CS
     },
-#endif
 };
 
 /* SPI configuration structure */
-const SPI_Config SPI_config[] = {  //
+const SPI_Config SPI_config[] = {
     {
-        //
-        .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-        .object      = &spiCC26XXDMAObjects[0],
-        .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
-        //
+         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+         .object      = &spiCC26XXDMAObjects[0],
+         .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
     },
     {
-        //
-        .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-        .object      = &spiCC26XXDMAObjects[1],
-        .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
-        //
+         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+         .object      = &spiCC26XXDMAObjects[1],
+         .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
     },
-    {NULL, NULL, NULL}};
+    {NULL, NULL, NULL}
+};
 /*
  *  ========================== SPI DMA end =====================================
- */
+*/
+
 
 /*
  *  ========================== Crypto begin ====================================
@@ -294,28 +275,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 +310,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 +336,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 +367,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 +382,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 +407,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 +424,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,76 @@ 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        /* ADC_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_MISO                DIO0
+#define Board_SPI0_MOSI                DIO1
+#define Board_SPI0_CLK                 DIO3
 #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_MOSI                DIO8
+#define Board_SPI1_CLK                 DIO9
 #define Board_SPI1_CS                  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 +170,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 +189,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
@@ -225,10 +220,7 @@ typedef enum BOOSTXL_CC2650MA_CryptoName {
  */
 typedef enum BOOSTXL_CC2650MA_SPIName {
     BOOSTXL_CC2650MA_SPI0 = 0,
-
-#ifdef HEADSTAGE_MA_USE_SPI2
-    BOOSTXL_CC2650MA_SPI1 ,
-#endif
+    BOOSTXL_CC2650MA_SPI1 = 1,
 
     BOOSTXL_CC2650MA_SPICOUNT
 } BOOSTXL_CC2650MA_SPIName;
@@ -309,29 +301,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.c

@@ -81,9 +81,14 @@ const PIN_Config BoardGpioInitTable[] = {
     Board_SPI_FLASH_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MIN,  /* External flash chip select    */
     Board_UART_RX | PIN_INPUT_EN | PIN_PULLDOWN,                                              /* UART RX via debugger back channel */
     Board_UART_TX | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,                        /* UART TX via debugger back channel */
-    Board_SPI0_MOSI | PIN_INPUT_EN | PIN_PULLDOWN,                                            /* SPI master out - slave in */
-    Board_SPI0_MISO | PIN_INPUT_EN | PIN_PULLDOWN,                                            /* SPI master in - slave out */
-    Board_SPI0_CLK | PIN_INPUT_EN | PIN_PULLDOWN,                                             /* SPI clock */
+
+    Board_SPI0_MOSI | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    Board_SPI0_MISO | PIN_INPUT_EN | PIN_PULLDOWN,
+    Board_SPI0_CLK  | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    Board_SPI0_CSN  | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+
+//    Board_PWMPIN2   | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+
 
     PIN_TERMINATE
 };

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

@@ -79,18 +79,19 @@ 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_CSN              PIN_UNASSIGNED
+#define Board_SPI0_CLK              IOID_10         /* RF1.16 */
+#define Board_SPI0_CSN              IOID_23
+
 #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 */
@@ -103,8 +104,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 +145,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 +161,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/headstage_arm.h

@@ -1,17 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_ARM_H
-#define HEADSTAGE_ARM_H
-
-
-static void headstage_arm_append_ramp_data(uint8_t *buff) {
-    static uint16_t headstage_ramp_data_counter = 0;
-
-    uint16_t v = headstage_ramp_data_counter++;
-
-    buff[0] = 0xB0 | (0x0F & (uint8_t)(v >> 6));
-    buff[1] = (uint8_t)(v << 2);
-}
-
-
-#endif // HEADSTAGE_ARM_H

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

@@ -1,101 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_LED_H
-#error "headstage_led.h not included"
-#endif
-
-#ifndef HEADSTAGE_CIS_LED_H
-#define HEADSTAGE_CIS_LED_H
-
-// clang-format off
-#define CIS_LED_DISABLE 0x00
-#define CIS_LED_ENABLE  0x01
-#define CIS_LED_PATTERN 0x10
-#define CIS_LED_SET     0x20
-// clang-format on
-
-#define LED_PATTERN_SIZE 0
-// static LEDParameter LED_PATTERN_TABLE[] = {};
-
-static void headstage_cis_led_enable(uint8_t enable);
-
-/**
- * @return: CDR_SUCCESS
- */
-static uint8_t headstage_cis_led_set_pattern(uint8_t pattern);
-
-/**
- * @para pattern: pattern number
- * @para parameter: led parameter, NULL to unset
- * @return: CDR_SUCCESS
- */
-static uint8_t headstage_cis_led_set_value(uint8_t       pattern,  //
-                                           LEDParameter *parameter);
-
-/*
- * @return: _B_4b4b(CDR_SUCCESS, length), or others,
- */
-static uint8_t headstage_update_vis_led(uint8_t  ins_len,  //
-                                        uint8_t *instruction,
-                                        uint8_t *cdr_buf) {
-    uint8_t led_oper = instruction[0];
-
-    switch (led_oper) {
-    case CIS_LED_DISABLE:
-    case CIS_LED_ENABLE:
-        if (ins_len == 1) {
-            headstage_cis_led_enable(led_oper);
-
-            return _B_4b4b(CDR_SUCCESS, 0);
-        } else {
-            break;
-        }
-
-    case CIS_LED_PATTERN:
-        if (ins_len == 1) {
-            cdr_buf[0] = LED_PATTERN_SIZE;
-            return _B_4b4b(CDR_SUCCESS, 1);
-        } else if (ins_len == 2) {
-            uint8_t pattern = instruction[1];
-            uint8_t status  = headstage_cis_led_set_pattern(pattern);
-            return _B_4b4b(status, 0);
-        } else {
-            break;
-        }
-
-    case CIS_LED_SET:
-        if (ins_len == 2) {
-            uint8_t pattern = instruction[1];
-            uint8_t status  = headstage_cis_led_set_value(pattern, NULL);
-            return _B_4b4b(status, 0);
-
-        } else if (ins_len == 7) {
-            uint8_t pattern = instruction[1];
-
-            LEDParameter parameter = {
-                // clang-format off
-                .luminance = instruction[2],
-                .red = instruction[3],
-                .green = instruction[4],
-                .blue = instruction[5],
-                .duration = (instruction[6] >> 4) & 0xF,
-                .duty_cycle = instruction[6] & 0xF
-                // clang-format on
-            };
-
-            uint8_t status = headstage_cis_led_set_value(pattern, &parameter);
-            return _B_4b4b(status, 0);
-
-        } else {
-            break;
-        }
-    }
-
-    return _B_4b4b(CDR_INV_PAR, 0);
-}
-
-/*===========================
- ==== function implement ====
- ==========================*/
-
-#endif  // HEADSTAGE_CIS_LED_H

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

@@ -1,37 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_CIS_VOLT_H
-#define HEADSTAGE_CIS_VOLT_H
-
-static void headstage_cis_volt(uint8_t second);
-
-/*
- * @return: _B_4b4b(CDR_SUCCESS, length), or others,
- */
-static uint8_t headstage_update_vis_volt(uint8_t  ins_len,  //
-                                         uint8_t *instruction,
-                                         uint8_t *cdr_buf) {
-    if (ins_len == 0) {
-        uint16_t volt_value = headstage_cis_volt(0);
-
-        cdr_buf[0] = (volt_value)&0xFF;
-        cdr_buf[1] = (volt_value >> 8)&0xFF;
-
-        return _B_4b4b(CDR_SUCCESS, 2);
-
-    } else if (ins_len == 1) {
-        headstage_cis_volt(instruction[0]);
-
-        return _B_4b4b(CDR_SUCCESS, 0);
-
-    } else {
-        return _B_4b4b(CDR_INV_PAR, 0);
-    }
-}
-
-/*===========================
- ==== function implement ====
- ==========================*/
-
-
-#endif // HEADSTAGE_CIS_VOLT_H

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

@@ -1,54 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-
-/**
- * ref: http://dev.ti.com/tirex/content/tirtos_cc13xx_cc26xx_2_21_00_06/products/bios_6_46_01_37/docs/cdoc/ti/sysbios/knl/Clock.html
- */
-
-#ifndef HRADSTAGE_CLOCK_H
-#define HRADSTAGE_CLOCK_H
-
-#include <ti/sysbios/knl/Clock.h>
-
-#define EVT_PERIODIC_CLOCK EVT_PERIODIC_0
-
-static Clock_Handle clock_handle = NULL;
-
-static void headstage_clock_callback(UArg arg) {
-    flag_notify(EVT_PERIODIC_CLOCK);
-}
-
-#define headstage_clock_start() Clock_start(clock_handle)
-#define headstage_clock_stop() Clock_stop(clock_handle)
-#define headstage_clock_active() (clock_handle && Clock_isActive(clock_handle))
-
-#define headstage_clock_close()     \
-    do {                            \
-        Clock_delete(clock_handle); \
-        clock_handle = NULL;        \
-    } while (0)
-
-// XXX function not tested
-// period in mini second
-#define headstage_clock_open(_period)                                               \
-    do {                                                                           \
-        Clock_Params param;                                                        \
-        Clock_Params_init(&param);                                                 \
-        param.period    = 48000*(_period);                                         \
-        param.startFlag = false;                                                   \
-        clock_handle    = Clock_create(headstage_clock_callback, 1, &param, NULL); \
-    } while (0)
-
-#define headstage_clock_set_frequency(frequency)           \
-    do {                                                   \
-        uint32_t     _frequency = (uint32_t)(frequency);   \
-        Types_FreqHz _cpu_freq;                            \
-        BIOS_getCpuFreq(&_cpu_freq);                       \
-        uint32_t _load     = _cpu_freq.lo / _frequency;    \
-        bool     is_active = Clock_isActive(clock_handle); \
-        if (is_active) Clock_stop(clock_handle);           \
-        Clock_setPeriod(clock_handle, _load);              \
-        if (is_active) Clock_start(clock_handle);          \
-    } while (0)
-
-#endif  // HRADSTAGE_CLOCK_H

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

@@ -1,17 +0,0 @@
-#ifndef HEADSTAGE_DEBUG_H
-#define HEADSTAGE_DEBUG_H
-
-static uint8_t headstage_debug_buffer[BLE_DEBUG_BUFF_SIZE] = {0};
-
-/**
- * declare debug instruction handle.
- *
- * @param ins_buf: debug instruction buffer
- * @return: size of data length.
- *      non-zero position value for write [ins_buf] back to debug characteristic.
- */
-static uint8_t headstage_debug_instruction(uint8_t* ins_buf);
-
-#define headstage_set_debug_information() SimpleProfile_SetParameter(BLE_DEBUG_BUFF_CHAR, BLE_DEBUG_BUFF_SIZE, headstage_debug_buffer)
-
-#endif // HEADSTAGE_DEBUG_H

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

@@ -1,116 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-
-/*
-
-device implement header template
-================================
-
-How to create a device header
------------------------------
-
-1.  copy this and rename
-2.  update device information.
-
-    1.  DEVICE_NAME
-    2.  MAJOR/MINOR_PRODUCT/VERSION_NUMBER
-
-3.  replace @REPLACE@ with device nick name.
-4.  write your code
-5.  do not remember update the device document below.
-
- */
-
-/*
-
-Device Document
-===============
-
-Real instruction format
------------------------
-
-TODO
-
- */
-
-#ifndef HEADSTAGE_H
-#error "headstage.h not include"
-#endif
-
-#ifndef HEADSTAGE_@REPLACE@_H
-#define HEADSTAGE_@REPLACE@_H
-
-/*============================
- ==== product information ====
- ===========================*/
-
-#define DEVICE_NAME "Device Name"
-#define MAJOR_PRODUCT_NUMBER 0
-#define MINOR_PRODUCT_NUMBER 0
-#define MAJOR_VERSION_NUMBER 0
-#define MINOR_VERSION_NUMBER 0
-
-/*=================
- ==== constant ====
- =================*/
-
-// TODO define constant macro
-
-/*================
- ==== include ====
- ================*/
-
-// TODO include other headstage header
-
-/*=================================
- ==== constant parameter table ====
- ================================*/
-
-// TODO define device relative parameter table
-
-/*========================
- ==== parameter table ====
- ========================*/
-
-struct HEADSTAGE_PARAMETER_TABLE {
-} INSTRUCTION = {0};
-
-#define reset_parameter_table() memset(&INSTRUCTION, 0, sizeof(struct HEADSTAGE_PARAMETER_TABLE));
-
-/*=============================
- ==== function declaration ====
- ============================*/
-
-static void headstage_@REPLACE@_init();
-
-/*=======================
- ==== event dispatch ====
- =======================*/
-
-static void headstage_@REPLACE@_event() {
-    if (flag_mask(EVT_DISCONNECTED)) {
-        headstage_update_vis_instruction(VIS_INT);
-    }
-}
-
-/*===========================
- ==== function implement ====
- ==========================*/
-
-static void headstage_init() {
-    // TODO
-}
-
-static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t *instruction) {
-    // TODO
-}
-
-static void headstage_update_vis_instruction(uint8_t vis_oper) {
-    // TODO
-}
-
-/*========================
- ==== device function ====
- =======================*/
-
-#endif // HEADSTAGE_@REPLACE@_H

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

@@ -1,45 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_GPTIMER_H
-#define HEADSTAGE_GPTIMER_H
-
-#include <Board.h>
-#include <ti/drivers/timer/GPTimerCC26XX.h>
-#include <ti/sysbios/BIOS.h>
-#include <xdc/runtime/Types.h>
-
-#define EVT_PERIODIC_GPTIMER EVT_PERIODIC_0
-
-static GPTimerCC26XX_Handle gptimer_handle;
-
-static void headstage_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask) {
-    flag_notify(EVT_PERIODIC_GPTIMER);
-}
-
-#define headstage_gptimer_start() GPTimerCC26XX_start(gptimer_handle)
-#define headstage_gptimer_stop() GPTimerCC26XX_stop(gptimer_handle)
-#define headstage_gptimer_close() GPTimerCC26XX_close(gptimer_handle)
-
-#define headstage_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);                         \
-        GPTimerCC26XX_setLoadValue(gptimer_handle, 0xFFFFFF);                                         \
-        GPTimerCC26XX_registerInterrupt(gptimer_handle, headstage_gptimer_callback, GPT_INT_TIMEOUT); \
-    } while (0)
-
-#define headstage_gptimer_set_frequency(frequency)                                               \
-    do {                                                                                         \
-        uint32_t     _frequency = (uint32_t)(frequency);                                         \
-        Types_FreqHz _cpu_freq;                                                                  \
-        BIOS_getCpuFreq(&_cpu_freq);                                                             \
-        GPTimerCC26XX_Value _load = _cpu_freq.lo / _frequency - 1;                               \
-        _load                     = (_load < 0xFFFF) ? _load : ((0xFA0000 | (_load / 250)) - 1); \
-        GPTimerCC26XX_setLoadValue(gptimer_handle, _load);                                       \
-    } while (0)
-
-#endif  // HEADSTAGE_GPTIMER_H

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

@@ -1,198 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_LED_H
-#define HEADSTAGE_LED_H
-
-typedef struct {
-    uint8_t luminance;
-    uint8_t red;
-    uint8_t green;
-    uint8_t blue;
-    uint8_t duration;
-    uint8_t duty_cycle;
-} LEDParameter;
-
-static void headstage_led_open();
-static void headstage_led_close();
-static void headstage_led_send(LEDParameter *led);
-static void headstage_led_color(uint8_t color);
-
-static uint16_t headstage_led_set_dark(uint16_t *ins_buf, uint8_t repeat) {
-    uint16_t *p = ins_buf;
-
-    *p++ = 0;
-    *p++ = 0;
-
-    for (uint8_t j = 0; j < repeat; j++) {
-        *p++ = 0xE000;
-        *p++ = 0x0000;
-    }
-
-    *p++ = 0xFFFF;
-    *p++ = 0xFFFF;
-
-    return p - ins_buf;
-}
-
-static uint16_t headstage_led_set_bright(uint16_t *ins_buf, uint8_t repeat) {
-    uint16_t *p = ins_buf;
-
-    *p++ = 0;
-    *p++ = 0;
-
-    for (uint8_t j = 0; j < repeat; j++) {
-        *p++ = 0xFEFF;
-        *p++ = 0xFFFF;
-    }
-
-    *p++ = 0xFFFF;
-    *p++ = 0xFFFF;
-
-    return p - ins_buf;
-}
-
-static uint16_t headstage_led_set_buffer(uint16_t *ins_buf, uint8_t repeat, LEDParameter *parameter) {
-    uint16_t *p = ins_buf;
-
-    *p++ = 0;
-    *p++ = 0;
-
-    if (parameter && repeat > 0) {
-        uint16_t a = 0xE000 | ((uint16_t)(parameter->luminance & 0x1F) << 8) | (uint16_t)(parameter->blue & 0xFF);
-        uint16_t b = ((uint16_t)(parameter->green & 0xFF) << 8) | (uint16_t)(parameter->red & 0xFF);
-
-        for (uint8_t j = 0; j < repeat; j++) {
-            *p++ = a;
-            *p++ = b;
-        }
-    }
-
-    *p++ = 0xFFFF;
-    *p++ = 0xFFFF;
-
-    return p - ins_buf;
-}
-
-// clang-format off
-#define COLOR_BLACK     0
-#define COLOR_RED       1
-#define COLOR_ORANGE    2
-#define COLOR_YELLOW    3
-#define COLOR_GREEN     4
-#define COLOR_BLUE      5
-#define COLOR_CYAN      6
-#define COLOR_MAGENTA   7
-#define COLOR_WHITE     9
-// clang-format on
-
-static uint8_t headstage_led_set_color(uint16_t *ins_buf, uint8_t repeat, uint8_t color) {
-    LEDParameter parameter;
-
-    switch (color) {
-        case COLOR_RED:
-            parameter = (LEDParameter){.luminance = 0xFF, .red = 0xFF, .green = 0x00, .blue = 0x00};
-            break;
-        case COLOR_ORANGE:
-            parameter = (LEDParameter){.luminance = 0xFF, .red = 0xFF, .green = 0x03, .blue = 0x00};
-            break;
-        case COLOR_YELLOW:
-            parameter = (LEDParameter){.luminance = 0xFF, .red = 0x0F, .green = 0x0F, .blue = 0x00};
-            break;
-        case COLOR_GREEN:
-            parameter = (LEDParameter){.luminance = 0xFF, .red = 0x00, .green = 0xFF, .blue = 0x00};
-            break;
-        case COLOR_BLUE:
-            parameter = (LEDParameter){.luminance = 0xFF, .red = 0x00, .green = 0x00, .blue = 0xFF};
-            break;
-        case COLOR_CYAN:
-            parameter = (LEDParameter){.luminance = 0xFF, .red = 0x00, .green = 0xFF, .blue = 0xFF};
-            break;
-        case COLOR_MAGENTA:
-            parameter = (LEDParameter){.luminance = 0xFF, .red = 0xFF, .green = 0x00, .blue = 0xFF};
-            break;
-        case COLOR_WHITE:
-            parameter = (LEDParameter){.luminance = 0xFF, .red = 0x0F, .green = 0x7F, .blue = 0x1F};
-            break;
-        default:
-        case COLOR_BLACK:
-            parameter = (LEDParameter){.luminance = 0x00, .red = 0x00, .green = 0x00, .blue = 0x00};
-            break;
-    }
-
-    return headstage_led_set_buffer(ins_buf, repeat, &parameter);
-}
-
-/*============================
- ==== LED implement (SPI) ====
- ===========================*/
-
-#ifdef HEADSTAGE_LED_USE_SPI
-
-#include <Board.h>
-#include <ti/drivers/SPI.h>
-#include <ti/drivers/dma/UDMACC26XX.h>
-#include <ti/drivers/spi/SPICC26XXDMA.h>
-
-#if defined(BOOSTXL_CC2650MA) && !defined(HEADSTAGE_MA_USE_SPI2)
-#error "HEADSTAGE_MA_USE_SPI2 not predefine if use SPI1"
-#endif
-
-#define HEADSTAGE_LED_USE_SPI_BOARD Board_SPI1
-
-#define SPI_LED_BUFF_SIZE 20
-#define SPI_LED_REPEAT 8
-
-static uint16_t headstage_spi_led_txbuf[SPI_LED_BUFF_SIZE];
-
-static SPI_Handle      led_handle;
-static SPI_Transaction led_transaction;
-
-static void headstage_led_open() {
-    // SPI parameters initialize
-    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      = 2500;
-    spi_parameter.dataSize     = 16;
-    spi_parameter.frameFormat  = SPI_POL0_PHA1;
-
-    led_handle = SPI_open(HEADSTAGE_LED_USE_SPI_BOARD, &spi_parameter);
-}
-
-static void headstage_led_close() {
-    SPI_close(led_handle);
-}
-
-static void headstage_led_send(LEDParameter *led) {
-    headstage_led_set_buffer(headstage_spi_led_txbuf, SPI_LED_REPEAT, led);
-
-    led_transaction.txBuf = headstage_spi_led_txbuf;
-    led_transaction.rxBuf = NULL;
-    led_transaction.count = SPI_LED_BUFF_SIZE;
-
-    SPI_transfer(led_handle, &led_transaction);
-}
-
-static void headstage_led_color(uint8_t color) {
-    headstage_led_set_color(headstage_spi_led_txbuf, SPI_LED_REPEAT, color);
-
-    led_transaction.txBuf = headstage_spi_led_txbuf;
-    led_transaction.rxBuf = NULL;
-    led_transaction.count = SPI_LED_BUFF_SIZE;
-
-    SPI_transfer(led_handle, &led_transaction);
-}
-
-#endif  // HEADSTAGE_LED_USE_SPI
-
-/*=============================
- ==== LED implement (GPIO) ====
- ============================*/
-
-#ifdef HEADSTAGE_LED_USE_GPIO
-// XXX not implement
-#endif  // HEADSTAGE_LED_USE_GPIO
-
-#endif  // HEADSTAGE_LED_H

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

@@ -1,76 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-
-/*
-
-Headstage notify utility
-========================
-
-optional predefined
--------------------
-
-*  `HEADSTAGE_NOTIFY_USE_ATT`
-
-    send notify through ATT instead characteristic.
-
-    [reference](https://github.com/ti-simplelink/ble_examples/blob/ble_examples-2.2/src/examples/throughput_example_peripheral/cc26xx/app/throughput_example_peripheral.c)
-
-optional implement
-
-*   `tni/headstage_notify.h`
-
-    implement `TDC4VAF2` format
-
-*.  `sti/headstage_notify.h`
-
-    implement `TDC4VC3` format.
-
- */
-#ifndef HEADSTAGE_NOTIFY_H
-#define HEADSTAGE_NOTIFY_H
-
-#include <xdc/runtime/Timestamp.h>
-
-#define headstage_time_stamp_us() (32 * Timestamp_get32())
-#define headstage_time_stamp_ms() (Timestamp_get32() / 32)
-
-/*========================
- ==== notify function ====
- =======================*/
-
-static uint8_t headstage_notify_buffer[BLE_NOT_BUFF_SIZE] = {0};
-
-/**
- * send notify.
- *
- */
-static void headstage_notify_send() {
-#ifdef HEADSTAGE_NOTIFY_USE_ATT
-    uint16_t buffer_size = BLE_NOT_BUFF_SIZE;
-    uint8_t *value       = (uint8 *)GATT_bm_alloc(CONNECT_HANDLE, ATT_HANDLE_VALUE_NOTI, GATT_MAX_MTU, &buffer_size);
-
-    if (value != NULL) {
-        memcpy(value, headstage_notify_buffer, buffer_size);
-
-        attHandleValueNoti_t notify = {
-            // clang-format off
-            .handle = 0x1E,
-            .len    = buffer_size,
-            .pValue = value
-            // clang-format on
-        };
-
-        if (GATT_Notification(CONNECT_HANDLE, &notify, GATT_NO_AUTHENTICATION) != SUCCESS) {
-            // notify not send
-            GATT_bm_free((gattMsg_t *)&notify, ATT_HANDLE_VALUE_NOTI);
-        }
-    }
-
-#else
-
-    SimpleProfile_SetParameter(BLE_NOT_BUFF_CHAR, BLE_NOT_BUFF_SIZE, headstage_notify_buffer);
-
-#endif
-}
-
-#endif  // HEADSTAGE_NOTIFY_H

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

@@ -1,40 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_PIN_H
-#define HEADSTAGE_PIN_H
-
-#include <Board.h>
-#include <ti/drivers/PIN.h>
-
-static PIN_State  headstage_pins_state;
-static PIN_Handle headstage_pins_handle;
-
-#if defined(CC2650_LAUNCHXL)
-#define PIN_LED_R Board_RLED
-#define PIN_LED_G Board_GLED
-#endif
-
-static PIN_Config headstage_pin_configuration[] = {  //
-
-// LED
-#if defined(CC2650_LAUNCHXL)
-    PIN_LED_R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    PIN_LED_G | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-#endif
-
-    //
-    PIN_TERMINATE};
-
-#define headstage_pin_add(configuration) PIN_add(headstage_pins_handle, configuration)
-#define headstage_pin_remove(pin) PIN_remove(headstage_pins_handle, pin)
-#define headstage_pin_close() PIN_close(headstage_pins_handle)
-
-#define headstage_pin_open()                                                                  \
-    do {                                                                                      \
-        headstage_pins_handle = PIN_open(&headstage_pins_state, headstage_pin_configuration); \
-    } while (0)
-
-#define headstage_pin_output(pin, value) PIN_setOutputValue(headstage_pins_handle, PIN_ID(pin), (value))
-#define headstage_pin_input(pin) PIN_getInputValue(PIN_ID(pin))
-
-#endif  // HEADSTAGE_PIN_H

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

@@ -1,9 +0,0 @@
-#ifndef HEADSTAGE_POWER_H
-#define HEADSTAGE_POWER_H
-
-#include <ti/drivers/Power.h>
-#include <ti/drivers/power/PowerCC26XX.h>
-
-#define headstage_power_shutdown() Power_shutdown(0, 0)
-
-#endif // HEADSTAGE_POWER_H

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

@@ -1,28 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_PWM_H
-#define HEADSTAGE_PWM_H
-
-#include <Board.h>
-#include <ti/drivers/PWM.h>
-
-static PWM_Handle headstage_pwm_handle;
-
-#define headstage_pwm_open()                                  \
-    do {                                                      \
-        PWM_init();                                           \
-        PWM_Params params;                                    \
-        PWM_Params_init(&params);                             \
-        params.idleLevel     = PWM_IDLE_LOW;                  \
-        params.periodUnits   = PWM_PERIOD_HZ;                 \
-        params.periodValue   = UMC_SYS_CLK;                   \
-        params.dutyUnits     = PWM_DUTY_FRACTION;             \
-        params.dutyValue     = PWM_DUTY_FRACTION_MAX / 2;     \
-        headstage_pwm_handle = PWM_open(Board_PWM0, &params); \
-    } while (0);
-
-#define headstage_pwm_start() PWM_start(headstage_pwm_handle)
-#define headstage_pwm_stop() PWM_stop(headstage_pwm_handle)
-#define headstage_pwm_close() PWM_close(headstage_pwm_handle)
-
-#endif  // HEADSTAGE_PWM_H

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

@@ -1,43 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_SPI_H
-#define HEADSTAGE_SPI_H
-
-#include <Board.h>
-#include <ti/drivers/SPI.h>
-#include <ti/drivers/dma/UDMACC26XX.h>
-#include <ti/drivers/spi/SPICC26XXDMA.h>
-
-/*
- * SPI parameter and function declaration
- */
-static SPI_Handle      spi_handle;
-static SPI_Transaction spi_transaction;
-
-#define headstage_spi_close() SPI_close(spi_handle)
-#define headstage_spi_transaction_cancel() SPI_transferCancel(spi_handle)
-
-// SPI parameters initialize
-#define headstage_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;                        \
-        spi_handle                    = SPI_open(Board_SPI0, &spi_parameter); \
-    } while (0)
-
-#define headstage_spi_transaction(len, tx, rx)      \
-    ({                                              \
-        spi_transaction.txBuf = (tx);               \
-        spi_transaction.rxBuf = (rx);               \
-        spi_transaction.count = (len);              \
-        SPI_transfer(spi_handle, &spi_transaction); \
-    })
-
-#endif  // HEADSTAGE_SPI_H

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

@@ -1,532 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-
-/*
-
-Device Document
-===============
-
-Real instruction format
------------------------
-
-TODO
-
- */
-
-#ifndef HEADSTAGE_H
-#error "headstage.h not include"
-#endif
-
-#ifndef HEADSTAGE_STI_H
-#define HEADSTAGE_STI_H
-
-/*============================
- ==== product information ====
- ===========================*/
-
-#define DEVICE_NAME "NeuliveSTI-M0.1"
-#define MAJOR_PRODUCT_NUMBER 1
-#define MINOR_PRODUCT_NUMBER 2
-#define MAJOR_VERSION_NUMBER 0
-#define MINOR_VERSION_NUMBER 1
-
-/*=================
- ==== constant ====
- =================*/
-
-// clang-format off
-
-
-#define CHANNEL_BATTERY         0
-#define CHANNEL_STI_0           1
-#define CHANNEL_STI_1           2
-#define TOTAL_CHANNEL_NUMBER    3
-
-#define RIS_GLOBAL              0x20
-#define RIS_LOCAL               0x40
-#define RIS_CHANNEL             0x80
-
-#define DEBUG_INS_SLEEP         0x50
-
-#define STI_POS                 0x00
-#define STI_NEG                 0x01
-#define STI_P2N                 0x02
-#define STI_N2P                 0x03
-
-// clang-format on
-
-/*================
- ==== include ====
- ================*/
-
-#include "headstage_debug.h"
-#include "headstage_power.h"
-#include "sti/headstage_adc.h"
-#include "sti/headstage_gptimer.h"
-#include "sti/headstage_pin.h"
-#include "sti/headstage_pwm.h"
-
-/*=================================
- ==== constant parameter table ====
- ================================*/
-
-/*========================
- ==== parameter table ====
- ========================*/
-
-typedef struct {
-    uint8_t  enable;
-    uint8_t  mode;
-    uint8_t  precision;
-    uint16_t frequency;
-    uint16_t pulse_width;
-    uint16_t pw_ipi;
-    uint16_t times;
-
-    /**
-     * low frequency counter.
-     */
-    int low_freq_counter;
-} NeuLiveStiChanelParameter;
-
-struct HEADSTAGE_PARAMETER_TABLE {
-    uint32_t                  duty_cycle;
-    NeuLiveStiChanelParameter channel[TOTAL_CHANNEL_NUMBER];
-} INSTRUCTION = {0};
-
-#define reset_parameter_table() memset(&INSTRUCTION, 0, sizeof(struct HEADSTAGE_PARAMETER_TABLE));
-
-#define actual_channel_frequency(p) (p->frequency / (p->precision ? 10 : 1))
-
-#define is_low_frequency(p) ((p->frequency < 4 && p->precision == 0) || (p->frequency < 2000 && p->precision == 1))
-
-static GPTimerCC26XX_Handle headstage_gptimer_handle[] = {
-    //
-    gptimer_handle_2,
-    gptimer_handle_0,
-    gptimer_handle_1,
-    //
-};
-
-static ADC_Handle headstage_adc_handle[] = {
-    //
-    headstage_adc_handle_2,
-    headstage_adc_handle_0,
-    headstage_adc_handle_1,
-    //
-};
-
-/*=============================
- ==== function declaration ====
- ============================*/
-
-static void headstage_sti_pulse_event(uint8_t channel);
-static void headstage_sti_collect_recording_data(uint8_t channel);
-static void headstage_sti_collect_stimulation_information();
-
-/*=======================
- ==== event dispatch ====
- =======================*/
-
-static void headstage_sti_event() {
-    if (flag_mask(EVT_PERIODIC_GPTIMER_0)) {
-        flag_disable(EVT_PERIODIC_GPTIMER_0);
-
-        headstage_sti_pulse_event(CHANNEL_STI_0);
-    }
-
-    if (flag_mask(EVT_PERIODIC_GPTIMER_1)) {
-        flag_disable(EVT_PERIODIC_GPTIMER_1);
-
-        headstage_sti_pulse_event(CHANNEL_STI_1);
-    }
-
-    if (flag_mask(EVT_PERIODIC_GPTIMER_2)) {
-        flag_disable(EVT_PERIODIC_GPTIMER_2);
-
-        headstage_sti_collect_recording_data(CHANNEL_BATTERY);
-        headstage_sti_collect_stimulation_information();
-    }
-
-    if (EVENT_MASK == 0) {
-        // fast return
-        return;
-    }
-
-    if (flag_mask(EVT_DISCONNECTED)) {
-        headstage_update_vis_instruction(VIS_INT);
-    }
-}
-
-/*===========================
- ==== function implement ====
- ==========================*/
-
-static void headstage_init() {
-    headstage_pin_open();
-    headstage_gptimer_open();
-    headstage_pwm_open();
-    headstage_adc_open();
-
-    headstage_gptimer_set_frequency(headstage_gptimer[CHANNEL_BATTERY], 200);
-
-    headstage_pwm_start();
-
-    headstage_pin_output(PIN_STI_0, 0);
-    headstage_pin_output(PIN_SET_1, 0);
-    headstage_pin_output(PIN_SET_3, 1);
-    headstage_pin_output(PIN_SET_5, 0);
-    headstage_pin_output(PIN_SET_6, 0);
-    headstage_pin_output(PIN_SET_10, 0);
-    headstage_pin_output(PIN_SET_11, 0);
-}
-
-static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t *instruction) {
-    uint8_t ins_oper = instruction[0] & 0xE0;
-
-    switch (ins_oper) {
-    case RIS_GLOBAL: {
-        // 5b11111#header;2b0#GV;12bCURRENT
-        // --------------------
-        // 3b001#header#;1bx;12bCURRENT
-
-        uint16_t a       = (uint16_t)(instruction[0]) && 0x0F;
-        uint16_t b       = (uint16_t)(instruction[1]) && 0xFF;
-        uint16_t current = (a << 8) | b;  // actual current output(mA) in 1mA mode   (2019/03)
-
-        INSTRUCTION.duty_cycle = current;
-        headstage_pwm_set(MAX_DUTY, current);
-        break;
-    }
-
-    case RIS_LOCAL: {
-        // 5b11111#header;2b01#LV
-        // 3b>channel
-        // 1b>PRECISION[channel]
-        // 3b>STI_MODE[channel]
-        // 12b>STI_FREQ[channel]
-        // 10b>STI_PW[channel]
-        // 10b>STI_PW_IPI[channel]
-        // 10b>STI_NUM[channel]
-        // --------------------
-        // 3b010#header;1bx
-        // 4b>channel
-        // 3b>STI_MODE[channel]
-        // 1b>PRECISION[channel]
-        // 12b>STI_FREQ[channel]
-        // 10b>STI_PW[channel]
-        // 10b>STI_PW_IPI[channel]
-        // 10b>STI_NUM[channel]
-        uint8_t  channel = (instruction[0] & 0x0F);
-        uint8_t  mode    = (instruction[1] & 0xE0) >> 5;
-        uint8_t  prec    = (instruction[1] & 0x10) >> 4;
-        uint16_t freq_a  = (uint16_t)(instruction[1]) & 0x0F;
-        uint16_t freq_b  = (uint16_t)(instruction[2]) & 0xFF;
-        uint16_t freq    = (freq_a << 8) | freq_b;
-        uint16_t width_a = (uint16_t)(instruction[3]) & 0xFF;
-        uint16_t width_b = (uint16_t)(instruction[4]) & 0xC0;
-        uint16_t width   = (width_a << 2) | (width_b >> 6);
-        uint16_t ipi_a   = (uint16_t)(instruction[4]) & 0x3F;
-        uint16_t ipi_b   = (uint16_t)(instruction[5]) & 0xF0;
-        uint16_t ipi     = (ipi_a << 4) | (ipi_b >> 4);
-        uint16_t times_a = (uint16_t)(instruction[5]) & 0x0F;
-        uint16_t times_b = (uint16_t)(instruction[6]) & 0xFC;
-        uint16_t times   = (times_a << 6) | (times_b >> 2);
-
-        if (channel < TOTAL_CHANNEL_NUMBER - 1) {
-            NeuLiveStiChanelParameter *p = &INSTRUCTION.channel + 1 + channel;
-
-            uint16_t adjust_value = (channel == 0) ? 3 : 5;
-
-            if (width > 0) {
-                // error when output 100us
-                width += (width * adjust_value / 100) - 1;
-            }
-
-            if (ipi > 0) {
-                // error when output 100us
-                ipi += (ipi * adjust_value / 100) - 1;
-            }
-
-            p->mode        = mode;
-            p->precision   = prec;
-            p->frequency   = freq;
-            p->pulse_width = width;
-            p->pulse_width = width;
-            p->pw_ipi      = ipi;
-            p->times       = times;
-        }
-
-        break;
-    }
-
-    case RIS_CHANNEL: {
-        // 5b11111#header;2b10#CE
-        // a0;a1;a2;a3;a4;a5;a6;a7;a8;a9;aa;ab;ac;ad;ae;af
-        // --------------------
-        // 3b100#header;5bx;
-        // a0;a1;a2;a3;a4;a5;a6;a7;a8;a9;aa;ab;ac;ad;ae;af
-
-        if (INSTRUCTION.duty_cycle == 0) {
-            break;
-        }
-
-        for (uint8_t channel = 1; channel < TOTAL_CHANNEL_NUMBER; i++) {
-            NeuLiveStiChanelParameter *p = &INSTRUCTION.channel + channel;
-
-            uint8_t index = 1 + (channel - 1) % 8;
-            uint8_t mask  = 1 << (7 - (channel - 1) / 8);
-
-            p->enable = 0;
-
-            if ((instruction[index] & mask) != 0) {
-                uint16_t frequency = actual_channel_frequency(p);
-
-                if (is_low_frequency(p)) {
-                    frequency *= 100;
-                }
-
-                if (frequency != 0 && p->pulse_width != 0) {
-                    p->enable = 1;
-                    headstage_gptimer_set_frequency(headstage_gptimer_handle[channel], frequency);
-                }
-            }
-        }
-
-        break;
-    }
-    }
-}
-
-static void headstage_update_vis_instruction(uint8_t vis_oper) {
-    switch (vis_oper) {
-    case VIS_STI:
-        headstage_gptimer_start(gptimer_handle_0);
-        headstage_gptimer_start(gptimer_handle_1);
-        headstage_gptimer_start(gptimer_handle_2);
-        break;
-    case VIS_RST:
-        headstage_gptimer_stop(gptimer_handle_0);
-        headstage_gptimer_stop(gptimer_handle_1);
-        headstage_gptimer_stop(gptimer_handle_2);
-        reset_parameter_table();
-        break;
-    case VIS_INT:
-        headstage_gptimer_stop(gptimer_handle_0);
-        headstage_gptimer_stop(gptimer_handle_1);
-        headstage_gptimer_stop(gptimer_handle_2);
-        break;
-    }
-}
-
-static uint8_t headstage_debug_instruction(uint8_t ins_buf) {
-    uint8_t ins_oper = ins_buf[0] & 0xF0;
-
-    switch (ins_oper) {
-    case DEBUG_INS_SLEEP:
-        headstage_pin_output(IOID_3, 0);
-        headstage_power_shutdown();
-        break;
-    }
-}
-
-/*========================
- ==== device function ====
- =======================*/
-
-static void headstage_sti_pulse_event(uint8_t channel) {
-    NeuLiveStiChanelParameter *p;
-
-    switch (channel) {
-    case CHANNEL_STI_0:
-    case CHANNEL_STI_1:
-        p = &INSTRUCTION.channel + channel;
-        break;
-    case CHANNEL_BATTERY:
-    default:
-        return;
-    }
-
-    if (!(p->enable && p->times > 0)) {
-        return;
-    }
-
-    uint8_t p0, p1, p2;
-
-    switch (channel) {
-    case CHANNEL_STI_0:
-        p0 = PIN_STI_0;
-        p1 = PIN_SET_10;
-        p2 = PIN_SET_11;
-        break;
-    case CHANNEL_STI_1:
-        p0 = PIN_STI_1;
-        p1 = PIN_SET_6;
-        p2 = PIN_SET_5;
-        break;
-    }
-
-    switch (p->mode) {
-    case STI_POS:
-        headstage_pin_output(p1, 0);
-        headstage_pin_output(p2, 1);
-        headstage_pin_output(p0, 1);
-        headstage_cpu_delay_us(p->pulse_width);
-        headstage_pin_output(p2, 0);
-        break;
-    case STI_NEG:
-        headstage_pin_output(p1, 1);
-        headstage_pin_output(p2, 1);
-        headstage_pin_output(p0, 1);
-        headstage_cpu_delay_us(p->pulse_width);
-        headstage_pin_output(p2, 0);
-        break;
-    case STI_P2N:
-        if (p->pw_ipi == 0) {
-            headstage_pin_output(p1, 0);
-            headstage_pin_output(p2, 1);
-            headstage_pin_output(p0, 1);
-            headstage_cpu_delay_us(p->pulse_width);
-            headstage_pin_output(p1, 1);
-            headstage_cpu_delay_us(p->pulse_width);
-            headstage_pin_output(p2, 0);
-        } else {
-            headstage_pin_output(p1, 0);
-            headstage_pin_output(p2, 1);
-            headstage_pin_output(p0, 1);
-            headstage_cpu_delay_us(p->pulse_width);
-            headstage_pin_output(p2, 0);
-            headstage_cpu_delay_us(p->pw_ipi);
-            headstage_pin_output(p2, 1);
-            headstage_pin_output(p1, 1);
-            headstage_cpu_delay_us(p->pulse_width);
-            headstage_pin_output(p2, 0);
-        }
-        break;
-    case STI_N2P:
-        if (p->pw_ipi == 0) {
-            headstage_pin_output(p1, 1);
-            headstage_pin_output(p2, 1);
-            headstage_pin_output(p0, 1);
-            headstage_cpu_delay_us(p->pulse_width);
-            headstage_pin_output(p1, 0);
-            headstage_cpu_delay_us(p->pulse_width);
-            headstage_pin_output(p2, 0);
-        } else {
-            headstage_pin_output(p1, 1);
-            headstage_pin_output(p2, 1);
-            headstage_pin_output(p0, 1);
-            headstage_cpu_delay_us(p->pulse_width);
-            headstage_pin_output(p2, 0);
-            headstage_cpu_delay_us(p->pw_ipi);
-            headstage_pin_output(p2, 1);
-            headstage_pin_output(p1, 0);
-            headstage_cpu_delay_us(p->pulse_width);
-            headstage_pin_output(p2, 0);
-        }
-        break;
-    }
-
-    headstage_sti_collect_recording_data(channel);
-}
-
-// XXX move code to headstage_sti_event and keep interrupt handle clean?
-static void headstage_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask) {
-    NeuLiveStiChanelParameter *p = &INSTRUCTION.channel;
-
-    uint16_t evt_flag = 0;
-
-    if (handle == gptimer_handle_0) {
-        p += CHANNEL_STI_0;
-        evt_flag = EVT_PERIODIC_GPTIMER_0;
-
-        goto sti_channel_event;
-
-    } else if (handle == gptimer_handle_1) {
-        p += CHANNEL_STI_1;
-        evt_flag = EVT_PERIODIC_GPTIMER_1;
-
-        goto sti_channel_event;
-
-    } else if (handle == gptimer_handle_2) {
-        if (p->low_freq_counter > 0) {
-            p->low_freq_counter--;
-
-        } else {
-            p->low_freq_counter = 9;
-
-            evt_flag = EVT_PERIODIC_GPTIMER_2;
-
-            goto fire_event;
-        }
-    }
-
-    return;
-
-sti_channel_event:
-
-    if (is_low_frequency(p)) {
-        if (p->low_freq_counter > 0) {
-            p->low_freq_counter--;
-        } else {
-            p->low_freq_counter = 99;
-
-            if (p->enable && p->times > 0) {
-                p->times--;
-                goto fire_event;
-            }
-        }
-    } else {
-        if (p->enable && p->times > 0) {
-            p->times--;
-            goto fire_event;
-        }
-    }
-
-    return;
-
-fire_event:
-
-    if (evt_flag) {
-        flag_notify(evt_flag);
-    }
-}
-
-static void headstage_sti_collect_recording_data(uint16_t channel) {
-    uint16_t adc_value;
-
-    headstage_adc_convert(headstage_adc_handle[channel], &adc_value);
-
-    uint8_t not_size = headstage_notify_append_data(channel, adc_value);
-
-    if (not_size >= BLE_DATA_BUFF_SIZE) {
-        headstage_notify_send();
-    }
-}
-
-static void headstage_sti_collect_stimulation_information() {
-    // flush remind data in notify buffer
-    if (not_buf_offset > NOT_BUF_OFFSET_INIT) {
-        headstage_notify_flip_buffer();
-        headstage_notify_send();
-    }
-
-    //
-    headstage_notify_set_timestamp();
-
-    uint16_t sti_times_0 = INSTRUCTION.channel[CHANNEL_STI_0].times;
-    uint16_t sti_times_1 = INSTRUCTION.channel[CHANNEL_STI_1].times;
-
-    uint8_t *p = headstage_notify_buffer + NOT_BUF_OFFSET_INIT;
-    *p++       = (sti_times_0 >> 8) && 0xFF;
-    *p++       = sti_times_0 && 0xFF;
-    *p++       = (sti_times_1 >> 8) && 0xFF;
-    *p++       = sti_times_1 && 0xFF;
-
-    not_buf_offset = p - headstage_notify_buffer;
-
-    headstage_notify_flip_buffer();
-    headstage_notify_send();
-}
-
-#endif  // HEADSTAGE_STI_H

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

@@ -1,503 +1,145 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
 
-/*
+#ifndef HEADSTAGE_H
+#error "headstage.h not include"
+#endif
 
-Headstage TNI Document
-======================
-
-Although this file and correspond device do not used anymore,
-this header could be a example to implement a driver.
-
-Real instruction format
------------------------
-
-
- */
+#ifdef HEADSTAGE_H_H
+#error "headstage_*.h has be included"
+#endif
 
 #ifndef HEADSTAGE_TNI_H
+#define HEADSTAGE_H_H
 #define HEADSTAGE_TNI_H
 
-/*============================
- ==== product information ====
- ===========================*/
-
-#define DEVICE_NAME "Elite-v0.2"
+// product information
+#define DEVICE_NAME "Elite-v0.1"
 #define MAJOR_PRODUCT_NUMBER 0
 #define MINOR_PRODUCT_NUMBER 1
 #define MAJOR_VERSION_NUMBER 0
 #define MINOR_VERSION_NUMBER 1
 
-/*================
- ==== include ====
- ================*/
+// header
+#include <ti/drivers/PIN.h>
+#include "board.h"
 
-#include "headstage_arm.h"
-#include "headstage_gptimer.h"
-#include "headstage_notify.h"
-#include "tni/headstage_notify.h"
-#include "tni/headstage_pin.h"
-#include "tni/headstage_spi.h"
+/*============
+ ==== SPI ====
+ ===========*/
 
-/*=================================
- ==== constant parameter table ====
- ================================*/
+/* application use SPI parameters and buffers */
 
-// clang-format off
+#define SPI_BUFFER_SIZE 16
 
-#define RIS_ART 0x60    // amplifier reset
-#define RIS_ARM 0x80
-#define RIS_DIR 0xA0
-#define RIS_REC 0xC0
-#define RIS_STI 0xE0
-
-#define FREQ_MODE_INDEX 0
-#define FREQ_MODE_VALUE 1
-
-#define STI_MODE_DISABLE    0
-#define STI_MODE_POS        1
-#define STI_MODE_NEG        2
-#define STI_MODE_P2N        3
-#define STI_MODE_N2P        4
-#define STI_MODE_AWF        5
-#define ARM_MODE_RAMP       8
-// clang-format on
-
-#define IS_REC_MODE(mode) (STI_MODE_DISABLE == (mode))
-#define IS_STI_MODE(mode) (STI_MODE_DISABLE < (mode) && (mode) <= STI_MODE_AWF)
-#define IS_ARM_MODE(mode) (ARM_MODE_RAMP == (mode))
-
-#define REC_CHANNEL_COUNT 16
-
-/**
- * stimulation frequency fixed-value table.
- */
-static uint32_t sti_freq_table[] = {
-    15,
-    25,
-    40,
-    50,
-    100,
-    250,
-    400,
-    500,
-    1000,
-    2500,
-    4000,
-    5000,
-    5000,  // 12
-    5000,  // 13
-    5000,  // 14
-    5000,  // 15
-};
-
-/**
- * ADC clock/sampling rate fixed-value table
- */
-static uint32_t adc_clock_table[] = {
-    30,
-    50,
-    80,
-    100,
-    200,
-    500,
-    800,
-    1000,
-    2000,
-    5000,
-    8000,
-    10000,
-    10000,  // 12
-    10000,  // 13
-    10000,  // 14
-    10000,  // 15
-};
-
-/*========================
- ==== parameter table ====
- ========================*/
-
-struct HEADSTAGE_PARAMETER_TABLE {
-    /**
-     * MODE
-     */
-    uint8_t mode;
-
-    uint8_t channel_table[REC_CHANNEL_COUNT];
-
-    /**
-     * indicate the value frequency is a index (to a mapper table) or a value
-     */
-    uint8_t frequency_mode;
-
-    /**
-     * RATE. ADC clock/sampling rate value
-     * FREQ. the stimulation frequency value.
-     */
-    uint32_t frequency;
-
-    uint8_t amp_gain;
-    uint8_t amp_low_band_freq;
-    uint8_t chopper;
-    uint8_t fast_settle;
-    uint8_t sti_channel_pmos;
-    uint8_t sti_channel_nmos;
-    uint8_t sti_volt;
-
-    uint8_t flag_start;
-
-    /**
-     * ADC clock switch signal.
-     */
-    bool adc_clock_signal;
-
-    /*
-     * amplifier reset
-     */
-    bool amp_rst;
-
-    int8_t channel_pointer;
-
-    uint8_t data_channel;
-
-} INSTRUCTION = {0};
-
-#define reset_parameter_table() memset(&INSTRUCTION, 0, sizeof(struct HEADSTAGE_PARAMETER_TABLE));
-#define actual_frequency() ((INSTRUCTION.frequency_mode == FREQ_MODE_INDEX) ? (adc_clock_table[INSTRUCTION.frequency]) : (INSTRUCTION.frequency))
+static uint8_t spi_txbuf[SPI_BUFFER_SIZE] = {0};
+static uint8_t spi_rxbuf[SPI_BUFFER_SIZE] = {0};
 
 /*=============================
- ==== function declaration ====
+ ==== headstage variable ====
  ============================*/
 
-static void headstage_tni_periodic();
-static void update_ins_buffer();
+PIN_Handle       pin_handle;
+static PIN_State DBS_rst;
 
-/*=======================
- ==== event dispatch ====
- =======================*/
+// DBS reset pin
 
-static void headstage_tni_event() {
-    if (flag_mask(EVT_PERIODIC_GPTIMER)) {
-        flag_disable(EVT_PERIODIC_GPTIMER);
-        headstage_tni_periodic();
-    }
-
-    if (EVENT_MASK == 0) {
-        // fast return
-        return;
-    }
-
-    if (flag_mask(EVT_DISCONNECTED)) {
-        headstage_update_vis_instruction(VIS_INT);
-    }
-}
-
-/*===========================
- ==== function implement ====
- ==========================*/
-
-static void headstage_init() {
-    headstage_pin_open();
-    headstage_spi_open();
-    headstage_gptimer_open();
-
-    headstage_pin_output(PIN_S2P_RST, 0);
-    headstage_pin_output(PIN_P2S_RST, 0);
-}
-
-static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t *instruction) {
-    uint8_t header = instruction[0] & 0xE0;
-
-    switch (header) {
-    // direct instruction
-    case RIS_DIR: {
-        uint8_t amp_gain    = (instruction[0] & 0b00011000) >> 3;
-        uint8_t amp_lbf     = (instruction[0] & 0b00000111);
-        uint8_t channel     = (instruction[1] & 0b11110000) >> 4;
-        uint8_t chopper     = (instruction[1] & 0b00001000) >> 3;
-        uint8_t fast_settle = (instruction[1] & 0b00000100) >> 2;
-        uint8_t mode        = (instruction[1] == 0b00000010) ? STI_MODE_POS : STI_MODE_DISABLE;
-        uint8_t sti_volt_h  = (instruction[1] & 0b00000001);
-        uint8_t sti_volt_l  = (instruction[2] & 0b11110000) >> 4;
-        uint8_t sti_volt    = (sti_volt_h << 4) | sti_volt_l;
-        uint8_t sti_chp     = (instruction[2] & 0b00001111);
-        uint8_t sti_chn     = (instruction[3] & 0b11110000) >> 4;
-        uint8_t frequency   = (instruction[3] & 0b00001111);
-
-        INSTRUCTION.mode                   = mode;
-        INSTRUCTION.channel_table[channel] = TRUE;
-        INSTRUCTION.frequency_mode         = FREQ_MODE_INDEX;
-        INSTRUCTION.frequency              = frequency;
-        INSTRUCTION.amp_gain               = amp_gain;
-        INSTRUCTION.amp_low_band_freq      = amp_lbf;
-        INSTRUCTION.chopper                = chopper;
-        INSTRUCTION.fast_settle            = fast_settle;
-        INSTRUCTION.sti_volt               = sti_volt;
-        INSTRUCTION.sti_channel_pmos       = sti_chp;
-        INSTRUCTION.sti_channel_nmos       = sti_chn;
-        break;
-    }
-
-    // recording instruction
-    case RIS_REC: {
-        uint8_t amp_gain  = (instruction[0] & 0b00011000) >> 3;
-        uint8_t amp_lbf   = (instruction[0] & 0b00000111);
-        uint8_t frequency = (instruction[1] & 0b11110000) >> 4;
-
-        INSTRUCTION.mode              = STI_MODE_DISABLE;
-        INSTRUCTION.amp_gain          = amp_gain;
-        INSTRUCTION.amp_low_band_freq = amp_lbf;
-        INSTRUCTION.frequency_mode    = FREQ_MODE_INDEX;
-        INSTRUCTION.frequency         = frequency;
-
-        uint8_t cha = (instruction[2] & 0b11110000) >> 4;
-        uint8_t chb = (instruction[2] & 0b00001111);
-        uint8_t chc = (instruction[3] & 0b11110000) >> 4;
-        uint8_t chd = (instruction[3] & 0b00001111);
-
-        if (instruction[1] & 0b1000) INSTRUCTION.channel_table[cha] = TRUE;
-        if (instruction[1] & 0b0100) INSTRUCTION.channel_table[chb] = TRUE;
-        if (instruction[1] & 0b0010) INSTRUCTION.channel_table[chc] = TRUE;
-        if (instruction[1] & 0b0001) INSTRUCTION.channel_table[chd] = TRUE;
-        break;
-    }
-
-    // artifact recording instruction
-    case RIS_ARM: {
-        uint8_t arm_mode  = (instruction[0] & 0b00000111);
-        uint8_t frequency = (instruction[1] & 0b11110000) >> 4;
-
-        INSTRUCTION.mode              = STI_MODE_DISABLE;
-        INSTRUCTION.amp_gain          = arm_mode;
-        INSTRUCTION.amp_low_band_freq = 0;
-        INSTRUCTION.frequency_mode    = FREQ_MODE_INDEX;
-        INSTRUCTION.frequency         = frequency;
-
-        uint8_t cha = (instruction[2] & 0b11110000) >> 4;
-        uint8_t chb = (instruction[2] & 0b00001111);
-        uint8_t chc = (instruction[3] & 0b11110000) >> 4;
-        uint8_t chd = (instruction[3] & 0b00001111);
-
-        if (instruction[1] & 0b1000) INSTRUCTION.channel_table[cha] = TRUE;
-        if (instruction[1] & 0b0100) INSTRUCTION.channel_table[chb] = TRUE;
-        if (instruction[1] & 0b0010) INSTRUCTION.channel_table[chc] = TRUE;
-        if (instruction[1] & 0b0001) INSTRUCTION.channel_table[chd] = TRUE;
-
-        switch (arm_mode) {
-        case 1:
-            INSTRUCTION.mode = ARM_MODE_RAMP;
-            break;
-        }
-        break;
-    }
-
-    // stimulating instruction
-    case RIS_STI: {
-        uint8 mode = (instruction[0] & 0b00011000) >> 3;
-
-        switch (mode) {
-        // simple instruction
-        case 0: {
-            uint8_t mode        = (instruction[0] & 0b00000111);
-            uint8_t sti_freq    = (instruction[1] & 0b11110000) >> 4;
-            uint8_t chopper     = (instruction[1] & 0b00001000);
-            uint8_t fast_settle = (instruction[1] & 0b00000100);
-            uint8_t sti_chp     = (instruction[2] & 0b11110000) >> 4;
-            uint8_t sti_chn     = (instruction[2] & 0b00001111);
-            uint8_t sti_volt    = (instruction[3] & 0b11111000) >> 3;
-
-            INSTRUCTION.mode           = mode;
-            INSTRUCTION.chopper        = chopper;
-            INSTRUCTION.fast_settle    = fast_settle;
-            INSTRUCTION.sti_volt       = sti_volt;
-            INSTRUCTION.frequency_mode = FREQ_MODE_INDEX;
-            INSTRUCTION.frequency      = sti_freq;
-
-            switch (mode) {
-            case STI_MODE_POS:
-            case STI_MODE_P2N: {
-                INSTRUCTION.sti_channel_pmos = sti_chp;
-                INSTRUCTION.sti_channel_nmos = sti_chn;
-                break;
-            }
-            case STI_MODE_NEG:
-            case STI_MODE_N2P: {
-                INSTRUCTION.sti_channel_pmos = sti_chn;
-                INSTRUCTION.sti_channel_nmos = sti_chp;
-                break;
-            }
-            }
-            break;
-        }
-
-        // continuous frequency
-        case 1: {
-            uint8_t  prec = (instruction[0] & 0b00000111);
-            uint32_t freq = (instruction[1] << 16) | (instruction[2] << 8) | (instruction[3]);
-
-            // XXX consider precision
-            INSTRUCTION.frequency_mode = FREQ_MODE_VALUE;
-            INSTRUCTION.frequency      = freq;
-            break;
-        }
-
-        // reserved
-        case 2:
-        case 3:
-        default:
-            break;
-        }
-        break;
-    }
-
-    case RIS_ART: {
-        break;
-    }
-    }
-
-    // update gptimer frequency
-    uint32_t frequency = 0;
-    if (INSTRUCTION.frequency_mode == FREQ_MODE_INDEX) {
-        if (IS_REC_MODE(INSTRUCTION.mode) || IS_ARM_MODE(INSTRUCTION.mode)) {
-            // recording mode
-            frequency = adc_clock_table[INSTRUCTION.frequency];
-
-        } else if (IS_STI_MODE(INSTRUCTION.mode)) {
-            // stimulation mode
-            frequency = sti_freq_table[INSTRUCTION.frequency];
-        }
-    } else {
-        frequency = INSTRUCTION.frequency;
-    }
-
-    if (frequency > 0) {
-        headstage_gptimer_set_frequency(frequency);
-    }
-
-    // update instruction buffer
-    update_ins_buffer();
-}
-
-static void headstage_update_vis_instruction(uint8_t vis_oper) {
-    switch (vis_oper) {
-    case VIS_STI:
-        INSTRUCTION.flag_start = TRUE;
-        headstage_gptimer_start();
-        break;
-
-    // reset
-    case VIS_RST:
-        // stop gptimer
-        headstage_gptimer_stop();
-
-        // reset. reset all variable
-        reset_parameter_table();
-        memset(spi_txbuf, 0, SPI_BUFFER_SIZE);
-
-        not_buf_offset = NOT_BUF_OFFSET_INIT;
-
-        INSTRUCTION.channel_pointer = -1;
-        break;
-
-    // interrupt
-    case VIS_INT:
-        // stop gptimer
-        headstage_gptimer_stop();
-
-        // stop. reset channel table
-        memset(&INSTRUCTION.channel_table, 0, REC_CHANNEL_COUNT);
-        memset(spi_txbuf, 0, SPI_BUFFER_SIZE);
-
-        not_buf_offset = NOT_BUF_OFFSET_INIT;
-
-        INSTRUCTION.channel_pointer = -1;
-        break;
-
-    default:
-        break;
-        // nothing
-    }
-}
-
-/*======================
- ==== notify buffer ====
- =====================*/
+const PIN_Config BLE_IO[] = {
+    //
+    IOID_9 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    IOID_2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    IOID_3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    IOID_13 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    PIN_TERMINATE  //
+};
 
 /**
- * move data to not_buf. If not_buf is full, then send notify.
+ * ADC clock switch signal.
  */
-static void headstage_tni_data_append_notify_buffer(uint8_t *dat_buf) {
-    uint8_t  channel    = INSTRUCTION.data_channel;
-    uint16_t data_value = 0;
-    uint8_t  data_size;
+static bool adc_clock_signal = FALSE;
 
-    if ((dat_buf[0] & 0xF0) == 0xB0) {
-        // valid value
-        data_value = (((uint16_t)dat_buf[0] & 0x0F) << 6) | ((dat_buf[1] & 0xFC) >> 2);
-        data_size  = headstage_notify_append_data(channel, &data_value);
-    } else {
-        data_size = headstage_notify_append_data(channel, NULL);
-    }
+/*=======================================
+ ==== headstage function declaration ====
+ ======================================*/
 
-    // check buffer full or not
-    // check whether has more place to append data into notify buffer
-    if (data_size >= BLE_NOT_BUFF_SIZE) {
-        headstage_notify_send();
-    }
+static void headstage_tni_update_instruction_callback(uint8_t ins_type, uint8_t ins_op, uint8_t ins_len, uint8_t *ins);
+
+/*=============================
+ ==== ramp data generating ====
+ ============================*/
+
+static uint16_t ramp_data_counter = 0;
+
+static void create_ramp(uint8_t *buff) {
+    buff[0] = 0b10110000 | (0b00001111 & (uint8_t)(ramp_data_counter >> 6));
+    buff[1] = (uint8_t)(ramp_data_counter << 2);
+    ramp_data_counter += 1;
 }
 
-/*===========================
- ==== instruction buffer ====
- ===========================*/
+/*=======================================
+ ==== headstage function implemented ====
+ ======================================*/
+
+/**
+ * change channel value to little endian
+ */
+static uint8 encode_channel(uint8 channel) {
+    return 0x0F & (((channel & 0b1000) >> 3) |  //
+                   ((channel & 0b0100) >> 1) |  //
+                   ((channel & 0b0010) << 1) |  //
+                   ((channel & 0b0001) << 3));
+}
+
+static void headstage_init() {
+    set_update_instruction_callback(headstage_tni_update_instruction_callback);
+
+    // initialize the DBS reset pin
+    pin_handle = PIN_open(&DBS_rst, BLE_IO);
+    PIN_setOutputValue(pin_handle, IOID_9, 1);
+    PIN_setOutputValue(pin_handle, IOID_2, 0);
+    PIN_setOutputValue(pin_handle, IOID_3, 0);
+}
 
 /**
  * change the recording clock bit in the instruction buffer.
  */
-static void update_ins_rec_clock(uint8_t *ins_buf, bool adc_clock_signal) {
-    ins_buf[3] = (ins_buf[3] & 0b11110000) | ((adc_clock_signal) ? 0b1000 : 0);
+static void update_ins_rec_clock(uint8_t *buf, bool adc_clock_signal) {
+    buf[3] = (buf[3] & 0b11110000) | ((adc_clock_signal) ? 0b1000 : 0);
 }
 
 /**
  * change the recording channel bit in the instruction buffer.
  */
-static void update_ins_rec_channel(uint8_t *ins_buf, uint8 channel) {
-    ins_buf[1] = (ins_buf[1] & 0b00001111) | (_B_flip4(channel) << 4);
+static void update_ins_rec_channel(uint8_t *buf, uint8 channel) {
+    buf[1] = (buf[1] & 0b00001111) | (encode_channel(channel) << 4);
 }
 
 /**
  * change the stimulation enable bit in the instruction buffer.
  */
-static void update_ins_sti_enable(uint8_t *ins_buf, bool enable) {
-    ins_buf[1] = (ins_buf[1] & 0b11111101) | ((enable) ? 0b10 : 0);
+static void update_ins_sti_enable(uint8_t *buf, bool enable) {
+    buf[1] = (buf[1] & 0b11111101) | ((enable) ? 0b10 : 0);
 }
 
 /**
  * change the stimulating channel bit in the instruction buffer.
  */
-static void update_ins_sti_channel(uint8_t *ins_buf, uint8 sti_chp, uint8 sti_chn) {
-    ins_buf[2] = (ins_buf[2] & 0b11110000) | (_B_flip4(sti_chp));
-    ins_buf[3] = (ins_buf[3] & 0b00001111) | (_B_flip4(sti_chn) << 4);
+static void update_ins_sti_channel(uint8_t *buf, uint8 sti_chp, uint8 sti_chn) {
+    buf[2] = (buf[2] & 0b11110000) | encode_channel(sti_chp);
+    buf[3] = (buf[3] & 0b00001111) | (encode_channel(sti_chn) << 4);
 }
 
 static void update_ins_buffer() {
     uint8 header      = 0b10100000;
-    uint8 amp_gain    = (_B_flip2(INSTRUCTION.amp_gain) & 0b11) << 3;
-    uint8 amp_lbf     = _B_flip3(INSTRUCTION.amp_low_band_freq) & 0b111;
+    uint8 amp_gain    = (INSTRUCTION.amp_gain & 0b11) << 3;
+    uint8 amp_lbf     = INSTRUCTION.amp_low_band_freq & 0b111;
     uint8 channel     = 0;  // should be call update_ins_channel to modify this value
     uint8 chopper     = (INSTRUCTION.chopper) ? 0b00001000 : 0;
     uint8 fast_settle = (INSTRUCTION.fast_settle) ? 0b00000100 : 0;
-    uint8 sti_enable  = (INSTRUCTION.mode != STI_MODE_DISABLE) ? 0b00000010 : 0;
-    uint8 sti_volt    = _B_flip5(INSTRUCTION.sti_volt);
-    uint8 sti_volt_l  = (sti_volt & 0b10000) >> 4;
-    uint8 sti_volt_h  = (sti_volt & 0b01111) << 4;
+    uint8 sti_enable  = (INSTRUCTION.work_mode != STI_MODE_DISABLE) ? 0b00000010 : 0;
+    uint8 sti_volt_l  = (INSTRUCTION.sti_volt & 0b11111) >> 4;
+    uint8 sti_volt_h  = (INSTRUCTION.sti_volt & 0b01111) << 4;
     uint8 sti_chp     = INSTRUCTION.sti_channel_pmos & 0b1111;
     uint8 sti_chn     = (INSTRUCTION.sti_channel_nmos & 0b1111) << 4;
-    uint8 clk_signal  = 0;  // updated by update_ins_rec_clock to modify this value
-
-    if (INSTRUCTION.amp_rst) {
-        INSTRUCTION.amp_rst = 0;
-        fast_settle         = 0b0001000;
-    }
+    uint8 clk_signal  = 0;  // should be call update_ins_clock to modify this value
 
     spi_txbuf[0] = header | amp_gain | amp_lbf;
     spi_txbuf[1] = channel | chopper | fast_settle | sti_enable | sti_volt_l;
@@ -505,50 +147,19 @@ static void update_ins_buffer() {
     spi_txbuf[3] = sti_chn | clk_signal;
 }
 
-/**
- * find next enable channel
- */
-static int8_t next_active_channel(int8_t channel_pointer) {
-    channel_pointer++;
-
-    while (channel_pointer < REC_CHANNEL_COUNT && !INSTRUCTION.channel_table[channel_pointer]) {
-        channel_pointer++;
-    }
-
-    if (channel_pointer >= REC_CHANNEL_COUNT) {
-        // channel to to the end of the channel_table, set to the beginning and re-search enable channel.
-        channel_pointer = 0;
-        while (channel_pointer < REC_CHANNEL_COUNT && !INSTRUCTION.channel_table[channel_pointer]) {
-            channel_pointer++;
-        }
-
-        if (channel_pointer >= REC_CHANNEL_COUNT) {
-            // no channel enable, return directly
-            return -1;
-        }
-    }
-
-    return channel_pointer;
-}
-
 static bool update_ins_rec_buffer() {
-    int8_t channel_pointer = INSTRUCTION.channel_pointer;
+    adc_clock_signal = (adc_clock_signal) ? FALSE : TRUE;  // switch adc_clock
+    update_ins_rec_clock(spi_txbuf, adc_clock_signal);
 
-    update_ins_rec_clock(spi_txbuf, INSTRUCTION.adc_clock_signal);
+    if (adc_clock_signal) {
+        // change to next channel
 
-    if (channel_pointer >= 0) {
-        // store previous channel
-        INSTRUCTION.data_channel = (uint8_t)channel_pointer;
-    }
-
-    // change to next channel
-    channel_pointer = next_active_channel(channel_pointer);
-
-    if (channel_pointer >= 0) {
-        update_ins_rec_channel(spi_txbuf, channel_pointer);
-    } else {
-        // no channel active
-        return false;
+        if (next_active_channel()) {
+            update_ins_rec_channel(spi_txbuf, channel_pointer);
+        } else {
+            // no channel active
+            return false;
+        }
     }
 
     return true;
@@ -582,7 +193,7 @@ static bool update_ins_rec_buffer() {
  * @param: buf: pointer of the SPI buffer.
  */
 static void update_ins_sti_buffer() {
-    switch (INSTRUCTION.mode) {
+    switch (INSTRUCTION.work_mode) {
     case STI_MODE_POS:
     case STI_MODE_NEG:
         // copy [4:7]
@@ -646,57 +257,49 @@ static void update_ins_sti_buffer() {
     }
 }
 
-static void headstage_tni_periodic() {
-    if (!INSTRUCTION.flag_start) return;
+static void headstage_tni_update_instruction_callback(uint8_t ins_type, uint8_t ins_op, uint8_t ins_len, uint8_t *ins) {
+    switch (ins_type) {
+    case INS_TYPE_VIS: {
+    // reset
+    case VIS_RST:
+        // reset. reset all variable
+        adc_clock_signal = FALSE;
+        memset(spi_txbuf, 0, SPI_BUFFER_SIZE);
+        break;
 
-    bool adc_clock_signal        = (INSTRUCTION.adc_clock_signal) ? FALSE : TRUE;  // flip adc_clock_signal
-    INSTRUCTION.adc_clock_signal = adc_clock_signal;
-
-    if (IS_REC_MODE(INSTRUCTION.mode)) {
-        // recording mode
-
-        if (adc_clock_signal && update_ins_rec_buffer()) {
-            headstage_pin_output(PIN_P2S_RST, 1);  // DBS_P2S turn on
-            headstage_spi_transaction(SPI_BUFFER_SIZE, spi_txbuf, spi_rxbuf);
-            headstage_pin_output(PIN_P2S_RST, 0);  // DBS_P2S turn off
-        }
-
-        goto collect_data;
-    } else if (IS_ARM_MODE(INSTRUCTION.mode)) {
-        // artifact recording mode
-
-        if (adc_clock_signal && update_ins_rec_buffer()) {
-            headstage_arm_append_ramp_data(spi_rxbuf);
-        }
-
-        goto collect_data;
-    } else if (IS_STI_MODE(INSTRUCTION.mode)) {
-        // stimulation mode
-        update_ins_sti_buffer();
-        headstage_spi_transaction(SPI_BUFFER_SIZE, spi_txbuf, NULL);
+    // interrupt
+    case VIS_INT:
+        // stop. reset channel table
+        ramp_data_counter = 0;
+        memset(spi_txbuf, 0, SPI_BUFFER_SIZE);
+        break;
     }
-
-    return;
-
-collect_data:
-
-    if (!adc_clock_signal) {
-        headstage_tni_data_append_notify_buffer(spi_rxbuf);
-        headstage_pin_output(PIN_S2P_RST, 1);
-
-        if (actual_frequency() < 1000) {
-            // low sampling rate data
-
-            // append 0 at end of the data
-            headstage_notify_buffer[not_buf_offset]     = 0;
-            headstage_notify_buffer[not_buf_offset + 1] = 0;
-
-            // prepare to send notify
-            headstage_notify_flip_buffer();
-            headstage_notify_send();
-        }
+    case INS_TYPE_RIS:
+    default:
+        break;
     }
-    return;
 }
 
-#endif  // HEADSTAGE_TNI_H
+static uint8_t *spi_transact_rec_instruction() {
+    if (IS_REC_MODE(INSTRUCTION.work_mode)) {
+        PIN_setOutputValue(pin_handle, IOID_13, 1);  // DBS_P2S turn on
+        headstage_spi_transaction(SPI_BUFFER_SIZE, spi_txbuf, spi_rxbuf);
+        PIN_setOutputValue(pin_handle, IOID_13, 0);  // DBS_P2S turn off
+
+    } else if (IS_ARM_MODE(INSTRUCTION.work_mode) && !adc_clock_signal) {
+        create_ramp(spi_rxbuf);
+    }
+
+    if (adc_clock_signal) {
+        return NULL;
+    } else {
+        return spi_rxbuf;
+    }
+}
+
+static uint8_t *spi_transact_sti_instruction() {
+    headstage_spi_transaction(16, spi_txbuf, NULL);
+    return NULL;
+}
+
+#endif

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

@@ -1,397 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_H
-#error "headstage.h not include"
-#endif
-
-#ifndef HEADSTAGE_ZM_H
-#define HEADSTAGE_ZM_H
-
-// product information
-#define DEVICE_NAME "Elite-ZM-v1.2-30"
-#define MAJOR_PRODUCT_NUMBER 0
-#define MINOR_PRODUCT_NUMBER 2
-#define MAJOR_VERSION_NUMBER 1
-#define MINOR_VERSION_NUMBER 2
-
-#define HEADSTAGE_LED_USE_SPI
-
-#include "headstage_arm.h"
-#include "headstage_clock.h"
-#include "headstage_notify.h"
-#include "zm/headstage_pin.h"
-#include "zm/headstage_spi.h"
-#include "headstage_led.h"
-
-/*=================================
- ==== constant parameter table ====
- ================================*/
-
-// clang-format off
-#define RIS_DAC         0x10
-#define RIS_ADC         0x20
-#define RIS_MODE        0x30
-// clang-format on
-
-// clang-format off
-#define MODE_IV         0x01
-#define MODE_CV         0x02
-#define MODE_GEN        0x03
-#define MODE_ZT         0x04
-#define MODE_VT         0x05
-#define MODE_IT         0x06
-#define MODE_POWER_ON   0x10
-#define MODE_READY      0x20
-// clang-format on
-
-#define COLOR_POWER_ON COLOR_GREEN
-
-/*========================
- ==== parameter table ====
- ========================*/
-
-struct HEADSTAGE_PARAMETER_TABLE {
-    uint8_t mode;
-
-    void (*headstage_zm_periodic)();
-
-    /** RATE. ADC clock/sampling rate value*/
-    uint32_t adc_clock_rate;
-
-    /** CS **/
-    uint8_t chip_select;
-
-    // DAC
-
-    //    uint8_t register_address;
-    //
-    //    uint8_t clear_voltage_selection;
-    //
-    //    uint8_t overrange;
-    //
-    //    uint8_t bipolar_range;
-    //
-    //    uint8_t thermal_shutdown_alert;
-    //
-    //    /** I **/
-    //    uint8_t internal_ref;
-    //
-    //    /** PV **/
-    //    uint8_t power_up_voltage;
-    //
-    //    /** RA **/
-    //    uint8_t output_range;
-
-    // ADC
-
-    /** SS **/
-    uint8_t single_short;
-
-    /** MUX **/
-    uint8_t multi_config;
-
-    /** PGA **/
-    uint8_t gain_amp_config;
-
-    /** M **/
-    uint8_t operating_mode;
-
-    /** DR **/
-    uint8_t adc_data_rate;
-
-    uint8_t temp_sensor;
-
-    uint8_t pullup_R_enable;
-
-    uint8_t no_operation;
-
-    uint8_t reserved;
-
-} INSTRUCTION = {0};
-
-/*=============================
- ==== function declaration ====
- ============================*/
-
-static void headstage_zm_mode_init();
-static void headstage_zm_mode_IV();
-static void headstage_zm_mode_CV();
-static void headstage_zm_mode_func_gen();
-static void headstage_zm_mode_ZT();
-static void headstage_zm_mode_VT();
-static void headstage_zm_mode_IT();
-static void headstage_zm_turn(uint8_t on_off);
-static void headstage_zm_switch(uint8_t hold);
-
-/*=======================
- ==== event dispatch ====
- =======================*/
-
-// clang-format off
-#define EVT_MODE_CHANGE         0x0001
-#define EVT_SWITCH_MASK         0x0030
-// clang-format on
-
-// clang-format off
-#define SWITCH_PRESSED          0x0010
-#define SWITCH_HOLDING          0x0020
-#define SWITCH_FUNCTION         0x0030
-// clang-format on
-
-static void headstage_zm_event() {
-    uint16_t switch_state = (EVENT_MASK & EVT_SWITCH_MASK);
-
-    if (flag_mask(EVT_PERIODIC_CLOCK)) {
-        flag_disable(EVT_PERIODIC_CLOCK);
-
-        if (switch_state == SWITCH_HOLDING) {
-            headstage_zm_switch(1);
-        }
-        if (INSTRUCTION.headstage_zm_periodic) {
-            INSTRUCTION.headstage_zm_periodic();
-        }
-    }
-
-    if (EVENT_MASK == 0) {
-        // fast return
-        return;
-    }
-
-    if (switch_state == SWITCH_FUNCTION) {
-        flag_disable(EVT_SWITCH_MASK);
-
-        headstage_zm_turn((INSTRUCTION.mode & MODE_READY) == 0);
-
-    } else if (switch_state == SWITCH_PRESSED) {
-        headstage_zm_switch(0);
-    }
-
-    if (flag_mask(EVT_MODE_CHANGE)) {
-        flag_disable(EVT_MODE_CHANGE);
-        headstage_zm_mode_init();
-    }
-
-    if (flag_mask(EVT_DISCONNECTED)) {
-        headstage_update_vis_instruction(VIS_INT);
-    }
-}
-
-static void headstage_zm_pin_callback(PIN_Handle handle, PIN_Id pin) {
-    switch (pin) {
-        case PIN_SWITCH_ON:
-            flag_notify(SWITCH_PRESSED);
-            break;
-    }
-}
-
-/*=====================
- ==== ADC function ====
- =====================*/
-
-/*=====================
- ==== DAC function ====
- =====================*/
-
-#define DAC_CMD_W_IN_REG 0x00
-#define DAC_CMD_W_DAC_REG 0x10
-#define DAC_CMD_WRITE_REG 0x30
-#define DAC_CMD_POWER_ON 0x40
-#define DAC_CMD_REF_INT 0x60
-#define DAC_CMD_REF_EXT 0x70
-
-static uint8_t build_dac_instruction(uint8_t* ins_buf, uint8_t command, uint8_t p1, uint8_t p2) {
-    uint8_t* p = ins_buf;
-
-    *p++ = command;
-    *p++ = p1;
-    *p++ = p2;
-
-    return p - ins_buf;
-}
-
-static void headstage_dac_send(uint8_t command, uint8_t p1, uint8_t p2) {
-    build_dac_instruction(headstage_spi_dac_txbuf, command, p1, p2);
-
-    headstage_pin_output(PIN_DAC_CS, 0);
-    headstage_dac_transaction();
-    headstage_pin_output(PIN_DAC_CS, 1);
-}
-
-/*===========================
- ==== function implement ====
- ==========================*/
-
-static void headstage_init() {
-    headstage_pin_open();
-    headstage_led_open();
-    headstage_spi_open();
-
-    PIN_registerIntCb(headstage_pins_handle, &headstage_zm_pin_callback);
-    PIN_setInterrupt(headstage_pins_handle, PIN_SWITCH_ON | PIN_IRQ_NEGEDGE);
-
-    headstage_pin_output(PIN_SHUTDOWN_6994, 1);
-    headstage_pin_output(PIN_ENABLE_V05, 1);
-    headstage_pin_output(PIN_ENABLE_V10, 1);
-
-    headstage_pin_output(PIN_ADC_CS, 1);
-    headstage_pin_output(PIN_DAC_CS, 1);
-
-    INSTRUCTION.mode = MODE_POWER_ON;
-}
-
-static void headstage_zm_turn(uint8_t on_off) {
-    if (on_off) {
-        // turn on
-        headstage_led_color(COLOR_POWER_ON);
-        INSTRUCTION.mode = MODE_READY;
-    } else {
-        // shutdown
-        headstage_pin_output(PIN_ENABLE_V05, 0);
-    }
-}
-
-static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instruction) {
-    uint8_t header = instruction[0] & 0xF0;
-
-    switch (header) {
-        case RIS_MODE:
-            INSTRUCTION.mode = (INSTRUCTION.mode & 0xF0) | (instruction[1] & 0x0F);
-
-            flag_notify(EVT_MODE_CHANGE);
-            break;
-
-        case RIS_ADC:
-        case RIS_DAC:
-        default:
-            break;
-    }
-}
-
-static void headstage_update_vis_instruction(uint8_t vis_oper) {
-    switch (vis_oper) {
-        case VIS_ASK:
-        case VIS_INT:
-        case VIS_FUH:
-        case VIS_CAL:
-        case VIS_STI:
-        case VIS_RST:
-    }
-}
-
-static void headstage_zm_switch(uint8_t hold) {
-    static uint32_t time_stamp = 0;
-
-    bool working = (INSTRUCTION.mode & MODE_READY) != 0;
-
-    if (!hold) {
-        // button just pressed
-
-        time_stamp = headstage_time_stamp_ms();
-
-        if (!headstage_clock_active()) {
-            // TODO clock period
-            headstage_clock_open(250);
-            headstage_clock_start();
-        }
-
-        flag_disable(EVT_SWITCH_MASK);
-        flag_enable(SWITCH_HOLDING);
-
-    } else if (headstage_pin_input(PIN_SWITCH_ON)) {
-        // button released
-
-        if (!working) {
-            headstage_clock_stop();
-            headstage_clock_close();
-        }
-
-        flag_disable(EVT_SWITCH_MASK);
-
-    } else {
-        // button still pressing
-
-        uint32_t current = headstage_time_stamp_ms();
-
-        if (current - time_stamp >= ((working) ? 3000 : 1000)) {  // 3 sec
-            headstage_clock_stop();
-            headstage_clock_close();
-
-            flag_notify(SWITCH_FUNCTION);
-        }
-    }
-
-    return;
-}
-
-/*====================================
- ==== Elite ZM function implement ====
- ===================================*/
-
-static void headstage_zm_mode_init() {
-    switch (INSTRUCTION.mode) {
-        case MODE_READY | MODE_IV:
-            headstage_led_color(COLOR_RED);
-
-            INSTRUCTION.headstage_zm_periodic = &headstage_zm_mode_IV;
-            break;
-        case MODE_READY | MODE_CV:
-            headstage_led_color(COLOR_ORANGE);
-
-            INSTRUCTION.headstage_zm_periodic = &headstage_zm_mode_CV;
-            break;
-        case MODE_READY | MODE_GEN:
-            headstage_led_color(COLOR_YELLOW);
-
-            INSTRUCTION.headstage_zm_periodic = &headstage_zm_mode_func_gen;
-            break;
-        case MODE_READY | MODE_ZT:
-            headstage_led_color(COLOR_GREEN);
-
-            INSTRUCTION.headstage_zm_periodic = &headstage_zm_mode_ZT;
-            break;
-        case MODE_READY | MODE_VT:
-            headstage_led_color(COLOR_BLUE);
-
-            INSTRUCTION.headstage_zm_periodic = &headstage_zm_mode_VT;
-            break;
-        case MODE_READY | MODE_IT:
-            headstage_led_color(COLOR_CYAN);
-
-            INSTRUCTION.headstage_zm_periodic = &headstage_zm_mode_IT;
-            break;
-        default:
-            headstage_led_color(COLOR_BLACK);
-
-            INSTRUCTION.mode                  = MODE_READY;
-            INSTRUCTION.headstage_zm_periodic = NULL;
-            return;
-    }
-
-   headstage_clock_open(500);
-}
-
-static void headstage_zm_mode_IV() {
-    // TODO
-}
-
-static void headstage_zm_mode_CV() {
-    // TODO
-}
-
-static void headstage_zm_mode_func_gen() {
-    // TODO
-}
-
-static void headstage_zm_mode_ZT() {
-    // TODO
-}
-
-static void headstage_zm_mode_VT() {
-    // TODO
-}
-
-static void headstage_zm_mode_IT() {
-    // TODO
-}
-
-#endif  // HEADSTAGE_ZM_H

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

@@ -0,0 +1,701 @@
+/*
+ * impedance_meter.h
+ *
+ *  Created on: 2019�~1��15��
+ *      Author: benny
+ */
+#ifndef HEADSTAGE_H
+#error "headstage.h not include"
+#endif
+
+#ifdef HEADSTAGE_H_H
+#error "headstage_*.h has be included"
+#endif
+
+#ifndef IMPEDANCE_METER_H_
+#define HEADSTAGE_H_H
+#define IMPEDANCE_METER_H_
+
+// product information
+#define DEVICE_NAME "Elite-ZM-v1.2-30"
+#define MAJOR_PRODUCT_NUMBER 0
+#define MINOR_PRODUCT_NUMBER 2
+#define MAJOR_VERSION_NUMBER 1
+#define MINOR_VERSION_NUMBER 2
+
+// ADC, DAC reset
+#define ADC_reset 0x058B
+#define DAC_reset 0xAF
+
+// header
+#include <ti/drivers/PIN.h>
+#include "board.h"
+
+static void SimpleBLEPeripheral_performPeriodicTask();
+/*============
+ ==== SPI ====
+ ===========*/
+
+/* application use SPI parameters and buffers */
+#define SPI_LED_SIZE 20
+#define SPI_DAC_SIZE 3
+#define SPI_ADC_SIZE 4
+
+static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
+static uint16_t spi_LEDrxbuf[SPI_LED_SIZE] = {0};
+
+static uint8_t spi_DACtxbuf[SPI_DAC_SIZE] = {0};
+static uint8_t spi_rxbuf[SPI_DAC_SIZE]    = {0};
+
+static uint8_t spi_ADC_txbuf[SPI_ADC_SIZE] = {0};
+static uint8_t spi_ADC_rxbuf[SPI_ADC_SIZE] = {0};
+
+/*============
+ ==== PIN ====
+ ===========*/
+
+//#define PIN_SCLK IOID_11
+//#define PIN_MOSI IOID_8
+//#define PIN_MISO IOID_7
+//#define PIN_ADC_CS IOID_12
+//#define PIN_DAC_CS IOID_9
+
+static SPI_Handle      spiHandle0 = NULL;  // SPI0 is for ADC and DAC
+static SPI_Params      spiParams0;
+static SPI_Transaction ZM_transaction;
+
+#define SPI_DAC 0
+#define SPI_ADC 1
+static uint8_t SPI_mode;
+
+static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins);
+
+/*======================================
+ ========== ramp generating ============
+ =====================================*/
+
+/*
+static void switch_on_callback(PIN_Handle handle, PIN_Id pin) {
+    if (pin == switch_on) {
+        switch_on_key = 0;
+        PIN_setInterrupt(pin_handle, switch_on | PIN_IRQ_DIS);
+    }
+}
+*/
+
+
+
+static void ZM_init() {
+    set_update_instruction_callback(ZM_update_instruction_callback);
+
+    ZM_spi_init();
+    //    PIN_registerIntCb(pin_handle, switch_on_callback);
+    //    PIN_setInterrupt(pin_handle, switch_on | PIN_IRQ_POSEDGE);
+}
+
+
+/*** register of ADC ***/
+static void update_ADC_control_register() {
+    uint8 chip_select     = INSTRUCTION.chip_select & 0b11110000;
+    uint8 single_short    = (INSTRUCTION.single_short & 0b1) << 7;       // 1bit
+    uint8 multi_config    = (INSTRUCTION.multi_config & 0b111) << 4;     // 3bits
+    uint8 gain_amp_config = (INSTRUCTION.gain_amp_config & 0b111) << 1;  // 3bits
+    uint8 operating_mode  = (INSTRUCTION.operating_mode & 0b1);          // 1bit
+    uint8 adc_data_rate   = (INSTRUCTION.adc_data_rate & 0b111) << 5;    // 3bits
+    uint8 temp_sensor     = (INSTRUCTION.temp_sensor & 0b1) << 4;        // 1bit
+    uint8 pullup_R_enable = (INSTRUCTION.pullup_R_enable & 0b1) << 3;    // 1bit
+    uint8 no_operation    = (INSTRUCTION.no_operation & 0b11) << 1;      // 2bits
+    uint8 reserved        = (INSTRUCTION.reserved & 0b1);
+
+    //    spi_txbuf[0] = chip_select;
+    spi_LEDtxbuf[0] = (((single_short | multi_config | gain_amp_config | operating_mode) << 8) & 0xff00)  //
+                      | ((adc_data_rate | temp_sensor | pullup_R_enable | no_operation | reserved) & 0x00ff);
+}
+// static void ADC_reset_register(){
+//    uint8 chip_select               = INSTRUCTION.chip_select & 0b11110000;
+//    uint8 reset_0                   = ADC_reset & 0xFF00;
+//    uint8 reset_1                   = ADC_reset & 0x00FF;
+//
+//    spi_txbuf[0] = chip_select;
+//    spi_txbuf[1] = reset_0;
+//    spi_txbuf[2] = reset_1;
+//}
+
+static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins) {}
+
+static void ADC_write(uint8_t ADCin) {
+    /*
+    *   [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
+    */
+
+    if(SPI_mode != SPI_ADC){
+        SPI_close(spiHandle0);  //
+        ADC_spi_init();
+    }
+//    spi_ADC_txbuf[0] = 0b00000101;
+    spi_ADC_txbuf[0] = ADCin;
+    spi_ADC_txbuf[1] = 0b11101011;
+
+    for(int i=2 ; i<SPI_ADC_SIZE ; i++){
+        spi_ADC_txbuf[i] = 0;
+    }
+
+    PIN_setOutputValue(pin_handle, Board_SPI0_CSN, 1);  // ADC_CS HIGH
+    PIN_setOutputValue(pin_handle, Board_SPI0_CSN, 0);  // ADC_CS HIGH
+    ZM_spi_transaction(2, spi_ADC_txbuf, spi_ADC_rxbuf);
+    PIN_setOutputValue(pin_handle, Board_SPI0_CSN, 1);  // ADC_CS HIGH
+}
+
+static void ADC_read(){
+
+    if(SPI_mode != SPI_ADC){
+        SPI_close(spiHandle0);  //
+        ADC_spi_init();
+    }
+
+    for(int i=0 ; i<SPI_ADC_SIZE ; i++){
+        spi_ADC_txbuf[i] = 0;
+        spi_ADC_rxbuf[i] = 0;
+    }
+
+    PIN_setOutputValue(pin_handle, Board_SPI0_CSN, 1);  // DAC_CS HIGH
+    PIN_setOutputValue(pin_handle, Board_SPI0_CSN, 0);  // ADC_CS HIGH
+    ZM_spi_transaction(SPI_ADC_SIZE, spi_ADC_txbuf, spi_ADC_rxbuf);
+    PIN_setOutputValue(pin_handle, Board_SPI0_CSN, 1);  // ADC_CS HIGH
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, SPI_ADC_SIZE, spi_ADC_rxbuf);
+    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, SPI_ADC_SIZE, spi_ADC_rxbuf);
+}
+
+static void DAC_outputV(uint8_t command, uint8_t v1, uint8_t v2) {
+    // C = command, X = don't care, D = data
+    // CCCC XXXX = command
+    // DDDD DDDD = v1
+    // DDDD XXXX = v2
+
+    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;
+    }
+
+    if(SPI_mode != SPI_DAC){
+        SPI_close(spiHandle0);  //
+        ZM_spi_init();
+    }
+
+    PIN_setOutputValue(pin_handle, Board_SPI0_CSN, 1);  // ADC_CS HIGH
+    PIN_setOutputValue(pin_handle, Board_SPI0_CSN, 0);  // DAC_CS LOW
+    ZM_spi_transaction(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+    PIN_setOutputValue(pin_handle, Board_SPI0_CSN, 1);  // DAC_CS HIGH
+}
+
+static void VoltScan(){
+    if(VoltOrigin == VoltFinal){
+        uint8_t ramp0 = (uint8_t) (VoltOrigin & 0x00FF);
+        uint8_t ramp1 = (uint8_t) ((VoltOrigin>>8) & 0x00FF);
+        DAC_outputV(0x30, ramp1, ramp0);
+//        PeriodicEvent = false;
+    }
+    else if(VoltOrigin < VoltFinal){
+        IVCurve_T();
+    }
+    else{
+        IVCurve_T2();
+    }
+}
+
+static void cyclic_Voltammetry(){
+    DAC_outputV(0x30, 0x7F, 0xF0);
+    ADC_write(0x00);
+    ADC_read();
+}
+
+static void fxn_Gen() {}
+
+// output a certain voltage e.g. 2v
+// and measure the input voltage
+// => calculate the resister
+// change the output voltage every second
+// => get a R-T curve (with resolution=1 sec)
+static void ZT_plot(uint16_t outV, uint16_t inV) {}
+
+static void VT_Plot() {
+    //
+}
+static void IT_Plot() {
+
+}
+
+static void ramp_test(){
+    // DAC instruction
+    // 0b0011 = Command (Write to and Update (Power-Up) DAC Register)
+    // 0bXXXX = don't care
+    // data (16 bits) = last 4bits / 6 bits / 8 bits are don't care
+
+    /*spi_DACtxbuf[0] = 0x3011;
+    spi_DACtxbuf[1] = 0x1100;
+    for (int i = 2; i < SPI_DAC_SIZE; i++) {
+        spi_DACtxbuf[i] = 0;
+    }
+
+    PIN_setOutputValue(pin_handle, DAC_CS, 0);  // DAC_CS LOW
+    ZM_spi_transaction(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
+    */
+    uint8_t ramp0 = 0;
+    uint8_t ramp1 = 0;
+    for(ramp0 = 0x00 ;  ; ramp0 = ramp0 + 0x10){
+        if(ramp0 >= 0xF0){
+            ramp1 ++;
+            ramp0 = 0x00;
+        }
+        DAC_outputV(0x30, ramp1, ramp0);
+        CPUdelay(16000000);
+    }
+}
+
+
+static void SimpleBLEPeripheral_clockHandler(UArg arg) {
+        // Store the event.
+//        events |= SBP_PERIODIC_EVT;
+
+        // Wake up the application.
+        Semaphore_post(semaphore);
+}
+
+// power on reset should be mid-scale
+static void DAC_init(){
+    DAC_outputV(0x30, 0x7F, 0xF0);
+
+}
+
+static void SimpleBLEPeripheral_performPeriodicTask() {
+    switch (INSTRUCTION.eliteFxn) {
+        case IVCurve: {
+            // output a certain voltage
+            VoltScan();
+
+            // read the current
+
+
+            break;
+        }
+        case cyclicVoltammetry:{
+            // output a certain voltage
+            VoltScan();
+
+            // read current
+
+            // reverse the voltage
+            uint16_t temp = VoltOrigin;
+            VoltOrigin = VoltFinal;
+            VoltFinal = temp;
+            VoltScan();
+
+            // read current
+
+            break;
+        }
+        case fxnGen: {
+            break;
+        }
+        case ZTCurve: {
+
+            break;
+        }
+        case VTCurve: {
+            break;
+        }
+        case ITCurve: {
+            break;
+        }
+        case VIS_RST: {
+
+            break;
+        }
+        case RAMP_GENERATE: {
+            /*
+            static uint8_t ramp0 = 0;
+            static uint8_t ramp1 = 0;
+
+            DAC_outputV(0x30, ramp1, ramp0);
+            if(ramp0 >= 0xC0){
+                ramp1 ++;
+                ramp0 = 0x00;
+            }
+            else{
+                ramp0  = ramp0 + 0x40;
+            }
+            */
+            break;
+        }
+        case ADCTEST: {
+            break;
+        }
+
+        default: {
+            break;
+        }
+    }
+}
+
+static void IVCurve_T(){
+    static bool reset = true;
+    static uint8_t ramp0;
+    static uint8_t ramp1;
+    uint16_t ramp = 0;
+
+    // reset origin volt at the begin
+    if (reset){
+        ramp0 = (uint8_t) (VoltOrigin & 0x00FF);
+        ramp1 = (uint8_t) ((VoltOrigin>>8) & 0x00FF);
+        reset = false;
+    }
+
+    // output a certain volt
+    DAC_outputV(0x30, ramp1, ramp0);
+
+    // check if we reach the final volt
+    ramp = ( (uint16_t) (ramp1)<<8 ) | ( (uint16_t) (ramp0) );
+    if ( ramp >= VoltFinal) {
+//        PeriodicEvent = false;
+//        reset = true;
+
+        // reset all the parameter
+        VoltOrigin = 0x7FF0;
+        VoltFinal = 0xFFF0;
+        Step = 0x30;     // 10 = 0x0A ~= 3.05 mv ~= 3 mv
+        StepTime = 0x18; // 0x30 = 2'd48 ~= 2 second, 24 = 0x18 = 1 sec
+        PeriodicCounter = 0;
+        return;
+    }
+
+    // prepare the next output volt
+    uint8_t temp = ramp0 - Step;
+    if( temp > ramp0){
+        temp = ramp1 - 1;
+        if( temp > ramp1){
+            ramp0 = (uint8_t) (VoltFinal & 0x00FF);
+            ramp1 = (uint8_t) ((VoltFinal>>8) & 0x00FF);
+            return;
+        }
+        else{
+            ramp1 --;
+        }
+    }
+    ramp0  = ramp0 - Step;
+}
+
+static void IVCurve_T2(){
+    static bool reset = true;
+    static uint8_t ramp0;
+    static uint8_t ramp1;
+    uint16_t ramp = 0;
+
+    // reset origin volt at the begin
+    if (reset){
+        ramp0 = (uint8_t) (VoltOrigin & 0x00FF);
+        ramp1 = (uint8_t) ((VoltOrigin>>8) & 0x00FF);
+        reset = false;
+    }
+
+    // output a certain volt
+    DAC_outputV(0x30, ramp1, ramp0);
+
+    // check if we reach the final volt
+    ramp = ( (uint16_t) (ramp1)<<8 ) | ( (uint16_t) (ramp0) );
+    if ( ramp <= VoltFinal) {
+//        PeriodicEvent = false;
+//        reset = true;
+
+        // reset all the parameter
+        VoltOrigin = 0x7FF0;
+        VoltFinal = 0xFFF0;
+        Step = 0x30;     // 10 = 0x0A ~= 3.05 mv ~= 3 mv
+        StepTime = 0x18; // 0x30 = 2'd48 ~= 2 second, 24 = 0x18 = 1 sec
+        PeriodicCounter = 0;
+        return;
+    }
+
+    // prepare the next output volt
+    uint8_t temp = ramp0 - Step;
+    if( temp > ramp0){
+        temp = ramp1 - 1;
+        if( temp > ramp1){
+            ramp0 = (uint8_t) (VoltFinal & 0x00FF);
+            ramp1 = (uint8_t) ((VoltFinal>>8) & 0x00FF);
+            return;
+        }
+        else{
+            ramp1 --;
+        }
+    }
+    ramp0  = ramp0 - Step;
+}
+
+
+
+//static void WorkModeLED(){
+//    switch(INSTRUCTION.eliteFxn){
+//        case IVCurve:{
+//            LED_color(0xE1, 0xF4, 0x00, 0x00);
+//            break;
+//        }
+//        case cyclicVoltammetry:{
+//            LED_color(0xE1, 0xF4, 0x00, 0x00);
+//            break;
+//        }
+//        case fxnGen:{
+//            LED_color(0xE1, 0xF4, 0x00, 0x00);
+//            break;
+//        }
+//        case ZTCurve:{
+//            LED_color(0xE1, 0x00, 0x00, 0xF4);
+//            break;
+//        }
+//        case VTCurve:{
+//            LED_color(0xE1, 0xF4, 0x00, 0x00);
+//            break;
+//        }
+//        case ITCurve:{
+//            LED_color(0xE1, 0xF4, 0x00, 0xF4);
+//            break;
+//        }
+//
+//        case VIS_RST:{
+//            LEDPowerON();
+//            break;
+//        }
+//        case RAMP_GENERATE:{
+//            LED_color(0xE1, 0xF4, 0x00, 0x00);
+//            break;
+//        }
+//        case ADCTEST:{
+//            LEDPowerON();
+//            break;
+//        }
+//
+//        default:{
+//            LEDPowerON();
+//            break;
+//        }
+//    }
+//}
+//
+//static void KeyWorkModeLED(){
+//    switch(INSTRUCTION.eliteFxn){
+//        case IVCurve:{
+//            LED_color(0xEF, 0xF4, 0x00, 0x00);
+//            break;
+//        }
+//        case cyclicVoltammetry:{
+//            LED_color(0xEF, 0xF4, 0x00, 0x00);
+//            break;
+//        }
+//        case fxnGen:{
+//            LED_color(0xEF, 0xF4, 0x00, 0x00);
+//            break;
+//        }
+//        case ZTCurve:{
+//            LED_color(0xEF, 0x00, 0x00, 0xF4);
+//            break;
+//        }
+//        case VTCurve:{
+//            LED_color(0xEF, 0xF4, 0x00, 0x00);
+//            break;
+//        }
+//        case ITCurve:{
+//            LED_color(0xEF, 0xF4, 0x00, 0x00);
+//            break;
+//        }
+//
+//        case VIS_RST:{
+//            LED_color(0xEF, 0x00, 0xFA, 0x00);
+//            break;
+//        }
+//        case RAMP_GENERATE:{
+//            LED_color(0xEF, 0xF4, 0x00, 0x00);
+//            break;
+//        }
+//        case ADCTEST:{
+//            LED_color(0xEF, 0x00, 0xF4, 0x00);
+//            break;
+//        }
+//
+//        default:{
+//            LED_color(0xEF, 0x00, 0xFA, 0x00);
+//            break;
+//        }
+//    }
+//}
+
+static void EliteKeyPress(uint8_t key){
+    static uint8_t ShutDownCounter = 0;
+    static uint8_t OriginEliteFxn = 0;
+
+    if(key == 0){
+        // key = 0 if press
+        // press key => bight LED
+//        KeyWorkModeLED();
+
+        // press 3~4 sec, shutdown 2650
+        if(ShutDownCounter >= 35){
+//            PIN_setOutputValue(pin_handle, enable_5v, 0);      // disable 5V
+        }
+        else{
+            ShutDownCounter ++;
+        }
+
+    }
+    else{
+        if(OriginEliteFxn == INSTRUCTION.eliteFxn){
+            if(ShutDownCounter != 0){
+                // dark LED
+//                WorkModeLED();
+                ShutDownCounter = 0;
+            }
+        }
+        else{
+            OriginEliteFxn = INSTRUCTION.eliteFxn;
+            if(ShutDownCounter != 0){
+                ShutDownCounter = 0;
+            }
+            // dark mode LED
+//            WorkModeLED();
+        }
+    }
+}
+
+static bool TurnOnElite(uint8_t key){
+    static uint8_t TurnOnCounter = 0;
+
+    if(key == 0){
+        // press 1 sec, power on LED
+        if(TurnOnCounter >= 15){
+//            PIN_setOutputValue(pin_handle, enable_10v, 1);      // enable 10V
+//            PIN_setOutputValue(pin_handle, enable_5v, 1);      // enable 5V
+//            LEDPowerON();
+            return true;
+        }
+        else{
+            TurnOnCounter ++;
+            return false;
+        }
+    }
+    else{
+        TurnOnCounter = 0;
+//        PIN_setOutputValue(pin_handle, enable_5v, 0);      // enable 5V
+        return false;
+    }
+
+}
+
+static void reset(){
+//    PeriodicEvent = false;
+    VoltOrigin = 0;
+    VoltFinal = 0;
+    Step = 10;     // 10 = 0x0A ~= 3.05 mv ~= 3 mv
+    StepTime = 24; // 0x30 = 2'd48 ~= 2 second, 24 = 0x18
+    PeriodicCounter = 0;
+
+//    LEDPowerON();
+    for(int i=0 ; i<BLE_INS_BUFF_SIZE ; i++){
+        ins_buf[i] = 0;
+    }
+
+    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;
+    }
+
+    SPI_close(spiHandle0);  //
+    ZM_spi_init();
+    DAC_init();
+
+    PIN_setOutputValue(pin_handle, Board_SPI0_CSN, 1);  // ADC_CS HIGH
+    PIN_setOutputValue(pin_handle, Board_SPI0_CSN, 1);  // DAC_CS HIGH
+}
+
+/*
+ * Notify format
+ *
+ * 0xIIII VVVV ZZZZ TTTT TTTT,
+ * I = current, V = voltage, Z = impedance, T = time
+ *
+ *
+ */
+
+static void SendNotify(){
+
+    for(int i=0 ; i<16 ; i++){
+        not_buf[i] = i;
+    }
+
+    // 1 Timestamp = 32 usec;  31 Timestamp ~= 1 msec
+    not_time_stamp = (Timestamp_get32())/31;   // msec
+
+    not_buf[16] = not_time_stamp & 0xff;
+    not_buf[17] = (not_time_stamp >> 8) & 0xff;
+    not_buf[18] = (not_time_stamp >> 16) & 0xff;
+    not_buf[19] = (not_time_stamp >> 24) & 0xff;
+
+//    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
+}
+
+static void ZM_spi_init() {
+    SPI_init();
+
+    SPI_Params_init(&spiParams0);
+    spiParams0.bitRate     = 1200000;  // 1.2M
+    spiParams0.mode        = SPI_MASTER;
+    spiParams0.dataSize    = 8;
+    spiParams0.frameFormat = SPI_POL0_PHA0;
+
+    spiHandle0 = SPI_open(Board_SPI0, &spiParams0);  // ADC and DAC
+    SPI_mode = SPI_DAC;
+
+}
+
+static void ADC_spi_init(){
+    SPI_init();
+
+    SPI_Params_init(&spiParams0);
+    spiParams0.bitRate     = 1200000;  // 1.2M
+    spiParams0.mode        = SPI_MASTER;
+    spiParams0.dataSize    = 8;
+    spiParams0.frameFormat = SPI_POL0_PHA1;
+
+    spiHandle0 = SPI_open(Board_SPI0, &spiParams0);  // ADC and DAC
+    SPI_mode = SPI_ADC;
+
+}
+// for DAC / ADC
+static void ZM_spi_transaction(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+    ZM_transaction.count = length;
+    ZM_transaction.txBuf = spi_txbuf;
+    ZM_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle0, &ZM_transaction);
+}
+#endif /* IMPEDANCE_METER_H_ */

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

@@ -1,23 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef POPULATION_H
-#define POPULATION_H
-
-static uint32_t pop_count(uint32_t value) {
-    value -= ((value >> 1) & 0x55555555);
-    value = (((value >> 2) & 0x33333333) + (value & 0x33333333));
-    value = (((value >> 4) + value) & 0x0f0f0f0f);
-    value += (value >> 8);
-    value += (value >> 16);
-    return (value & 0x0000003f);
-}
-
-static uint32_t bit_reverse(uint32_t value) {
-    value = (((value & 0xaaaaaaaa) >> 1) | ((value & 0x55555555) << 1));
-    value = (((value & 0xcccccccc) >> 2) | ((value & 0x33333333) << 2));
-    value = (((value & 0xf0f0f0f0) >> 4) | ((value & 0x0f0f0f0f) << 4));
-    value = (((value & 0xff00ff00) >> 8) | ((value & 0x00ff00ff) << 8));
-    return ((value >> 16) | (value << 16));
-}
-
-#endif // POPULATION_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/headstage_adc.h

@@ -1,40 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_ADC_H
-#define HEADSTAGE_ADC_H
-
-#if defined(BOOSTXL_CC2650MA) && !defined(HEADSTAGE_MA_USE_ADC)
-#error "put HEADSTAGE_MA_USE_ADC in predefined"
-#endif
-
-#include <Board.h>
-#include <ti/drivers/ADC.h>
-
-#if defined(CC2650_LAUNCHXL)
-#define CC2650_ADC0 CC2650_LAUNCHXL_ADC0
-#define CC2650_ADC1 CC2650_LAUNCHXL_ADC1
-#define CC2650_ADC2 CC2650_LAUNCHXL_ADC2
-#elif defined(BOOSTXL_CC2650MA)
-#define CC2650_ADC0 BOOSTXL_CC2650MA_ADC0
-#define CC2650_ADC1 BOOSTXL_CC2650MA_ADC1
-#define CC2650_ADC2 BOOSTXL_CC2650MA_ADC2
-#endif
-
-static ADC_Handle headstage_adc_handle_0;
-static ADC_Handle headstage_adc_handle_1;
-static ADC_Handle headstage_adc_handle_2;
-
-#define headstage_adc_close(handle) ADC_close(handle)
-#define headstage_adc_convert(handle, value) ADC_convert(handle, value)
-
-#define headstage_adc_open()                                    \
-    do {                                                        \
-        ADC_init();                                             \
-        ADC_Params param;                                       \
-        ADC_Params_init(&params);                               \
-        headstage_adc_handle_0 = ADC_open(CC2650_ADC0, &param); \
-        headstage_adc_handle_1 = ADC_open(CC2650_ADC1, &param); \
-        headstage_adc_handle_2 = ADC_open(CC2650_ADC2, &param); \
-    } while (0)
-
-#endif  // HEADSTAGE_ADC_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/headstage_gptimer.h

@@ -1,53 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_GPTIMER_H
-#define HEADSTAGE_GPTIMER_H
-
-#include <Board.h>
-#include <ti/drivers/timer/GPTimerCC26XX.h>
-#include <ti/sysbios/BIOS.h>
-#include <xdc/runtime/Types.h>
-
-#define EVT_PERIODIC_GPTIMER_0 EVT_PERIODIC_0
-#define EVT_PERIODIC_GPTIMER_1 EVT_PERIODIC_1
-#define EVT_PERIODIC_GPTIMER_2 EVT_PERIODIC_2
-
-static GPTimerCC26XX_Handle gptimer_handle_0;
-static GPTimerCC26XX_Handle gptimer_handle_1;
-static GPTimerCC26XX_Handle gptimer_handle_2;
-
-static void headstage_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask);
-
-#define headstage_gptimer_start(gptimer_handle) GPTimerCC26XX_start(gptimer_handle)
-#define headstage_gptimer_stop(gptimer_handle) GPTimerCC26XX_stop(gptimer_handle)
-#define headstage_gptimer_close(gptimer_handle) GPTimerCC26XX_close(gptimer_handle)
-
-#define headstage_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_0      = GPTimerCC26XX_open(Board_GPTIMER0A, &params);                           \
-        gptimer_handle_1      = GPTimerCC26XX_open(Board_GPTIMER1A, &params);                           \
-        gptimer_handle_2      = GPTimerCC26XX_open(Board_GPTIMER2A, &params);                           \
-        GPTimerCC26XX_setLoadValue(gptimer_handle_0, 0xFFFFFF);                                         \
-        GPTimerCC26XX_setLoadValue(gptimer_handle_1, 0xFFFFFF);                                         \
-        GPTimerCC26XX_setLoadValue(gptimer_handle_2, 0xFFFFFF);                                         \
-        GPTimerCC26XX_registerInterrupt(gptimer_handle_0, headstage_gptimer_callback, GPT_INT_TIMEOUT); \
-        GPTimerCC26XX_registerInterrupt(gptimer_handle_1, headstage_gptimer_callback, GPT_INT_TIMEOUT); \
-        GPTimerCC26XX_registerInterrupt(gptimer_handle_2, headstage_gptimer_callback, GPT_INT_TIMEOUT); \
-    } while (0)
-
-#define headstage_gptimer_set_frequency(gptimer_handle, frequency)                               \
-    do {                                                                                         \
-        uint32_t     _frequency = (uint32_t)(frequency);                                         \
-        Types_FreqHz _cpu_freq;                                                                  \
-        BIOS_getCpuFreq(&_cpu_freq);                                                             \
-        GPTimerCC26XX_Value _load = _cpu_freq.lo / _frequency - 1;                               \
-        _load                     = (_load < 0xFFFF) ? _load : ((0xFA0000 | (_load / 250)) - 1); \
-        GPTimerCC26XX_setLoadValue(gptimer_handle, _load);                                       \
-    } while (0)
-
-#endif  // HEADSTAGE_GPTIMER_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/headstage_notify.h

@@ -1,58 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-
-#ifndef HEADSTAGE_NOTIFY_TDC4VC3_H
-#define HEADSTAGE_NOTIFY_TDC4VC3_H
-
-#ifndef HEADSTAGE_NOTIFY_H
-#error "headstage/headstage_notify.h not included"
-#endif
-
-#define NOT_BUF_OFFSET_INIT 6
-
-static uint32_t not_buf_offset = NOT_BUF_OFFSET_INIT;
-static uint32_t not_time_stamp = 0;
-
-static void headstage_notify_set_timestamp() {
-    not_time_stamp = headstage_time_stamp_us();
-
-    headstage_notify_buffer[2] = not_time_stamp & 0xFF;
-    headstage_notify_buffer[3] = (not_time_stamp >> 8) & 0xFF;
-    headstage_notify_buffer[4] = (not_time_stamp >> 16) & 0xFF;
-    headstage_notify_buffer[5] = (not_time_stamp >> 24) & 0xFF;
-}
-
-static void headstage_notify_flip_buffer() {
-    uint8_t data_count = not_buf_offset;
-
-    headstage_notify_buffer[0] = CHIP_ID;
-    headstage_notify_buffer[1] = data_count;
-
-    not_buf_offset = NOT_BUF_OFFSET_INIT;
-}
-
-static uint8_t headstage_notify_append_data(uint8_t channel, uint16_t data_value) {
-    if (not_buf_offset <= NOT_BUF_OFFSET_INIT) {
-        headstage_notify_set_timestamp();
-
-        not_buf_offset = NOT_BUF_OFFSET_INIT;
-    }
-
-    if (not_buf_offset >= BLE_NOT_BUFF_SIZE) {
-        return not_buf_offset;
-    }
-
-    headstage_notify_buffer[not_buf_offset++] = ((channel & 0x0F) << 4) | ((data_value >> 8) & 0x0F);
-    headstage_notify_buffer[not_buf_offset++] = (data_value & 0xFF);
-
-    uint8_t ret = not_buf_offset;
-
-    if (not_buf_offset >= BLE_NOT_BUFF_SIZE) {
-        headstage_notify_flip_buffer();
-    }
-
-    return ret;
-}
-
-
-#endif  // HEADSTAGE_NOTIFY_TDC4VC3_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/headstage_pin.h

@@ -1,60 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_PIN_H
-#define HEADSTAGE_PIN_H
-
-#include <Board.h>
-#include <ti/drivers/PIN.h>
-
-static PIN_State  headstage_pins_state;
-static PIN_Handle headstage_pins_handle;
-
-// clang-format off
-// XXX name those pin with its propose
-#define PIN_STI_0       IOID_0
-#define PIN_STI_1       IOID_1
-#define PIN_STI_3       IOID_3
-#define PIN_STI_5       IOID_5
-#define PIN_STI_6       IOID_6
-#define PIN_STI_7       IOID_7
-#define PIN_STI_10      IOID_10
-#define PIN_STI_11      IOID_11
-// clang-format on
-
-#if defined(CC2650_LAUNCHXL)
-#define PIN_LED_R Board_RLED
-#define PIN_LED_G Board_GLED
-#endif
-
-static PIN_Config headstage_pin_configuration[] = {  //
-    PIN_STI_0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_STI_1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_STI_3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_STI_5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_STI_6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_STI_7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_STI_10 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_STI_11 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-
-// LED
-#if defined(CC2650_LAUNCHXL)
-    PIN_LED_R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    PIN_LED_G | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-#endif
-
-    //
-    PIN_TERMINATE};
-
-#define headstage_pin_add(configuration) PIN_add(headstage_pins_handle, configuration)
-#define headstage_pin_remove(pin) PIN_remove(headstage_pins_handle, pin)
-#define headstage_pin_close() PIN_close(headstage_pins_handle)
-
-#define headstage_pin_open()                                                                  \
-    do {                                                                                      \
-        headstage_pins_handle = PIN_open(&headstage_pins_state, headstage_pin_configuration); \
-    } while (0)
-
-#define headstage_pin_output(pin, value) PIN_setOutputValue(headstage_pins_handle, PIN_ID(pin), (value))
-#define headstage_pin_input(pin) PIN_getInputValue(PIN_ID(pin))
-
-#endif  // HEADSTAGE_PIN_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/headstage_pwm.h

@@ -1,41 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_PWM_H
-#define HEADSTAGE_PWM_H
-
-#include <Board.h>
-#include <ti/drivers/PWM.h>
-
-#define MAX_DUTY 6900
-
-static PWM_Handle headstage_pwm_handle;
-
-#define headstage_pwm_open()                                  \
-    do {                                                      \
-        PWM_init();                                           \
-        PWM_Params params;                                    \
-        PWM_Params_init(&params);                             \
-        params.idleLevel     = PWM_IDLE_LOW;                  \
-        params.periodUnits   = PWM_PERIOD_COUNTS;             \
-        params.periodValue   = MAX_DUTY;                      \
-        params.dutyUnits     = PWM_DUTY_COUNTS;               \
-        params.dutyValue     = 1;                             \
-        headstage_pwm_handle = PWM_open(Board_PWM7, &params); \
-    } while (0);
-
-#define headstage_pwm_start() PWM_start(headstage_pwm_handle)
-#define headstage_pwm_stop() PWM_stop(headstage_pwm_handle)
-#define headstage_pwm_close() PWM_close(headstage_pwm_handle)
-
-#define headstage_pwm_set(frequency, duty_cycle)                     \
-    do {                                                             \
-        int status = PWM_setPeriod(headstage_pwm_handle, frequency); \
-        if (status < 0) {                                            \
-            PWM_stop(headstage_pwm_handle);                          \
-            PWM_setPeriod(headstage_pwm_handle, frequency);          \
-        }                                                            \
-        PWM_setDuty(headstage_pwm_handle, duty_cycle);               \
-        if (status < 0) PWM_start(headstage_pwm_handle);             \
-    } while (0)
-
-#endif  // HEADSTAGE_PWM_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/tni/headstage_notify.h

@@ -1,68 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-
-#ifndef HEADSTAGE_NOTIFY_TDC4VAF2_H
-#define HEADSTAGE_NOTIFY_TDC4VAF2_H
-
-#ifndef HEADSTAGE_NOTIFY_H
-#error "headstage/headstage_notify.h not included"
-#endif
-
-#define NOT_BUF_OFFSET_INIT 8
-
-static uint32_t not_buf_offset = NOT_BUF_OFFSET_INIT;
-static uint32_t not_time_stamp = 0;
-
-static void headstage_notify_set_timestamp() {
-    not_time_stamp = headstage_time_stamp_us();
-
-    headstage_notify_buffer[2] = not_time_stamp & 0xFF;
-    headstage_notify_buffer[3] = (not_time_stamp >> 8) & 0xFF;
-    headstage_notify_buffer[4] = (not_time_stamp >> 16) & 0xFF;
-    headstage_notify_buffer[5] = (not_time_stamp >> 24) & 0xFF;
-}
-
-static void headstage_notify_flip_buffer() {
-    uint8_t data_count = (not_buf_offset - NOT_BUF_OFFSET_INIT) / 2;
-
-    headstage_notify_buffer[0] = CHIP_ID;
-    headstage_notify_buffer[1] = data_count;
-
-    not_buf_offset = NOT_BUF_OFFSET_INIT;
-}
-
-static uint8_t headstage_notify_append_data(uint8_t channel, uint16_t *data_value) {
-    if (not_buf_offset <= NOT_BUF_OFFSET_INIT) {
-        headstage_notify_set_timestamp();
-
-        not_buf_offset = NOT_BUF_OFFSET_INIT;
-    }
-
-    if (not_buf_offset >= BLE_NOT_BUFF_SIZE) {
-        return not_buf_offset;
-    }
-
-    if (data_value == NULL) {
-        headstage_notify_buffer[not_buf_offset++] = ((channel & 0x0F) << 4);
-        headstage_notify_buffer[not_buf_offset++] = 0x03;
-    } else {
-        headstage_notify_buffer[not_buf_offset++] = ((channel & 0x0F) << 4) | ((*data_value >> 6) & 0x0F);
-        headstage_notify_buffer[not_buf_offset++] = ((*data_value << 2) & 0xFC);
-    }
-
-    uint8_t ret = not_buf_offset;
-
-    if (not_buf_offset >= BLE_NOT_BUFF_SIZE) {
-        uint32_t current    = headstage_time_stamp_us();
-        uint32_t time_delta = (current - not_time_stamp) & 0xFFFF;
-
-        headstage_notify_buffer[6] = time_delta & 0xFF;
-        headstage_notify_buffer[7] = (time_delta >> 8) & 0xFF;
-
-        headstage_notify_flip_buffer();
-    }
-
-    return ret;
-}
-
-#endif  // HEADSTAGE_NOTIFY_TDC4VAF2_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/tni/headstage_pin.h

@@ -1,46 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_PIN_H
-#define HEADSTAGE_PIN_H
-
-#include <Board.h>
-#include <ti/drivers/PIN.h>
-
-#if defined(CC2650_LAUNCHXL)
-#define PIN_LED_R IOID_6
-#define PIN_LED_G IOID_7
-#endif
-
-#define PIN_P2S_RST IOID_6
-#define PIN_S2P_RST IOID_7
-
-static PIN_State  headstage_pins_state;
-static PIN_Handle headstage_pins_handle;
-
-static PIN_Config headstage_pin_configuration[] = {  //
-
-// LED
-#if defined(CC2650_LAUNCHXL)
-    PIN_LED_R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    PIN_LED_G | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-#else
-    PIN_P2S_RST | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_S2P_RST | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-#endif
-
-    //
-    PIN_TERMINATE};
-
-#define headstage_pin_add(configuration) PIN_add(headstage_pins_handle, configuration)
-#define headstage_pin_remove(pin) PIN_remove(headstage_pins_handle, pin)
-#define headstage_pin_close() PIN_close(headstage_pins_handle)
-
-#define headstage_pin_open()                                                                  \
-    do {                                                                                      \
-        headstage_pins_handle = PIN_open(&headstage_pins_state, headstage_pin_configuration); \
-    } while (0)
-
-#define headstage_pin_output(pin, value) PIN_setOutputValue(headstage_pins_handle, PIN_ID(pin), (value))
-#define headstage_pin_input(pin) PIN_getInputValue(PIN_ID(pin))
-
-#endif  // HEADSTAGE_PIN_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/tni/headstage_spi.h

@@ -1,47 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_SPI_H
-#define HEADSTAGE_SPI_H
-
-#include <Board.h>
-#include <ti/drivers/SPI.h>
-#include <ti/drivers/dma/UDMACC26XX.h>
-#include <ti/drivers/spi/SPICC26XXDMA.h>
-
-/*
- * SPI parameter and function declaration
- */
-static SPI_Handle      spi_handle;
-static SPI_Transaction spi_transaction;
-
-#define headstage_spi_close() SPI_close(spi_handle)
-#define headstage_spi_transaction_cancel() SPI_transferCancel(spi_handle)
-
-// SPI parameters initialize
-#define headstage_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.dataSize        = 8;                                    \
-        spi_parameter.frameFormat     = SPI_POL0_PHA1;                        \
-        spi_handle                    = SPI_open(Board_SPI0, &spi_parameter); \
-    } while (0)
-
-#define headstage_spi_transaction(len, tx, rx)      \
-    ({                                              \
-        spi_transaction.txBuf = (tx);               \
-        spi_transaction.rxBuf = (rx);               \
-        spi_transaction.count = (len);              \
-        SPI_transfer(spi_handle, &spi_transaction); \
-    })
-
-#define SPI_BUFFER_SIZE 16
-
-static uint8_t spi_txbuf[SPI_BUFFER_SIZE] = {0};
-static uint8_t spi_rxbuf[SPI_BUFFER_SIZE] = {0};
-
-#endif  // HEADSTAGE_SPI_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/uni/headstage_adc.h

@@ -1,5 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_ADC_H
-#define HEADSTAGE_ADC_H
-#endif // HEADSTAGE_ADC_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/uni/headstage_gptimer.h

@@ -1,45 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_GPTIMER_H
-#define HEADSTAGE_GPTIMER_H
-
-#include <Board.h>
-#include <ti/drivers/timer/GPTimerCC26XX.h>
-#include <ti/sysbios/BIOS.h>
-#include <xdc/runtime/Types.h>
-
-#define EVT_PERIODIC_GPTIMER EVT_PERIODIC_0
-
-static GPTimerCC26XX_Handle gptimer_handle;
-
-static void headstage_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask) {
-    flag_notify(EVT_PERIODIC_GPTIMER);
-}
-
-#define headstage_gptimer_start() GPTimerCC26XX_start(gptimer_handle)
-#define headstage_gptimer_stop() GPTimerCC26XX_stop(gptimer_handle)
-#define headstage_gptimer_close() GPTimerCC26XX_close(gptimer_handle)
-
-#define headstage_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);                         \
-        GPTimerCC26XX_setLoadValue(gptimer_handle, 0xFFFFFF);                                         \
-        GPTimerCC26XX_registerInterrupt(gptimer_handle, headstage_gptimer_callback, GPT_INT_TIMEOUT); \
-    } while (0)
-
-#define headstage_gptimer_set_frequency(frequency)                                               \
-    do {                                                                                         \
-        uint32_t     _frequency = (uint32_t)(frequency);                                         \
-        Types_FreqHz _cpu_freq;                                                                  \
-        BIOS_getCpuFreq(&_cpu_freq);                                                             \
-        GPTimerCC26XX_Value _load = _cpu_freq.lo / _frequency - 1;                               \
-        _load                     = (_load < 0xFFFF) ? _load : ((0xFA0000 | (_load / 250)) - 1); \
-        GPTimerCC26XX_setLoadValue(gptimer_handle, _load);                                       \
-    } while (0)
-
-#endif  // HEADSTAGE_GPTIMER_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/uni/headstage_pin.h

@@ -1,55 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_PIN_H
-#define HEADSTAGE_PIN_H
-
-#include <Board.h>
-#include <ti/drivers/PIN.h>
-
-#if defined(CC2650_LAUNCHXL)
-#include "lp/headstage_uni_pin.h"
-#elif defined(BOOSTXL_CC2650MA)
-#include "ma/headstage_uni_pin.h"
-#endif
-
-static PIN_State  headstage_pins_state;
-static PIN_Handle headstage_pins_handle;
-
-static PIN_Config headstage_pin_configuration[] = {                                    //
-    PIN_LED_RED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // POLY_R
-    PIN_LED_GRN | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // LED_G
-
-    PIN_ADC_EOC | PIN_INPUT_EN | PIN_PULLDOWN,
-    PIN_PWR_CHECK | PIN_INPUT_EN | PIN_PULLDOWN,
-
-    PIN_POLY_CLK | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,  // POLY_R
-    PIN_CLOCK_8M | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-
-    // LSK spi
-    PIN_LSK_MOSI | PIN_INPUT_EN | PIN_PULLDOWN,  // SPI0 to receive LSK
-    PIN_LSK_CLK | PIN_INPUT_EN | PIN_PULLDOWN,   // after lsk and lsk_manchester xor lsk_clk
-    PIN_LSK_CS | PIN_INPUT_EN | PIN_PULLDOWN,    // SPI0_LSK
-
-    // ASK
-    PIN_ASK_MOSI | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,  // SPI1 to transmit ASK
-    PIN_ASK_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,   // SPI1_ASK
-
-    PIN_RESET | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_TRIGGER | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-
-    //
-    PIN_TERMINATE};
-
-#define headstage_pin_add(configuration) PIN_add(headstage_pins_handle, configuration)
-#define headstage_pin_remove(pin) PIN_remove(headstage_pins_handle, pin)
-#define headstage_pin_close() PIN_close(headstage_pins_handle)
-
-#define headstage_pin_open()                                                                  \
-    do {                                                                                      \
-        headstage_pins_handle = PIN_open(&headstage_pins_state, headstage_pin_configuration); \
-    } while (0)
-
-#define headstage_pin_output(pin, value) PIN_setOutputValue(headstage_pins_handle, PIN_ID(pin), (value))
-#define headstage_pin_input(pin) PIN_getInputValue(PIN_ID(pin))
-
-#endif  // HEADSTAGE_PIN_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/uni/headstage_pwm.h

@@ -1,36 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_PWM_H
-#define HEADSTAGE_PWM_H
-
-#include <Board.h>
-#include <ti/drivers/PWM.h>
-
-static PWM_Handle headstage_system_pwm_handle;
-static PWM_Handle headstage_poly_r_pwm_handle;  // poly-R adjustment clock
-
-#define headstage_pwm_open()                                         \
-    do {                                                             \
-        PWM_init();                                                  \
-        PWM_Params params;                                           \
-        PWM_Params_init(&params);                                    \
-        params.idleLevel            = PWM_IDLE_LOW;                  \
-        params.periodUnits          = PWM_PERIOD_HZ;                 \
-        params.periodValue          = UMC_SYS_CLK;                   \
-        params.dutyUnits            = PWM_DUTY_FRACTION;             \
-        params.dutyValue            = PWM_DUTY_FRACTION_MAX / 2;     \
-        headstage_system_pwm_handle = PWM_open(Board_PWM2, &params); \
-        PWM_Params_init(&params);                                    \
-        params.idleLevel            = PWM_IDLE_LOW;                  \
-        params.periodUnits          = PWM_PERIOD_HZ;                 \
-        params.periodValue          = UMC_POLY_R_CLK;                \
-        params.dutyUnits            = PWM_DUTY_FRACTION;             \
-        params.dutyValue            = PWM_DUTY_FRACTION_MAX / 2;     \
-        headstage_poly_r_pwm_handle = PWM_open(Board_PWM0, &params); \
-    } while (0);
-
-#define headstage_pwm_start(handle) PWM_start(handle)
-#define headstage_pwm_stop(handle) PWM_stop(handle)
-#define headstage_pwm_close(handle) PWM_close(handle)
-
-#endif  // HEADSTAGE_PWM_H