test

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

README.md

@@ -26,8 +26,7 @@ BioPro Device
 3.  Neulive 1.3
 
     `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_neulive.h`
-    [docs](simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx\app/headstage/uni/Neulive13.md)
-    
+
 4.  EliteZM
 
     `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_zm.h`
@@ -36,10 +35,6 @@ BioPro Device
 
     `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_sti.h`
 
-6.  Neulive 2.0
-
-    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_neu.h`
-    
 ### Notable source code
     
 *   gpio table

ccs910/ccs/eclipse/configuration/org.eclipse.osgi/83/0/.cp/resources/languageSettings/dummy.c

@@ -1,3 +0,0 @@
-int main(void) {
-	return 0;
-}

ccs910/ccs/eclipse/configuration/org.eclipse.osgi/83/0/.cp/resources/languageSettings/dummy.cpp

@@ -1,3 +0,0 @@
-int main(void) {
-	return 0;
-}

python_test_code/devlib/main.py

@@ -23,7 +23,7 @@ NEULIVE_INSTRUCTION = {
 
 NEULIVE_PARAMETER = {
     'LB': 0,         # LOW BAND FREQEUNCY
-    'CH': 1,  # CHOPPER
+    'CH': 0,         # CHOPPER
     'FS': 0,         # FAST SETTLE
     'WF': 1,         # WAVEFORM : POS, NEG, P2N...etc.
     'TV': 0,         # STIMULATION VOLTAGE
@@ -36,10 +36,10 @@ NEULIVE_PARAMETER = {
     'SB': 2,         # STIMULATION BEHAVIOR
     'TF': 1,         # STIMULATION FREQUENCY
     'CA': 1,         # AMP CHANNEL A ENABLE
-    'CB': 1,         # AMP CHANNEL B ENABLE
-    'CC': 1,         # AMP CHANNEL C ENABLE
-    'CD': 1,         # AMP CHANNEL D ENABLE
-    'CHA': 9,        # AMP CHANNEL A
+    'CB': 0,         # AMP CHANNEL B ENABLE
+    'CC': 0,         # AMP CHANNEL C ENABLE
+    'CD': 0,         # AMP CHANNEL D ENABLE
+    'CHA': 0,        # AMP CHANNEL A
     'CHB': 1,        # AMP CHANNEL B
     'CHC': 2,        # AMP CHANNEL C
     'CHD': 3,        # AMP CHANNEL D

python_test_code/uni/briefly_data_analysis.py

@@ -256,9 +256,7 @@ def print_result(result: Result, options: Options):
         print(result.data_file)
         print('data_count', result.data_count)
         print('channel', ' '.join(list(map(str, sorted(result.channel)))))
-        print()
-        inv_map = {v: k for k, v in result.time_delta_counter.items()}
-        print('data loss rate', 1 - max(inv_map.keys()) * inv_map[max(inv_map.keys())] / result.total_duration)
+
         try:
             sample_rate = result.sample_rate
             print('sample_rate [1/s]', sample_rate)
@@ -296,10 +294,6 @@ def print_result(result: Result, options: Options):
         paint_fft_result(result, options)
 
 
-def calculate_(result: Result):
-    print(max(result))
-
-
 def paint_fft_result(result: Result, options: Options):
     import matplotlib.pyplot as plt
     import numpy as np

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

@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
-	<isTargetManual value="false"/>
+	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
+	<isTargetManual value="true"/>
 </projectOptions>

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

@@ -1,325 +1,167 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?>
 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-    <storageModule configRelations="2" moduleId="org.eclipse.cdt.core.settings">
-        <cconfiguration id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115">
-            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider"
-                           id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115"
-                           moduleId="org.eclipse.cdt.core.settings" name="FlashROM">
-                <externalSettings/>
-                <extensions>
-                    <extension id="com.ti.ccstudio.binaryparser.CoffParser" point="org.eclipse.cdt.core.BinaryParser"/>
-                    <extension id="com.ti.ccstudio.errorparser.CoffErrorParser"
-                               point="org.eclipse.cdt.core.ErrorParser"/>
-                    <extension id="com.ti.ccstudio.errorparser.LinkErrorParser"
-                               point="org.eclipse.cdt.core.ErrorParser"/>
-                    <extension id="com.ti.ccstudio.errorparser.AsmErrorParser"
-                               point="org.eclipse.cdt.core.ErrorParser"/>
-                    <extension id="com.ti.rtsc.XDCtools.parsers.ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-                    <extension id="org.eclipse.rtsc.xdctools.parsers.ErrorParser"
-                               point="org.eclipse.cdt.core.ErrorParser"/>
-                    <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-                </extensions>
-            </storageModule>
-            <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties=""
-                               cleanCommand="${CG_CLEAN_CMD}" description=""
-                               errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser"
-                               id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115" name="FlashROM"
-                               parent="com.ti.ccstudio.buildDefinitions.TMS470.Default"
-                               postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out"
-                               prebuildStep="">
-                    <folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115." name="/"
-                                resourcePath="">
-                        <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.1547228068"
-                                   name="TI Build Tools"
-                                   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
-                                   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.823790760">
-                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1311981229"
-                                    superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
-                                <listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
-                                <listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
-                                <listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
-                                <listOptionValue builtIn="false" value="LINKER_COMMAND_FILE=cc26x0f128.cmd"/>
-                                <listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
-                                <listOptionValue builtIn="false" value="XDC_VERSION=3.32.0.06_core"/>
-                                <listOptionValue builtIn="false" value="INACTIVE_REPOS="/>
-                                <listOptionValue builtIn="false" value="EXPANDED_REPOS="/>
-                                <listOptionValue builtIn="false"
-                                                 value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
-                                <listOptionValue builtIn="false" value="OUTPUT_TYPE=rtscApplication:executable"/>
-                                <listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
-                                <listOptionValue builtIn="false"
-                                                 value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
-                                <listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
-                            </option>
-                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1278535507"
-                                    superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
-                                    value="18.1.3.LTS" valueType="string"/>
-                            <targetPlatform
-                                    id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1286316488"
-                                    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.446247774"
-                                     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.1912820484"
-                                  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.147395442"
-                                        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.1631152097"
-                                        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.1810396348"
-                                        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.1849265676"
-                                        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.1940421475"
-                                        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.1367001075"
-                                        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.286581495"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH"
-                                        valueType="includePath">
-                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-                                    <listOptionValue builtIn="false"
-                                                     value="${SRC_EX}/examples/simple_central/cc26xx/app"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles/cc26xx"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/simple_profile"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/heapmgr"/>
-                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common"/>
-                                    <listOptionValue builtIn="false" value="${SRC_EX}/target"/>
-                                    <listOptionValue builtIn="false"
-                                                     value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/sdata"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
-                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/icall/src/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/inc"/>
-                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
-                                    <listOptionValue builtIn="false" value="${CC26XXWARE}"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.25198801"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1378439661"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
-                                        valueType="definedSymbols">
-                                    <listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
-                                    <listOptionValue builtIn="false" value="CC2650DK_7ID"/>
-                                    <listOptionValue builtIn="false" value="CC26XX"/>
-                                    <listOptionValue builtIn="false" value="GAPCENTRALROLE_NUM_RSSI_LINKS=1"/>
-                                    <listOptionValue builtIn="false" value="HEAPMGR_SIZE=0"/>
-                                    <listOptionValue builtIn="false" value="ICALL_MAX_NUM_ENTITIES=6"/>
-                                    <listOptionValue builtIn="false" value="ICALL_MAX_NUM_TASKS=3"/>
-                                    <listOptionValue builtIn="false" value="POWER_SAVING"/>
-                                    <listOptionValue builtIn="false" value="USE_ICALL"/>
-                                    <listOptionValue builtIn="false" value="xBOARD_DISPLAY_EXCLUDE_LCD"/>
-                                    <listOptionValue builtIn="false" value="xDisplay_DISABLE_ALL"/>
-                                    <listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
-                                    <listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.233710223"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING"
-                                        valueType="stringList">
-                                    <listOptionValue builtIn="false" value="225"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.20229844"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS"
-                                        valueType="stringList">
-                                    <listOptionValue builtIn="false" value="48"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.515276425"
-                                        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.472353918"
-                                        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.603203403"
-                                        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.1076262962"
-                                        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.20122028"
-                                        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.1937961346"
-                                        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.1529081332"
-                                        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.1787052493"
-                                        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.823790760"
-                                  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.654839495"
-                                        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.1634394199"
-                                        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.81069661"
-                                        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.460762728"
-                                        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.1440650831"
-                                        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.1917305202"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH"
-                                        valueType="libPaths">
-                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
-                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.87877887"
-                                        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.607092195"
-                                        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.898739186"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS"
-                                        valueType="stringList">
-                                    <listOptionValue builtIn="false" value="10247-D"/>
-                                    <listOptionValue builtIn="false" value="16002-D"/>
-                                </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.456484788"
-                                        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.1278856259"
-                                        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.1963895384"
-                                        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.219058338"
-                                        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.992399023"
-                                        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.1599766614"
-                                        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.2046318121"
-                                  name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.966050821"
-                                        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.1884095023"
-                                        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.1998683028"
-                                        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.405695666" name="XDCtools"
-                                  superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.605667670"
-                                        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.133637234"
-                                        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.2039910934"
-                                        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.1480791815"
-                                        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.214895402"
-                                        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.1983684756"
-                                        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.224609618"
-                                        superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS"
-                                        value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
-                            </tool>
-                        </toolChain>
-                    </folderInfo>
-                    <sourceEntries>
-                        <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-                    </sourceEntries>
-                </configuration>
-            </storageModule>
-            <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-        </cconfiguration>
-    </storageModule>
-    <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-    <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-        <project id="SimpleBLECentral.com.ti.ccstudio.buildDefinitions.TMS470.ProjectType.293217533" name="ARM"
-                 projectType="com.ti.ccstudio.buildDefinitions.TMS470.ProjectType"/>
-    </storageModule>
-    <storageModule moduleId="scannerConfiguration"/>
-    <storageModule moduleId="org.eclipse.cdt.core.language.mapping">
-        <project-mappings>
-            <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.asmSource"
-                                  language="com.ti.ccstudio.core.TIASMLanguage"/>
-            <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cHeader"
-                                  language="com.ti.ccstudio.core.TIGCCLanguage"/>
-            <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cSource"
-                                  language="com.ti.ccstudio.core.TIGCCLanguage"/>
-            <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cxxHeader"
-                                  language="com.ti.ccstudio.core.TIGPPLanguage"/>
-            <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cxxSource"
-                                  language="com.ti.ccstudio.core.TIGPPLanguage"/>
-        </project-mappings>
-    </storageModule>
-    <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+  <storageModule configRelations="2" moduleId="org.eclipse.cdt.core.settings">
+    <cconfiguration id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115">
+      <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115" moduleId="org.eclipse.cdt.core.settings" name="FlashROM">
+        <externalSettings/>
+        <extensions>
+          <extension id="com.ti.ccstudio.errorparser.CoffErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+          <extension id="com.ti.ccstudio.errorparser.LinkErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+          <extension id="com.ti.ccstudio.errorparser.AsmErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+          <extension id="com.ti.rtsc.XDCtools.parsers.ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+          <extension id="org.eclipse.rtsc.xdctools.parsers.ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+          <extension id="com.ti.ccstudio.binaryparser.CoffParser" point="org.eclipse.cdt.core.BinaryParser"/>
+        </extensions>
+      </storageModule>
+      <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+        <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out" prebuildStep="">
+          <folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1291753115." name="/" resourcePath="">
+            <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.DebugToolchain.1418073980" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug.1380025885">
+              <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1582688306" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+                <listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2640F128"/>
+                <listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
+                <listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
+                <listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
+                <listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
+                <listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=&quot;libc.a&quot;"/>
+                <listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
+                <listOptionValue builtIn="false" value="XDC_VERSION=3.32.0.06_core"/>
+                <listOptionValue builtIn="false" value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
+                <listOptionValue builtIn="false" value="INACTIVE_REPOS="/>
+                <listOptionValue builtIn="false" value="EXPANDED_REPOS="/>
+                <listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
+                <listOptionValue builtIn="false" value="OUTPUT_TYPE=rtscApplication:executable"/>
+              </option>
+              <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.739662419" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="16.9.4.LTS" valueType="string"/>
+              <targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.targetPlatformDebug.634338313" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.targetPlatformDebug"/>
+              <builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.builderDebug.1783170872" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.builderDebug"/>
+              <tool id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.compilerDebug.853360855" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.compilerDebug">
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.SILICON_VERSION.205081197" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CODE_STATE.1562370453" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CODE_STATE.16" valueType="enumerated"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.ABI.54100387" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.ABI.eabi" valueType="enumerated"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.LITTLE_ENDIAN.776513622" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL.1445673478" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED.484926802" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.INCLUDE_PATH.1112813014" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.INCLUDE_PATH" valueType="includePath">
+                  <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
+                  <listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_central/cc26xx/app"/>
+                  <listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
+                  <listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
+                  <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles/cc26xx"/>
+                  <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
+                  <listOptionValue builtIn="false" value="${SRC_EX}/profiles/simple_profile"/>
+                  <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
+                  <listOptionValue builtIn="false" value="${SRC_COMMON}/heapmgr"/>
+                  <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
+                  <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common"/>
+                  <listOptionValue builtIn="false" value="${SRC_EX}/target"/>
+                  <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
+                  <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
+                  <listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
+                  <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/sdata"/>
+                  <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
+                  <listOptionValue builtIn="false" value="${SRC_COMMON}/icall/src/inc"/>
+                  <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/inc"/>
+                  <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
+                  <listOptionValue builtIn="false" value="${CC26XXWARE}"/>
+                </option>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT.863938432" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT.C99" valueType="enumerated"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEFINE.1446784470" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEFINE" valueType="definedSymbols">
+                  <listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
+                  <listOptionValue builtIn="false" value="CC2650DK_7ID"/>
+                  <listOptionValue builtIn="false" value="CC26XX"/>
+                  <listOptionValue builtIn="false" value="GAPCENTRALROLE_NUM_RSSI_LINKS=1"/>
+                  <listOptionValue builtIn="false" value="HEAPMGR_SIZE=0"/>
+                  <listOptionValue builtIn="false" value="ICALL_MAX_NUM_ENTITIES=6"/>
+                  <listOptionValue builtIn="false" value="ICALL_MAX_NUM_TASKS=3"/>
+                  <listOptionValue builtIn="false" value="POWER_SAVING"/>
+                  <listOptionValue builtIn="false" value="USE_ICALL"/>
+                  <listOptionValue builtIn="false" value="xBOARD_DISPLAY_EXCLUDE_LCD"/>
+                  <listOptionValue builtIn="false" value="xDisplay_DISABLE_ALL"/>
+                  <listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
+                  <listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
+                </option>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WARNING.1982088211" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WARNING" valueType="stringList">
+                  <listOptionValue builtIn="false" value="225"/>
+                </option>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DISPLAY_ERROR_NUMBER.1446305355" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_SUPPRESS.1394384102" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_SUPPRESS" valueType="stringList">
+                  <listOptionValue builtIn="false" value="48"/>
+                </option>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WRAP.850367854" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GEN_FUNC_SUBSECTIONS.1893776167" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CMD_FILE.2006401530" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CMD_FILE" valueType="stringList">
+                  <listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
+                  <listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
+                  <listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
+                </option>
+                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__C_SRCS.339372296" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__C_SRCS"/>
+                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__CPP_SRCS.1684283158" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__CPP_SRCS"/>
+                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM_SRCS.876227203" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM_SRCS"/>
+                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM2_SRCS.1353139879" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM2_SRCS"/>
+              </tool>
+              <tool id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug.1380025885" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug">
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.STACK_SIZE.266547265" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.STACK_SIZE" value="256" valueType="string"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.HEAP_SIZE.1467179876" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.HEAP_SIZE" value="0" valueType="string"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.MAP_FILE.1547400525" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.OUTPUT_FILE.2000240221" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.OUTPUT_FILE" value="&quot;${ProjName}.out&quot;" valueType="string"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.LIBRARY.1982802675" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.LIBRARY" valueType="libs">
+                  <listOptionValue builtIn="false" value="&quot;libc.a&quot;"/>
+                  <listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
+                  <listOptionValue builtIn="false" value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
+                </option>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.SEARCH_PATH.1904712364" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.SEARCH_PATH" valueType="libPaths">
+                  <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
+                  <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
+                </option>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_WRAP.2092354689" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_SUPPRESS.747202646" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_SUPPRESS" valueType="stringList">
+                  <listOptionValue builtIn="false" value="10247-D"/>
+                  <listOptionValue builtIn="false" value="16002-D"/>
+                </option>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DISPLAY_ERROR_NUMBER.1660885810" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.XML_LINK_INFO.1420411176" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.UNUSED_SECTION_ELIMINATION.1346463382" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
+                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.COMPRESS_DWARF.770157989" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
+                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD_SRCS.421661570" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD_SRCS"/>
+                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD2_SRCS.1231976535" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD2_SRCS"/>
+                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__GEN_CMDS.604048880" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__GEN_CMDS"/>
+              </tool>
+              <tool id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.2015157039" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex"/>
+              <tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1717747287" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1962556839" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
+                  <listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_REPOS}"/>
+                  <listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
+                </option>
+                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.807920375" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
+                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.1248595667" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
+                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.444999592" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
+                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1186365171" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
+                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.430694521" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="&quot;${CG_TOOL_ROOT}&quot;" valueType="string"/>
+                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.136330490" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
+              </tool>
+            </toolChain>
+          </folderInfo>
+          <sourceEntries>
+            <entry excluding="cc26x0f128.cmd" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+          </sourceEntries>
+        </configuration>
+      </storageModule>
+      <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+    </cconfiguration>
+  </storageModule>
+  <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+  <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+    <project id="SimpleBLECentral.com.ti.ccstudio.buildDefinitions.TMS470.ProjectType.293217533" name="ARM" projectType="com.ti.ccstudio.buildDefinitions.TMS470.ProjectType"/>
+  </storageModule>
+  <storageModule moduleId="scannerConfiguration"/>
+  <storageModule moduleId="org.eclipse.cdt.core.language.mapping">
+    <project-mappings>
+      <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.asmSource" language="com.ti.ccstudio.core.TIASMLanguage"/>
+      <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cHeader" language="com.ti.ccstudio.core.TIGCCLanguage"/>
+      <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cSource" language="com.ti.ccstudio.core.TIGCCLanguage"/>
+      <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cxxHeader" language="com.ti.ccstudio.core.TIGPPLanguage"/>
+      <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cxxSource" language="com.ti.ccstudio.core.TIGPPLanguage"/>
+    </project-mappings>
+  </storageModule>
 </cproject>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/app/.project

@@ -1,419 +1,419 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <projectDescription>
-	<name>simple_central_cc2650em_app</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.rtsc.xdctools.buildDefinitions.XDC.xdcNature</nature>
-		<nature>com.ti.ccstudio.core.ccsNature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Application</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>Drivers</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>ICall</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>ICallBLE</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>Include</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>PROFILES</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>Startup</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>TOOLS</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>Application/board_key.c</name>
-			<type>1</type>
-			<locationURI>SRC_EX/common/cc26xx/board_key.c</locationURI>
-		</link>
-		<link>
-			<name>Application/board_key.h</name>
-			<type>1</type>
-			<locationURI>SRC_EX/common/cc26xx/board_key.h</locationURI>
-		</link>
-		<link>
-			<name>Application/simple_central.c</name>
-			<type>1</type>
-			<locationURI>SRC_EX/examples/simple_central/cc26xx/app/simple_central.c</locationURI>
-		</link>
-		<link>
-			<name>Application/simple_central.h</name>
-			<type>1</type>
-			<locationURI>SRC_EX/examples/simple_central/cc26xx/app/simple_central.h</locationURI>
-		</link>
-		<link>
-			<name>Application/util.c</name>
-			<type>1</type>
-			<locationURI>SRC_EX/common/cc26xx/util.c</locationURI>
-		</link>
-		<link>
-			<name>Application/util.h</name>
-			<type>1</type>
-			<locationURI>SRC_EX/common/cc26xx/util.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/Display</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>Drivers/ECC</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>Drivers/PIN</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>Drivers/RF</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>Drivers/SPI</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>Drivers/TRNG</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>Drivers/UART</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>Drivers/UDMA</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
-		<link>
-			<name>ICall/heapmgr.h</name>
-			<type>1</type>
-			<locationURI>SRC_COMMON/heapmgr/heapmgr.h</locationURI>
-		</link>
-		<link>
-			<name>ICall/icall.c</name>
-			<type>1</type>
-			<locationURI>SRC_COMMON/icall/src/icall.c</locationURI>
-		</link>
-		<link>
-			<name>ICall/icall.h</name>
-			<type>1</type>
-			<locationURI>SRC_COMMON/icall/src/inc/icall.h</locationURI>
-		</link>
-		<link>
-			<name>ICall/icall_addrs.h</name>
-			<type>1</type>
-			<locationURI>SRC_EX/icall/inc/icall_addrs.h</locationURI>
-		</link>
-		<link>
-			<name>ICall/icall_cc2650.c</name>
-			<type>1</type>
-			<locationURI>SRC_COMMON/icall/src/icall_cc2650.c</locationURI>
-		</link>
-		<link>
-			<name>ICall/icall_platform.h</name>
-			<type>1</type>
-			<locationURI>SRC_COMMON/icall/src/icall_platform.h</locationURI>
-		</link>
-		<link>
-			<name>ICallBLE/ble_user_config.c</name>
-			<type>1</type>
-			<locationURI>SRC_EX/icall/app/ble_user_config.c</locationURI>
-		</link>
-		<link>
-			<name>ICallBLE/ble_user_config.h</name>
-			<type>1</type>
-			<locationURI>SRC_EX/icall/inc/ble_user_config.h</locationURI>
-		</link>
-		<link>
-			<name>ICallBLE/icall_api.c</name>
-			<type>1</type>
-			<locationURI>SRC_EX/icall/app/icall_api.c</locationURI>
-		</link>
-		<link>
-			<name>ICallBLE/icall_apimsg.h</name>
-			<type>1</type>
-			<locationURI>SRC_EX/icall/inc/icall_apimsg.h</locationURI>
-		</link>
-		<link>
-			<name>Include/gap.h</name>
-			<type>1</type>
-			<locationURI>SRC_BLE_CORE/inc/gap.h</locationURI>
-		</link>
-		<link>
-			<name>Include/gapbondmgr.h</name>
-			<type>1</type>
-			<locationURI>SRC_EX/profiles/roles/gapbondmgr.h</locationURI>
-		</link>
-		<link>
-			<name>Include/gapgattserver.h</name>
-			<type>1</type>
-			<locationURI>SRC_EX/inc/gapgattserver.h</locationURI>
-		</link>
-		<link>
-			<name>Include/gatt.h</name>
-			<type>1</type>
-			<locationURI>SRC_BLE_CORE/inc/gatt.h</locationURI>
-		</link>
-		<link>
-			<name>Include/hci.h</name>
-			<type>1</type>
-			<locationURI>SRC_BLE_CORE/inc/hci.h</locationURI>
-		</link>
-		<link>
-			<name>Include/osal_snv.h</name>
-			<type>1</type>
-			<locationURI>SRC_COMMON/osal/src/inc/osal_snv.h</locationURI>
-		</link>
-		<link>
-			<name>PROFILES/central.c</name>
-			<type>1</type>
-			<locationURI>SRC_EX/profiles/roles/cc26xx/central.c</locationURI>
-		</link>
-		<link>
-			<name>PROFILES/central.h</name>
-			<type>1</type>
-			<locationURI>SRC_EX/profiles/roles/cc26xx/central.h</locationURI>
-		</link>
-		<link>
-			<name>Startup/board.c</name>
-			<type>1</type>
-			<locationURI>SRC_EX/target/board.c</locationURI>
-		</link>
-		<link>
-			<name>Startup/ccfg_app_ble.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-ORG_PROJ_DIR/config/ccfg_app_ble.c</locationURI>
-		</link>
-		<link>
-			<name>Startup/main.c</name>
-			<type>1</type>
-			<locationURI>SRC_EX/examples/simple_central/cc26xx/app/main.c</locationURI>
-		</link>
-		<link>
-			<name>TOOLS/app_ble.cfg</name>
-			<type>1</type>
-			<locationURI>PARENT-2-ORG_PROJ_DIR/ccs/config/app_ble.cfg</locationURI>
-		</link>
-		<link>
-			<name>TOOLS/cc26xx_app.cmd</name>
-			<type>1</type>
-			<locationURI>SRC_EX/common/cc26xx/ccs/cc26xx_app.cmd</locationURI>
-		</link>
-		<link>
-			<name>TOOLS/ccs_compiler_defines.bcfg</name>
-			<type>1</type>
-			<locationURI>PARENT-2-ORG_PROJ_DIR/ccs/config/ccs_compiler_defines.bcfg</locationURI>
-		</link>
-		<link>
-			<name>TOOLS/ccs_linker_defines.cmd</name>
-			<type>1</type>
-			<locationURI>PARENT-2-ORG_PROJ_DIR/ccs/config/ccs_linker_defines.cmd</locationURI>
-		</link>
-		<link>
-			<name>Drivers/Display/Display.h</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/mw/display/Display.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/Display/DisplayDogm1286.c</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/mw/display/DisplayDogm1286.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/Display/DisplayDogm1286.h</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/mw/display/DisplayDogm1286.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/Display/DisplayUART.c</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/mw/display/DisplayUART.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/Display/DisplayUART.h</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/mw/display/DisplayUART.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/ECC/ECCROMCC26XX.c</name>
-			<type>1</type>
-			<locationURI>SRC_EX/common/cc26xx/ecc/ECCROMCC26XX.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/ECC/ECCROMCC26XX.h</name>
-			<type>1</type>
-			<locationURI>SRC_EX/common/cc26xx/ecc/ECCROMCC26XX.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/PIN/PIN.h</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/PIN.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/PIN/PINCC26XX.c</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/pin/PINCC26XX.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/PIN/PINCC26XX.h</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/pin/PINCC26XX.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/RF/RF.h</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/rf/RF.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/RF/RFCC26XX_singleMode.c</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/rf/RFCC26XX_singleMode.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/SPI/SPI.c</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/SPI.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/SPI/SPI.h</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/SPI.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/SPI/SPICC26XXDMA.c</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/spi/SPICC26XXDMA.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/SPI/SPICC26XXDMA.h</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/spi/SPICC26XXDMA.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/TRNG/TRNGCC26XX.c</name>
-			<type>1</type>
-			<locationURI>SRC_COMMON/hal/src/target/_common/TRNGCC26XX.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/TRNG/TRNGCC26XX.h</name>
-			<type>1</type>
-			<locationURI>SRC_COMMON/hal/src/target/_common/TRNGCC26XX.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/UART/UART.c</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/UART.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/UART/UART.h</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/UART.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/UART/UARTCC26XX.c</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/uart/UARTCC26XX.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/UART/UARTCC26XX.h</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/uart/UARTCC26XX.h</locationURI>
-		</link>
-		<link>
-			<name>Drivers/UDMA/UDMACC26XX.c</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/dma/UDMACC26XX.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/UDMA/UDMACC26XX.h</name>
-			<type>1</type>
-			<locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/dma/UDMACC26XX.h</locationURI>
-		</link>
-	</linkedResources>
-	<variableList>
-		<variable>
-			<name>CC26XXWARE</name>
-			<value>file:/C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272</value>
-		</variable>
-		<variable>
-			<name>ORG_PROJ_DIR</name>
-			<value>$%7BPARENT-2-PROJECT_LOC%7D/iar/stack</value>
-		</variable>
-		<variable>
-			<name>ROM</name>
-			<value>$%7BPARENT-5-ORG_PROJ_DIR%7D/src/rom</value>
-		</variable>
-		<variable>
-			<name>SRC_BLE_CORE</name>
-			<value>$%7BPARENT-5-ORG_PROJ_DIR%7D/src</value>
-		</variable>
-		<variable>
-			<name>SRC_COMMON</name>
-			<value>$%7BPARENT-5-ORG_PROJ_DIR%7D/src/components</value>
-		</variable>
-		<variable>
-			<name>SRC_EX</name>
-			<value>$%7BPARENT-5-ORG_PROJ_DIR%7D/src</value>
-		</variable>
-		<variable>
-			<name>TI_RTOS_DRIVERS_BASE</name>
-			<value>file:/C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/tidrivers_cc13xx_cc26xx_2_21_01_01/packages</value>
-		</variable>
-		<variable>
-			<name>TOOLS_BLE</name>
-			<value>$%7BPARENT-5-ORG_PROJ_DIR%7D/tools</value>
-		</variable>
-	</variableList>
+  <name>simple_central_cc2650em_app</name>
+  <comment/>
+  <projects>
+  </projects>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+      <arguments>
+      </arguments>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+      <triggers>full,incremental,</triggers>
+      <arguments>
+      </arguments>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.rtsc.xdctools.buildDefinitions.XDC.xdcNature</nature>
+    <nature>com.ti.ccstudio.core.ccsNature</nature>
+    <nature>org.eclipse.cdt.core.cnature</nature>
+    <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+    <nature>org.eclipse.cdt.core.ccnature</nature>
+    <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+  </natures>
+  <linkedResources>
+    <link>
+      <name>Application</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Drivers</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Drivers/ECC</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Drivers/ECC/ECCROMCC26XX.c</name>
+      <type>1</type>
+      <locationURI>SRC_EX/common/cc26xx/ecc/ECCROMCC26XX.c</locationURI>
+    </link>
+    <link>
+      <name>Drivers/ECC/ECCROMCC26XX.h</name>
+      <type>1</type>
+      <locationURI>SRC_EX/common/cc26xx/ecc/ECCROMCC26XX.h</locationURI>
+    </link>
+    <link>
+      <name>ICall</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>ICallBLE</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Include</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>PROFILES</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Startup</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>TOOLS</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Application/board_key.c</name>
+      <type>1</type>
+      <locationURI>SRC_EX/common/cc26xx/board_key.c</locationURI>
+    </link>
+    <link>
+      <name>Application/board_key.h</name>
+      <type>1</type>
+      <locationURI>SRC_EX/common/cc26xx/board_key.h</locationURI>
+    </link>
+    <link>
+      <name>Application/simple_central.c</name>
+      <type>1</type>
+      <locationURI>SRC_EX/examples/simple_central/cc26xx/app/simple_central.c</locationURI>
+    </link>
+    <link>
+      <name>Application/simple_central.h</name>
+      <type>1</type>
+      <locationURI>SRC_EX/examples/simple_central/cc26xx/app/simple_central.h</locationURI>
+    </link>
+    <link>
+      <name>Application/util.c</name>
+      <type>1</type>
+      <locationURI>SRC_EX/common/cc26xx/util.c</locationURI>
+    </link>
+    <link>
+      <name>Application/util.h</name>
+      <type>1</type>
+      <locationURI>SRC_EX/common/cc26xx/util.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/Display</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Drivers/PIN</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Drivers/RF</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Drivers/SPI</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Drivers/TRNG</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Drivers/UART</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>Drivers/UDMA</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>ICall/heapmgr.h</name>
+      <type>1</type>
+      <locationURI>SRC_COMMON/heapmgr/heapmgr.h</locationURI>
+    </link>
+    <link>
+      <name>ICall/icall.c</name>
+      <type>1</type>
+      <locationURI>SRC_COMMON/icall/src/icall.c</locationURI>
+    </link>
+    <link>
+      <name>ICall/icall.h</name>
+      <type>1</type>
+      <locationURI>SRC_COMMON/icall/src/inc/icall.h</locationURI>
+    </link>
+    <link>
+      <name>ICall/icall_addrs.h</name>
+      <type>1</type>
+      <locationURI>SRC_EX/icall/inc/icall_addrs.h</locationURI>
+    </link>
+    <link>
+      <name>ICall/icall_cc2650.c</name>
+      <type>1</type>
+      <locationURI>SRC_COMMON/icall/src/icall_cc2650.c</locationURI>
+    </link>
+    <link>
+      <name>ICall/icall_platform.h</name>
+      <type>1</type>
+      <locationURI>SRC_COMMON/icall/src/icall_platform.h</locationURI>
+    </link>
+    <link>
+      <name>ICallBLE/ble_user_config.c</name>
+      <type>1</type>
+      <locationURI>SRC_EX/icall/app/ble_user_config.c</locationURI>
+    </link>
+    <link>
+      <name>ICallBLE/ble_user_config.h</name>
+      <type>1</type>
+      <locationURI>SRC_EX/icall/inc/ble_user_config.h</locationURI>
+    </link>
+    <link>
+      <name>ICallBLE/icall_api.c</name>
+      <type>1</type>
+      <locationURI>SRC_EX/icall/app/icall_api.c</locationURI>
+    </link>
+    <link>
+      <name>ICallBLE/icall_apimsg.h</name>
+      <type>1</type>
+      <locationURI>SRC_EX/icall/inc/icall_apimsg.h</locationURI>
+    </link>
+    <link>
+      <name>Include/gap.h</name>
+      <type>1</type>
+      <locationURI>SRC_BLE_CORE/inc/gap.h</locationURI>
+    </link>
+    <link>
+      <name>Include/gapbondmgr.h</name>
+      <type>1</type>
+      <locationURI>SRC_EX/profiles/roles/gapbondmgr.h</locationURI>
+    </link>
+    <link>
+      <name>Include/gapgattserver.h</name>
+      <type>1</type>
+      <locationURI>SRC_EX/inc/gapgattserver.h</locationURI>
+    </link>
+    <link>
+      <name>Include/gatt.h</name>
+      <type>1</type>
+      <locationURI>SRC_BLE_CORE/inc/gatt.h</locationURI>
+    </link>
+    <link>
+      <name>Include/hci.h</name>
+      <type>1</type>
+      <locationURI>SRC_BLE_CORE/inc/hci.h</locationURI>
+    </link>
+    <link>
+      <name>Include/osal_snv.h</name>
+      <type>1</type>
+      <locationURI>SRC_COMMON/osal/src/inc/osal_snv.h</locationURI>
+    </link>
+    <link>
+      <name>PROFILES/central.c</name>
+      <type>1</type>
+      <locationURI>SRC_EX/profiles/roles/cc26xx/central.c</locationURI>
+    </link>
+    <link>
+      <name>PROFILES/central.h</name>
+      <type>1</type>
+      <locationURI>SRC_EX/profiles/roles/cc26xx/central.h</locationURI>
+    </link>
+    <link>
+      <name>Startup/board.c</name>
+      <type>1</type>
+      <locationURI>SRC_EX/target/board.c</locationURI>
+    </link>
+    <link>
+      <name>Startup/ccfg_app_ble.c</name>
+      <type>1</type>
+      <locationURI>PARENT-1-ORG_PROJ_DIR/config/ccfg_app_ble.c</locationURI>
+    </link>
+    <link>
+      <name>Startup/main.c</name>
+      <type>1</type>
+      <locationURI>SRC_EX/examples/simple_central/cc26xx/app/main.c</locationURI>
+    </link>
+    <link>
+      <name>TOOLS/app_ble.cfg</name>
+      <type>1</type>
+      <locationURI>PARENT-2-ORG_PROJ_DIR/ccs/config/app_ble.cfg</locationURI>
+    </link>
+    <link>
+      <name>TOOLS/cc26xx_app.cmd</name>
+      <type>1</type>
+      <locationURI>SRC_EX/common/cc26xx/ccs/cc26xx_app.cmd</locationURI>
+    </link>
+    <link>
+      <name>TOOLS/ccs_compiler_defines.bcfg</name>
+      <type>1</type>
+      <locationURI>PARENT-2-ORG_PROJ_DIR/ccs/config/ccs_compiler_defines.bcfg</locationURI>
+    </link>
+    <link>
+      <name>TOOLS/ccs_linker_defines.cmd</name>
+      <type>1</type>
+      <locationURI>PARENT-2-ORG_PROJ_DIR/ccs/config/ccs_linker_defines.cmd</locationURI>
+    </link>
+    <link>
+      <name>Drivers/Display/Display.h</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/mw/display/Display.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/Display/DisplayDogm1286.c</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/mw/display/DisplayDogm1286.c</locationURI>
+    </link>
+    <link>
+      <name>Drivers/Display/DisplayDogm1286.h</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/mw/display/DisplayDogm1286.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/Display/DisplayUART.c</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/mw/display/DisplayUART.c</locationURI>
+    </link>
+    <link>
+      <name>Drivers/Display/DisplayUART.h</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/mw/display/DisplayUART.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/PIN/PIN.h</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/PIN.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/PIN/PINCC26XX.c</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/pin/PINCC26XX.c</locationURI>
+    </link>
+    <link>
+      <name>Drivers/PIN/PINCC26XX.h</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/pin/PINCC26XX.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/RF/RFCC26XX_singleMode.c</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/rf/RFCC26XX_singleMode.c</locationURI>
+    </link>
+    <link>
+      <name>Drivers/RF/RF.h</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/rf/RF.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/SPI/SPI.c</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/SPI.c</locationURI>
+    </link>
+    <link>
+      <name>Drivers/SPI/SPI.h</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/SPI.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/SPI/SPICC26XXDMA.c</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/spi/SPICC26XXDMA.c</locationURI>
+    </link>
+    <link>
+      <name>Drivers/SPI/SPICC26XXDMA.h</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/spi/SPICC26XXDMA.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/TRNG/TRNGCC26XX.c</name>
+      <type>1</type>
+      <locationURI>SRC_COMMON/hal/src/target/_common/TRNGCC26XX.c</locationURI>
+    </link>
+    <link>
+      <name>Drivers/TRNG/TRNGCC26XX.h</name>
+      <type>1</type>
+      <locationURI>SRC_COMMON/hal/src/target/_common/TRNGCC26XX.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/UART/UART.c</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/UART.c</locationURI>
+    </link>
+    <link>
+      <name>Drivers/UART/UART.h</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/UART.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/UART/UARTCC26XX.c</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/uart/UARTCC26XX.c</locationURI>
+    </link>
+    <link>
+      <name>Drivers/UART/UARTCC26XX.h</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/uart/UARTCC26XX.h</locationURI>
+    </link>
+    <link>
+      <name>Drivers/UDMA/UDMACC26XX.c</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/dma/UDMACC26XX.c</locationURI>
+    </link>
+    <link>
+      <name>Drivers/UDMA/UDMACC26XX.h</name>
+      <type>1</type>
+      <locationURI>TI_RTOS_DRIVERS_BASE/ti/drivers/dma/UDMACC26XX.h</locationURI>
+    </link>
+  </linkedResources>
+  <variableList>
+    <variable>
+      <name>CC26XXWARE</name>
+      <value>file:/C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272</value>
+    </variable>
+    <variable>
+      <name>ORG_PROJ_DIR</name>
+      <value>${PARENT-2-PROJECT_LOC}/iar/stack</value>
+    </variable>
+    <variable>
+      <name>ROM</name>
+      <value>${PARENT-5-ORG_PROJ_DIR}/src/rom</value>
+    </variable>
+    <variable>
+      <name>SRC_BLE_CORE</name>
+      <value>${PARENT-5-ORG_PROJ_DIR}/src</value>
+    </variable>
+    <variable>
+      <name>SRC_COMMON</name>
+      <value>${PARENT-5-ORG_PROJ_DIR}/src/components</value>
+    </variable>
+    <variable>
+      <name>SRC_EX</name>
+      <value>${PARENT-5-ORG_PROJ_DIR}/src</value>
+    </variable>
+    <variable>
+      <name>TI_RTOS_DRIVERS_BASE</name>
+      <value>file:/C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/tidrivers_cc13xx_cc26xx_2_21_01_01/packages</value>
+    </variable>
+    <variable>
+      <name>TOOLS_BLE</name>
+      <value>${PARENT-5-ORG_PROJ_DIR}/tools</value>
+    </variable>
+  </variableList>
 </projectDescription>

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/TIXDS100v3_Dot7_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>

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

@@ -18,315 +18,279 @@
 			<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.1870396971"
+                        <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.960161747"
                                    name="TI Build Tools"
                                    superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
-                                   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1042851466">
-                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1148563193"
+                                   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.795316214">
+                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.773509801"
                                     superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
-								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
-								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
-								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
-								<listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
-								<listOptionValue builtIn="false" value="XDC_VERSION=3.32.2.25_core"/>
-								<listOptionValue builtIn="false" value="INACTIVE_REPOS="/>
-								<listOptionValue builtIn="false" value="EXPANDED_REPOS="/>
-								<listOptionValue builtIn="false" value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
-								<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
-								<listOptionValue builtIn="false" value="OUTPUT_TYPE=rtscApplication:executable"/>
-								<listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
-								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
-								<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
-							</option>
-                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1477629759"
-                                    name="Compiler version"
+                                <listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
+                                <listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
+                                <listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
+                                <listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
+                                <listOptionValue builtIn="false" value="XDC_VERSION=3.32.2.25_core"/>
+                                <listOptionValue builtIn="false" value="INACTIVE_REPOS="/>
+                                <listOptionValue builtIn="false" value="EXPANDED_REPOS="/>
+                                <listOptionValue builtIn="false"
+                                                 value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
+                                <listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
+                                <listOptionValue builtIn="false" value="OUTPUT_TYPE=rtscApplication:executable"/>
+                                <listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
+                                <listOptionValue builtIn="false"
+                                                 value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
+                                <listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
+                            </option>
+                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1355878258"
                                     superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
-                                    value="18.1.5.LTS" valueType="string"/>
+                                    value="18.1.4.LTS" valueType="string"/>
                             <targetPlatform
-                                    id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1964203011"
+                                    id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.115857743"
                                     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.1215278602"
-                                     keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true"
-                                     parallelizationNumber="optimal"
+                                     id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.777666998"
+                                     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.844266887"
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.548851344"
                                   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.1339014530"
-                                        name="Target processor version (--silicon_version, -mv)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.2079251582"
                                         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.309125063"
-                                        name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1296542541"
                                         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.256396971"
-                                        name="Application binary interface. (--abi)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.830681449"
                                         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.224447533"
-                                        name="Little endian code [See 'General' page to edit] (--little_endian, -me)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.4295324"
                                         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.838358175"
-                                        name="Optimization level (--opt_level, -O)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.966262121"
                                         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.1758979029"
-                                        name="Speed vs. size trade-offs (--opt_for_speed, -mf)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.595578058"
                                         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.1992834918"
-                                        name="Add dir to #include search path (--include_path, -I)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1931842022"
                                         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"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/profiles/dev_info"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/profiles/simple_profile/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/profiles/simple_profile"/>
+                                    <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"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/dev_info"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/simple_profile/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/simple_profile"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/heapmgr"/>
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/target"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/sdata"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/icall/src/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
-									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
-								</option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.584710211"
-                                        name="Pre-define NAME (--define, -D)"
+                                    <listOptionValue builtIn="false"
+                                                     value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/sdata"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/icall/src/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
+                                    <listOptionValue builtIn="false" value="${CC26XXWARE}"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.919051850"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
                                         valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
-                                    <listOptionValue builtIn="false" value="HEADSTAGE_NOTIFY_USE_ATT"/>
-									<listOptionValue builtIn="false" value="HEADSTAGE_MA_USE_ADC"/>
-									<listOptionValue builtIn="false" value="HEADSTAGE_RECORD_BATTERY"/>
-									<listOptionValue builtIn="false" value="HEADSTAGE_CIS_VOLT_H"/>
-									<listOptionValue builtIn="false" value="POWER_SAVING"/>
-									<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
-									<listOptionValue builtIn="false" value="HEADSTAGE_MA_USE_SPI2"/>
-									<listOptionValue builtIn="false" value="CC26XX"/>
-									<listOptionValue builtIn="false" value="GAPROLE_TASK_STACK_SIZE=540"/>
-									<listOptionValue builtIn="false" value="HEAPMGR_SIZE=0"/>
-									<listOptionValue builtIn="false" value="ICALL_MAX_NUM_ENTITIES=6"/>
-									<listOptionValue builtIn="false" value="ICALL_MAX_NUM_TASKS=3"/>
-									<listOptionValue builtIn="false" value="USE_ICALL"/>
-									<listOptionValue builtIn="false" value="xBOARD_DISPLAY_EXCLUDE_LCD"/>
-									<listOptionValue builtIn="false" value="xDisplay_DISABLE_ALL"/>
-									<listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
-									<listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
-								</option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.366333795"
-                                        name="Debugging model"
+                                    <listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
+                                    <listOptionValue builtIn="false" value="HEADSTAGE_UNI_2_0"/>
+                                    <listOptionValue builtIn="false" value="POWER_SAVING"/>
+                                    <listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
+                                    <listOptionValue builtIn="false" value="HEADSTAGE_MA_USE_SPI2"/>
+                                    <listOptionValue builtIn="false" value="CC26XX"/>
+                                    <listOptionValue builtIn="false" value="GAPROLE_TASK_STACK_SIZE=540"/>
+                                    <listOptionValue builtIn="false" value="HEAPMGR_SIZE=0"/>
+                                    <listOptionValue builtIn="false" value="ICALL_MAX_NUM_ENTITIES=6"/>
+                                    <listOptionValue builtIn="false" value="ICALL_MAX_NUM_TASKS=3"/>
+                                    <listOptionValue builtIn="false" value="USE_ICALL"/>
+                                    <listOptionValue builtIn="false" value="xBOARD_DISPLAY_EXCLUDE_LCD"/>
+                                    <listOptionValue builtIn="false" value="xDisplay_DISABLE_ALL"/>
+                                    <listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
+                                    <listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.435242422"
                                         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.396634009"
-                                        name="C Dialect"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1041287954"
                                         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.5036346"
-                                        name="Enable support for GCC extensions (DEPRECATED) (--gcc)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.762496694"
                                         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.2023161003"
-                                        name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.150403703"
                                         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.1284580016"
-                                        name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)"
+                                    <listOptionValue builtIn="false" value="48"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.94153709"
                                         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.249332571"
-                                        name="Wrap diagnostic messages (--diag_wrap)"
+                                    <listOptionValue builtIn="false" value="225"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1489730615"
                                         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.278396112"
-                                        name="Emit diagnostic identifier numbers (--display_error_number, -pden)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1620048666"
                                         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.2092732559"
-                                        name="Place each function in a separate subsection (--gen_func_subsections, -ms)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.1485773521"
                                         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.1551195628"
-                                        name="Read options from specified file (--cmd_file, -@)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1081719363"
                                         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>
+                                    <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.1694661736"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.520101889"
                                         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.1687796135"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1070105812"
                                         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.1118337260"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.738826337"
                                         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.1159637661"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1232640856"
                                         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.1042851466"
+                            </tool>
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.795316214"
                                   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.872774008"
-                                        name="Set C system stack size (--stack_size, -stack)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.761443666"
                                         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.2009961004"
-                                        name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.1912770343"
                                         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.2041929472"
-                                        name="Link information (map) listed into &lt;file&gt; (--map_file, -m)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1725177715"
                                         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.1329270549"
-                                        name="Specify output file name (--output_file, -o)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.390113473"
                                         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.1665414523"
-                                        name="Include library file or command file as input (--library, -l)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1148769301"
                                         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.653944079"
-                                        name="Add &lt;dir&gt; to library search path (--search_path, -i)"
+                                    <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.120359588"
                                         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.1571098441"
-                                        name="Suppress diagnostic &lt;id&gt; (--diag_suppress)"
+                                    <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.945233756"
                                         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.2089339392"
-                                        name="Wrap diagnostic messages (--diag_wrap)"
+                                    <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.910404897"
                                         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.1585150190"
-                                        name="Emit diagnostic identifier numbers (--display_error_number)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.513420139"
                                         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.1879557100"
-                                        name="Detailed link information data-base into &lt;file&gt; (--xml_link_info, -xml_link_info)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.741712094"
                                         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.870807907"
-                                        name="Aggressively reduce size of the DWARF information (--compress_dwarf)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.891380419"
                                         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.1443935039"
-                                        name="Eliminate sections not needed in the executable (--unused_section_elimination)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.613666775"
                                         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.1144532052"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.277965674"
                                         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.527665495"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.1067547555"
                                         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.342557325"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.599189161"
                                         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.1134045744"
+                            </tool>
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1127603084"
                                   name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.361823987"
-                                        name="Specify rom width (--romwidth, -romwidth=width)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.222076978"
                                         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.2004720746"
-                                        name="Specify memory width (--memwidth, -memwidth=width)"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.1912546049"
                                         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.358755565"
-                                        name="Output format"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1935998185"
                                         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.861960875" name="XDCtools"
+                            </tool>
+                            <tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1402268573" name="XDCtools"
                                   superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1920608743"
-                                        name="Package repositories (--xdcpath)"
+                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1506218018"
                                         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.363159983"
-                                        name="Target (-t)"
+                                    <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.1860209354"
                                         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.1189355321"
-                                        name="Platform (-p)"
+                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.617935002"
                                         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.1865073937"
-                                        name="Platform (-p)"
+                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.298557207"
                                         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.1732364012"
-                                        name="Build-profile (-r)"
+                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1856522446"
                                         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.433819693"
-                                        name="Compiler tools directory (-c)"
+                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1053483030"
                                         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.417898510"
-                                        name="Additional compiler options (--compileOptions)"
+                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1740094026"
                                         superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS"
                                         value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
-							</tool>
+                            </tool>
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>

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

@@ -1,6 +0,0 @@
-/FlashROM__opt_for_speed__0/
-/FlashROM__opt_for_speed__1/
-/FlashROM__opt_for_speed__2/
-/FlashROM__opt_for_speed__3/
-/FlashROM__opt_for_speed__4/
-/FlashROM__opt_for_speed__5/

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/app/.launches/simple_peripheral_cc2650em_app.launch

@@ -12,7 +12,7 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\ccsv8\ccs_base\emulation\gel\images\cc26xx\cc26x0_rtos_rom_syms.out"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_app"/>
 </listAttribute>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/app/.settings/org.eclipse.core.resources.prefs

@@ -29,190 +29,4 @@ encoding//FlashROM/TOOLS/subdir_rules.mk=UTF-8
 encoding//FlashROM/TOOLS/subdir_vars.mk=UTF-8
 encoding//FlashROM/makefile=UTF-8
 encoding//FlashROM/objects.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Application/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Application/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/Display/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/Display/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/ECC/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/ECC/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/PIN/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/PIN/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/RF/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/RF/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/SPI/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/SPI/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/TRNG/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/TRNG/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/UART/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/UART/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/UDMA/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Drivers/UDMA/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/ICall/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/ICall/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/ICallBLE/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/ICallBLE/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/PROFILES/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/PROFILES/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Startup/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/Startup/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/TOOLS/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/TOOLS/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/makefile=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/objects.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__0/sources.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Application/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Application/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/Display/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/Display/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/ECC/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/ECC/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/PIN/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/PIN/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/RF/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/RF/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/SPI/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/SPI/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/TRNG/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/TRNG/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/UART/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/UART/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/UDMA/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Drivers/UDMA/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/ICall/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/ICall/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/ICallBLE/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/ICallBLE/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/PROFILES/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/PROFILES/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Startup/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/Startup/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/TOOLS/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/TOOLS/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/makefile=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/objects.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__1/sources.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Application/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Application/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/Display/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/Display/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/ECC/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/ECC/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/PIN/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/PIN/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/RF/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/RF/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/SPI/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/SPI/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/TRNG/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/TRNG/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/UART/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/UART/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/UDMA/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Drivers/UDMA/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/ICall/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/ICall/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/ICallBLE/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/ICallBLE/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/PROFILES/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/PROFILES/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Startup/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/Startup/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/TOOLS/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/TOOLS/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/makefile=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/objects.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__2/sources.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Application/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Application/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/Display/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/Display/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/ECC/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/ECC/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/PIN/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/PIN/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/RF/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/RF/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/SPI/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/SPI/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/TRNG/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/TRNG/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/UART/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/UART/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/UDMA/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Drivers/UDMA/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/ICall/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/ICall/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/ICallBLE/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/ICallBLE/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/PROFILES/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/PROFILES/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Startup/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/Startup/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/TOOLS/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/TOOLS/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/makefile=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/objects.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__3/sources.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Application/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Application/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/Display/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/Display/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/ECC/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/ECC/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/PIN/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/PIN/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/RF/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/RF/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/SPI/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/SPI/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/TRNG/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/TRNG/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/UART/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/UART/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/UDMA/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Drivers/UDMA/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/ICall/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/ICall/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/ICallBLE/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/ICallBLE/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/PROFILES/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/PROFILES/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Startup/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/Startup/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/TOOLS/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/TOOLS/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/makefile=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/objects.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__4/sources.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Application/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Application/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/Display/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/Display/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/ECC/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/ECC/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/PIN/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/PIN/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/RF/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/RF/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/SPI/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/SPI/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/TRNG/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/TRNG/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/UART/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/UART/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/UDMA/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Drivers/UDMA/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/ICall/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/ICall/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/ICallBLE/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/ICallBLE/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/PROFILES/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/PROFILES/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Startup/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/Startup/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/TOOLS/subdir_rules.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/TOOLS/subdir_vars.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/makefile=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/objects.mk=UTF-8
-encoding//FlashROM/optimizerAssistant/opt_for_speed__5/sources.mk=UTF-8
 encoding//FlashROM/sources.mk=UTF-8

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

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="2" id="The Converter Usage">
-                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
-                        <choice Name="Overclock with user specified value" value="unused">
-                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
-                        </choice>
-                    </property>
-                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="1" id="Power Selection">
+                <choice Name="Probe supplied power" value="1">
+                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
+                </choice>
+            </property>
+            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
+            <property Type="choicelist" Value="4" id="SWD Mode Settings">
+                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
                 </choice>
             </property>
             <platform XML_version="1.2" id="platform_0">

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

@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>

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

@@ -14,130 +14,246 @@
 			</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.1209999684" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postannouncebuildStep="" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;${TOOLS_BLE}/frontier/frontier.exe ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd" preannouncebuildStep="" prebuildStep="&quot;${TOOLS_BLE}/lib_search/lib_search.exe&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
-					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1209999684." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.929750171" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1008890994">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1479696404" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
-								<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.201372544" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1951196199" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.20903631" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1176131016" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.647279085" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1443871767" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.227818129" name="Application binary interface. (--abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.784155377" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.494285153" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.581550859" name="Speed vs. size trade-offs (--opt_for_speed, -mf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1288777730" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
-									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/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/nv/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv"/>
+					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1209999684." name="/"
+                                resourcePath="">
+                        <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.202004189"
+                                   name="TI Build Tools"
+                                   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
+                                   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1000474609">
+                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.384721047"
+                                    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.1036745756"
+                                    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.236081606"
+                                    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.1371891035"
+                                     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.1719137531"
+                                  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.677403831"
+                                        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.1103252039"
+                                        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.1530385187"
+                                        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.986411830"
+                                        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.1600021398"
+                                        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.610602206"
+                                        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.2056105474"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH"
+                                        valueType="includePath">
+                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
+                                    <listOptionValue builtIn="false"
+                                                     value="${SRC_EX}/examples/simple_peripheral/cc26xx/stack"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
+                                    <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/nv/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/icall/src/inc"/>
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
-									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/aes/cc26xx"/>
-									<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.986125825" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="CC26XX"/>
-									<listOptionValue builtIn="false" value="POWER_SAVING"/>
-									<listOptionValue builtIn="false" value="GATT_NO_CLIENT"/>
-									<listOptionValue builtIn="false" value="HEADSTAGE_NOTIFY_USE_ATT"/>
-									<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="${SRC_BLE_CORE}/rom"/>
+                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/aes/cc26xx"/>
+                                    <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.697027420"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
+                                        valueType="definedSymbols">
+                                    <listOptionValue builtIn="false" value="CC26XX"/>
+                                    <listOptionValue builtIn="false" value="GATT_NO_CLIENT"/>
+                                    <listOptionValue builtIn="false" value="HEADSTAGE_NOTIFY_USE_ATT"/>
+                                    <listOptionValue builtIn="false" value="POWER_SAVING"/>
+                                    <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="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="xPM_DISABLE_PWRDOWN"/>
-									<listOptionValue builtIn="false" value="xTESTMODES"/>
-									<listOptionValue builtIn="false" value="xTEST_BLEBOARD"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.372638078" name="C Dialect" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.201347726" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
-									<listOptionValue builtIn="false" value="48"/>
-									<listOptionValue builtIn="false" value="16004"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.73314177" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
-									<listOptionValue builtIn="false" value="225"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1126279750" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1492280006" name="Emit diagnostic identifier numbers (--display_error_number, -pden)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.538453952" name="Read options from specified file (--cmd_file, -@)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
-									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
-									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
-								</option>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.313905687" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1129729173" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.156783227" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.538375181" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
-							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1008890994" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1873600405" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.1359172875" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1355177509" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.829303802" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1078356909" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
-									<listOptionValue builtIn="false" value="libc.a"/>
-									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"/>
-									<listOptionValue builtIn="false" value="${ROM}/ble_rom_releases/04242014/ble_rom_patch.symbols"/>
-									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1707930214" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
-									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.59164041" name="Suppress diagnostic &lt;id&gt; (--diag_suppress)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
-									<listOptionValue builtIn="false" value="16002-D"/>
-									<listOptionValue builtIn="false" value="10247-D"/>
-									<listOptionValue builtIn="false" value="10325-D"/>
-									<listOptionValue builtIn="false" value="10229-D"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.11567165" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1727810233" name="Emit diagnostic identifier numbers (--display_error_number)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1385277262" name="Detailed link information data-base into &lt;file&gt; (--xml_link_info, -xml_link_info)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.1153340314" name="Specify program entry point for the output module (--entry_point, -e)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT" value="startup_entry" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.450995330" name="Aggressively reduce size of the DWARF information (--compress_dwarf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1827942626" name="Eliminate sections not needed in the executable (--unused_section_elimination)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1279238428" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.526125450" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.581803256" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
-							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.947560992" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1295209583" name="Specify rom width (--romwidth, -romwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.110293046" name="Specify memory width (--memwidth, -memwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1122561921" name="Output format" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
-							</tool>
-						</toolChain>
+                                    <listOptionValue builtIn="false" value="OSAL_SNV=1"/>
+                                    <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="xPM_DISABLE_PWRDOWN"/>
+                                    <listOptionValue builtIn="false" value="xTESTMODES"/>
+                                    <listOptionValue builtIn="false" value="xTEST_BLEBOARD"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.2049018539"
+                                        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.133900437"
+                                        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.181358488"
+                                        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.718298036"
+                                        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.973122860"
+                                        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.1320388168"
+                                        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.1951926405"
+                                        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.375018960"
+                                        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.1850764340"
+                                        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.1730763582"
+                                        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.1000474609"
+                                  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.788149472"
+                                        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.1048132209"
+                                        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.807659049"
+                                        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.925427965"
+                                        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.1310161066"
+                                        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.1308202839"
+                                        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.166746284"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS"
+                                        valueType="stringList">
+                                    <listOptionValue builtIn="false" value="16002-D"/>
+                                    <listOptionValue builtIn="false" value="10247-D"/>
+                                    <listOptionValue builtIn="false" value="10325-D"/>
+                                    <listOptionValue builtIn="false" value="10229-D"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.567907781"
+                                        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.1017913720"
+                                        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.792466464"
+                                        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.685791588"
+                                        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.471478777"
+                                        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.340204852"
+                                        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.601587839"
+                                        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.2113293581"
+                                        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.1732089675"
+                                        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.1445067749"
+                                  name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1310825565"
+                                        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.1858409467"
+                                        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.1953800232"
+                                        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" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>

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

@@ -12,6 +12,7 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_stack"/>
 </listAttribute>

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

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="2" id="The Converter Usage">
-                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
-                        <choice Name="Overclock with user specified value" value="unused">
-                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
-                        </choice>
-                    </property>
-                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="1" id="Power Selection">
+                <choice Name="Probe supplied power" value="1">
+                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
+                </choice>
+            </property>
+            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
+            <property Type="choicelist" Value="4" id="SWD Mode Settings">
+                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
                 </choice>
             </property>
             <platform XML_version="1.2" id="platform_0">

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

@@ -116,46 +116,46 @@ const PowerCC26XX_Config PowerCC26XX_config = {
  *  ============================= UART begin ===================================
  */
 /* Place into subsections to allow the TI linker to remove items properly */
-#if defined(__TI_COMPILER_VERSION__)
-#pragma DATA_SECTION(UART_config, ".const:UART_config")
-#pragma DATA_SECTION(uartCC26XXHWAttrs, ".const:uartCC26XXHWAttrs")
-#endif
-
-/* Include drivers */
-#include <ti/drivers/UART.h>
-#include <ti/drivers/uart/UARTCC26XX.h>
-
-/* UART objects */
-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
-        //
-    }
-    //
-};
-
-/* UART configuration structure */
-const UART_Config UART_config[] = {  //
-    {
-        //
-        .fxnTablePtr = &UARTCC26XX_fxnTable,
-        .object      = &uartCC26XXObjects[0],
-        .hwAttrs     = &uartCC26XXHWAttrs[0]
-        //
-    },
-    {NULL, NULL, NULL}};
+//#if defined(__TI_COMPILER_VERSION__)
+//#pragma DATA_SECTION(UART_config, ".const:UART_config")
+//#pragma DATA_SECTION(uartCC26XXHWAttrs, ".const:uartCC26XXHWAttrs")
+//#endif
+//
+///* Include drivers */
+//#include <ti/drivers/UART.h>
+//#include <ti/drivers/uart/UARTCC26XX.h>
+//
+///* UART objects */
+//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
+//        //
+//    }
+//    //
+//};
+//
+///* UART configuration structure */
+//const UART_Config UART_config[] = {  //
+//    {
+//        //
+//        .fxnTablePtr = &UARTCC26XX_fxnTable,
+//        .object      = &uartCC26XXObjects[0],
+//        .hwAttrs     = &uartCC26XXHWAttrs[0]
+//        //
+//    },
+//    {NULL, NULL, NULL}};
 /*
  *  ============================= UART end =====================================
  */
@@ -594,131 +594,3 @@ const I2C_Config I2C_config[] = {
  /*
   *  ============================= Watchdog end =====================================
  */
-
- /*
-  * ================================ ADC begin ======================================
-  */
-#ifdef HEADSTAGE_RECORD_BATTERY
-
-/* Place into subsections to allow the TI linker to remove items properly */
-#if defined(__TI_COMPILER_VERSION__)
-#pragma DATA_SECTION(ADC_config, ".const:ADC_config")
-#pragma DATA_SECTION(adcCC26xxHWAttrs, ".const:adcCC26xxHWAttrs")
-#endif
-
-#include <ti/drivers/ADC.h>
-#include <ti/drivers/adc/ADCCC26XX.h>
-
-/* ADC objects */
-ADCCC26XX_Object adcCC26xxObjects[BOOSTXL_CC2650MA_ADCCOUNT];
-
-const ADCCC26XX_HWAttrs adcCC26xxHWAttrs[BOOSTXL_CC2650MA_ADCCOUNT] = {
-    {
-        .adcDIO = Board_DIO0_ANALOG,
-        .adcCompBInput = ADC_COMPB_IN_AUXIO7,
-        .refSource = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource = ADCCC26XX_TRIGGER_MANUAL
-    },
-    {
-        .adcDIO = Board_DIO1_ANALOG,
-        .adcCompBInput = ADC_COMPB_IN_AUXIO6,
-        .refSource = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource = ADCCC26XX_TRIGGER_MANUAL
-    },
-    {
-        .adcDIO = Board_DIO2_ANALOG,
-        .adcCompBInput = ADC_COMPB_IN_AUXIO5,
-        .refSource = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource = ADCCC26XX_TRIGGER_MANUAL
-    },
-    {
-        .adcDIO = Board_DIO3_ANALOG,
-        .adcCompBInput = ADC_COMPB_IN_AUXIO4,
-        .refSource = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource = ADCCC26XX_TRIGGER_MANUAL
-    },
-    {
-        .adcDIO = Board_DIO4_ANALOG,
-        .adcCompBInput = ADC_COMPB_IN_AUXIO3,
-        .refSource = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource = ADCCC26XX_TRIGGER_MANUAL
-    },
-    {
-        .adcDIO = Board_DIO5_ANALOG,
-        .adcCompBInput = ADC_COMPB_IN_AUXIO2,
-        .refSource = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource = ADCCC26XX_TRIGGER_MANUAL
-    },
-    {
-        .adcDIO = Board_DIO6_ANALOG,
-        .adcCompBInput = ADC_COMPB_IN_AUXIO1,
-        .refSource = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource = ADCCC26XX_TRIGGER_MANUAL
-    },
-    {
-        .adcDIO = Board_DIO7_ANALOG,
-        .adcCompBInput = ADC_COMPB_IN_AUXIO0,
-        .refSource = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration = ADCCC26XX_SAMPLING_DURATION_10P9_MS,
-        .inputScalingEnabled = true,
-        .triggerSource = ADCCC26XX_TRIGGER_MANUAL
-    },
-    {
-        .adcDIO = PIN_UNASSIGNED,
-        .adcCompBInput = ADC_COMPB_IN_DCOUPL,
-        .refSource = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource = ADCCC26XX_TRIGGER_MANUAL
-    },
-    {
-        .adcDIO = PIN_UNASSIGNED,
-        .adcCompBInput = ADC_COMPB_IN_VSS,
-        .refSource = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource = ADCCC26XX_TRIGGER_MANUAL
-    },
-    {
-        .adcDIO = PIN_UNASSIGNED,
-        .adcCompBInput = ADC_COMPB_IN_VDDS,
-        .refSource = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource = ADCCC26XX_TRIGGER_MANUAL
-    }
-};
-
-const ADC_Config ADC_config[] = {
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[0], &adcCC26xxHWAttrs[0]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[1], &adcCC26xxHWAttrs[1]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[2], &adcCC26xxHWAttrs[2]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[3], &adcCC26xxHWAttrs[3]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[4], &adcCC26xxHWAttrs[4]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[5], &adcCC26xxHWAttrs[5]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[6], &adcCC26xxHWAttrs[6]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[7], &adcCC26xxHWAttrs[7]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[8], &adcCC26xxHWAttrs[8]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[9], &adcCC26xxHWAttrs[9]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[10], &adcCC26xxHWAttrs[10]},
-    {NULL, NULL, NULL},
-};
-
- /*
-  * ================================ ADC end ========================================
-  */
-#endif

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

@@ -51,6 +51,7 @@ extern "C" {
 #include <ti/drivers/PIN.h>
 #include <driverlib/ioc.h>
 
+#define HEADSTAGE_UNI_2_0
 #ifdef  HEADSTAGE_UNI_2_0
 #include "neu/headstage_pin.h"
 #else
@@ -208,16 +209,6 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_GPTIMER3A             BOOSTXL_CC2650MA_GPTIMER3A
 #define Board_GPTIMER3B             BOOSTXL_CC2650MA_GPTIMER3B
 
-/* Generic ADC instance identifiers */
-#define Board_DIO0_ANALOG           IOID_9
-#define Board_DIO1_ANALOG           PIN_UNASSIGNED
-#define Board_DIO2_ANALOG           PIN_UNASSIGNED
-#define Board_DIO3_ANALOG           PIN_UNASSIGNED
-#define Board_DIO4_ANALOG           PIN_UNASSIGNED
-#define Board_DIO5_ANALOG           PIN_UNASSIGNED
-#define Board_DIO6_ANALOG           PIN_UNASSIGNED
-#define Board_DIO7_ANALOG           PIN_UNASSIGNED
-
 /* Generic PWM instance identifiers */
 #define Board_PWM0                  BOOSTXL_CC2650MA_PWM0
 #define Board_PWM1                  BOOSTXL_CC2650MA_PWM1

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

@@ -51,7 +51,7 @@ extern "C" {
 #include <ti/drivers/PIN.h>
 #include <driverlib/ioc.h>
 
-//#include "neu/headstage_pin.h"
+#include "neu/headstage_pin.h"
 
 /** ============================================================================
  *  Externs
@@ -70,34 +70,34 @@ extern const PIN_Config BoardGpioInitTable[];
  */
 
 /* Discrete outputs */
-#define Board_RLED                  IOID_6
-#define Board_GLED                  IOID_7
+#define Board_RLED                  PIN_UNASSIGNED
+#define Board_GLED                  PIN_UNASSIGNED
 #define Board_LED_ON                1
 #define Board_LED_OFF               0
 
 /* Discrete inputs */
-#define Board_BTN1                  IOID_13
-#define Board_BTN2                  IOID_14
+#define Board_BTN1                  PIN_UNASSIGNED
+#define Board_BTN2                  PIN_UNASSIGNED
 
 /* UART Board */
-#define Board_UART_RX               IOID_2          /* RXD  */
-#define Board_UART_TX               IOID_3          /* TXD  */
-#define Board_UART_CTS              IOID_19         /* CTS  */
-#define Board_UART_RTS              IOID_18         /* RTS */
+#define Board_UART_RX               PIN_UNASSIGNED          /* RXD  */
+#define Board_UART_TX               PIN_UNASSIGNED          /* TXD  */
+#define Board_UART_CTS              PIN_UNASSIGNED         /* CTS  */
+#define Board_UART_RTS              PIN_UNASSIGNED         /* RTS */
 
 /* SPI Board */
-#define Board_SPI0_MISO             IOID_8          /* RF1.20 */
-#define Board_SPI0_MOSI             IOID_9          /* RF1.18 */
-#define Board_SPI0_CLK              IOID_10         /* RF1.16 */
-#define Board_SPI0_CSN              IOID_11
-#define Board_SPI1_MISO             PIN_UNASSIGNED
-#define Board_SPI1_MOSI             PIN_UNASSIGNED
-#define Board_SPI1_CLK              PIN_UNASSIGNED
-#define Board_SPI1_CSN              PIN_UNASSIGNED
+//#define Board_SPI0_MISO             PIN_UNASSIGNED          /* RF1.20 */
+//#define Board_SPI0_MOSI             PIN_UNASSIGNED          /* RF1.18 */
+//#define Board_SPI0_CLK              PIN_UNASSIGNED         /* RF1.16 */
+//#define Board_SPI0_CSN              PIN_UNASSIGNED
+//#define Board_SPI1_MISO             PIN_UNASSIGNED
+//#define Board_SPI1_MOSI             PIN_UNASSIGNED
+//#define Board_SPI1_CLK              PIN_UNASSIGNED
+//#define Board_SPI1_CSN              PIN_UNASSIGNED
 
 /* I2C */
-#define Board_I2C0_SCL0             IOID_4
-#define Board_I2C0_SDA0             IOID_5
+#define Board_I2C0_SCL0             PIN_UNASSIGNED
+#define Board_I2C0_SDA0             PIN_UNASSIGNED
 
 /* SPI */
 #define Board_SPI_FLASH_CS          IOID_20
@@ -132,14 +132,14 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_LCD_CS_OFF            0
 
 /* PWM outputs */
-#define Board_PWMPIN0               IOID_12
-#define Board_PWMPIN1               PIN_UNASSIGNED
-#define Board_PWMPIN2               PIN_UNASSIGNED
-#define Board_PWMPIN3               PIN_UNASSIGNED
-#define Board_PWMPIN4               PIN_UNASSIGNED
-#define Board_PWMPIN5               PIN_UNASSIGNED
-#define Board_PWMPIN6               PIN_UNASSIGNED
-#define Board_PWMPIN7               PIN_UNASSIGNED
+//#define Board_PWMPIN0               PIN_UNASSIGNED
+//#define Board_PWMPIN1               PIN_UNASSIGNED
+//#define Board_PWMPIN2               PIN_UNASSIGNED
+//#define Board_PWMPIN3               PIN_UNASSIGNED
+//#define Board_PWMPIN4               PIN_UNASSIGNED
+//#define Board_PWMPIN5               PIN_UNASSIGNED
+//#define Board_PWMPIN6               PIN_UNASSIGNED
+//#define Board_PWMPIN7               PIN_UNASSIGNED
 
 /** ============================================================================
  *  Instance identifiers

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Doxyfile

@@ -68,7 +68,7 @@ OUTPUT_DIRECTORY       =
 # performance problems for the file system.
 # The default value is: NO.
 
-CREATE_SUBDIRS         = YES
+CREATE_SUBDIRS         = NO
 
 # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
 # characters to appear in the names of generated files. If set to NO, non-ASCII

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

@@ -23,7 +23,7 @@ Instruction Specification
 
 file defined:
 
-Bio_Pro_Sci / �� / Pi3/DataServer / CC2650 / CC2650���誘銵�
+Bio_Pro_Sci / 研發 / Pi3/DataServer / CC2650 / CC2650通用指令表
 
 ```
 struct instruction {
@@ -206,7 +206,7 @@ extern ICall_Semaphore semaphore;
  ==== utility macro ====
  =====================*/
 
-#define _B_4b4b(a, b) (((a & 0x0f) << 4) | (b & 0x0f))
+#define _B_4b4b(a, b) ((((a) << 4) & 0xF0) | ((b)&0x0F))
 
 #define _B_flip2(a)                              \
     ({                                           \
@@ -316,11 +316,11 @@ typedef struct {
  ==== device implement implement header ====
  =========================================*/
 
-#include "headstage_uni.h"
+#include "headstage_neu.h"
 
-/*!
- * main function
- */
+/*======================
+ ==== main function ====
+ ======================*/
 
 static EventTableEntry EVENT_TABLE[] = {  //
 #ifdef HEADSTAGE_TNI_H
@@ -337,9 +337,6 @@ static EventTableEntry EVENT_TABLE[] = {  //
 #endif
 #ifdef HEADSTAGE_NEU_H
     {EVT_ALL, &headstage_neu_event},
-#endif
-#ifdef HEADSTAGE_TEST_DATA_H
-    {EVT_ALL, &headstage_test_event},
 #endif
     // terminated
     {0, NULL}};
@@ -348,7 +345,7 @@ static EventTableEntry EVENT_TABLE[] = {  //
  * system event handle. It go through [EVENT_TABLE] and invoke event callback
  * if event_mask bits set.
  */
-void headstage_event_handle() {
+static void headstage_event_handle() {
     for (EventTableEntry *entry = EVENT_TABLE; EVENT_MASK && entry->event_mask; entry++) {
         if (entry->event_callback && flag_mask(entry->event_mask)) {
             entry->event_callback();

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

@@ -13,4 +13,5 @@ static void headstage_arm_append_ramp_data(uint8_t *buff) {
     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_batt.h

@@ -1,20 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_BATT_H
-#define HEADSTAGE_BATT_H
-
-#include <driverlib/aon_batmon.h>
-#define MAX_BATTERY_CAPACITY 4200
-static uint8_t battery_percent = 100;
-
-static uint8_t headstage_battery_percent() {
-    uint8_t  internal_battery_percent;
-    uint32_t internal_batt_sense = AONBatMonBatteryVoltageGet();
-    internal_batt_sense          = (internal_batt_sense * 125) >> 5;
-    internal_batt_sense          = (internal_batt_sense * 100) / MAX_BATTERY_CAPACITY;
-    internal_battery_percent     = internal_batt_sense & 0xff;
-    if (internal_battery_percent < battery_percent) battery_percent = internal_battery_percent;
-    return battery_percent;
-}
-
-#endif  // HEADSTAGE_BATT_H

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

@@ -27,7 +27,7 @@ static void headstage_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26X
         params.width          = GPT_CONFIG_16BIT;                                                     \
         params.mode           = GPT_MODE_PERIODIC_DOWN;                                               \
         params.debugStallMode = GPTimerCC26XX_DEBUG_STALL_OFF;                                        \
-        gptimer_handle        = GPTimerCC26XX_open(Board_GPTIMER3A, &params);                         \
+        gptimer_handle        = GPTimerCC26XX_open(Board_GPTIMER0A, &params);                         \
         GPTimerCC26XX_setLoadValue(gptimer_handle, 0xFFFFFF);                                         \
         GPTimerCC26XX_registerInterrupt(gptimer_handle, headstage_gptimer_callback, GPT_INT_TIMEOUT); \
     } while (0)
@@ -42,4 +42,4 @@ static void headstage_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26X
         GPTimerCC26XX_setLoadValue(gptimer_handle, _load);                                       \
     } while (0)
 
-#endif  // HEADSTAGE_GPTIMER_H
+#endif  // HEADSTAGE_GPTIMER_H

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

@@ -0,0 +1,85 @@
+
+#ifndef NEU_INSTRUCTION
+#define NEU_INSTRUCTION
+
+struct HEADSTAGE_PARAMETER_TABLE {
+    uint8_t current_sti_cycle[NEU_STI_CHANNEL_COUNTS]; /** stimulation times will be executed. */
+
+    // sti_tx[0~7] is current stimulate
+    // sti_tx[8] assign to voltage mode channel. */
+    uint16_t sti_t1[NEU_STI_CHANNEL_COUNTS]; /**< first stimulation pulse duration, it can't be 0. */
+    uint16_t sti_t2[NEU_STI_CHANNEL_COUNTS]; /**< interval between biphasic pulses. */
+    uint16_t sti_t3[NEU_STI_CHANNEL_COUNTS]; /**< second stimulation pulse duration. */
+    uint32_t sti_t4[NEU_STI_CHANNEL_COUNTS]; /**< discharge time per stimulation. */
+    uint16_t sti_t5[NEU_STI_CHANNEL_COUNTS]; /**< discharge time after final stimulation. */
+    bool     sti_mode;                       /**< if true: continuous mode, else limited mode. */
+    bool     sti_h_bridge;                   /**< if true: enable h bridge, else single ended. */
+    bool     sti_ref;                        /**< if true: reference cell body to gnd, else single ended is used. */
+
+    uint8_t current_sti_polarity; /**<
+                                   *  default : low side.
+                                   *  define which channel is high side or low side.
+                                   */
+    uint8_t voltage_sti_channel;  /**<
+                                   *   voltage_channel[7:4] represent pmos channel,
+                                   *  voltage_channel[3:0] represent nmos channel
+                                   */
+
+    uint8_t amplifier_gain; /**<
+                             *  parameter table to represent actual amplifier gain
+                             *  ----------
+                             *  | bit |mean|
+                             *  ----------
+                             *  |0b00 | 100|
+                             *   ----------
+                             *  |0b01 | 400|
+                             *   ----------
+                             *  |0b10 | 800|
+                             *  -----------
+                             *  |0b11 | 25 |
+                             *  -----------
+                             */
+    /**< these parameter define the bias voltage of amplifier. */
+    uint8_t vgrp;
+    uint8_t vgrn;
+    uint8_t vgr_int_old;
+    uint8_t vgr_intp;
+    uint8_t vgr_intn;
+
+    uint8_t ins_opcode; /**< check instruction opcode which is transmitted to DBS. */
+
+    uint8_t voltage_sti_amplitude; /**< voltage mode stimulation amplitude control. */
+
+    uint16_t arbitrary_index; /**< this index to keep address of arbitrary data we have already stored. */
+
+    uint16_t arbitrary_en;      /**< if true: enable arbitrary mode stimulation. */
+    uint16_t recording_channel; /**< recording_channel[17] represent enabling channel 17. */
+
+    uint16_t sti_amplitude_h; /**< positive side amplitude. */
+    uint16_t sti_amplitude_l; /**< negative side amplitude. */
+
+    uint16_t sys_clk_ratio;   /**< frequency divider ratio for digital core clock. */
+    uint16_t adc_clock_ratio; /**< frequency divider ratio for adc clock. */
+    uint16_t sti_clock_ratio; /**< frequency divider ratio for stimulation clock. */
+    uint16_t chopper_ratio;   /**< freqeuncy divider for chopper. */
+
+    uint16_t sti_channel; /**<
+                           *    if stimulation[7] == true, stimulation channel 7 is enabled .
+                           *    if stimulation[4] == true. stimulation channel 4 is enabled .
+                           */
+
+} INSTRUCTION = {0};
+
+/**
+ *   @brief:
+ *   manage which operation to be conducted
+ */
+struct HEADSTAGE_STATE {
+    uint8_t state;
+
+    uint8_t config_type;
+
+    uint8_t index;
+} NEULIVE_STATE = {0};
+
+#endif

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

@@ -192,7 +192,7 @@ static void headstage_led_color(uint8_t color) {
  ==== LED implement (GPIO) ====
  ============================*/
 
-#if defined (HEADSTAGE_UNI_H) || defined(HEADSTAGE_TEST_DATA_H)
+#ifdef HEADSTAGE_UNI_H
 #define HEADSTAGE_LED_USE_GPIO
 #endif
 

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

@@ -129,9 +129,9 @@
     do {                                       \
         uint32_t __i     = (uint32_t)(index);  \
         uint32_t __v     = (uint32_t)(value);  \
-        spi_txbuf[__i++] = (__v >> 16) & 0xff; \
-        spi_txbuf[__i++] = (__v >> 8) & 0xff;  \
-        spi_txbuf[__i++] = (__v)&0xff;         \
+        spi_txbuf[__i++] = (__v >> 16) & 0xFF; \
+        spi_txbuf[__i++] = (__v >> 8) & 0xFF;  \
+        spi_txbuf[__i++] = (__v)&0xFF;         \
     } while (0)
 
 /**
@@ -163,34 +163,50 @@
 #define NEU_REC_PARAM  0x20
 #define NEU_ARB_PARAM  0x40
 #define NEU_TEST_INS   0x60
+#define NEU_STI_TIME   0x80
+#define NEU_WRITE_REG  0xE0
+#define NEU_READ_REG   0xF0
 
 /** event */
 #define EVT_NEU_SPI             0x0001  /**< spi transaction event */
 #define EVT_NEU_LED             0x0002  /**< set led event */
-#define EVT_NEU_CHECK           0x0003  /**< check neulive single instruction */
+#define EVT_NEU_CHECK           0x0004  /**< check neulive single instruction */
+#define EVT_NEU_REG_SPI         0x0008  /** register spi event  */
 
 /** clock setting */
-#define NEU_SYS_CLK             8000000  /**< 10Mhz */
+#define NEU_SYS_CLK             4000000  /**< 10Mhz */
 #define NEU_POLY_R_CLK          1000     /**< 1khz  */
-#define NEU_SPI_FREQ            800000   /**< 1Mhz  */
+#define NEU_SPI_FREQ            400000   /**< 1Mhz  */
 #define NEU_LED_FREQ            1000000  /**< 1Mhz  */
 
 /** amounts of channel */
-#define NEU_STI_CHANNEL_COUNTS  9   /**< voltage mode channel counts and current mode channel counts */
+#define NEU_STI_CHANNEL_COUNTS  9  /**< voltage mode channel counts and current mode channel counts */
 #define NEU_REC_CHANNEL_COUNTS  16  /**< recording channel counts */
 
+/** State for SPI (SPI callback to do task) **/
+static uint8_t SPICallBack  =   0;
+#define CLOSE_SPI               0x01 // close SPI after MISO transmit
+#define CONTINUOUS_TRANS        0x02 // transmit DBS data
+#define FLUSH_BUFFER            0x03 // clean SPI buffer, used after a "write" SPI instruction (MISO)
+#define FLUSH_BUFFER2           0x04 // clean SPI buffer twice
+#define READ_REG                0x05 // read DBS register value, used after a "read" SPI instruction (MISO)
+#define READ_REG2               0x06 // read DBS register value, used after a "read" SPI instruction (MISO)
+#define END_TRANSMIT            0x07 // end spi instruction
+#define ONE_SHOT_SPI            0x08
+
 /** state for CC2650 to control DBS */
 #define NEU_WRITE_INSTRUCTION  0 /**< write instruction into register table by spi interface */
 #define NEU_READ_DATA          1 /**< read amplifier data by spi interface */
 #define NEU_SINGLE_INS_READ    2
 #define NEU_CHECK_REGISTER     3
 #define NEU_RECEIVE_PARAM      4
+#define NEU_PREPARE_READ       5
 #define NEU_IDLE              15
 
 /** macros for build up DBS instruction */
 #define NEU_LNA_BIAS_ONE    0x0210 /**< vgrp(1_0000) left shift 5bits | vgrn(1_0000) */
 #define NEU_LNA_BIAS_TWO    0x4210 /**< vgr_int_old(1_0000) left shift 10bits | vgr_intp(1_0000) left shift 5bits | vgr_intn(1_0000) */
-#define NEU_GENERAL_EN      0x40f0 /**<
+#define NEU_GENERAL_EN      0x40F2 /**<
                                     * |    15|    14|       13|       12|        11|        10|      9|            8|
                                     * |en_ook|en_lsk|en_tg_10k|en_tg_10M|en_mux_10k|en_mux_10M|FSK_SEL|LNA_CLOCK_SEL|
                                     *
@@ -237,6 +253,7 @@
  *    include    *
  *****************/
 #include "time.h"
+#include "headstage_instruction.h"
 #include "headstage_pin.h"
 #include "headstage_arm.h"
 #include "headstage_debug.h"
@@ -249,6 +266,7 @@
 #include "neu/headstage_pwm.h"
 #include "neu/headstage_spi.h"
 #include "neu/headstage_notify.h"
+#include "neu/headstage_reset.h"
 
 /******************
  *    variable    *
@@ -261,84 +279,7 @@
  *  need to check default value of each parameter
  */
 
-struct HEADSTAGE_PARAMETER_TABLE {
-    uint8_t current_sti_cycle[NEU_STI_CHANNEL_COUNTS]; /** stimulation times will be executed. */
 
-    /**< channel[8] assign to voltage mode channel. */
-    uint16_t sti_t1[NEU_STI_CHANNEL_COUNTS]; /**< first stimulation pulse duration, it can't be 0. */
-    uint16_t sti_t2[NEU_STI_CHANNEL_COUNTS]; /**< interval between biphasic pulses. */
-    uint16_t sti_t3[NEU_STI_CHANNEL_COUNTS]; /**< second stimulation pulse duration. */
-    uint32_t sti_t4[NEU_STI_CHANNEL_COUNTS]; /**< discharge time per stimulation. */
-    uint16_t sti_t5[NEU_STI_CHANNEL_COUNTS]; /**< discharge time after final stimulation. */
-    bool     sti_mode;                       /**< if true: continuous mode, else limited mode. */
-    bool     sti_h_bridge;                   /**< if true: enable h bridge, else single ended. */
-    bool     sti_ref;                        /**< if true: reference cell body to gnd, else single ended is used. */
-
-    uint8_t current_sti_polarity; /**<
-                                   *  default : low side.
-                                   *  define which channel is high side or low side.
-                                   */
-    uint8_t voltage_sti_channel;  /**<
-                                   *   voltage_channel[7:4] represent pmos channel,
-                                   *  voltage_channel[3:0] represent nmos channel
-                                   */
-
-    uint8_t amplifier_gain; /**<
-                             *  parameter table to represent actual amplifier gain
-                             *  ----------
-                             *  | bit |mean|
-                             *  ----------
-                             *  |0b00 | 100|
-                             *   ----------
-                             *  |0b01 | 400|
-                             *   ----------
-                             *  |0b10 | 800|
-                             *  -----------
-                             *  |0b11 | 25 |
-                             *  -----------
-                             */
-    /**< these parameter define the bias voltage of amplifier. */
-    uint8_t vgrp;
-    uint8_t vgrn;
-    uint8_t vgr_int_old;
-    uint8_t vgr_intp;
-    uint8_t vgr_intn;
-
-    uint8_t ins_opcode; /**< check instruction opcode which is transmitted to DBS. */
-
-    uint8_t voltage_sti_amplitude; /**< voltage mode stimulation amplitude control. */
-
-    uint16_t arbitrary_index; /**< this index to keep address of arbitrary data we have already stored. */
-
-    uint16_t arbitrary_en;      /**< if true: enable arbitrary mode stimulation. */
-    uint16_t recording_channel; /**< recording_channel[17] represent enabling channel 17. */
-
-    uint16_t sti_amplitude_h; /**< positive side amplitude. */
-    uint16_t sti_amplitude_l; /**< negative side amplitude. */
-
-    uint16_t sys_clk_ratio;   /**< frequency divider ratio for digital core clock. */
-    uint16_t adc_clock_ratio; /**< frequency divider ratio for adc clock. */
-    uint16_t sti_clock_ratio; /**< frequency divider ratio for stimulation clock. */
-    uint16_t chopper_ratio;   /**< freqeuncy divider for chopper. */
-
-    uint16_t sti_channel; /**<
-                           *    if stimulation[7] == true, stimulation channel 7 is enabled .
-                           *    if stimulation[4] == true. stimulation channel 4 is enabled .
-                           */
-
-} INSTRUCTION = {0};
-
-/**
- *   @brief:
- *   manage which operation to be conducted
- */
-struct HEADSTAGE_STATE {
-    uint8_t state;
-
-    uint8_t config_type;
-
-    uint8_t index;
-} NEULIVE_STATE = {0};
 
 /*
  * todo: need to define some procedure to detect this device status
@@ -349,9 +290,11 @@ static uint8_t headstage_debug_instruction(uint8_t* ins_buf) {
 
 /**
  *  @fn get_sti_channel
+ *   this is a binary to decimal function
+ *   return the decimal value for input number < 8
+ *   return 0xFF if input >= 8
  */
-
-static uint8_t get_sti_channel(uint8_t sti_channel) {
+static uint8_t get_sti_channel(uint16_t sti_channel) {
     uint8_t sti_ch;
     for (uint8_t i = 0; i < 8; i++) {
         if ((0x01 << i) & sti_channel) {
@@ -359,7 +302,7 @@ static uint8_t get_sti_channel(uint8_t sti_channel) {
             return sti_ch;
         }
     }
-    return 0xff;
+    return 0xFF;
 }
 
 /**
@@ -371,25 +314,25 @@ static bool build_sti_cur_instruction(uint8_t sti_channel, uint32_t* value) {
     switch (ins_opcode) {
         case T_ST: {
             op_neu                 = sti_channel * 4 + 1;
-            *value                 = (0x01 << 23) | (op_neu << 16) | (INSTRUCTION.sti_t2[sti_channel] & 0x3f << 10) | (INSTRUCTION.sti_t1[sti_channel]);
+            *value                 = (0x01 << 23) | (op_neu << 16) | (INSTRUCTION.sti_t2[sti_channel] & 0x3F << 10) | (INSTRUCTION.sti_t1[sti_channel]);
             INSTRUCTION.ins_opcode = T_ND;
             return false;
         }
         case T_ND: {
             op_neu = sti_channel * 4 + 2;
-            *value = (0x01 << 23) | (op_neu << 16) | (INSTRUCTION.sti_t4[sti_channel] & 0x03 << 14) | (INSTRUCTION.sti_t3[sti_channel] << 6) | (INSTRUCTION.sti_t2[sti_channel] & 0x03c);
+            *value = (0x01 << 23) | (op_neu << 16) | (INSTRUCTION.sti_t4[sti_channel] & 0x03 << 14) | (INSTRUCTION.sti_t3[sti_channel] << 6) | (INSTRUCTION.sti_t2[sti_channel] & 0x03C0);
             INSTRUCTION.ins_opcode = T_RD;
             return false;
         }
         case T_RD: {
             op_neu                 = sti_channel * 4 + 3;
-            *value                 = (0x01 << 23) | (op_neu << 16) | (INSTRUCTION.sti_t4[sti_channel] >> 2) & 0xffff;
+            *value                 = (0x01 << 23) | (op_neu << 16) | (INSTRUCTION.sti_t4[sti_channel] >> 2) & 0x7FFF;
             INSTRUCTION.ins_opcode = T_FT;
             return false;
         }
         case T_FT: {
             op_neu                 = sti_channel * 4 + 4;
-            *value                 = (0x01 << 23) | (op_neu << 16) | (INSTRUCTION.sti_t5[sti_channel]) & 0x03ff;
+            *value                 = (0x01 << 23) | (op_neu << 16) | (INSTRUCTION.sti_t5[sti_channel]) & 0x03FF;
             INSTRUCTION.ins_opcode = STI_CYCLE;
             return false;
         }
@@ -397,7 +340,6 @@ static bool build_sti_cur_instruction(uint8_t sti_channel, uint32_t* value) {
             op_neu                 = (sti_channel / 2) + 42;
             uint8_t odd_even       = sti_channel % 2;
             INSTRUCTION.ins_opcode = HIGH_SIDE;
-            if (NEULIVE_STATE.config_type == NEU_SET_STI_VOLT) INSTRUCTION.ins_opcode = HIGH_SIDE;
             if (odd_even)
                 *value = (0x01 << 23) | (op_neu << 16) | (INSTRUCTION.current_sti_cycle[sti_channel] << 8) | (INSTRUCTION.current_sti_cycle[sti_channel - 1]);
             else
@@ -490,18 +432,42 @@ static void headstage_init() {
  */
 
 static void headstage_neu_append_notify_data() {
-    uint8_t not_buf[2];
-    not_buf[0] = (spi_rxbuf[0] << 4) | spi_rxbuf[1];
-    not_buf[1] = spi_rxbuf[2];
+    uint8_t not_buf[3];
+//    not_buf[0] = (spi_rxbuf[0] << 4) | spi_rxbuf[1];
+//    not_buf[1] = spi_rxbuf[2];
+    not_buf[0] = spi_rxbuf[0]; // address
+    not_buf[1] = spi_rxbuf[1];
+    not_buf[2] = spi_rxbuf[2];
+
+//    not_buf[1] = (INSTRUCTION.recording_channel | 0xFF00) >> 8;
+//    not_buf[2] = (INSTRUCTION.recording_channel | 0x00FF);
 
     uint8_t data_size = headstage_notify_append_data(not_buf);
     if (data_size >= BLE_NOT_BUFF_SIZE) {
-        headstage_notify_send();
-        headstage_notify_flip_buffer();
+        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_led_color(COLOR_GREEN);
+//        headstage_notify_buffer[6] = 0;
+//        headstage_notify_buffer[7] = 0;
+//
+//        headstage_notify_send();
+        SimpleProfile_SetParameter(BLE_NOT_BUFF_CHAR, BLE_NOT_BUFF_SIZE, headstage_notify_buffer);
+        not_buf_offset = NOT_BUF_OFFSET_INIT;
     }
 }
 
 static void headstage_neu_state_spi();
+static void headstage_neu_register_spi();
+
+#define MODE_IDLE           0x00
+#define MODE_REGISTER_WRITE 0x01
+#define MODE_REGISTER_READ  0x02
+struct _NeuliveTwoControl{
+    uint8_t mode;
+}NeuliveTwoControl = {0};
 
 /**
  *  @fn headstage_neu_event
@@ -511,14 +477,19 @@ static void headstage_neu_state_spi();
 
 static void headstage_neu_event() {
     if (flag_mask(EVT_NEU_SPI)) {
-        headstage_neu_state_spi();
         flag_disable(EVT_NEU_SPI);
+        headstage_neu_state_spi();
     }
 
     if (flag_mask(EVT_NEU_LED)) {
         flag_disable(EVT_NEU_LED); /** reserved to set led power and set color manually */
     }
 
+    if(flag_mask(EVT_NEU_REG_SPI)){
+        headstage_neu_register_spi();
+        flag_disable(EVT_NEU_REG_SPI);
+    }
+
     if (EVENT_MASK == 0) {
         // fast return
     }
@@ -535,7 +506,50 @@ static void headstage_neu_event() {
  */
 
 static void headstage_spi_callback(SPI_Handle handle, SPI_Transaction* transaction) {
-    flag_notify(EVT_NEU_SPI);
+    switch(SPICallBack){
+        case CONTINUOUS_TRANS:{
+            flag_notify(EVT_NEU_SPI);
+            break;
+        }
+        case FLUSH_BUFFER:{
+            SPICallBack = FLUSH_BUFFER2;
+            for(int i=0 ; i<SPI_BUFFER_SIZE ; i++){
+                spi_txbuf[i] = 0x00;
+            }
+            headstage_spi_transaction(3);
+            break;
+        }
+        case FLUSH_BUFFER2:{
+           SPICallBack = CLOSE_SPI;
+           for(int i=0 ; i<SPI_BUFFER_SIZE ; i++){
+               spi_txbuf[i] = 0x00;
+           }
+           headstage_spi_transaction(3);
+           break;
+       }
+
+        case READ_REG:{
+            SPICallBack = CLOSE_SPI;
+            headstage_spi_transaction(3);
+            break;
+        }
+
+        case CLOSE_SPI:{
+            SPICallBack = CONTINUOUS_TRANS;
+            OpenSPI = true;
+            SPI_close(headstage_spi_handle);
+            break;
+        }
+
+        case END_TRANSMIT:{
+            tx_put_u24(0, 0);
+            SPICallBack = CONTINUOUS_TRANS;
+            break;
+        }
+        default:{
+            break;
+        }
+    }
 }
 
 /**
@@ -543,35 +557,36 @@ static void headstage_spi_callback(SPI_Handle handle, SPI_Transaction* transacti
  *
  *  description: decode real instruction to set corresponding parameter
  */
-
+static bool STI = false;    // user using STI?
 static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instruction) {
     switch (instruction[0] & 0xE0) {
         case NEU_STI_PARAM: {
+            STI = true;
             /** this is for test */
             bool     sti_volt_curr_sel = (instruction[0] & 0b00001000);
             bool     sti_mode          = (instruction[0] & 0b00000100);
             bool     sti_h_bridge      = (instruction[0] & 0b00000010);
             bool     sti_ref           = (instruction[0] & 0b00000001);
-            uint8_t  p_ch              = (instruction[1] & 0xf0) >> 4;
-            uint8_t  n_ch              = (instruction[1] & 0x0f);
+            uint8_t  p_ch              = (instruction[1] & 0xF0) >> 4;
+            uint8_t  n_ch              = (instruction[1] & 0x0F);
             uint8_t  sti_cycles        = instruction[2];
-            uint16_t sti_amplitude_h   = (instruction[3] << 2) | ((instruction[4] & 0xc0) >> 6);
-            uint16_t sti_amplitude_l   = ((instruction[4] & 0x3f) << 4) | ((instruction[5] & 0xf0) >> 4);
-            uint16_t sti_t1            = ((instruction[5] & 0x0f) << 6) | ((instruction[6] & 0xfc) >> 2);
+            uint16_t sti_amplitude_h   = (instruction[3] << 2) | ((instruction[4] & 0xC0) >> 6);
+            uint16_t sti_amplitude_l   = ((instruction[4] & 0x3F) << 4) | ((instruction[5] & 0xF0) >> 4);
+            uint16_t sti_t1            = ((instruction[5] & 0x0F) << 6) | ((instruction[6] & 0xFC) >> 2);
             uint16_t sti_t2            = ((instruction[6] & 0x03) << 8) | instruction[7];
-            uint16_t sti_t3            = (instruction[8] << 2) | ((instruction[9] & 0xc0) >> 6);
-            uint16_t sti_t4            = ((instruction[9] & 0x3f) << 4) | ((instruction[10] & 0xf0) >> 4);
-            uint16_t sti_t5            = ((instruction[10] & 0x0f) << 6) | ((instruction[11] & 0xfc) >> 2);
-            uint16_t sti_clock_ratio   = ((instruction[11] & 0x03) << 14) | (instruction[12] << 6) | ((instruction[13] & 0xfc) >> 2);
+            uint16_t sti_t3            = (instruction[8] << 2) | ((instruction[9] & 0xC0) >> 6);
+            uint32_t sti_t4            = ((instruction[9] & 0x3F) << 11) | (instruction[10] << 2) | ((instruction[11] & 0xE0) >> 6);
+            uint16_t sti_t5            = ((instruction[11] & 0x1F) << 5) | ((instruction[12] & 0xF8) >> 3);
+            uint16_t sti_clock_ratio   = ((instruction[12] & 0x07) << 13) | (instruction[13] << 5) | ((instruction[14] & 0xF8) >> 3);
 
             INSTRUCTION.arbitrary_en         = (0x01 << p_ch) | (0x01 << n_ch);
             INSTRUCTION.sti_mode             = sti_mode;
             INSTRUCTION.sti_h_bridge         = sti_h_bridge;
             INSTRUCTION.sti_ref              = sti_ref;
-            INSTRUCTION.current_sti_polarity = (0x01) << (7 - p_ch);
+            INSTRUCTION.current_sti_polarity = (0x01) << (p_ch + 8);
             INSTRUCTION.sti_amplitude_h      = sti_amplitude_h;
             INSTRUCTION.sti_amplitude_l      = sti_amplitude_l;
-            if (sti_volt_curr_sel) {
+            if (!sti_volt_curr_sel) {
                 INSTRUCTION.sti_t1[p_ch]            = sti_t1;
                 INSTRUCTION.sti_t1[n_ch]            = sti_t1;
                 INSTRUCTION.sti_t2[p_ch]            = sti_t2;
@@ -583,30 +598,34 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instructi
                 INSTRUCTION.sti_t5[p_ch]            = sti_t5;
                 INSTRUCTION.sti_t5[n_ch]            = sti_t5;
                 INSTRUCTION.current_sti_cycle[p_ch] = sti_cycles;
-                INSTRUCTION.sti_channel             = ((0x01) << p_ch) | ((0x01) << n_ch);
+                if(sti_h_bridge){
+                    INSTRUCTION.sti_channel         = ((0x01) << p_ch) | ((0x01) << n_ch);
+                }else{
+                    INSTRUCTION.sti_channel         = 0x01 << p_ch;
+                }
             } else {
-                INSTRUCTION.sti_t1[8]            = sti_t1;
-                INSTRUCTION.sti_t2[8]            = sti_t2;
-                INSTRUCTION.sti_t3[8]            = sti_t3;
-                INSTRUCTION.sti_t4[8]            = sti_t4;
-                INSTRUCTION.sti_t5[8]            = sti_t5;
-                INSTRUCTION.current_sti_cycle[8] = sti_cycles;
-                INSTRUCTION.sti_channel          = (0x01 << 8);
+                INSTRUCTION.sti_t1[NEU_STI_CHANNEL_COUNTS-1]            = sti_t1;
+                INSTRUCTION.sti_t2[NEU_STI_CHANNEL_COUNTS-1]            = sti_t2;
+                INSTRUCTION.sti_t3[NEU_STI_CHANNEL_COUNTS-1]            = sti_t3;
+                INSTRUCTION.sti_t4[NEU_STI_CHANNEL_COUNTS-1]            = sti_t4;
+                INSTRUCTION.sti_t5[NEU_STI_CHANNEL_COUNTS-1]            = sti_t5;
+                INSTRUCTION.current_sti_cycle[NEU_STI_CHANNEL_COUNTS-1] = sti_cycles;
+                INSTRUCTION.sti_channel          = (0x01 << (NEU_STI_CHANNEL_COUNTS-1)) ;
             }
             INSTRUCTION.sti_clock_ratio = sti_clock_ratio;
             INSTRUCTION.ins_opcode      = T_FT;
             break;
         }
         case NEU_REC_PARAM: {
-            uint8_t  vgrp              = instruction[0] & 0x1f;
-            uint8_t  vgrn              = (instruction[1] & 0xf8) >> 3;
-            uint8_t  vgr_int_old       = ((instruction[1] & 0x07) << 2) | ((instruction[2] & 0xc0) >> 6);
+            uint8_t  vgrp              = instruction[0] & 0x1F;
+            uint8_t  vgrn              = (instruction[1] & 0xF8) >> 3;
+            uint8_t  vgr_int_old       = ((instruction[1] & 0x07) << 2) | ((instruction[2] & 0xC0) >> 6);
             uint8_t  vgr_intp          = ((instruction[2] & 0x3E) >> 1);
-            uint8_t  vgr_intn          = ((instruction[2] & 0x01) << 4) | ((instruction[3] & 0xf0) >> 4);
-            uint16_t recording_channel = ((instruction[3] & 0x0f) << 12) | (instruction[4] << 4) | ((instruction[5] & 0xf0) >> 4);
-            uint16_t adc_clock_ratio   = ((instruction[5] & 0x0f) << 12) | (instruction[6] << 4) | ((instruction[7] & 0xf0) >> 4);
-            uint16_t sys_clk_ratio     = ((instruction[7] & 0x0f) << 12) | (instruction[8] << 4) | ((instruction[9] & 0xf0) >> 4);
-            uint8_t  amplifier_gain    = ((instruction[9] & 0x0c) >> 2);
+            uint8_t  vgr_intn          = ((instruction[2] & 0x01) << 4) | ((instruction[3] & 0xF0) >> 4);
+            uint16_t recording_channel = ((instruction[3] & 0x0F) << 12) | (instruction[4] << 4) | ((instruction[5] & 0xF0) >> 4);
+            uint16_t adc_clock_ratio   = ((instruction[5] & 0x0F) << 12) | (instruction[6] << 4) | ((instruction[7] & 0xF0) >> 4);
+            uint16_t sys_clk_ratio     = ((instruction[7] & 0x0F) << 12) | (instruction[8] << 4) | ((instruction[9] & 0xF0) >> 4);
+            uint8_t  amplifier_gain    = ((instruction[9] & 0x0C) >> 2);
             uint16_t chopper_ratio     = (instruction[10] << 8) | instruction[11];
 
             INSTRUCTION.vgrp              = vgrp;
@@ -617,9 +636,27 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instructi
             INSTRUCTION.recording_channel = recording_channel;
             INSTRUCTION.adc_clock_ratio   = adc_clock_ratio;
             INSTRUCTION.sys_clk_ratio     = sys_clk_ratio;
-            INSTRUCTION.amplifier_gain    = (amplifier_gain == 0) ?3 :amplifier_gain-1 ; /**< control shift*/
+            INSTRUCTION.amplifier_gain    = amplifier_gain; /**< control shift*/
             INSTRUCTION.chopper_ratio     = chopper_ratio;
-            INSTRUCTION.ins_opcode        = T_FT;
+
+            if(STI){
+                INSTRUCTION.ins_opcode        = T_FT;
+            }
+            else{
+                INSTRUCTION.ins_opcode        = BIAS_ONE;
+            }
+            break;
+        }
+        case NEU_STI_TIME:{
+//            4b>PMOS_CH;10b>STI_T1;10b>STI_T2;10b>STI_T3;17b>STI_T4;10b>STI_T5
+            uint8_t StiChPos = instruction[0] & 0x0F;
+            if(StiChPos < 9){
+                INSTRUCTION.sti_t1[StiChPos] = instruction[1] << 2 | (instruction[2] & 0xC0) >> 6;
+                INSTRUCTION.sti_t2[StiChPos] = (instruction[2] & 0x3F) << 4 | (instruction[3] & 0xF0) >> 4;
+                INSTRUCTION.sti_t3[StiChPos] = (instruction[3] & 0x0F) << 6 | (instruction[4] & 0xFC) >> 2;
+                INSTRUCTION.sti_t4[StiChPos] = (instruction[4] & 0x03) << 15 | (instruction[5] << 7) | (instruction[6] & 0x80) >> 15;
+                INSTRUCTION.sti_t5[StiChPos] = instruction[6];
+            }
             break;
         }
         case NEU_ARB_PARAM: {
@@ -656,6 +693,25 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instructi
             INSTRUCTION.ins_opcode           = T_FT;
             break;
         }
+
+        case NEU_WRITE_REG:{
+            NeuliveTwoControl.mode = MODE_REGISTER_WRITE;
+            uint8_t address = instruction[1];
+            uint16_t data = instruction[2] << 8 | instruction[3];
+            uint32_t value = address << 16 | data;
+
+            tx_put_u24(0, value);
+            break;
+        }
+        case NEU_READ_REG:{
+            NeuliveTwoControl.mode = MODE_REGISTER_READ;
+            uint8_t address = instruction[1];
+            uint16_t data = instruction[2] << 8 | instruction[3];
+            uint32_t value = address << 16 | data;
+
+            tx_put_u24(0, value);
+            break;
+        }
         default: {
             break;
         }
@@ -671,20 +727,26 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instructi
 static void headstage_update_vis_instruction(uint8_t vis_oper) {
     switch (vis_oper) {
         case VIS_RST: {
-            headstage_pin_output(PIN_RESET, 0);
-            headstage_cpu_delay_ms(1);
-            headstage_pin_output(PIN_RESET, 1);
+            Neu2Reset();
             /**< stop spi transaction */
             break; /**< reset all the parameter */
         }
         case VIS_STI: {
             NEULIVE_STATE.state = NEU_WRITE_INSTRUCTION;
+//            NEULIVE_STATE.state = NEU_READ_DATA;
+            SPICallBack = CONTINUOUS_TRANS;
             flag_notify(EVT_NEU_SPI);
+
+            if(NeuliveTwoControl.mode == MODE_REGISTER_READ || NeuliveTwoControl.mode == MODE_REGISTER_WRITE){
+                flag_notify(EVT_NEU_REG_SPI);
+            }
+
             break; /**< start to operate */
         }
         case VIS_INT: {
             NEULIVE_STATE.state = NEU_IDLE;
-            headstage_spi_transaction_cancel(headstage_spi_handle);
+            Neu2Reset();
+//            headstage_spi_transaction_cancel(headstage_spi_handle);
             /**< stop stimulation and recording  */
             break; /**< interrupt the operation */
         }
@@ -862,10 +924,15 @@ static uint8_t build_neu_ins_config(uint8_t config_type, uint32_t* value) {
     bool done;
     switch (config_type) {
         case NEU_SET_STI_CUR: {
+            if(!STI){
+                // go to recording setting if no stimulate
+                SPICallBack = CONTINUOUS_TRANS;
+                return NEU_SET_GENERAL_EN;
+            }
             uint8_t sti_channel = get_sti_channel(INSTRUCTION.sti_channel);
             done                = build_sti_cur_instruction(sti_channel, value);
             if (done) {
-                if (sti_channel == 0xff) {
+                if (sti_channel == 0xFF) {
                     return NEU_SET_STI_VOLT;
                 } else {
                     INSTRUCTION.sti_channel ^= (0x01 << sti_channel);
@@ -885,57 +952,77 @@ static uint8_t build_neu_ins_config(uint8_t config_type, uint32_t* value) {
         }
         case NEU_SET_POLARITY: {
             *value = (0x01 << 23) | (0x28 << 16) | INSTRUCTION.current_sti_polarity;
-            return NEU_SET_GENERAL_EN;
-        }
-        case NEU_SET_STI_CHANNEL: {
-            *value = (0x01 << 23) | (0x2E << 16) | INSTRUCTION.sti_channel;
-            return NEU_SET_STI_CUR;
-        }
-        case NEU_SET_GENERAL_EN: {
-            *value = (0x01 << 23) | (0x2F << 16) | NEU_GENERAL_EN;
-            return NEU_SET_REC_CHANNEL;
-        }
-        case NEU_SET_REC_CHANNEL: {
-            *value = (0x01 << 23) | (0x30 << 16) | INSTRUCTION.recording_channel;
-            return NEU_SET_AMP_GAIN;
-        }
-        case NEU_SET_AMP_GAIN: {
-            *value = (0x01 << 23) | (0x31 << 16) | INSTRUCTION.amplifier_gain;
-            return NEU_SET_SYS_CLK;
-        }
-        case NEU_SET_SYS_CLK: {
-            *value = (0x01 << 23) | (0x32 << 16) | INSTRUCTION.sys_clk_ratio;
-            return NEU_SET_ADC_CLK;
-        }
-        case NEU_SET_ADC_CLK: {
-            *value = (0x01 << 23) | (0x33 << 16) | INSTRUCTION.adc_clock_ratio;
             return NEU_SET_STI_CLK;
         }
         case NEU_SET_STI_CLK: {
             *value = (0x01 << 23) | (0x34 << 16) | INSTRUCTION.sti_clock_ratio;
             return NEU_SET_STI_MODE;
         }
-        case NEU_SET_ARBITRARY: {
-            *value = (0x01 << 23) | (0x36 << 16) | INSTRUCTION.arbitrary_en;
-            return NEU_SET_ARB_INDEX;
-        }
-        case NEU_SET_ARB_INDEX: {
-            *value = (0x01 << 23) | (0x37 << 16) | INSTRUCTION.arbitrary_index;
-            return NEU_SET_STI_MODE;
-        }
+//        case NEU_SET_ARBITRARY: {
+//            *value = (0x01 << 23) | (0x36 << 16) | INSTRUCTION.arbitrary_en;
+//            return NEU_SET_ARB_INDEX;
+//        }
+//        case NEU_SET_ARB_INDEX: {
+//            *value = (0x01 << 23) | (0x37 << 16) | INSTRUCTION.arbitrary_index;
+//            return NEU_SET_STI_MODE;
+//        }
         case NEU_SET_STI_MODE: {
             *value = (0x01 << 23) | (0x38 << 16) | (INSTRUCTION.sti_mode << 2) | (INSTRUCTION.sti_h_bridge << 1) | (INSTRUCTION.sti_ref);
+            return NEU_SET_GENERAL_EN;
+        }
+
+        /* These are recording parameter */
+        case NEU_SET_GENERAL_EN: {
+            *value = (0x01 << 23) | (0x2F << 16) | NEU_GENERAL_EN;
+            SPICallBack = CONTINUOUS_TRANS;
+            return NEU_SET_REC_CHANNEL;
+        }
+        case NEU_SET_REC_CHANNEL: {
+            *value = (0x01 << 23) | (0x30 << 16) | INSTRUCTION.recording_channel;
+            *value = (0x01 << 23) | (0x30 << 16) | 0b0000000000000100;
+            SPICallBack = CONTINUOUS_TRANS;
+            return NEU_SET_AMP_GAIN;
+        }
+        case NEU_SET_AMP_GAIN: {
+            *value = (0x01 << 23) | (0x31 << 16) | INSTRUCTION.amplifier_gain;
+            SPICallBack = CONTINUOUS_TRANS;
+            return NEU_SET_ADC_CLK;
+        }
+//        case NEU_SET_SYS_CLK: {
+//            *value = (0x01 << 23) | (0x32 << 16) | INSTRUCTION.sys_clk_ratio;
+//            return NEU_SET_ADC_CLK;
+//        }
+        case NEU_SET_ADC_CLK: {
+            if(INSTRUCTION.adc_clock_ratio < 28){
+                INSTRUCTION.adc_clock_ratio = 28;
+            }
+            *value = (0x01 << 23) | (0x33 << 16) | INSTRUCTION.adc_clock_ratio;
+//            *value = (0x01 << 23) | (0x33 << 16) | 0x00C8;
             return NEU_SET_AMP_BIAS;
         }
         case NEU_SET_AMP_BIAS: {
             done = build_amp_bias(value);
-            if (done)
-                return NEU_SET_CHOPPER;
-            else
+            SPICallBack = CONTINUOUS_TRANS;
+            if (done){
+                if(STI){
+                    return NEU_SET_STI_CHANNEL;
+                }
+                else{
+                    return NEU_SETUP_DONE;
+                }
+            }
+            else{
                 return NEU_SET_AMP_BIAS;
+            }
         }
-        case NEU_SET_CHOPPER: {
-            *value = (0x01 << 23) | (0x3B << 16) | INSTRUCTION.chopper_ratio;
+//        case NEU_SET_CHOPPER: {
+//            *value = (0x01 << 23) | (0x3B << 16) | INSTRUCTION.chopper_ratio;
+//            return NEU_SETUP_DONE;
+//        }
+        // enable stimulate
+        case NEU_SET_STI_CHANNEL: {
+            *value = (0x01 << 23) | (0x2E << 16) | INSTRUCTION.sti_channel;
+            SPICallBack = CONTINUOUS_TRANS;
             return NEU_SETUP_DONE;
         }
         default: {
@@ -949,25 +1036,48 @@ static uint8_t build_neu_ins_config(uint8_t config_type, uint32_t* value) {
  *
  *  @brief spi transaction
  */
-
+static uint8_t FlushSPICounter = 0;
 static void headstage_neu_state_spi() {
-    uint32_t value;
-    uint8_t  nxt_ins;
+    uint32_t value = 0;
+    uint8_t  nxt_ins = 0;
     switch (NEULIVE_STATE.state) {
         case NEU_WRITE_INSTRUCTION: {
             nxt_ins                   = build_neu_ins_config(NEULIVE_STATE.config_type, &value); /**< set instruction one by one in order to set all the parameter.*/
             NEULIVE_STATE.config_type = nxt_ins;
-            tx_put_u24(0, value);
-            headstage_spi_transaction(3);
+
             if (nxt_ins == NEU_SETUP_DONE) {
-                NEULIVE_STATE.state = NEU_READ_DATA;
+                // setting done, reset STI flag
+                STI = false;
+
+                // go to read ADC data
+                NEULIVE_STATE.state = NEU_PREPARE_READ;
             } else {
                 NEULIVE_STATE.state = NEU_WRITE_INSTRUCTION;
             }
+
+            tx_put_u24(0, value);
+            headstage_spi_transaction(3);
+            break;
+        }
+        case NEU_PREPARE_READ:{
+            SPICallBack = CONTINUOUS_TRANS;
+            if(FlushSPICounter < 6){
+                NEULIVE_STATE.state = NEU_PREPARE_READ;
+                tx_put_u24(0, 0);
+                headstage_spi_transaction(3);
+                FlushSPICounter ++;
+            }
+            else{
+                NEULIVE_STATE.state = NEU_READ_DATA;
+                tx_put_u24(0, 0);
+                headstage_spi_transaction(3);
+                FlushSPICounter = 0;
+            }
             break;
         }
         case NEU_READ_DATA: {
             headstage_neu_append_notify_data();
+            tx_put_u24(0, 0);
             headstage_spi_transaction(3);
             break;
         }
@@ -1000,4 +1110,22 @@ static void headstage_neu_state_spi() {
     }
 }
 
+static void headstage_neu_register_spi(){
+    switch(NeuliveTwoControl.mode){
+        case MODE_REGISTER_WRITE:{
+
+            WriteSPI(3);
+
+            break;
+        }
+        case MODE_REGISTER_READ:{
+            ReadSPI();
+            break;
+        }
+        default:{
+            break;
+        }
+    }
+}
+
 #endif

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

@@ -16,8 +16,6 @@
 #include "sti/headstage_pin.h"
 #elif defined(HEADSTAGE_NEU_H)
 #include "neu/headstage_pin.h"
-#elif defined(HEADSTAGE_TEST_DATA_H)
-#include "uni/headstage_pin.h"
 #else
 
 #error "headstage_pin headstage_pin_configuration not defined"

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

@@ -11,9 +11,6 @@
 /*
  * SPI parameter and function declaration
  */
-
-static uint8_t  spi_rxbuf[120] = {0};
-
 static SPI_Handle      spi_handle = NULL;
 static SPI_Transaction spi_transaction;
 
@@ -31,7 +28,7 @@ static SPI_Transaction spi_transaction;
         spi_parameter.bitRate         = 12000000;                             \
         spi_parameter.transferTimeout = 1000;                                 \
         spi_parameter.dataSize        = 8;                                    \
-        spi_parameter.frameFormat     = SPI_POL0_PHA1;                        \
+        spi_parameter.frameFormat     = SPI_POL0_PHA0;                        \
         spi_handle                    = SPI_open(Board_SPI0, &spi_parameter); \
     } while (0)
 
@@ -43,12 +40,4 @@ static SPI_Transaction spi_transaction;
         SPI_transfer(spi_handle, &spi_transaction); \
     })
 
-#define headstage_spi_test_transaction(len)         \
-    ({                                              \
-        spi_transaction.txBuf = NULL;               \
-        spi_transaction.rxBuf = (spi_rxbuf);        \
-        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_test_data.h

@@ -1,119 +0,0 @@
-#ifndef HEADSTAGE_H
-#error "headstage_test_data.h not include"
-#endif
-
-#ifndef HEADSTAGE_TEST_DATA_H
-#define HEADSTAGE_TEST_DATA_H
-
-/**
- *  @file headstage_test_data.h
- *
- *  Copyright (c) 2019. BioPro. Scientific
- *
- *  NEULIVE test structure:
- *
- *      headstage_init()
- *      headstage_test_event()
- *
- */
-
-
-#define DEVICE_NAME "Neulive-v1.3"
-#define MAJOR_PRODUCT_NUMBER 1
-#define MINOR_PRODUCT_NUMBER 1
-#define MAJOR_VERSION_NUMBER 1
-#define MINOR_VERSION_NUMBER 3
-
-
-#include "time.h"
-#include "headstage_pin.h"
-#include "headstage_led.h"
-#include "headstage_notify.h"
-#include "headstage_batt.h"
-#include "headstage_gptimer.h"
-#include "headstage_spi.h"
-#include "tni/headstage_notify.h"
-
-static void headstage_test_periodic();
-
-static void headstage_init() {
-    headstage_pin_open();
-    headstage_spi_open();
-    headstage_gptimer_open();
-    headstage_gptimer_set_frequency(1000);
-}
-
-static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instruction) {
-}
-
-static void headstage_update_vis_instruction(uint8_t ins_oper) {
-    switch (ins_oper) {
-        case VIS_STI:
-            headstage_gptimer_start();
-            break;
-        default:
-            break;
-    }
-}
-
-static void headstage_update_cis_instruction(uint8_t ins_oper) {
-}
-
-static void headstage_test_event() {
-    if (flag_mask(EVT_PERIODIC_GPTIMER)) {
-        flag_disable(EVT_PERIODIC_GPTIMER);
-        headstage_test_periodic();
-    }
-
-    if (EVENT_MASK == 0) {
-    // fast return
-    }
-
-    if (flag_mask(EVT_DISCONNECTED)) {
-        headstage_update_vis_instruction(VIS_INT);
-    }
-}
-
-static void headstage_append_data( uint8_t* dat_buf) {
-    for (uint8_t i = 0; i < 1 ; i++) {
-        dat_buf[3*i] = ( 0x0f << 4 ) | ( dat_buf[3*i+1] );
-        dat_buf[3*i+1] = dat_buf[3*i+2] ;
-    }
-}
-
-static uint8_t headstage_append_notify_data(uint8_t* data_value) {
-    if ( not_buf_offset <= NOT_BUF_OFFSET_INIT) {
-        headstage_notify_set_timestamp();
-        not_buf_offset = NOT_BUF_OFFSET_INIT;
-    }
-    for (uint8_t i = 0; i < 1 ; i++) {
-        headstage_notify_buffer[2*i + not_buf_offset] = data_value[3*i];
-        headstage_notify_buffer[2*i + 1 + not_buf_offset] = data_value[3*i + 1];
-    }
-    not_buf_offset = not_buf_offset + 2;
-    if (not_buf_offset == 200) {
-        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;
-    }
-    return not_buf_offset;
-}
-
-/**
- *  @fn headstage_test_periodic
- *      description : every 100us sample adc data
- */
-
-static void headstage_test_periodic() {
-    headstage_spi_test_transaction(3);
-    headstage_append_data(spi_rxbuf);
-    uint8_t index = headstage_append_notify_data(spi_rxbuf);
-    if ( index >= 200 ) {
-        headstage_notify_flip_buffer();
-        headstage_notify_send();
-    }
-}
-
-#endif

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

@@ -62,7 +62,7 @@
  *                                                                                       -->      CONTINUOUS        --
  *
  *      State Description:
- *
+
  *          There are two state machines implemented in this structure.
  *          Different state acts differently,
  *          e.g., CONFIGURE and WAIT_START would transmit the same code to DBS with different meaning
@@ -78,37 +78,37 @@
 // TODO watchdog function need implementing
 // TODO use gptimer to check bluetooth transmit
 
-/******************
- *    constant
- ******************/
+/*=================
+ ==== constant ====
+ =================*/
 
 // clang-format off
 
 /**
- *   specific data from DBS
- *
- *   In order to set recording channel, arrange a set of selected channel.
- *   The first select channel data will come with preamble.
+    specific data from DBS
+
+    In order to set recording channel, arrange a set of selected channel.
+    The first select channel data will come with preamble.
  */
 #define UMC_PREAMBLE    0b011000001
 /**
- *  header used in LSK and ASK transmission
+    header used in LSK and ASK transmission
  */
 #define UMC_HEADER      0b0101
 // clang-format on
 
 /**
- *  The data format between NEULIVE and CONTROLL BOX
- *
- *  Use notification to transmit data to control box through BLE.
- *  Definition of the protocol:
- *  4'B timestamp + 2'B time delta + (4'b channel + 10'b voltage + 2'b flag) * (N)
- *  N: numbers of data transmitted in a transaction
+    The data format between NEULIVE and CONTROLL BOX
+
+    Use notification to transmit data to control box through BLE.
+    Definition of the protocol:
+    4'B timestamp + 2'B time delta + (4'b channel + 10'b voltage + 2'b flag) * (N)
+    N: numbers of data transmitted in a transaction
  */
 #define HEADSTAGE_NOTIFY_USE_TDC4VAF2
-/*****************
- *    include
- *****************/
+/*================
+ ==== include ====
+ ================*/
 #include "time.h"
 #include "population.h"
 #include "headstage_arm.h"
@@ -118,39 +118,40 @@
 #include "headstage_watchdog.h"
 #include "headstage_notify.h"
 #include "headstage_indicate.h"
-#include "headstage_batt.h"
+#include "headstage_swi.h"
 #include "tni/headstage_notify.h"
 #include "uni/headstage_spi.h"
 #include "uni/headstage_pwm.h"
+#include "uni/headstage_adc.h"
 #include "uni/uni1.3_parameter.h"
 
-/************************************
- *    instruction building macro
- ************************************/
+/*===================================
+ ==== instruction building macro ====
+ ==================================*/
+/**
+    construct final instruction
+
+    Construct the final instruction transmitted to DBS chip
+    final instruction = Header + instruction + instruction
+
+    @param code: prebuilt instruction
+    @return final instruction
+ */
 
-/*************************************
- *  construct final instruction
- *
- *  Construct the final instruction transmitted to DBS chip
- *  final instruction = Header + instruction + instruction
- *
- *  @param code: prebuilt instruction
- *  @return final instruction
- *************************************/
 #define build_instruction(code)                   \
     ({                                            \
         uint32_t __x = (code)&0x3FFF;             \
         (UMC_HEADER << 28) | (__x << 14) | (__x); \
     })
-/***********************************************************
- *  construct instruction
- *
- *  Construct the instruction and pass it to build_instruction.
- *  Instruction = 4'b type(opcode) + 6'b value + 4'b chip_id
- *  @param type: the opcode is going to be transmitted
- *  @param value: the operating value
- *  @return final instruction
- ***********************************************************/
+/**
+    construct instruction
+
+    Construct the instruction and pass it to build_instruction.
+    Instruction = 4'b type(opcode) + 6'b value + 4'b chip_id
+    @param type: the opcode is going to be transmitted
+    @param value: the operating value
+    @return final instruction
+ */
 
 #define build_configure_instruction(type, value)           \
     ({                                                     \
@@ -160,12 +161,11 @@
         build_instruction((__t << 10) | (__v << 4) | __c); \
     })
 
-/******************************************************
- * @
- * get data from spi_rxbuf and convert it to uint16_t
- * @param  index: getting value from the index
- * @return receive data casting in uint16_t
- ******************************************************/
+/**
+    get data from spi_rxbuf and convert it to uint16_t
+    @param  index: getting value from the index
+    @return receive data casting in uint16_t
+*/
 
 #define rx_get_u16(index)                          \
     ({                                             \
@@ -175,11 +175,11 @@
         (__a << 8) | __b;                          \
     })
 
-/*******************************************************
- *  get data from spi_rxbuf and convert it to uint32_t
- *  @param  index: the index of spi_rxbuf
- *  @return receive data casting in uint32_t
- *******************************************************/
+/**
+    get data from spi_rxbuf and convert it to uint32_t
+    @param  index: the index of spi_rxbuf
+    @return receive data casting in uint32_t
+*/
 
 #define rx_get_u32(index)                             \
     ({                                                \
@@ -191,11 +191,11 @@
         (__a << 24) | (__b << 16) | (__c << 8) | __d; \
     })
 
-/*******************************************************
- *  put uint16_t into spi_txbuf
- *  @param  index: the index of spi_txbuf
- *  @param  value: the data is going to be set
- *******************************************************/
+/**
+    put uint16_t into spi_txbuf
+    @param  index: the index of spi_txbuf
+    @param  value: the data is going to be set
+*/
 
 #define tx_put_u16(index, value)              \
     do {                                      \
@@ -205,11 +205,11 @@
         spi_txbuf[__i++] = (__v)&0xFF;        \
     } while (0)
 
-/*********************************************************
- *  put uint32_t into spi_txbuf
- *  @param  index: the index of spi_txbuf
- *  @param  value: the data is going to be set
- *********************************************************/
+/**
+    put uint32_t into spi_txbuf
+    @param  index: the index of spi_txbuf
+    @param  value: the data is going to be set
+*/
 
 #define tx_put_u32(index, value)               \
     do {                                       \
@@ -221,76 +221,76 @@
         spi_txbuf[__i++] = (__v)&0xFF;         \
     } while (0)
 
-/******************
- *    constant
- ******************/
+/*=================
+ ==== constant ====
+ =================*/
 
 /**
- * this part frequency is controlling the operating
+ this part frequency is controlling the operating
  */
 // clang-format off
-
-#define UMC_LSK_FREQ    50000 /**<  target LSK data rate is 50 khz */
-
-#define UMC_ASK_FREQ    10000 /**< target ASK data rate is 10 khz */
-
-#define UMC_SYS_CLK     1000000 /**< target SYSTEM clock frequency is 1Mhz */
-
-#define UMC_POLY_R_CLK  100 /**< poly-R switching clock frequency */
+/**  target LSK data rate is 50 khz */
+#define UMC_LSK_FREQ    50000
+/** target ASK data rate is 10 khz */
+#define UMC_ASK_FREQ    10000
+/** target SYSTEM clock frequency is 1Mhz */
+#define UMC_SYS_CLK     1000000
+/** poly-R switching clock frequency */
+#define UMC_POLY_R_CLK  1000
 
 
 /// Neulive instruction macro
-
-#define UMC_HAND_SHAKE_SEND     0b0011000011 /**< handshake information receive from DBS */
-
-#define UMC_HAND_SHAKE_RECV     0b01010011000110000000110001100000 /**< handshake information send to DBS */
-
-#define UMC_MODE_LSK_OUT        0b101001 /**< set the interface with DBS */
-
-#define UMC_CALIB_DONE          0b1010 /**< UMC_CALIB_DONE + UMC_MODE_LSK_OUT : leave initial state and set "CHIP ID" */
-
-#define UMC_CONFIG_DONE         0b0100 /**< UMC_CONFIG_DONE + 6 bits don't care : EXIT config state */
-/*************************************************************************************************
- *  UMC_IRQ + UMC_IRQ_CODE + CHIP ID : go back to configure data from continuous, trigger, limited
- *  UMC_IRQ type of interrupt
- *************************************************************************************************/
+/** handshake information receive from DBS */
+#define UMC_HAND_SHAKE_SEND     0b0011000011
+/** handshake information send to DBS */
+#define UMC_HAND_SHAKE_RECV     0b01010011000110000000110001100000
+/** set the interface with DBS */
+#define UMC_MODE_LSK_OUT        0b101001
+/** UMC_CALIB_DONE + UMC_MODE_LSK_OUT : leave initial state and set "CHIP ID" */
+#define UMC_CALIB_DONE          0b1010
+/** UMC_CONFIG_DONE + 6 bits don't care : EXIT config state */
+#define UMC_CONFIG_DONE         0b0100
+/**
+    UMC_IRQ + UMC_IRQ_CODE + CHIP ID : go back to configure data from continuous, trigger, limited
+    UMC_IRQ type of interrupt
+*/
 #define UMC_IRQ                 0b1110
+/** UMC_IRQ_CODE value of interrupt */
+#define UMC_IRQ_CODE            0b001001
+/** leave wait trigger state by this instruction */
+#define UMC_GOLDEN_KEY          0b01011010010110000010100101100000 //this is important to leave wait trigger state.
 
-#define UMC_IRQ_CODE            0b001001 /**< UMC_IRQ_CODE value of interrupt */
+/** we need to check transfer data meets or not */
+#define UMC_TRANSMIT_S          0b101
 
-#define UMC_GOLDEN_KEY          0b01011010010110000010100101100000 /**< leave wait trigger state by this instruction */
-
-
-#define UMC_TRANSMIT_S          0b101 /**< we need to check transfer data meets or not */
-
-/***************************************
- *  trigger a stimulation by ASK
- *  UMC_TRIG + UMC_STIMULUS + CHIP ID
- *  UMC_TRIG type of trigger a stimulus
- ***************************************/
+/**
+    trigger a stimulation by ASK
+    UMC_TRIG + UMC_STIMULUS + CHIP ID
+    UMC_TRIG type of trigger a stimulus
+*/
 #define UMC_TRIG                0b1100
-/*******************************************
- *  UMC_STIMULUS value of trigger a stimulus
- *******************************************/
+/**
+    UMC_STIMULUS value of trigger a stimulus
+*/
 #define UMC_STIMULUS            0b000011
 
-/*****************************************
- *  type of opcode, control box to cc2650.
- *****************************************/
+/**
+    type of opcode, control box to cc2650.
+*/
+/** control box to cc2650:default type instruction */
+#define RIS_DEFAULT             0x00
+/** control box to cc2650 instruction opcode, parameter set 1 */
+#define RIS_SET_PARA            0x20
+/** control box to cc2650 instruction opcode, remove amplifier offset */
+#define RIS_RESET_AMP           0x60
+/** control box to cc2650 instruction opcode, parameter set 2 */
+#define RIS_DIR                 0xA0
+/** control box to cc2650 instruction opcode, trigger stimulation */
+#define RIS_UMC_TRIG            0xC0
 
-#define RIS_DEFAULT             0x00 /**< control box to cc2650:default type instruction */
-
-#define RIS_SET_PARA            0x20 /**< control box to cc2650 instruction opcode, parameter set 1 */
-
-#define RIS_RESET_AMP           0x60 /**< control box to cc2650 instruction opcode, remove amplifier offset */
-
-#define RIS_DIR                 0xA0 /**< control box to cc2650 instruction opcode, parameter set 2 */
-
-#define RIS_UMC_TRIG            0xC0 /**< control box to cc2650 instruction opcode, trigger stimulation */
-
-/***********************
- *  stimulation waveform
- ***********************/
+/**
+    stimulation waveform
+ */
 #define STI_MODE_DISABLE        0
 #define STI_MODE_POS            1
 #define STI_MODE_NEG            2
@@ -299,17 +299,17 @@
 #define STI_MODE_AWF            5
 #define ARM_MODE_RAMP           8
 
-/*******************************
- *  reserved virtual instruction
- *******************************/
+/**
+    reserved virtual instruction
+ */
 #define VIS_BLE_T               0b10100000
 #define VIS_SHIFT_T             0b01010000
 
-/// all the categories of instruction we can change .
+// all the categories of instruction we can change .
 
-/****************************************
- *  configuration set for DBS instruction
- ****************************************/
+/**
+    configuration set for DBS instruction
+*/
 
 #define CONFIG_AMP_CH           0x10 // this state is for transmit amp channel one more time
 #define CONFIG_AMP_MUX          0x01
@@ -333,33 +333,30 @@
 #define CONFIG_ERROR            0xFF
 // clang-format on
 
-/**********************************
- *    constant parameter table
- **********************************/
+/*=================================
+ ==== constant parameter table ====
+ ================================*/
 
 #define REC_CHANNEL_COUNT 16
 
-static uint8_t sti_waveform_table[5] = {
-    {0b000011},  /**< positive */
-    {0b001100},  /**< negative */
-    {0b110000},  /**< p 2 s    */
-    {0b110011},  /**< s 2 p    */
-    {0b000010}   /**< arbitrary, test arbitrary mode */
+static uint16_t sti_waveform_table[5] = {
+    {0b000011},  // positive
+    {0b001100},  // negative
+    {0b110000},  // p 2 s
+    {0b110011},  // s 2 p
+    {0b000010}   // arbitrary, test arbitrary mode
 };
 
-/***************************************
- *TODO add disable stimulation mode
- *TODO when we choose trigger mode , but we can't transmit any trigger instruction.
- ***************************************/
-
-static uint8_t sti_mode_table[4] = {
-    {0b001100},  /**< disable stimulation, it would there will be no trigger to be set */
-    {0b001100},  /**< trigger mode */
-    {0b000011},  /**< limited mode */
-    {0b110000}   /**< continuous mode */
+// TODO add disable stimulation mode
+// TODO when we choose trigger mode , but we can't transmit any trigger instruction.
+static uint16_t sti_mode_table[4] = {
+    {0b001100},  // disable stimulation, it would there will be no trigger to be set
+    {0b001100},  // trigger mode
+    {0b000011},  // limited mode
+    {0b110000}   // continuous mode
 };
 
-static uint8_t amp_band_table[8] = {  /**< this parameter define the low frequency corner. */
+static uint16_t amp_band_table[8] = {  //
     {0b000011},
     {0b001100},
     {0b110010},
@@ -369,37 +366,36 @@ static uint8_t amp_band_table[8] = {  /**< this parameter define the low frequen
     {0b100100},
     {0b111100}};
 
-static uint8_t fast_settle_table[2] = {  /**< this parameter is used for protecting amplifier input when stimulus is conducted */
+static uint16_t fast_settle_table[2] = {  //
     {0b000000},
     {0b000001}};
 
-/************************************
- * stimulus pulse width, with unit us
- ************************************/
-
-static uint8_t sti_pulse_width_table[] = {
-    0b000011,  /**< 40  */
-    0b001100,  /**< 90  */
-    0b110000,  /**< 140 */
-    0b110011,  /**< 190 */
-    0b000010,  /**< 240 */
-    0b100001,  /**< 290 */
-    0b011000,  /**< 340 */
-    0b100011,  /**< 390 */
-    0b001111,  /**< 440 */
-    0b111100,  /**< 490 */
+/**
+ * pulse width, with unit us
+ */
+static uint16_t sti_pulse_width_table[] = {
+    0b000011,  // 40
+    0b001100,  // 90
+    0b110000,  // 140
+    0b110011,  // 190
+    0b000010,  // 240
+    0b100001,  // 290
+    0b011000,  // 340
+    0b100011,  // 390
+    0b001111,  // 440
+    0b111100,  // 490
 };
 
-/*****************************
+/**
  * stimulate times, in unit Hz
- *****************************/
-static uint8_t sti_freq_table[] = {
-    0,   /**< 30 hz */
-    1,   /**< 40 hz */
-    2,   /**< 50 hz */
-    3,   /**< 60 hz */
-    4,   /**< 70 hz */
-    5,   /**< 80 hz */
+ */
+static uint16_t sti_freq_table[] = {
+    0,   // 30
+    1,   // 40
+    2,   // 50
+    3,   // 60
+    4,   // 70
+    5,   // 80
     6,   // 90
     7,   // 100
     8,   // 110
@@ -424,10 +420,10 @@ static uint8_t sti_freq_table[] = {
     27,  // 10000
 };
 
-/********************************************************************
+/*
  * ADC clock/sampling rate fixed-value table (built in digital core)
- ********************************************************************/
-static uint8_t adc_clock_table[] = {
+ */
+static uint32_t adc_clock_table[] = {
     0b010000,  // 10000
     0b000010,  // 20000
     0b110011,  // 40000
@@ -436,17 +432,15 @@ static uint8_t adc_clock_table[] = {
     0b000011,  // 180000
 };
 
-static uint8_t adc_data[3] = {0};
-
-/*************************
- *    parameter table
- *************************/
+/*========================
+ ==== parameter table ====
+ ========================*/
 
 struct HEADSTAGE_PARAMETER_TABLE {
-    /**< MODE */
+    /** MODE */
     uint8_t mode;
 
-    bool    channel_table[REC_CHANNEL_COUNT];
+    uint8_t channel_table[REC_CHANNEL_COUNT];
     uint8_t channel_mux[REC_CHANNEL_COUNT];
     uint8_t last_enable_channel;
     uint8_t enable_channel_number;
@@ -454,60 +448,60 @@ struct HEADSTAGE_PARAMETER_TABLE {
 
     uint8_t frequency;
 
-    /**< AGN */
+    /** AGN */
     uint8_t amp_gain;
 
-    /**< LBF */
+    /** LBF */
     uint8_t amp_low_band_freq;
 
-    /**< flag C. */
+    /** flag C. */
     uint8_t chopper;
 
-    /**< flag F */
+    /** flag F */
     uint8_t fast_settle;
 
-    /**< SCH_P */
+    /** SCH_P */
     uint8_t sti_channel_pmos;
 
-    /**< SCH_N */
+    /** SCH_N */
     uint8_t sti_channel_nmos;
 
-    /**< SVT, voltage */
+    /** SVT, voltage */
     uint8_t sti_volt;
 
     uint8_t sti_freq;
 
-    /**< stimulus pulse width */
+    /* stimulus pulse width */
     uint8_t pulse_width;
 
-    /**< how many times stimulus repeat */
+    /* how many times stimulus repeat */
     uint8_t sti_times;
 
     uint8_t sti_waveform;
 
-    /**< chip delay */
+    /* chip delay */
     uint8_t chip_delay;
 
-    /**< umc channel select */
+    /* umc channel select */
     uint8_t umc_channel;
 
     uint8_t flag_start;
 
-    /**************************
+    /**
      * ADC clock switch signal.
-     **************************/
+     */
     bool adc_clock_signal;
 
-    /*****************
+    /**
      * amplifier reset
-     *****************/
+     */
     bool amp_rst;
 } INSTRUCTION = {0};
 
-/***************************************
- * @fn static void headstage_uni_delay()
- * @brief make some delay
- ***************************************/
+/**
+@fn static void headstage_uni_delay()
+@brief make some delay
+*/
 static void headstage_uni_delay() {
     for (uint16_t i = 0; i < 1023; i++)
         ;
@@ -526,6 +520,7 @@ static void rearrange_channel_mux_table() {
 
     INSTRUCTION.last_enable_channel   = last_enable_channel;
     INSTRUCTION.enable_channel_number = enable_channel_number;
+
     if (enable_channel_number == 0) {
         // no channel enable
         memset(INSTRUCTION.channel_mux, 0, REC_CHANNEL_COUNT);
@@ -546,12 +541,11 @@ static void rearrange_channel_mux_table() {
     while (channel_mux_index >= 0) {
         int8_t i = next_enable_channel - 1;
 
-        while (i >= 0) {
+        for (; i >= 0; i--) {
             if (INSTRUCTION.channel_table[i]) {
                 next_enable_channel = i;
                 break;
             }
-            i--;
         }
 
         if (i < 0) {
@@ -570,9 +564,9 @@ static void rearrange_channel_mux_table() {
     }
 }
 
-/***********************
- *    state machine
- ***********************/
+/*======================
+ ==== state machine ====
+ =====================*/
 
 // clang-format off
 #define UMC_STATE_IDLE              0x00
@@ -590,9 +584,9 @@ static void rearrange_channel_mux_table() {
 #define UPDATE_DONE                 0xFF
 // clang-format on
 
-/*******************
- * @struct UMC_STATE
- *******************/
+/**
+@struct UMC_STATE
+*/
 
 struct {
     uint8_t state;
@@ -616,22 +610,21 @@ struct {
 
 #define umc_pass_check() ((pop_count(rx_get_u32(0)) + pop_count(rx_get_u32(4))) == 4)
 
-/******************************
- *    function declaration
- ******************************/
+/*=============================
+ ==== function declaration ====
+ ============================*/
 
 static void headstage_umc_state_transfer_ask();
 static void headstage_umc_state_transfer_lsk();
 
-/************************
- *    event dispatch
- ************************/
+/*=======================
+ ==== event dispatch ====
+ =======================*/
 
 // clang-format off
 #define EVT_UMC_ASK             0x0001
 #define EVT_UMC_LSK             0x0002
 #define EVT_UMC_STI             0x0004
-#define EVT_UMC_TEST            0x0008
 // clang-format on
 
 static void headstage_uni_event() {
@@ -665,6 +658,7 @@ static void headstage_spi_ask_callback(SPI_Handle handle, SPI_Transaction* trans
 }
 
 static void headstage_spi_lsk_callback(SPI_Handle handle, SPI_Transaction* transaction) {
+    if (not_buf_offset >= BLE_NOT_BUFF_SIZE) Swi_post(headstage_swi);
     if (UMC_STATE.reset_flag == 0) flag_notify(EVT_UMC_LSK);
 }
 
@@ -687,18 +681,27 @@ static void headstage_reset() {
  ==== function implement ====
  ==========================*/
 
-/*=========================================
- ==== initialize parameter and device. ====
- ========================================*/
+static void headstage_swi_func(UArg a0, UArg a1) {}
+
+/**
+ * initialize parameter and device.
+ */
 static void headstage_init() {
     headstage_pin_open();
     headstage_spi_open();
     headstage_pwm_open();
+    headstage_swi_init(headstage_swi_func);
     headstage_led_spi_color(COLOR_GREEN);
+    //    headstage_watchdog_open();
+    //    if(headstage_watchdog_handle == NULL)
+    //        {
+    //            headstage_led_spi_color(COLOR_RED);
+    //        }
+
     headstage_pin_output(PIN_RESET, 1);    // initialize DBS chip
     headstage_pin_output(PIN_STI_SEL, 1);  // chip select is ok
-    headstage_pin_output(PIN_VGRP, 1);
-    headstage_pin_output(PIN_FASTSET, 0);
+    headstage_pin_output(PIN_VGRP, 1);     //
+    headstage_pin_output(PIN_FASTSET, 0);  //
 }
 
 static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instruction) {
@@ -749,6 +752,24 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instructi
 
             // todo: check multichannel selection is correct or not
         case RIS_DEFAULT: {
+            INSTRUCTION.channel_table[amp_channel_table[0] - 1] = TRUE;
+            INSTRUCTION.amp_gain                                = 5;  // x1000
+            INSTRUCTION.pulse_width                             = 0;  // 40us
+            INSTRUCTION.sti_times                               = 0;  // repeat stimulation x1
+            INSTRUCTION.mode                                    = 3;  // trigger mode
+            INSTRUCTION.sti_freq                                = 3;  // 30hz
+            INSTRUCTION.sti_waveform                            = 1;  // positive
+            INSTRUCTION.chopper                                 = 0;  // turn off chopper
+            INSTRUCTION.fast_settle                             = 0;  // turn on fast settling
+            INSTRUCTION.sti_volt                                = 0;  // 2Volt
+            INSTRUCTION.sti_channel_nmos                        = 0;  // sti nch = ch2  means sti turn off
+            INSTRUCTION.sti_channel_pmos                        = 1;  // sti pch = ch1  means sti turn off
+            INSTRUCTION.amp_low_band_freq                       = 0;  // the maximum
+
+            //            this for-loop is used for setting the amplifier channel
+            //            for (unsigned int i = 0; i < REC_CHANNEL_COUNT; i++) {
+            //                INSTRUCTION.channel_table[i] = (4 <= i && i <= 8);
+            //            }
             break;
         }
 
@@ -756,12 +777,12 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instructi
             tx_put_u32(0, build_configure_instruction(UMC_TRIG, UMC_STIMULUS));
             flag_notify(EVT_UMC_STI);
             break;
-        }
-        case RIS_RESET_AMP: {
+            }
+        case RIS_RESET_AMP:{
             tx_put_u32(0, build_configure_instruction(UMC_TRIG, UMC_STIMULUS));
             headstage_spi_ask_transaction(4);
             break;
-        }
+            }
         default:
             break;
     }
@@ -817,61 +838,73 @@ static void headstage_update_vis_instruction(uint8_t vis_oper) {
     }
 }
 
-/***************************************
+/**
  *  @fn headstage_update_cis_instruction
- ***************************************/
+ */
 static void headstage_update_cis_instruction(uint8_t cis_oper) {
-    switch (cis_oper) {
-        case CIS_NOP: {
-            // nothing
-            cdr_buf[0] = _B_4b4b(CIS_NOP, CHIP_ID);
-            cdr_buf[1] = _B_4b4b(CDR_SUCCESS, 0);
+            switch (cis_oper) {
+                case CIS_NOP: {
+                    // nothing
+                    cdr_buf[0] = _B_4b4b(CIS_NOP, CHIP_ID);
+                    cdr_buf[1] = _B_4b4b(CDR_SUCCESS, 0);
 
-            SimpleProfile_SetParameter(BLE_CDR_BUFF_CHAR, 2, cdr_buf);
-            break;
-        }
+                    SimpleProfile_SetParameter(BLE_CDR_BUFF_CHAR, 2, cdr_buf);
+                    break;
+                }
 #ifdef HEADSTAGE_CIS_VOLT_H
-        case CIS_VOLT: {
+                case CIS_VOLT: {
+                    uint8_t status = headstage_update_vis_volt(ins_len, instruction + 2, cdr_buf + 2);
 
-            cdr_buf[0] = CIS_VOLT | CHIP_ID;
-            cdr_buf[1] = headstage_battery_percent();
+                    cdr_buf[0] = _B_4b4b(CIS_VOLT, CHIP_ID);
+                    cdr_buf[1] = status;
 
-            SimpleProfile_SetParameter(BLE_CDR_BUFF_CHAR, BLE_CDR_BUFF_SIZE, cdr_buf);
-
-            break;
-        }
+                    SimpleProfile_SetParameter(BLE_CDR_BUFF_CHAR, BLE_CDR_BUFF_SIZE, cdr_buf);
+                    break;
+                }
 #endif
 #ifdef HEADSTAGE_CIS_LED_H
-        case CIS_LED: {
-            uint8_t status = headstage_update_vis_led(ins_len, instruction + 2, cdr_buf + 2);
+                case CIS_LED: {
+                    uint8_t status = headstage_update_vis_led(ins_len, instruction + 2, cdr_buf + 2);
 
-            cdr_buf[0] = _B_4b4b(CIS_LED, CHIP_ID);
-            cdr_buf[1] = status;
+                    cdr_buf[0] = _B_4b4b(CIS_LED, CHIP_ID);
+                    cdr_buf[1] = status;
 
-            SimpleProfile_SetParameter(BLE_CDR_BUFF_CHAR, BLE_CDR_BUFF_SIZE, cdr_buf);
-            break;
-        }
+                    SimpleProfile_SetParameter(BLE_CDR_BUFF_CHAR, BLE_CDR_BUFF_SIZE, cdr_buf);
+                    break;
+                }
 #endif
-        default: {
-            cdr_buf[0] = _B_4b4b(cis_oper, CHIP_ID);
-            cdr_buf[1] = _B_4b4b(CDR_FAILURE, 0);
+                default: {
+                    cdr_buf[0] = _B_4b4b(cis_oper, CHIP_ID);
+                    cdr_buf[1] = _B_4b4b(CDR_FAILURE, 0);
 
-            SimpleProfile_SetParameter(BLE_CDR_BUFF_CHAR, BLE_CDR_BUFF_SIZE, cdr_buf);
-            break;
-        }
-    }
+                    SimpleProfile_SetParameter(BLE_CDR_BUFF_CHAR, BLE_CDR_BUFF_SIZE, cdr_buf);
+                    break;
+                }
+            }
 }
 
-/******************************************************************
+
+/*
  * todo: need to define some procedure to detect this device status
- ******************************************************************/
+ */
 static uint8_t headstage_debug_instruction(uint8_t* ins_buf) {
     return 0;
 }
 
-/***********************
- *    notify buffer
- ***********************/
+/*======================
+ ==== notify buffer ====
+ =====================*/
+
+static void headstage_uni_test_data_append_notify_buffer(uint8_t* dat_buf) {
+    uint8_t channel = 0;
+    dat_buf[0]      = dat_buf[0];
+    dat_buf[1]      = (dat_buf[1] + 1) & 0xfc;
+    headstage_notify_append_data(channel, dat_buf);
+
+    // always send notify no matter buffer full or not
+    headstage_notify_flip_buffer();
+    headstage_notify_send();
+}
 
 // todo: check data length extension with this function -> this function should be
 static void headstage_uni_umc_data_append_notify_buffer(uint8_t* dat_buf) {
@@ -879,44 +912,46 @@ static void headstage_uni_umc_data_append_notify_buffer(uint8_t* dat_buf) {
     // sometimes we lose the first bit , it means we only receive
     //  0110_0000_1010_1xxx_xxxx_xxxX_XXXX_XXXX and
     //  1100_0001_0101_xxxx_xxxx_xxXX_XXXX_XXXX
-    if (((dat_buf[0] & 0xC1) != 0xC1) && (dat_buf[0] != 0x00)) {
+    if (((spi_rxbuf[0] & 0xC1) != 0xC1) && (spi_rxbuf[0] != 0x00)) {
         headstage_led_spi_color(COLOR_CYAN);
         headstage_uni_delay();
     } else {
-        if ((dat_buf[1] & 0x28) == 0x28) {
-            dat_buf[0] = (dat_buf[0] << 1) | ((dat_buf[1] >> 7) & 0x01);
-            dat_buf[1] = (dat_buf[1] << 1) | ((dat_buf[2] >> 7) & 0x01);
-            dat_buf[2] = (dat_buf[2] << 1) | ((dat_buf[3] >> 7) & 0x01);
+        if ((spi_rxbuf[1] & 0x28) == 0x28) {
+            spi_rxbuf[0] = (spi_rxbuf[0] << 1) | ((spi_rxbuf[1] >> 7) & 0x01);
+            spi_rxbuf[1] = (spi_rxbuf[1] << 1) | ((spi_rxbuf[2] >> 7) & 0x01);
+            spi_rxbuf[2] = (spi_rxbuf[2] << 1) | ((spi_rxbuf[3] >> 7) & 0x01);
         }
 
         uint8_t channel;
 
-        if ((INSTRUCTION.enable_channel_number == 1) || (dat_buf[0] == 0xc1)) {
+        if ((INSTRUCTION.enable_channel_number == 1) || (spi_rxbuf[0] == 0xc1)) {
             channel = reverse_channel[INSTRUCTION.last_enable_channel];
         } else {
             uint8_t channel_pointer     = (INSTRUCTION.channel_pointer + 1) % INSTRUCTION.last_enable_channel;
-            channel                     = reverse_channel[INSTRUCTION.channel_mux[channel_pointer]];
             INSTRUCTION.channel_pointer = channel_pointer;
+            channel                     = reverse_channel[INSTRUCTION.channel_mux[channel_pointer]];
         }
-        uint8_t data_size = headstage_notify_append_data(channel, dat_buf);
+//        uint8_t data_size = headstage_notify_append_data(channel, spi_rxbuf);
         if (data_size >= BLE_NOT_BUFF_SIZE) {
-            headstage_notify_flip_buffer();
             headstage_notify_send();
+            headstage_notify_flip_buffer();
         }
     }
     //    uint16_t data_value = (uint16_t)(((dat_buf[1] & 0x0F) << 6) | ((dat_buf[2] & 0xFC) >> 2));
     headstage_spi_lsk_transaction(3);
 }
 
-/**********************
- *    instruction
- **********************/
+/*=====================
+ ==== instruction  ====
+ =====================*/
+
 static uint8_t build_umn_ins_config(uint8_t config_type, uint32_t* value) {
     switch (config_type) {
         case CONFIG_AMP_MUX: {
             uint8_t channel_pointer     = INSTRUCTION.channel_pointer + 1;
             *value                      = build_configure_instruction(CONFIG_AMP_MUX, INSTRUCTION.channel_mux[INSTRUCTION.channel_pointer] + 1);
             INSTRUCTION.channel_pointer = channel_pointer;
+
             if (channel_pointer < INSTRUCTION.enable_channel_number) {
                 return CONFIG_AMP_MUX;
             } else {
@@ -991,13 +1026,14 @@ static uint8_t build_umn_ins_config(uint8_t config_type, uint32_t* value) {
     }
 }
 
-/***************************
- *    UMC SPI interface
- ***************************/
+/*==========================
+ ==== UMC SPI interface ====
+ =========================*/
 
-/***************************************
+/**
  *  @fn headstage_umc_state_transfer_ask
- ***************************************/
+ *
+ */
 
 static void headstage_umc_state_transfer_ask() {
     // after receive handshake , transmit handreceive
@@ -1032,10 +1068,12 @@ static void headstage_umc_state_transfer_ask() {
     }
 }
 
-/**
- * @fn headstage_umc_state_transfer_lsk
+/** headstage_umc_state_transfer_lsk
+ *
  */
 static void headstage_umc_state_transfer_lsk() {
+    headstage_debug_buffer[0] = headstage_state;
+    headstage_set_debug_information();
     switch (headstage_state) {
         case UMC_STATE_IDLE:
             headstage_state = UMC_STATE_HANDSHAKE;
@@ -1053,14 +1091,18 @@ static void headstage_umc_state_transfer_lsk() {
             break;
 
         case UMC_STATE_HANDSHAKE_RECEIVE:
-            /**< if we success to receive handshake data */
+            // if we success to receive handshake data
             if (umc_pass_check()) {
                 tx_put_u32(0, build_configure_instruction(UMC_CALIB_DONE, UMC_MODE_LSK_OUT));
 
+                headstage_cpu_delay_ms(1);
+
                 headstage_state = UMC_STATE_INITIAL;
 
                 headstage_spi_ask_transaction(4);
             } else {
+                headstage_cpu_delay_ms(1);
+
                 headstage_spi_ask_transaction(4);
             }
             break;
@@ -1069,8 +1111,12 @@ static void headstage_umc_state_transfer_lsk() {
             if (umc_pass_check()) {
                 headstage_state = UMC_STATE_CONFIGURE;
 
+                headstage_cpu_delay_ms(1);
+
                 headstage_spi_ask_transaction(4);
             } else {
+                headstage_cpu_delay_ms(1);
+
                 headstage_spi_ask_transaction(4);
             }
             break;
@@ -1093,16 +1139,20 @@ static void headstage_umc_state_transfer_lsk() {
                         headstage_state = UMC_STATE_CONFIGURE;
                     }
 
+                    headstage_cpu_delay_ms(1);
+
                     headstage_spi_ask_transaction(4);
                 }
             } else {
+                headstage_cpu_delay_ms(1);
+
                 headstage_spi_ask_transaction(4);
             }
 
             break;
-            /**
-             *          conservative instruction need golden key to trigger DBS
-             */
+            /*
+                        conservative instruction need golden key to trigger DBS
+            */
         case UMC_STATE_WAIT_START:
             if (headstage_debug_buffer[1] > 18) {
                 // this transaction make cause amplifier data right shift
@@ -1156,8 +1206,8 @@ static void headstage_umc_state_transfer_lsk() {
             break;
 
         case UMC_STATE_WAIT_TRIGGER:
+            // XXX how to back to UMC_STATE_TRIGGER state
             headstage_spi_ask_transaction(4);
-            SimpleProfile_SetParameter(BLE_NOT_BUFF_CHAR, BLE_NOT_BUFF_SIZE, headstage_notify_buffer);
             break;
 
         case UMC_STATE_CONTINUOUS:

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

@@ -10,12 +10,14 @@
 
 #define NOT_BUF_OFFSET_INIT 8
 
-static uint32_t not_buf_offset = NOT_BUF_OFFSET_INIT;
+static uint8_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[0] = CHIP_ID;
+    headstage_notify_buffer[1] = 4;
     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;
@@ -31,27 +33,23 @@ static void headstage_notify_flip_buffer() {
     not_buf_offset = NOT_BUF_OFFSET_INIT;
 }
 
+/**
+    The data format between NEULIVE and CONTROL BOX
+
+    Use notification to transmit data to control box through BLE.
+    Definition of the protocol:
+    4 byte timestamp + (1 byte channel + 2 byte voltage) * (N)
+    N: numbers of data transmitted in a transaction
+ */
 static uint8_t headstage_notify_append_data(uint8_t *data_value) {
     if (not_buf_offset <= NOT_BUF_OFFSET_INIT) {
         headstage_notify_set_timestamp();
         not_buf_offset = NOT_BUF_OFFSET_INIT;
     }
 
-    if (data_value == NULL) {
-        headstage_notify_buffer[not_buf_offset++] = 0x00;
-        headstage_notify_buffer[not_buf_offset++] = 0x03;
-    } else {
-        headstage_notify_buffer[not_buf_offset++] = data_value[0];
-        headstage_notify_buffer[not_buf_offset++] = data_value[1];
-    }
-
-    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_buffer[not_buf_offset++] = data_value[0];
+    headstage_notify_buffer[not_buf_offset++] = data_value[1];
+    headstage_notify_buffer[not_buf_offset++] = data_value[2];
 
     uint8_t ret = not_buf_offset;
 

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

@@ -3,6 +3,9 @@
 #ifndef HEADSTAGE_PIN_NEU_H
 #define HEADSTAGE_PIN_NEU_H
 
+//#define NEU_2_0
+#define NEU_2_1
+
 #if defined(CC2650_LAUNCHXL)
 
 // clang-format off
@@ -11,7 +14,7 @@
 #define PIN_DC_DC               IOID_2  //  STI select need
 #define PIN_BATT_HALF           IOID_3  //
 #define PIN_AMP_VCK             IOID_4  //
-#define PIN_LED_SDI             IOID_7  //
+#define PIN_LED_SDI             IOID_5  //
 #define PIN_LED_CLK             IOID_8  //
 #define PIN_STI_CLK             IOID_9  //
 #define PIN_SPI_MISO            IOID_10 //
@@ -19,12 +22,15 @@
 #define PIN_SPI_CS              IOID_12 //
 #define PIN_SPI_CLK             IOID_13 //
 #define PIN_SYS_CLK             IOID_14 //
+//#define GLED                    IOID_7
+//#define RLED                    IOID_6
+
 // clang-format on
 
 #elif defined(BOOSTXL_CC2650MA)
 
 // clang-format off
-
+#ifdef NEU_2_0
 #define PIN_RESET               IOID_0  //  SPI1 to receive LSK
 #define PIN_EN_ADC_SPI_CLK      IOID_1  //  SPI1 clock
 #define PIN_DC_DC               IOID_2  //  STI select need
@@ -39,6 +45,22 @@
 #define PIN_SPI_CLK             IOID_13 //
 #define PIN_SYS_CLK             IOID_14 //
 
+#elif defined(NEU_2_1)
+#define PIN_LED_SDI             IOID_0  //  SPI1 to receive LSK
+#define PIN_LED_CLK             IOID_1  //  SPI1 clock
+#define PIN_DC_DC               IOID_2  //  STI select need
+#define PIN_EN_ADC_SPI_CLK      IOID_3  //
+#define PIN_BATT_HALF           IOID_4  //
+#define PIN_SPI_MISO            IOID_7  //
+#define PIN_SPI_MOSI            IOID_8  //
+#define PIN_SPI_CS              IOID_9  //
+#define PIN_SPI_CLK             IOID_10 //
+#define PIN_SYS_CLK             IOID_11 //
+#define PIN_RESET               IOID_12 //
+#define PIN_AMP_VCK             IOID_13 //
+#define PIN_STI_CLK             IOID_14 //
+#endif
+
 // clang-format on
 #endif
 /*
@@ -78,6 +100,8 @@ static PIN_Config headstage_pin_configuration[] = {  //
     PIN_DC_DC | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
     PIN_BATT_HALF | PIN_INPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
     PIN_STI_CLK | PIN_INPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    RLED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    GLED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
     //
     PIN_TERMINATE};
 

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/neu/headstage_reset.h

@@ -0,0 +1,23 @@
+
+#ifndef NEU_2_RST
+#define NEU_2_RST
+
+static void MCUReset(){
+    NEULIVE_STATE.state = NEU_WRITE_INSTRUCTION;
+    headstage_led_color(COLOR_GREEN);  // color green
+}
+
+static void DBSReset(){
+    headstage_pin_output(PIN_RESET, 0);
+    headstage_cpu_delay_ms(10);
+    headstage_pin_output(PIN_DC_DC, 1);
+    headstage_pin_output(PIN_EN_ADC_SPI_CLK, 1);
+    headstage_pin_output(PIN_RESET, 1);
+}
+
+static void Neu2Reset(){
+    DBSReset();
+    headstage_led_color(COLOR_GREEN);  // color green
+}
+
+#endif

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

@@ -12,7 +12,7 @@
 #include <ti/drivers/dma/UDMACC26XX.h>
 #include <ti/drivers/spi/SPICC26XXDMA.h>
 
-#define SPI_BUFFER_SIZE 20
+#define SPI_BUFFER_SIZE 3
 
 static uint8_t spi_txbuf[SPI_BUFFER_SIZE] = {0};
 static uint8_t spi_rxbuf[SPI_BUFFER_SIZE] = {0};
@@ -22,6 +22,7 @@ static SPI_Handle headstage_spi_handle = NULL;
 static SPI_Transaction headstage_spi_transaction;
 
 static void headstage_spi_callback(SPI_Handle handle, SPI_Transaction* transaction);
+static bool OpenSPI = false;
 
 // SPI parameters initialize
 #define headstage_spi_open()                                                      \
@@ -70,4 +71,47 @@ static void headstage_spi_callback(SPI_Handle handle, SPI_Transaction* transacti
         }                                            \
     } while (0)
 
-#endif
+static void ReopenSPI(){
+    SPI_init();
+    SPI_Params spi_parameter;
+    SPI_Params_init(&spi_parameter);
+    spi_parameter.transferMode        = SPI_MODE_CALLBACK;
+    spi_parameter.mode                = SPI_SLAVE;
+    spi_parameter.bitRate             = NEU_SPI_FREQ;
+    spi_parameter.dataSize            = 8;
+    spi_parameter.frameFormat         = SPI_POL0_PHA1;
+    spi_parameter.transferCallbackFxn = headstage_spi_callback;
+    headstage_spi_handle              = SPI_open(Board_SPI0, &spi_parameter);
+}
+
+static void WriteSPI(uint8_t length){
+    if(OpenSPI){
+        ReopenSPI();
+    }
+
+    for(int i=length ; i<SPI_BUFFER_SIZE ; i++){
+        spi_rxbuf[i] = 0x00;
+    }
+
+    SPICallBack = FLUSH_BUFFER;
+    headstage_spi_transaction.count = 3;
+    headstage_spi_transaction.txBuf = spi_txbuf;
+    headstage_spi_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(headstage_spi_handle, &headstage_spi_transaction);
+}
+
+static void ReadSPI(){
+    if(OpenSPI){
+        ReopenSPI();
+    }
+
+    SPICallBack = READ_REG;
+    headstage_spi_transaction.count = 3;
+    headstage_spi_transaction.txBuf = spi_txbuf;
+    headstage_spi_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(headstage_spi_handle, &headstage_spi_transaction);
+}
+
+#endif

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

@@ -1,7 +1,7 @@
 /* Copyright (c) 2019. BioPro. Scientific.
  */
-#ifndef HEADSTAGE_STI_ADC_H
-#define HEADSTAGE_STI_ADC_H
+#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"
@@ -37,4 +37,4 @@ static ADC_Handle headstage_adc_handle_2;
         headstage_adc_handle_2 = ADC_open(CC2650_ADC2, &param); \
     } while (0)
 
-#endif  // HEADSTAGE_STI_ADC_H
+#endif  // HEADSTAGE_ADC_H

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

@@ -58,5 +58,4 @@ static uint8_t headstage_notify_append_data(uint8_t channel, uint8_t *data_value
     return ret;
 }
 
-
 #endif  // HEADSTAGE_NOTIFY_TDC4VAF2_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/uni/Neulive13.md

@@ -1,118 +0,0 @@
-#Neulive 1.3
-
-
-##include files
-
-
-######time.h
-This part is used for getting the time information. 
-Such as year and month.
-
-For example:
-
-    static void  headstage_init_device_info() {
-        uint8_t year  = 10 * (date[9] - '0') + (date[10] - '0');
-        uint8_t month = 0;
-    
-        switch (date[0]) {
-            case 'J':
-                // Jan, January
-                // Jun, June
-                // Jul, July
-                if (date[1] == 'a') {
-                    month = 1;
-                } else if (date[2] == 'n') {
-                    month = 6;
-                } else {
-                    month = 7;
-                }
-                break;
-            case 'F':
-                // Feb, February
-                month = 2;
-                break;
-            case 'M':
-                // Mar, March
-                // May, May
-                if (date[2] == 'r') {
-                    month = 3;
-                } else {
-                    month = 5;
-                }
-                break;
-            case 'A':
-                // Apr, April
-                // Ang, August
-                if (date[1] == 'p') {
-                    month = 4;
-                } else {
-                    month = 8;
-                }
-                break;
-            case 'S':
-                // Sep, September
-                month = 9;
-                break;
-            case 'O':
-                // Oct, October
-                month = 10;
-                break;
-            case 'N':
-                // Nov, November
-                month = 11;
-                break;
-            case 'D':
-                // Dec, December
-                month = 12;
-                break;
-        }
-        ......
-
-        *p++ = year;
-        *p++ = month;
-
-        ......
-    }
-
-
-######population.h
-This is used for checking each digit of data is 1 or 0. 
-
-It will return how many 1 are included in the value.
-
-    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);
-    }
-
-######headstage_arm.h
-This part is used for generating arbitrary data to test data rate.
-
-######headstage_debug.h
-
-######headstage_pin.h
-
-######headstage_led.h
-
-######headstage_watchdog.h
-
-######headstage_notify.h
-
-######headstage_indicate.h
-
-######headstage_batt.h
-
-######tni/headstage_notify.h
-
-######uni/headstage_spi.h
-
-######uni/headstage_pwm.h
-
-######uni/uni1.3_parameter.h
-
--------------
-

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

@@ -1,26 +1,5 @@
 /* Copyright (c) 2019. BioPro. Scientific.
  */
-#ifndef HEADSTAGE_UNI_ADC_H
-#define HEADSTAGE_UNI_ADC_H
-
-#include <Board.h>
-#include <ti/drivers/ADC.h>
-
-static ADC_Handle headstage_adc;
-
-#define headstage_adc_open()                                                    \
-    do {                                                                        \
-        ADC_init();                                                             \
-        ADC_Params headstage_adc_params;                                        \
-        ADC_Params_init(&headstage_adc_params);                                 \
-        headstage_adc = ADC_open(BOOSTXL_CC2650MA_ADC0, &headstage_adc_params); \
-    } while (0)
-
-#define headstage_adc_convert()                                                 \
-    ({                                                                          \
-        uint16_t adc_value;                                                     \
-        ADC_convert(headstage_adc, &adc_value);                                 \
-        ADC_convertRawToMicroVolts(headstage_adc , adc_value);                  \
-    })
-
-#endif  // HEADSTAGE_UNI_ADC_H
+#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_pin.h

@@ -48,7 +48,7 @@
 #define Board_SPI0_MISO                PIN_UNASSIGNED
 #define Board_SPI0_MOSI                PIN_LSK_MOSI
 #define Board_SPI0_CLK                 PIN_LSK_CLK
-#define Board_SPI0_CSN                 PIN_LSK_CS
+#define Board_SPI0_CS                  PIN_LSK_CS
 
 /*
  *  SPI1 interface work with LED
@@ -57,7 +57,7 @@
 #define Board_SPI1_MISO                PIN_UNASSIGNED
 #define Board_SPI1_MOSI                PIN_ASK_MOSI
 #define Board_SPI1_CLK                 PIN_UNASSIGNED
-#define Board_SPI1_CSN                 PIN_ASK_CS
+#define Board_SPI1_CS                  PIN_ASK_CS
 
 /* Power Management Board */
 #define Board_SRDY                     Board_BP_Pin_J2_19

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/uni/neulive1.3.json

@@ -12,53 +12,53 @@
     "REC_CHANNEL_COUNT": 12,
     "STI_CHANNEL_COUNT": 4,
     "ADC_SAMPLE_RATE_LIST": [
-      1000,
-      1900,
+      2000,
       3800,
       7600,
-      15200
+      15200,
+      30400
     ],
     "STI_FREQ_LIST": [
-      3,
-      4,
-      5,
       6,
-      7,
       8,
-      9,
       10,
-      11,
       12,
-      13,
       14,
-      15,
       16,
-      17,
       18,
-      19,
       20,
-      100,
+      22,
+      24,
+      26,
+      28,
+      30,
+      32,
+      34,
+      36,
+      38,
+      40,
       200,
-      300,
       400,
-      500,
       600,
-      700,
       800,
-      900,
-      1000
+      1000,
+      1200,
+      1400,
+      1600,
+      1800,
+      2000
     ],
     "STI_PULSE_WIDTH": [
-      400,
-      900,
-      1400,
-      1900,
-      2400,
-      2900,
-      3400,
-      3900,
-      4400,
-      4900
+      80,
+      180,
+      280,
+      380,
+      480,
+      580,
+      680,
+      780,
+      880,
+      980
     ]
   },
   "parameters": {
@@ -84,6 +84,9 @@
       "description": "amp gain",
       "record_meta": true,
       "value": [
+        3,
+        14,
+        27,
         60,
         280,
         540
@@ -184,6 +187,10 @@
   },
   "instruction": {
     "start": [
+      {
+        "expression": "len(CHANNEL) > 0",
+        "raise": "no recording channel"
+      },
       "data_format",
       "_notify(True)",
       "start_recording",

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/uni/uni1.3_parameter.h

@@ -55,6 +55,9 @@ static uint16_t amp_gain_table[] = {
     0b100011,  // 3
     0b101100,  // 14
     0b101001,  // 27
+    0b000011,  // 60
+    0b001100,  // 280
+    0b001001,  // 540
 };
 
 #endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/simple_peripheral.c

@@ -72,6 +72,7 @@
 
 #if defined(FEATURE_OAD) || defined(IMAGE_INVALIDATE)
 #include "oad_target.h"
+
 #include "oad.h"
 #endif  // FEATURE_OAD || IMAGE_INVALIDATE
 
@@ -114,11 +115,11 @@
 #ifndef FEATURE_OAD
 // Minimum connection interval (units of 1.25ms, 80=100ms) if automatic
 // parameter update request is enabled
-#define DEFAULT_DESIRED_MIN_CONN_INTERVAL 80
+#define DEFAULT_DESIRED_MIN_CONN_INTERVAL 6
 
 // Maximum connection interval (units of 1.25ms, 800=1000ms) if automatic
 // parameter update request is enabled
-#define DEFAULT_DESIRED_MAX_CONN_INTERVAL 80
+#define DEFAULT_DESIRED_MAX_CONN_INTERVAL 6
 #else  //! FEATURE_OAD
 // Minimum connection interval (units of 1.25ms, 8=10ms) if automatic
 // parameter update request is enabled
@@ -220,6 +221,7 @@ static void    SimpleBLEPeripheral_sendAttRsp(void);
 static void    SimpleBLEPeripheral_freeAttRsp(uint8_t status);
 static void    SimpleBLEPeripheral_stateChangeCB(gaprole_States_t newState);
 static void    SimpleBLEPeripheral_enqueueMsg(uint8_t event, uint8_t state);
+static void    headstage_data_length_extension();
 
 #ifndef FEATURE_OAD_ONCHIP
 static void SimpleBLEPeripheral_charValueChangeCB(uint8_t paramID);
@@ -307,7 +309,6 @@ static void SimpleBLEPeripheral_init(void) {
     // so that the application can send and receive messages.
     ICall_registerApp(&self, &semaphore);
 
-    // Hard code the DB Address till CC2650 board gets its own IEEE address
 #ifdef USE_RCOSC
     RCOSC_enableCalibration();
 #endif  // USE_RCOSC
@@ -407,12 +408,10 @@ static void SimpleBLEPeripheral_init(void) {
     // Register for GATT local events and ATT Responses pending for transmission
     GATT_RegisterForMsgs(self);
 
-    headstage_led_spi_color(COLOR_GREEN);
     HCI_LE_ReadMaxDataLenCmd();
 
     HCI_LE_WriteSuggestedDefaultDataLenCmd(251, 2120);  // this is used for data length extension
 
-
 }
 
 #ifndef DEVICE_NAME
@@ -511,7 +510,7 @@ static void  headstage_init_device_info() {
     for (unsigned int i = 0; i < sizeof(DEVICE_NAME) - 1; i++) {
         *p++ = DEVICE_NAME[i];
     }
-    *p++ = 15;
+    *p++ = 11;
     *p++ = GAP_ADTYPE_MANUFACTURER_SPECIFIC;
     //    unsafe_memcpy(p, "BPHS", 4);
     *p++ = 'B';
@@ -524,11 +523,6 @@ static void  headstage_init_device_info() {
     *p++ = MINOR_VERSION_NUMBER;
     *p++ = year;
     *p++ = month;
-    *p++ = 'B';
-    *p++ = 'A';
-    *p++ = 'T';
-    *p++ = headstage_battery_percent();
-
 
     GGS_SetParameter(GGS_DEVICE_NAME_ATT, sizeof(DEVICE_NAME), DEVICE_NAME);
 
@@ -559,6 +553,7 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
         // 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);
+        //        headstage_watchdog_clear();
         if (errno == ICALL_ERRNO_SUCCESS) {
             ICall_EntityID    dest;
             ICall_ServiceEnum src;
@@ -586,19 +581,19 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
                     ICall_freeMsg(message);
                 }
             }
-        }
-        // If RTOS queue is not empty, process app message.
-        while (!Queue_empty(application_message_queue)) {
-            sbpEvt_t *message = (sbpEvt_t *)Util_dequeueMsg(application_message_queue);
-            if (message) {
-                // Process message.
-                SimpleBLEPeripheral_processAppMsg(message);
 
-                // Free the space from the message.
-                ICall_free(message);
+            // If RTOS queue is not empty, process app message.
+            while (!Queue_empty(application_message_queue)) {
+                sbpEvt_t *message = (sbpEvt_t *)Util_dequeueMsg(application_message_queue);
+                if (message) {
+                    // Process message.
+                    SimpleBLEPeripheral_processAppMsg(message);
+
+                    // Free the space from the message.
+                    ICall_free(message);
+                }
             }
         }
-
         if (EVENT_MASK > 0) {
             headstage_event_handle();
         }
@@ -681,6 +676,8 @@ static uint8_t SimpleBLEPeripheral_processGATTMsg(gattMsgEvent_t *message) {
 
     } else if (message->method == ATT_MTU_UPDATED_EVENT) {
         // MTU size updated
+        headstage_debug_buffer[10] = 0xff;
+        headstage_set_debug_information();
     } else if (message->method == ATT_HANDLE_VALUE_CFM) {
         // quick pass
     }
@@ -826,13 +823,14 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)
             uint8_t      numActive = 0;
             numActive              = linkDB_NumActive();
 
+            headstage_led_color(COLOR_CYAN);
+
             uint16_t cxnHandle;
-            uint16_t requestedPDUSize = 251;
-            uint16_t requestTxTime    = 2120;
+            uint16_t requestedPDUSize = 251;    // payload = 251 - 7 = 244 byte
+            uint16_t requestTxTime    = 2120;   // 2 ms
             GAPRole_GetParameter(GAPROLE_CONNHANDLE, &cxnHandle);
 
-            if (SUCCESS == HCI_LE_SetDataLenCmd(cxnHandle, requestedPDUSize, requestTxTime)) {
-                headstage_led_spi_color(COLOR_CYAN);
+            if (SUCCESS != HCI_LE_SetDataLenCmd(cxnHandle, requestedPDUSize, requestTxTime)) {
             }
             // Use numActive to determine the connection handle of the last
             // connection
@@ -841,6 +839,7 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)
                 uint8_t peerAddress[B_ADDR_LEN];
                 GAPRole_GetParameter(GAPROLE_CONN_BD_ADDR, peerAddress);
             }
+            flag_notify(EVT_CONNECTED);
             break;
         }
 
@@ -853,12 +852,12 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)
             // Device just timed out from a connection but is not yet advertising, is in waiting period before advertising again
             // disconnected
             SimpleBLEPeripheral_freeAttRsp(bleNotConnected);
-            headstage_led_spi_color(COLOR_RED); /** for neulive1.3 call headstage_led_spi_color ; for neulive2.0 call headstage_led_color */
+            headstage_led_color(COLOR_RED);
             CONNECT_HANDLE = 0xFFFF;
             flag_notify(EVT_DISCONNECTED);
             break;
         case GAPROLE_ERROR:  // Error occurred - invalid state
-            headstage_led_spi_color(COLOR_RED);
+            headstage_led_color(COLOR_RED);
             break;
         case GAPROLE_INIT:           // Waiting to be started
         case GAPROLE_ADVERTISING:    // Currently Advertising

simplelink/ble_sdk_2_02_02_25/src/examples/throughput_example_central/cc26xx/app/throughput_example_central.c

@@ -71,8 +71,6 @@
 
 #include "ble_user_config.h"
 
-#include "headstage_spi.h"
-
 
 /*********************************************************************
  * MACROS
@@ -272,10 +270,6 @@ static uint8_t throughput_peripheral_peer_addr[B_ADDR_LEN] = { 0xFF, 0xEE, 0xDD,
 // Received byte counters
 static volatile uint32_t bytesRecvd = 0;
 static volatile uint32_t bytesRecvdShadow = 0;
-static volatile uint8_t  channel = 0;
-
-uint8_t spi_tx[3] = {0x00, 0x01, 0x0f};
-uint8_t spi_rx[3] = {0};
 
 /*********************************************************************
  * LOCAL FUNCTIONS
@@ -376,7 +370,7 @@ static void SimpleBLECentral_init(void)
   // Register the current thread as an ICall dispatcher application
   // so that the application can send and receive messages.
   ICall_registerApp(&selfEntity, &sem);
-  headstage_spi_open();
+
   // Hard code the DB Address till CC2650 board gets its own IEEE address
   //uint8 bdAddress[B_ADDR_LEN] = { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 };
   //HCI_EXT_SetBDADDRCmd(bdAddress);
@@ -502,7 +496,7 @@ static void SimpleBLECentral_taskFxn(UArg a0, UArg a1)
       ICall_HciExtEvt *pMsg = NULL;
 
       if (ICall_fetchServiceMsg(&src, &dest, 
-                                (void **)&pMsg) == ICALL_ERRNO_SUCCESS) // i think this part of (void **)&pMsg is called by referenced
+                                (void **)&pMsg) == ICALL_ERRNO_SUCCESS)
       {
         if ((src == ICALL_SERVICE_CLASS_BLE) && (dest == selfEntity))
         {
@@ -542,10 +536,6 @@ static void SimpleBLECentral_taskFxn(UArg a0, UArg a1)
       events &= ~SBC_MEASURE_SPEED_EVT;
 
       Display_print1(dispHandle, 7, 0, "Rate (B/s): %d", bytesRecvdShadow);
-      Display_print1(dispHandle, 7, 0, "channel:%d", channel);
-      Display_print1(dispHandle, 7, 0, "spi_rxbuf[0]: %d", spi_rx[0]);
-      Display_print1(dispHandle, 7, 0, "spi_rxbuf[1]: %d", spi_rx[1]);
-      Display_print1(dispHandle, 7, 0, "spi_rxbuf[2]: %d", spi_rx[2]);
     }
   }
 }
@@ -860,7 +850,6 @@ static void SimpleBLECentral_processGATTMsg(gattMsgEvent_t *pMsg)
     else if (pMsg->method == ATT_HANDLE_VALUE_NOTI)
     {
       bytesRecvd += pMsg->msg.handleValueNoti.len;
-      channel = pMsg->msg.handleValueNoti.pValue[8];
     }
     else if (pMsg->method == ATT_MTU_UPDATED_EVENT)
     {
@@ -1306,7 +1295,6 @@ static uint8_t SimpleBLECentral_enqueueMsg(uint8_t event, uint8_t state,
  */
 static void SimpleBLECentral_speedHandler(UArg a0)
 {
-//  headstage_spi_transaction(3, spi_tx, spi_rx);
   bytesRecvdShadow = bytesRecvd;
   bytesRecvd = 0;
   events |= SBC_MEASURE_SPEED_EVT;

simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/simple_gatt_profile.h

@@ -84,7 +84,8 @@ extern "C" {
 #define SIMPLEPROFILE_CHAR1_LEN 2
 #define SIMPLEPROFILE_CHAR2_LEN 10
 #define SIMPLEPROFILE_CHAR3_LEN 20
-#define SIMPLEPROFILE_CHAR4_LEN 200
+#define SIMPLEPROFILE_CHAR4_LEN 193
+#define SIMPLEPROFILE_CHAR4_LEN 20  // 8 header + 3n data, n=3
 #define SIMPLEPROFILE_CHAR5_LEN 20
 
 /*********************************************************************