Clear Okay Okay (?)

Clear Okay (?)
Modify calibration parameter.
2021-12-23 17:51:01 +08:00 · 2021-12-23 17:38:43 +08:00 · 2021-12-23 17:18:56 +08:00 · 2021-10-12 17:22:51 +08:00 · 2021-10-07 13:19:39 +08:00 · 2021-10-06 09:56:21 +08:00
129 changed files with 11246 additions and 4994 deletions
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+#path=$(pwd)
+#folder=$($path | awk -F"/" '{$NF}')
+folder=$(basename "$(pwd)")
+
+if [ "$folder" == "bioprocc2650" ]; then
+    year=$(date +%-y)
+    month=$(date +%-m)
+    day=$(date +%-d)
+    hour=$(date +%-H)
+    minute=$(date +%-M)
+
+    hash=$(git rev-parse HEAD)
+    branch=$(git rev-parse --abbrev-ref HEAD)
+
+    sed -i "5c #define VERSION_DATE_YEAR      ${year}"\
+        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
+
+    sed -i "6c #define VERSION_DATE_MONTH     ${month}"\
+        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
+
+    sed -i "7c #define VERSION_DATE_DAY       ${day}"\
+        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
+
+    sed -i "8c #define VERSION_DATE_HOUR      ${hour}"\
+        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
+
+    sed -i "9c #define VERSION_DATE_MINUTE    ${minute}"\
+        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
+
+    sed -i "13c #define VERSION_HASH           ${hash}"\
+        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
+
+    sed -i "14c #define VERSION_GIT_BRANCH     ${branch}"\
+        ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
+
+    #cat ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
+fi
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/common/cc26xx/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc/
@@ -1 +0,0 @@
-../tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/heapmgr/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/icall/inc/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/inc/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/npi/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/profiles/roles/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/rom/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/
@@ -1 +0,0 @@
-../simplelink/ble_sdk_2_02_02_25/src/target/
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<configurations XML_version="1.2" id="configurations_0">
+    <configuration XML_version="1.2" id="configuration_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe">
+            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="2" id="The Converter Usage">
+                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
+                        <choice Name="Overclock with user specified value" value="unused">
+                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
+                        </choice>
+                    </property>
+                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+                </choice>
+            </property>
+            <platform XML_version="1.2" id="platform_0">
+                <instance XML_version="1.2" desc="CC2640F128" href="devices/cc2640f128.xml" id="CC2640F128" xml="cc2640f128.xml" xmlpath="devices"/>
+            </platform>
+        </connection>
+    </configuration>
+</configurations>
@@ -0,0 +1,9 @@
+The 'targetConfigs' folder contains target-configuration (.ccxml) files, automatically generated based
+on the device and connection settings specified in your project on the Properties > General page.
+
+Please note that in automatic target-configuration management, changes to the project's device and/or
+connection settings will either modify an existing or generate a new target-configuration file. Thus,
+if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
+you may create your own target-configuration file for this project and manage it manually. You can
+always switch back to automatic target-configuration management by checking the "Manage the project's
+target-configuration automatically" checkbox on the project's Properties > General page.
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<configurations XML_version="1.2" id="configurations_0">
+    <configuration XML_version="1.2" id="configuration_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe">
+            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="2" id="The Converter Usage">
+                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
+                        <choice Name="Overclock with user specified value" value="unused">
+                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
+                        </choice>
+                    </property>
+                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+                </choice>
+            </property>
+            <platform XML_version="1.2" id="platform_0">
+                <instance XML_version="1.2" desc="CC2640F128" href="devices/cc2640f128.xml" id="CC2640F128" xml="cc2640f128.xml" xmlpath="devices"/>
+            </platform>
+        </connection>
+    </configuration>
+</configurations>
@@ -0,0 +1,9 @@
+The 'targetConfigs' folder contains target-configuration (.ccxml) files, automatically generated based
+on the device and connection settings specified in your project on the Properties > General page.
+
+Please note that in automatic target-configuration management, changes to the project's device and/or
+connection settings will either modify an existing or generate a new target-configuration file. Thus,
+if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
+you may create your own target-configuration file for this project and manage it manually. You can
+always switch back to automatic target-configuration management by checking the "Manage the project's
+target-configuration automatically" checkbox on the project's Properties > General page.
@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>
@@ -18,13 +18,13 @@
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o      ${ProjName}.hex ${ProjName}.out" prebuildStep="">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.308833195" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.2125878104">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.2138235341" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.410623502" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1351821865">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1751124300" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
 								<listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
-								<listOptionValue builtIn="false" value="XDC_VERSION=3.32.0.06_core"/>
+								<listOptionValue builtIn="false" value="XDC_VERSION=3.32.2.25_core"/>
 								<listOptionValue builtIn="false" value="INACTIVE_REPOS="/>
 								<listOptionValue builtIn="false" value="EXPANDED_REPOS="/>
 								<listOptionValue builtIn="false" value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
@@ -34,17 +34,17 @@
 								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
 								<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
 							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.243195404" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.955793533" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.638576662" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1016177761" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.2070806136" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1411365061" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.193495829" name="Application binary interface. (--abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1573436637" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.978889992" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.1392883332" name="Speed vs. size trade-offs (--opt_for_speed, -mf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.511635494" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.277675815" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
+							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1593934674" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
+							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.632414212" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.154623462" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.974280107" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1783826131" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1536570599" name="Application binary interface. (--abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1895413316" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.322983319" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.1305400753" name="Speed vs. size trade-offs (--opt_for_speed, -mf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1468985930" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 									<listOptionValue builtIn="false" value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\simple_peripheral\cc26xx\app\headstage"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/cc26xx/app"/>
@@ -70,10 +70,11 @@
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.521147483" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1897088" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
 									<listOptionValue builtIn="false" value="POWER_SAVING"/>
 									<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
+									<listOptionValue builtIn="false" value="HEADSTAGE_MA_USE_SPI2"/>
 									<listOptionValue builtIn="false" value="CC26XX"/>
 									<listOptionValue builtIn="false" value="GAPROLE_TASK_STACK_SIZE=540"/>
 									<listOptionValue builtIn="false" value="HEAPMGR_SIZE=0"/>
@@ -85,71 +86,71 @@
 									<listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
 									<listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.1861999587" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1867564782" name="C Dialect" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.2052831394" name="Enable support for GCC extensions (DEPRECATED) (--gcc)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1102242787" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.871011287" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.863089168" name="C Dialect" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1454248503" name="Enable support for GCC extensions (DEPRECATED) (--gcc)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1965115059" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="48"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.727880917" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1638011093" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.996618365" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.858761211" name="Emit diagnostic identifier numbers (--display_error_number, -pden)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.96303422" name="Place each function in a separate subsection (--gen_func_subsections, -ms)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1634706392" name="Read options from specified file (--cmd_file, -@)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1920170652" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.2038786257" name="Emit diagnostic identifier numbers (--display_error_number, -pden)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.811478344" name="Place each function in a separate subsection (--gen_func_subsections, -ms)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1229809338" name="Read options from specified file (--cmd_file, -@)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
 									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
 								</option>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1149005836" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.404213358" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1356338499" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1609020645" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1540775079" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.319000695" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.270651019" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.463094612" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.2125878104" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1993482378" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.833137428" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1072440081" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.95815077" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1766117832" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1351821865" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.174129193" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.567300083" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1800982811" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1091211742" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1479599481" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="libc.a"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
 									<listOptionValue builtIn="false" value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1149343368" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.672837228" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.512740056" name="Suppress diagnostic &lt;id&gt; (--diag_suppress)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.544523272" name="Suppress diagnostic &lt;id&gt; (--diag_suppress)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="10247-D"/>
 									<listOptionValue builtIn="false" value="16002-D"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.755787473" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1039632635" name="Emit diagnostic identifier numbers (--display_error_number)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.160090718" name="Detailed link information data-base into &lt;file&gt; (--xml_link_info, -xml_link_info)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1907564273" name="Aggressively reduce size of the DWARF information (--compress_dwarf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1278577864" name="Eliminate sections not needed in the executable (--unused_section_elimination)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1166775149" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.1192919935" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1491242603" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1281207998" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.468817864" name="Emit diagnostic identifier numbers (--display_error_number)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1679096029" name="Detailed link information data-base into &lt;file&gt; (--xml_link_info, -xml_link_info)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.254835397" name="Aggressively reduce size of the DWARF information (--compress_dwarf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1848192295" name="Eliminate sections not needed in the executable (--unused_section_elimination)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1999849945" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.25027104" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.888093741" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1967400950" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1242139870" name="Specify rom width (--romwidth, -romwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.1863065780" name="Specify memory width (--memwidth, -memwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.47746446" name="Output format" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.19288898" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.11734737" name="Specify rom width (--romwidth, -romwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.466140455" name="Specify memory width (--memwidth, -memwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.824070691" name="Output format" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
 							</tool>
-							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1864525425" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.46430604" name="Package repositories (--xdcpath)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
+							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1392704063" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.225737408" name="Package repositories (--xdcpath)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_REPOS}"/>
 									<listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
 								</option>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.313008504" name="Target (-t)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.807892561" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1808973543" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1028195441" name="Build-profile (-r)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.295955151" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.128448790" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.571281110" name="Target (-t)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.205178830" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1097777495" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.744121344" name="Build-profile (-r)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.165807018" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.391961861" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
@@ -3,16 +3,20 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_app"/>
 </listAttribute>
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="2" id="The Converter Usage">
-                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
-                        <choice Name="Overclock with user specified value" value="unused">
-                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
-                        </choice>
-                    </property>
-                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="1" id="Power Selection">
+                <choice Name="Probe supplied power" value="1">
+                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
+                </choice>
+            </property>
+            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
+            <property Type="choicelist" Value="4" id="SWD Mode Settings">
+                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
                </choice>
            </property>
            <platform XML_version="1.2" id="platform_0">
@@ -16,11 +16,11 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa

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

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

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

 DEL = C:/ti/xdctools_3_32_02_25_core/packages/../bin/rm -f
 CP = C:/ti/xdctools_3_32_02_25_core/packages/../bin/cp -f
@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>
@@ -15,8 +15,8 @@
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1209999684" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postannouncebuildStep="" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;${TOOLS_BLE}/frontier/frontier.exe ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd" preannouncebuildStep="" prebuildStep="&quot;${TOOLS_BLE}/lib_search/lib_search.exe&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1209999684." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.929750171" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1008890994">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1479696404" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.958553711" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.2088015050">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.2112506999" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
@@ -26,17 +26,17 @@
 								<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
 								<listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
 							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.201372544" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1951196199" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.20903631" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1176131016" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.647279085" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1443871767" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.227818129" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.784155377" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.494285153" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.581550859" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1288777730" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.101349069" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
+							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.572884961" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
+							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.50794417" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.783335843" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.341974501" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.274225680" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.529764162" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1837039616" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1393115220" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.2112471580" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.152832201" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/cc26xx/stack"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
@@ -60,7 +60,7 @@
 									<listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.986125825" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1361895403" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CC26XX"/>
 									<listOptionValue builtIn="false" value="POWER_SAVING"/>
 									<listOptionValue builtIn="false" value="CC26XXWARE"/>
@@ -81,60 +81,60 @@
 									<listOptionValue builtIn="false" value="xTESTMODES"/>
 									<listOptionValue builtIn="false" value="xTEST_BLEBOARD"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.372638078" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.201347726" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1555958931" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1144396572" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="48"/>
 									<listOptionValue builtIn="false" value="16004"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.73314177" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1546809951" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1126279750" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1492280006" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.538453952" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.12083718" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1432753391" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1345637669" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
 									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
 								</option>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.313905687" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1129729173" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.156783227" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.538375181" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1884548091" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.682104615" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.662317863" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.728508440" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1008890994" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1873600405" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.1359172875" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1355177509" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.829303802" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1078356909" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.2088015050" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1079333148" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.1347544490" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.136883143" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1510359183" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1331488920" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="libc.a"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"/>
 									<listOptionValue builtIn="false" value="${ROM}/ble_rom_releases/04242014/ble_rom_patch.symbols"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1707930214" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1835383942" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.59164041" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.821225577" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="16002-D"/>
 									<listOptionValue builtIn="false" value="10247-D"/>
 									<listOptionValue builtIn="false" value="10325-D"/>
 									<listOptionValue builtIn="false" value="10229-D"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.11567165" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1727810233" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1385277262" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.1153340314" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT" value="startup_entry" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.450995330" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1827942626" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1279238428" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.526125450" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.581803256" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1390204935" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1601082213" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.351715800" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.90863272" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT" value="startup_entry" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1779672459" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1701763005" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.687564793" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.1056923280" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.73723664" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.947560992" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1295209583" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.110293046" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1122561921" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1766088709" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.494132983" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.1603693219" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1153492005" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
@@ -3,15 +3,20 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_stack"/>
 </listAttribute>
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="2" id="The Converter Usage">
-                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
-                        <choice Name="Overclock with user specified value" value="unused">
-                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
-                        </choice>
-                    </property>
-                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="1" id="Power Selection">
+                <choice Name="Probe supplied power" value="1">
+                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
+                </choice>
+            </property>
+            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
+            <property Type="choicelist" Value="4" id="SWD Mode Settings">
+                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
                </choice>
            </property>
            <platform XML_version="1.2" id="platform_0">
@@ -16,7 +16,7 @@
 # sources were generated) is:
 #    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\host_test\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../config/src
+GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/host_test/ccs/config/src

 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
@@ -16,11 +16,11 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa

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

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

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

 DEL = C:/ti/xdctools_3_32_00_06_core/packages/../bin/rm -f
 CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f
@@ -16,7 +16,7 @@
 # sources were generated) is:
 #    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../config/src
+GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/src

 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
@@ -80,6 +80,7 @@ const PIN_Config BoardGpioInitTable[] = {
    Board_UART_TX | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,                        /* UART TX */
   Board_SRDY | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,                           /* SRDY */
   Board_MRDY | PIN_INPUT_EN | PIN_PULLDOWN,                                                 /* MRDY */
+
    PIN_TERMINATE
 };

@@ -189,57 +190,6 @@ const UDMACC26XX_Config UDMACC26XX_config[] = {
 *  ============================= UDMA end =====================================
 */

-/*
- *  ========================== SPI DMA begin ===================================
- */
-/* Place into subsections to allow the TI linker to remove items properly */
-#if defined(__TI_COMPILER_VERSION__)
-#pragma DATA_SECTION(SPI_config, ".const:SPI_config")
-#pragma DATA_SECTION(spiCC26XXDMAHWAttrs, ".const:spiCC26XXDMAHWAttrs")
-#endif
-
-/* Include drivers */
-#include <ti/drivers/spi/SPICC26XXDMA.h>
-
-/* SPI objects */
-SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
-
-/* SPI configuration structure, describing which pins are to be used */
-const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_UDMACOUNT] = {
-    {
-        .baseAddr           = SSI0_BASE,
-        .intNum             = INT_SSI0_COMB,
-        .intPriority        = ~0,
-        .swiPriority        = 0,
-        .powerMngrId        = PowerCC26XX_PERIPH_SSI0,
-        .defaultTxBufValue  = 0,
-        .rxChannelBitMask   = 1<<UDMA_CHAN_SSI0_RX,
-        .txChannelBitMask   = 1<<UDMA_CHAN_SSI0_TX,
-        .mosiPin            = Board_SPI0_MOSI,
-        .misoPin            = Board_SPI0_MISO,
-        .clkPin             = Board_SPI0_CLK,
-        .csnPin             = Board_SPI0_CS
-    },
-};
-
-/* SPI configuration structure */
-const SPI_Config SPI_config[] = {
-    {
-         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-         .object      = &spiCC26XXDMAObjects[0],
-         .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
-    },
-    {
-         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-         .object      = &spiCC26XXDMAObjects[1],
-         .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
-    },
-    {NULL, NULL, NULL}
-};
-/*
- *  ========================== SPI DMA end =====================================
-*/
-

 /*
 *  ========================== Crypto begin ====================================
@@ -89,24 +89,24 @@ extern const PIN_Config BoardGpioInitTable[];
 */

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

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

 /* Mapping of BoosterPack Connector Pins to BoosterPack Standard Functions (reflecting the BoosterPack Standard)
@@ -125,12 +125,12 @@ extern const PIN_Config BoardGpioInitTable[];

 /* Connector J2 */
 #define Board_BP_PWM_0                 Board_BP_Pin_J2_19
-#define Board_BP_SPI_CS_Wireless       Board_BP_Pin_J2_18
+#define Board_BP_SPI_CS_Wireless       PIN_UNASSIGNED
 #define Board_BP_GPIO_3                Board_BP_Pin_J2_17
 #define Board_BP_SPI_MOSI              Board_BP_Pin_J2_15
 #define Board_BP_SPI_MISO              Board_BP_Pin_J2_14
-#define Board_BP_SPI_CS_Display        Board_BP_Pin_J2_13
-#define Board_BP_SPI_CS_Other          Board_BP_Pin_J2_12
+#define Board_BP_SPI_CS_Display        PIN_UNASSIGNED
+#define Board_BP_SPI_CS_Other          PIN_UNASSIGNED
 #define Board_BP_GPIO_2                Board_BP_Pin_J2_11


@@ -145,11 +145,11 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_UART_TX                  Board_BP_UART_Rx          /* RXD */
 #define Board_UART_RX                  Board_BP_UART_Tx          /* TXD */

-/* SPI Board */
-#define Board_SPI0_MISO                Board_BP_SPI_MISO
-#define Board_SPI0_MOSI                Board_BP_SPI_MOSI
-#define Board_SPI0_CLK                 Board_BP_SPI_CLK
-#define Board_SPI0_CS                  Board_BP_SPI_CS_Wireless
+
+
+//#define Board_SPI0_MISO                PIN_UNASSIGNED
+//#define Board_SPI0_MOSI                PIN_UNASSIGNED
+

 /* Power Management Board */
 #define Board_SRDY                     Board_BP_Pin_J2_19
@@ -170,6 +170,7 @@ extern const PIN_Config BoardGpioInitTable[];
 *  ==========================================================================*/
 /* Generic SPI instance identifiers */
 #define Board_SPI0                  BOOSTXL_CC2650MA_SPI0
+#define Board_SPI1                  BOOSTXL_CC2650MA_SPI1
 /* Generic UART instance identifiers */
 #define Board_UART                  BOOSTXL_CC2650MA_UART0
 /* Generic TRNG instance identiifer */
@@ -208,15 +209,7 @@ typedef enum BOOSTXL_CC2650MA_CryptoName {
 } BOOSTXL_CC2650MA_CryptoName;


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

-    BOOSTXL_CC2650MA_SPICOUNT
-} BOOSTXL_CC2650MA_SPIName;

 /*!
 *  @def    BOOSTXL_CC2650MA_TRNGName
@@ -39,6 +39,7 @@ extern "C" {

 #include <ti/drivers/Power.h>

+//#include "BOOSTXL_CC2650MA.h"
 #include "BOOSTXL_CC2650MA.h"

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

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

 /* SPI Board */
-#define Board_SPI0_MISO             IOID_8          /* RF1.20 */
-#define Board_SPI0_MOSI             IOID_9          /* RF1.18 */
-#define Board_SPI0_CLK              IOID_10         /* RF1.16 */
+#define Board_SPI0_MISO             IOID_0          /* RF1.20 */
+#define Board_SPI0_MOSI             IOID_1          /* RF1.18 */
+#define Board_SPI0_CLK              IOID_3         /* RF1.16 */
 #define Board_SPI0_CSN              PIN_UNASSIGNED
 #define Board_SPI1_MISO             PIN_UNASSIGNED
-#define Board_SPI1_MOSI             PIN_UNASSIGNED
-#define Board_SPI1_CLK              PIN_UNASSIGNED
+#define Board_SPI1_MOSI             IOID_8          /* LED_MOSI */
+#define Board_SPI1_CLK              IOID_9          /* LED_CLK */
+
+
 #define Board_SPI1_CSN              PIN_UNASSIGNED

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

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

 /* Booster pack generic */
-#define Board_DIO0                  IOID_0
-#define Board_DIO1_RFSW             IOID_1
+#define Board_DIO0                  PIN_UNASSIGNED
+#define Board_DIO1_RFSW             PIN_UNASSIGNED
 #define Board_DIO12                 IOID_12
 #define Board_DIO15                 IOID_15
 #define Board_DIO16_TDO             IOID_16
@@ -55,7 +55,7 @@ extern "C"
 // includes
 // ****************************************************************************
 #include "hal_types.h"
-#include "npi/src/inc/npi_config.h"
+#include "inc/npi_config.h"

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

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

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

-/*********************************************************************
- * INCLUDES
- */
-
 #include <ti/sysbios/knl/Task.h>
+
 #include <ti/sysbios/hal/Hwi.h>
+
 #include <ti/sysbios/knl/Clock.h>
+
 #include <ti/sysbios/knl/Semaphore.h>
+
 #include <ti/sysbios/knl/Queue.h>

 #include <string.h>

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

 #include "gapgattserver.h"
+
 #include "gattservapp.h"

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

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

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

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

 #include "host_test_app.h"

-#if defined( USE_FPGA ) || defined( DEBUG_SW_TRACE )
-#include <driverlib/ioc.h>
-#endif // USE_FPGA | DEBUG_SW_TRACE
+//#define PERIODIC_USE_GPTIMER

-/*********************************************************************
- * CONSTANTS
- */
+#include "cc2650/cc2650_util.h"
+
+//#include "cc2650/cc2650_slave.h"
+
+#include "cc2650/cc2650_master.h"

 // LE Event Lengths
-#define HCI_CMD_COMPLETE_EVENT_LEN              3
-#define HCI_CMD_VS_COMPLETE_EVENT_LEN           2
-#define HCI_CMD_STATUS_EVENT_LEN                4
-#define HCI_PHY_UPDATE_COMPLETE_EVENT_LEN       6
+#define HCI_CMD_COMPLETE_EVENT_LEN 3
+#define HCI_CMD_VS_COMPLETE_EVENT_LEN 2
+#define HCI_CMD_STATUS_EVENT_LEN 4
+#define HCI_PHY_UPDATE_COMPLETE_EVENT_LEN 6
+
+static void HTA_init(void);
+static void HTA_main(UArg a0, UArg a1);
+static void HTA_handle_gap_event(ICall_HciExtEvt *message);
+static void HTA_handle_att_event(gattMsgEvent_t *message);
+static void HTA_handle_ble_event(ICall_HciExtEvt *message);
+static void send_command_complete_event(uint8 eventCode, uint16 opcode, uint8 numParam, uint8 *param);
+static void send_command_status_event(uint8_t eventCode, uint16_t status, uint16_t opcode);
+static void send_ble_complete_event(uint8 eventLen, uint8 *pEvent);
+
+extern void AssertHandler(uint8 assertCause, uint8 assertSubCause);

 // Task configuration
-#define HTA_TASK_PRIORITY                       1
-#define HTA_TASK_STACK_SIZE                     644
+#define HTA_TASK_STACK_SIZE 512
+Task_Struct hta_task;
+Char        hta_task_stack[HTA_TASK_STACK_SIZE];

-/*********************************************************************
- * GLOBAL VARIABLES
- */
-
-// Display Interface
-Display_Handle dispHandle = NULL;
-
-/*********************************************************************
- * LOCAL VARIABLES
- */
-// Entity ID globally used to check for source and/or destination of messages
-static ICall_EntityID selfEntity;
-
-// Semaphore globally used to post events to the application thread
-static ICall_Semaphore sem;
-
-// Task configuration
-Task_Struct htaTask;
-Char htaTaskStack[HTA_TASK_STACK_SIZE];
-
-#if !defined ( GATT_DB_OFF_CHIP )
-  static uint8 deviceName[GAP_DEVICE_NAME_LEN] = { 0 };
-  static uint16 appearance = 17;
-#endif
-
-// Stack build revision
-ICall_BuildRevision buildRev;
-
-/*********************************************************************
- * LOCAL FUNCTIONS
- */
-
-static void HostTestApp_init(void);
-static void HostTestApp_taskFxn(UArg a0, UArg a1);
-
-static void HostTestApp_processGapEvent(ICall_HciExtEvt *pMsg);
-static void HostTestApp_processBLEEvent(ICall_HciExtEvt *pMsg);
-
-static void sendCommandCompleteEvent(uint8 eventCode, uint16 opcode,
-                                     uint8 numParam, uint8 *param);
-static void sendCommandStatusEvent(uint8_t eventCode, uint16_t status,
-                                   uint16_t opcode);
-static void sendBLECompleteEvent(uint8 eventLen, uint8 *pEvent);
-
-/*********************************************************************
- * EXTERN FUNCTIONS
- */
-extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
-
-/*********************************************************************
- * PUBLIC FUNCTIONS
- */
-
-/*********************************************************************
+/*
 * @fn      HostTestApp_createTask
 *
 * @brief   Task creation function for the Host Test App.
@@ -168,21 +134,30 @@ extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
 *
 * @return  none
 */
-void HostTestApp_createTask(void)
-{
-  Task_Params taskParams;
+void HostTestApp_createTask(void) {
+    /* main task */
+    Task_Params task_main_parameter;
+    Task_Params_init(&task_main_parameter);
+    task_main_parameter.stack     = hta_task_stack;
+    task_main_parameter.stackSize = HTA_TASK_STACK_SIZE;
+    task_main_parameter.priority  = 1;

-  // Configure task
-  Task_Params_init(&taskParams);
-  taskParams.stack = htaTaskStack;
-  taskParams.stackSize = HTA_TASK_STACK_SIZE;
-  taskParams.priority = HTA_TASK_PRIORITY;
-
-  Task_construct(&htaTask, HostTestApp_taskFxn, &taskParams, NULL);
+    Task_construct(&hta_task, HTA_main, &task_main_parameter, NULL);
 }

-/*********************************************************************
- * @fn      HostTestApp_init
+// Entity ID globally used to check for source and/or destination of messages
+static ICall_EntityID self;
+
+// Semaphore globally used to post events to the application thread
+extern ICall_Semaphore semaphore;
+
+extern uint16_t event_flags;
+
+// Stack build revision
+ICall_BuildRevision build_reversion;
+
+/*
+ * @fn      HTA_init
 *
 * @brief   Called during initialization and contains application
 *          specific initialization (ie. hardware initialization/setup,
@@ -193,118 +168,30 @@ void HostTestApp_createTask(void)
 *
 * @return  none
 */
-static void HostTestApp_init(void)
-{
-  // Register the current thread as an ICall dispatcher application
-  // so that the application can send and receive messages.
-  ICall_registerApp(&selfEntity, &sem);
+static void HTA_init(void) {
+    // Register the current thread as an ICall dispatcher application
+    // so that the application can send and receive messages.
+    ICall_registerApp(&self, &semaphore);

-#if defined( USE_FPGA )
-  // configure RF Core SMI Data Link
-  IOCPortConfigureSet(IOID_12, IOC_PORT_RFC_GPO0, IOC_STD_OUTPUT);
-  IOCPortConfigureSet(IOID_11, IOC_PORT_RFC_GPI0, IOC_STD_INPUT);
+    // Initialize GATT Client
+    VOID GATT_InitClient();

-  // configure RF Core SMI Command Link
-  IOCPortConfigureSet(IOID_10, IOC_IOCFG0_PORT_ID_RFC_SMI_CL_OUT, IOC_STD_OUTPUT);
-  IOCPortConfigureSet(IOID_9, IOC_IOCFG0_PORT_ID_RFC_SMI_CL_IN, IOC_STD_INPUT);
+    // Register to receive incoming ATT Indications or Notifications of attribute values.
+    GATT_RegisterForInd(self);

-  // configure RF Core tracer IO
-  IOCPortConfigureSet(IOID_8, IOC_PORT_RFC_TRC, IOC_STD_OUTPUT);
-#else // !USE_FPGA
-  #if defined( DEBUG_SW_TRACE )
-    // configure RF Core tracer IO
-    IOCPortConfigureSet(IOID_8, IOC_PORT_RFC_TRC, IOC_STD_OUTPUT | IOC_CURRENT_4MA | IOC_SLEW_ENABLE);
-  #endif // DEBUG_SW_TRACE
-#endif // USE_FPGA
+    // Register for GATT local events and ATT Responses pending for transmission.
+    GATT_RegisterForMsgs(self);

-  // Set device's Sleep Clock Accuracy
-  //HCI_EXT_SetSCACmd(40);
-
-#if defined( USE_RCOSC )
-  RCOSC_enableCalibration();
-#endif // USE_RCOSC
-
-  dispHandle = Display_open(Display_Type_LCD, NULL);
-
-  // Register for unprocessed HCI/Host event messages
-  GAP_RegisterForMsgs(selfEntity);
-
-  // Initialize GATT Client
-  VOID GATT_InitClient();
-
-  // Get build revision
-  VOID Util_buildRevision(&buildRev);
-
-#if !defined ( GATT_DB_OFF_CHIP )
-
-  #if defined ( GATT_QUAL )
-    VOID GATTQual_AddService( GATT_ALL_SERVICES ); // Includes GAP and GATT Services
-  #else
    // Add our services to GATT Server
-    VOID GGS_AddService( GATT_ALL_SERVICES );
-    VOID GATTServApp_AddService( GATT_ALL_SERVICES );
-    #if defined ( GATT_TEST )
-      VOID GATTTest_AddService( GATT_ALL_SERVICES );
-    #endif
-  #endif
+    GGS_AddService(GATT_ALL_SERVICES);
+    GATTServApp_AddService(GATT_ALL_SERVICES);

-  // Set device name
-  if ((buildRev.hostInfo & CENTRAL_CFG) && (buildRev.hostInfo & PERIPHERAL_CFG))
-  {
-    memcpy(deviceName, "TI BLE All", 10);
-  }
-  else if (buildRev.hostInfo & CENTRAL_CFG)
-  {
-    memcpy(deviceName, "TI BLE Central", 14);
-  }
-  else if (buildRev.hostInfo & PERIPHERAL_CFG)
-  {
-    memcpy(deviceName, "TI BLE Peripheral",  17);
-  }
-  else
-  {
-    memcpy(deviceName, "TI BLE Unknown",  14);
-  }
-
-  VOID GGS_SetParameter(GGS_DEVICE_NAME_ATT, strlen((char *)deviceName), deviceName);
-  VOID GGS_SetParameter(GGS_APPEARANCE_ATT, sizeof(uint16), (void*)&appearance);
-
-#endif // GATT_DB_OFF_CHIP
-
-  Display_print0(dispHandle, 0, 0, "TI BLEv2.0");
-  Display_print0(dispHandle, 1, 0, "HostTestApp");
-
-  // Display Host build configuration
-  if ((buildRev.hostInfo & CENTRAL_CFG) && (buildRev.hostInfo & PERIPHERAL_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "All");
-  }
-  else if ((buildRev.hostInfo & CENTRAL_CFG) &&
-           (buildRev.hostInfo & BROADCASTER_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "Cent+Bcast");
-  }
-  else if ((buildRev.hostInfo & PERIPHERAL_CFG) &&
-           (buildRev.hostInfo & OBSERVER_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "Peri+Observ");
-  }
-  else if (buildRev.hostInfo & CENTRAL_CFG)
-  {
-    Display_print0(dispHandle, 2, 0, "Central");
-  }
-  else if (buildRev.hostInfo & PERIPHERAL_CFG)
-  {
-    Display_print0(dispHandle, 2, 0, "Peripheral");
-  }
-  else
-  {
-    Display_print1(dispHandle, 2, 0, "Unknown build cfg %d", buildRev.hostInfo);
-  }
+    // Register for unprocessed HCI/Host event messages
+    GAP_RegisterForMsgs(self);
 }

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

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

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

-      if (ICall_fetchServiceMsg(&src, &dest,
-                                (void **)&pMsg) == ICALL_ERRNO_SUCCESS)
-      {
-        bool dealloc = true;
+            if (ICall_fetchServiceMsg(&src, &dest, (void **)&message) == ICALL_ERRNO_SUCCESS) {
+                bool dealloc = true;

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

-            default:
-              break;
-          }
+                    case GATT_MSG_EVENT:
+                        HTA_handle_att_event((gattMsgEvent_t *)message);
+                        break;
+
+                    case GAP_MSG_EVENT:
+                        break;
+                    }
+                }
+
+                if (dealloc && message) {
+                    ICall_freeMsg(message);
+                }
+            }
        }

-        if (dealloc == true)
-        {
-          ICall_freeMsg(pMsg);
+        if (event_flags > 0) {
+            HTA_event_call();
        }
-      }
    }
-  }
 }

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

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

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

    case HCI_DISCONNECTION_COMPLETE_EVENT_CODE:
-      break;
+        break;

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

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

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

-/*********************************************************************
- * @fn      HostTestApp_processBLEEvent
+static void HTA_handle_att_event(gattMsgEvent_t *message) {
+    uint8_t method = message->method;
+
+    if (message->hdr.status == blePending) {
+        // pass
+    } else if ((method == ATT_READ_RSP) || (method == ATT_ERROR_RSP && message->msg.errorRsp.reqOpcode == ATT_READ_REQ)) {
+        // pass
+    } else if ((method == ATT_WRITE_RSP) || (method == ATT_ERROR_RSP && message->msg.errorRsp.reqOpcode == ATT_WRITE_REQ)) {
+        // pass
+    } else if (method == ATT_HANDLE_VALUE_NOTI) {
+#ifdef HTA_PIN_RS
+        if (!PIN_getInputValue(HTA_PIN_RS)) {
+#endif
+            attHandleValueNoti_t *att_notify = (attHandleValueNoti_t *)(&message->msg);
+            HTA_main_handle_notify(att_notify->len, att_notify->pValue);
+#ifdef HTA_PIN_RS
+        }
+#endif
+    }
+
+    // Free message. Needed only for ATT Protocol messages
+    GATT_bm_free(&message->msg, message->method);
+}
+
+/*
+ * @fn      HTA_handle_ble_event
 *
 * @brief   Process an incoming BLE Event.

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

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

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

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

-//*****************************************************************************
-// the function prototypes
-
-/*******************************************************************************
+/*
 * This generic function sends a Command Complete or a Vendor Specific Command
 * Complete Event to the Host.
 *
 */
-static void sendCommandCompleteEvent(uint8_t eventCode, uint16_t opcode,
-                                     uint8_t numParam, uint8_t *param)
-{
-  npiPkt_t *msg;
-  uint8_t   totalLength;
-  uint8_t   txLen = 0; // Length to transmit
+static void send_command_complete_event(uint8_t eventCode, uint16_t opcode, uint8_t numParam, uint8_t *param) {
+    npiPkt_t *msg;
+    uint8_t   totalLength;
+    uint8_t   txLen = 0;  // Length to transmit

-  // The initial length will be:
-  // OSAL message header(4) - not part of packet sent to HCI Host!
-  // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
-  // Return Parameters (0..N)
-  totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + numParam;
+    // The initial length will be:
+    // OSAL message header(4) - not part of packet sent to HCI Host!
+    // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
+    // Return Parameters (0..N)
+    totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + numParam;

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

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

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

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

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

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

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

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

-/*******************************************************************************
+/*
 * This generic function sends a Command Complete or a Vendor Specific Command
 * Complete Event to the Host.
 *
 */
-static void sendCommandStatusEvent(uint8_t eventCode, uint16_t status,
-                                   uint16_t opcode)
-{
-  npiPkt_t *msg;
-  uint8_t   totalLength;
+static void send_command_status_event(uint8_t eventCode, uint16_t status, uint16_t opcode) {
+    npiPkt_t *msg;
+    uint8_t   totalLength;

-  // The initial length will be:
-  // OSAL message header(4) - not part of packet sent to HCI Host!
-  // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
-  // Command Status Event Data: Status (1) + Num HCI Cmd Pkt (1) + Cmd Opcode (2)
-  totalLength = sizeof(npiPkt_t)     +
-                HCI_EVENT_MIN_LENGTH +
-                HCI_CMD_STATUS_EVENT_LEN;
+    // The initial length will be:
+    // OSAL message header(4) - not part of packet sent to HCI Host!
+    // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
+    // Command Status Event Data: Status (1) + Num HCI Cmd Pkt (1) + Cmd Opcode (2)
+    totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;

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

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

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

-    NPITask_sendToHost((uint8_t *)msg);
-  }
-}
-
-/*******************************************************************************
- * This is a generic function used to send BLE Complete Event to the
- * Host processor.
- *
- */
-static void sendBLECompleteEvent(uint8 eventLen, uint8 *pEvent)
-{
-  npiPkt_t *msg;
-  uint8_t   totalLength;
-
-  // The initial length will be:
-  // OSAL message header(4) - not part of packet sent to HCI Host!
-  // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
-  // Event Data: eventLen
-  totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + eventLen;
-
-  // allocate memory for OSAL hdr + packet
-  msg = (npiPkt_t *)ICall_allocMsg(totalLength);
-  if (msg)
-  {
-    // OSAL message event, status, and pointer to packet
-    msg->hdr.event  = HCI_EVENT_PACKET;
-    msg->hdr.status = 0xFF;
-
-    // fill in length and data pointer
-    msg->pktLen = HCI_EVENT_MIN_LENGTH + eventLen;
-    msg->pData  = (uint8*)(msg+1);
-
-    // fill in BLE Complete Event data
-    msg->pData[0] = HCI_EVENT_PACKET;
-    msg->pData[1] = HCI_LE_EVENT_CODE;
-    msg->pData[2] = eventLen;
-
-    // populate event data
-    if (eventLen > 0)
-    {
-      memcpy(&msg->pData[3], pEvent, eventLen);
+        NPITask_sendToHost((uint8_t *)msg);
    }
-
-    NPITask_sendToHost((uint8_t *)msg);
-  }
 }

-/*********************************************************************
-*********************************************************************/
+/*
+ * This is a generic function used to send BLE Complete Event to the Host processor.
+ */
+static void send_ble_complete_event(uint8 eventLen, uint8 *pEvent) {
+    npiPkt_t *msg;
+    uint8_t   totalLength;
+
+    // The initial length will be:
+    // OSAL message header(4) - not part of packet sent to HCI Host!
+    // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
+    // Event Data: eventLen
+    totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + eventLen;
+
+    // allocate memory for OSAL hdr + packet
+    msg = (npiPkt_t *)ICall_allocMsg(totalLength);
+    if (msg) {
+        // OSAL message event, status, and pointer to packet
+        msg->hdr.event  = HCI_EVENT_PACKET;
+        msg->hdr.status = 0xFF;
+
+        // fill in length and data pointer
+        msg->pktLen = HCI_EVENT_MIN_LENGTH + eventLen;
+        msg->pData  = (uint8 *)(msg + 1);
+
+        // fill in BLE Complete Event data
+        msg->pData[0] = HCI_EVENT_PACKET;
+        msg->pData[1] = HCI_LE_EVENT_CODE;
+        msg->pData[2] = eventLen;
+
+        // populate event data
+        if (eventLen > 0) {
+            memcpy(&msg->pData[3], pEvent, eventLen);
+        }
+
+        NPITask_sendToHost((uint8_t *)msg);
+    }
+}
@@ -9,7 +9,7 @@
 Target Device: CC2650, CC2640

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

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

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

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

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

-#endif /* HOSTESTAPP_H */
+#endif
@@ -8,7 +8,7 @@
 Target Device: CC2650, CC2640

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

@@ -44,26 +44,29 @@
 Release Date: 2018-04-02 18:03:35
 *****************************************************************************/

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

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

 #include "host_test_app.h"

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

+#include <inc/hw_memmap.h>
+
 #ifndef USE_DEFAULT_USER_CFG

 #include "ble_user_config.h"
@@ -71,70 +74,12 @@
 // BLE user defined configuration
 bleUserCfg_t user0Cfg = BLE_USER_CFG;

-#endif // USE_DEFAULT_USER_CFG
+#endif  // USE_DEFAULT_USER_CFG

-#include <ti/mw/display/Display.h>
-
-#ifdef USE_FPGA
-#include <inc/hw_prcm.h>
-#endif // USE_FPGA
-
-/*******************************************************************************
- * MACROS
- */
-
-/*******************************************************************************
- * CONSTANTS
- */
-
-#if defined( USE_FPGA )
-  #define RFC_MODE_BLE                 PRCM_RFCMODESEL_CURR_MODE1
-  #define RFC_MODE_ANT                 PRCM_RFCMODESEL_CURR_MODE4
-  #define RFC_MODE_EVERYTHING_BUT_ANT  PRCM_RFCMODESEL_CURR_MODE5
-  #define RFC_MODE_EVERYTHING          PRCM_RFCMODESEL_CURR_MODE6
-  //
-  #define SET_RFC_BLE_MODE(mode) HWREG( PRCM_BASE + PRCM_O_RFCMODESEL ) = (mode)
-#endif // USE_FPGA
-
-/*******************************************************************************
- * TYPEDEFS
- */
-
-/*******************************************************************************
- * LOCAL VARIABLES
- */
-
-/*******************************************************************************
- * GLOBAL VARIABLES
- */
-
-#ifdef CC1350_LAUNCHXL
-#ifdef POWER_SAVING
-// Power Notify Object for wake-up callbacks
-Power_NotifyObj rFSwitchPowerNotifyObj;
-static uint8_t rFSwitchNotifyCb(uint8_t eventType, uint32_t *eventArg,
-                                uint32_t *clientArg);
-#endif //POWER_SAVING
-
-PIN_State  radCtrlState;
-PIN_Config radCtrlCfg[] =
-{
-  Board_DIO1_RFSW   | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW  | PIN_PUSHPULL | PIN_DRVSTR_MAX, /* RF SW Switch defaults to 2.4GHz path*/
-  Board_DIO30_SWPWR | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX, /* Power to the RF Switch */
-  PIN_TERMINATE
-};
-PIN_Handle radCtrlHandle;
-#endif //CC1350_LAUNCHXL
-
-/*******************************************************************************
- * EXTERNS
- */

 extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);

-extern Display_Handle dispHandle;
-
-/*******************************************************************************
+/*
 * @fn          Main
 *
 * @brief       Application Main
@@ -149,68 +94,38 @@ extern Display_Handle dispHandle;
 *
 * @return      None.
 */
-int main()
-{
-#if defined( USE_FPGA )
-  HWREG(PRCM_BASE + PRCM_O_PDCTL0) &= ~PRCM_PDCTL0_RFC_ON;
-  HWREG(PRCM_BASE + PRCM_O_PDCTL1) &= ~PRCM_PDCTL1_RFC_ON;
-#endif // USE_FPGA
+int main() {

-  /* Register Application callback to trap asserts raised in the Stack */
-  RegisterAssertCback(AssertHandler);
+    /* Register Application callback to trap asserts raised in the Stack */
+    RegisterAssertCback(AssertHandler);

-  PIN_init(BoardGpioInitTable);
+    PIN_init(BoardGpioInitTable);

-#ifdef CC1350_LAUNCHXL
-  // Enable 2.4GHz Radio
-  radCtrlHandle = PIN_open(&radCtrlState, radCtrlCfg);
+    // Enable iCache prefetching
+    VIMSConfigure(VIMS_BASE, TRUE, TRUE);

-#ifdef POWER_SAVING
-  Power_registerNotify(&rFSwitchPowerNotifyObj,
-                       PowerCC26XX_ENTERING_STANDBY | PowerCC26XX_AWAKE_STANDBY,
-                       (Power_NotifyFxn) rFSwitchNotifyCb, NULL);
-#endif //POWER_SAVING
-#endif //CC1350_LAUNCHXL
+    // Enable cache
+    VIMSModeSet(VIMS_BASE, VIMS_MODE_ENABLED);

-#if defined( USE_FPGA )
-  // set RFC mode to support BLE
-  // Note: This must be done before the RF Core is released from reset!
-  SET_RFC_BLE_MODE(RFC_MODE_BLE);
-#endif // USE_FPGA
+    /* Initialize ICall module */
+    ICall_init();

-  // Enable iCache prefetching
-  VIMSConfigure(VIMS_BASE, TRUE, TRUE);
+    /* Start tasks of external images */
+    ICall_createRemoteTasks();

-  // Enable cache
-  VIMSModeSet(VIMS_BASE, VIMS_MODE_ENABLED);
+    /* Kick off application */
+    HostTestApp_createTask();

-#if !defined( POWER_SAVING ) || defined( USE_FPGA )
-  /* Set constraints for Standby, powerdown and idle mode */
-  // PowerCC26XX_SB_DISALLOW may be redundant
-  Power_setConstraint(PowerCC26XX_SB_DISALLOW);
-  Power_setConstraint(PowerCC26XX_IDLE_PD_DISALLOW);
-#endif // POWER_SAVING | USE_FPGA
+    /* Kick off NPI */
+    NPITask_createTask(ICALL_SERVICE_CLASS_BLE);

-  /* Initialize ICall module */
-  ICall_init();
+    /* enable interrupts and start SYS/BIOS */
+    BIOS_start();

-  /* Start tasks of external images */
-  ICall_createRemoteTasks();
-
-  /* Kick off application */
-  HostTestApp_createTask();
-
-  /* Kick off NPI */
-  NPITask_createTask(ICALL_SERVICE_CLASS_BLE);
-
-  /* enable interrupts and start SYS/BIOS */
-  BIOS_start();
-
-  return 0;
+    return 0;
 }

-
-/*******************************************************************************
+/*
 * @fn          AssertHandler
 *
 * @brief       This is the Application's callback handler for asserts raised
@@ -246,57 +161,9 @@ int main()
 *
 * @return      None.
 */
-void AssertHandler(uint8 assertCause, uint8 assertSubcause)
-{
-  // Open the display if the app has not already done so
-  if ( !dispHandle )
-  {
-    dispHandle = Display_open(Display_Type_LCD, NULL);
-  }
+void AssertHandler(uint8 assertCause, uint8 assertSubcause) {}

-  Display_print0(dispHandle, 0, 0, ">>>STACK ASSERT");
-
-  // check the assert cause
-  switch (assertCause)
-  {
-    // This assert is raised from the BLE Stack when a malloc failure occurs.
-    case HAL_ASSERT_CAUSE_OUT_OF_MEMORY:
-      Display_print0(dispHandle, 0, 0, "***ERROR***");
-      Display_print0(dispHandle, 2, 0, ">> OUT OF MEMORY!");
-      break;
-
-    case HAL_ASSERT_CAUSE_INTERNAL_ERROR:
-      // check the subcause
-      if (assertSubcause == HAL_ASSERT_SUBCAUSE_FW_INERNAL_ERROR)
-      {
-        Display_print0(dispHandle, 0, 0, "***ERROR***");
-        Display_print0(dispHandle, 2, 0, ">> INTERNAL FW ERROR!");
-      }
-      else
-      {
-        Display_print0(dispHandle, 0, 0, "***ERROR***");
-        Display_print0(dispHandle, 2, 0, ">> INTERNAL ERROR!");
-      }
-      break;
-
-    // An assert originating from an ICall failure.
-    case HAL_ASSERT_CAUSE_ICALL_ABORT:
-      Display_print0(dispHandle, 0, 0, "***ERROR***");
-      Display_print0(dispHandle, 2, 0, ">> ICALL ABORT!");
-      HAL_ASSERT_SPINLOCK;
-      break;
-
-    default:
-      Display_print0(dispHandle, 0, 0, "***ERROR***");
-      Display_print0(dispHandle, 2, 0, ">> DEFAULT SPINLOCK!");
-      HAL_ASSERT_SPINLOCK;
-  }
-
-  return;
-}
-
-
-/*******************************************************************************
+/*
 * @fn          exceptionHandler
 *
 * @brief       Generic spinlock to trap RTOS raised errors.
@@ -311,13 +178,11 @@ void AssertHandler(uint8 assertCause, uint8 assertSubcause)
 *
 * @return      None.
 */
-void exceptionHandler( void )
-{
-  volatile uint8 i = 1;
-  while(i);
+void exceptionHandler(void) {
+     for (;;);
 }

-/*******************************************************************************
+/*
 * @fn          smallErrorHook
 *
 * @brief       Error handler to be hooked into TI-RTOS.
@@ -332,45 +197,6 @@ void exceptionHandler( void )
 *
 * @return      None.
 */
-void smallErrorHook(Error_Block *eb)
-{
-  for (;;);
+void smallErrorHook(Error_Block *eb) {
+    for (;;);
 }
-
-#if defined (CC1350_LAUNCHXL) && defined (POWER_SAVING)
-/*******************************************************************************
- * @fn          rFSwitchNotifyCb
- *
- * @brief       Power driver callback to toggle RF switch on Power state
- *              transitions.
- *
- * input parameters
- *
- * @param   eventType - The state change.
- * @param   eventArg  - Not used.
- * @param   clientArg - Not used.
- *
- * @return  Power_NOTIFYDONE to indicate success.
- */
-static uint8_t rFSwitchNotifyCb(uint8_t eventType, uint32_t *eventArg,
-                                uint32_t *clientArg)
-{
-  if (eventType == PowerCC26XX_ENTERING_STANDBY)
-  {
-    // Power down RF Switch
-    PIN_setOutputValue(radCtrlHandle, Board_DIO30_SWPWR, 0);
-  }
-  else if (eventType == PowerCC26XX_AWAKE_STANDBY)
-  {
-    // Power up RF Switch
-    PIN_setOutputValue(radCtrlHandle, Board_DIO30_SWPWR, 1);
-  }
-
-  // Notification handled successfully
-  return Power_NOTIFYDONE;
-}
-#endif //CC1350_LAUNCHXL || POWER_SAVING
-
-
-/*******************************************************************************
- */
@@ -0,0 +1,247 @@
+
+#ifndef AD5940
+#define AD5940
+
+static void AD5940_init(){
+    select_REG(0x0908);//initiation
+    w16_REG(0x02C9);
+    select_REG(0x0C08);
+    w16_REG(0x206C);
+    select_REG(0x21F0);
+    w16_REG(0x0010);
+    select_REG(0x0410);
+    w16_REG(0x02C9);
+    select_REG(0x0A28);
+    w16_REG(0x0009);
+    select_REG(0x238C);
+    w16_REG(0x0104);
+    select_REG(0x0A04);
+    w16_REG(0x4859);
+    select_REG(0x0A04);
+    w16_REG(0xF27B);
+    select_REG(0x0A00);
+    w16_REG(0x8009);
+    select_REG(0x0A04);
+    w16_REG(0x4859);
+    select_REG(0x22F0);
+    w16_REG(0x0000);
+}
+
+static void AD5940_sftreset(){
+    select_REG(0x0424);
+    w16_REG(0xA158);
+    CPUdelay(200);
+}
+
+static void AD5940_HWReset(){
+    PIN_setOutputValue(pin_handle, AD_reset, 0);
+    CPUdelay(2000); // 200us
+    PIN_setOutputValue(pin_handle, AD_reset, 1);
+    CPUdelay(5000); // 500us
+}
+
+static void setEIS_EIS (void)
+{
+    select_REG(LPDACCON0);  //2128 //DC on
+    w32_REG(0x00000001); //LPDAC enabled
+    select_REG(LPDACSW0);  //2124  //operation
+    w32_REG(0b111111); //0b101011
+
+    select_REG(HSRTIACON);
+    w32_REG(0x00000000); //200R //1pF
+
+    select_REG(ADCCON);  //21A8
+    w32_REG(0x00000101);
+    select_REG(DFTCON);
+    w32_REG(0x00000091);
+    select_REG(SWCON);  //200C
+    w32_REG(0x00026355); //D5 | P5 | N3 | T6 | T9   0b010 0110 0011 0101 0101
+
+    if (instru.ADCGainLv != HSRTIA_GAIN_AUTO) {
+        instru.AutoGainEnable = 0;
+        HSTIAGainCtrl(instru.ADCGainLv);
+    } else {
+        instru.AutoGainEnable = 1;
+        instru.ADCGainLv = HSRTIA_200R;
+        HSTIAGainCtrl(instru.ADCGainLv);
+    }
+
+    DAC_outputV(instru.dcbias + CaliTable.DAC_offset * 200);
+    SetWGAmp(instru.acamp);
+
+    select_REG(0x2000);  //2000
+    w32_REG(0x0031CFC0);
+
+    //HIGH POWER MODE
+    select_REG(0x22F0); //PWMB
+    w32_REG(0x0000000D); //switch to active high power mode
+    select_REG(0x0414);
+    w16_REG(0x0000);
+    select_REG(0x0420);
+    w16_REG(0xA815);
+    select_REG(0x0408); //16bit system clock divider
+    w16_REG(0x0442); //set divider = 2
+    select_REG(0x20BC); //HSOSCCON
+    w32_REG(0x00000000); //switch to 32MHz output
+    select_REG(0x2044);
+    w32_REG(0x00000311);
+    select_REG(0x2010); //HSDACCON
+    w32_REG(0x0000000E); //DAC gain = 2, > 80 kHz
+    select_REG(0x238C); //ADCBUFCON
+    w32_REG(0x005F3D0F); //recommended
+    SetEISHIGHZ(0);
+}
+
+static void setEIS_CV (void)
+{
+   //Clock and Ref
+    select_REG(0x0414); //CLKSEL
+    w16_REG(0x0);
+    select_REG(0x20BC); //HSOSCCON
+    w32_REG(0x00000004); //16 MHz output
+    select_REG(0x2180); //BUFSENCON
+    w32_REG(0x00000037); //0b110110
+
+    //Configure LPDAC LPTIA
+    select_REG(0x2050); //LPREFBUFCON
+    w32_REG(0x0); //enable lpref and lp 2.5V buffer
+    select_REG(0x2124); //LPDACSW0
+    w32_REG(0x0000003E);
+    select_REG(0x20E4); //LPTIASW0
+    w32_REG(0x00008034); // SW2 | SW4 | SW5
+    select_REG(0x20EC); //LPTIACON0
+    w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
+    select_REG(0x2128); //LPDACCON0
+    w32_REG(0x00000001);
+
+    //Configure ADC | ADCDAT (0x2074)
+    select_REG(0x21A8); //ADCCON
+    w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
+    select_REG(0x2044); //ADCFILTERCON
+    w32_REG(0x00002011); // Sinc3 En | SINC3OSR2 | SINC2OSR22
+    select_REG(0x20D0); //DFTCON
+    w32_REG(0x00000001); // Sinc2 to DFT | DFTNUM4
+
+    //AFE and PWMB
+    select_REG(0x2000); //AFECON
+    w32_REG(0x00098780); //ADC on //0b10011000011110000000
+    select_REG(0x22F0); //PWMB
+    w32_REG(0x00000005);//fc 50kHz, low power mode
+
+
+//    //Clock and Ref
+//    select_REG(CLKSEL); //CLKSEL
+//    w16_REG(0x0);
+//    select_REG(HSOSCCON); //HSOSCCON
+//    w32_REG(0x00000004); //16 MHz output
+//    select_REG(0x2180); //BUFSENCON
+//    w32_REG(0x00000037); //0b110110
+//
+//    //Configure LPDAC LPTIA
+//    select_REG(LPREFBUFCON); //LPREFBUFCON
+//    w32_REG(0x0); //enable lpref and lp 2.5V buffer
+//    select_REG(LPDACSW0); //LPDACSW0
+//    w32_REG(0x0000003E);
+//    select_REG(LPTIASW0); //LPTIASW0
+//    w32_REG(0x00008034); // SW2 | SW4 | SW5
+//    select_REG(LPTIACON0); //LPTIACON0
+//    w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
+//    select_REG(LPDACCON0); //LPDACCON0
+//    w32_REG(0x00000001);
+//
+//    //Configure ADC | ADCDAT (0x2074)
+//    select_REG(ADCCON); //ADCCON
+//    w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
+//    select_REG(ADCFILTERCON); //ADCFILTERCON
+//    w32_REG(0x00014091); //AVR 4 | Sinc3 En | OSR 5
+////    w32_REG(0x00012011); //Disable avr | sinc3 enable | osr 2
+//    select_REG(DFTCON); //DFTCON
+//    w32_REG(0x00100031); //sinc3 + average input for DFT | DFTNUM 32
+//
+//    //AFE and PMWB
+//    select_REG(AFECON); //AFECON
+//    w32_REG(0x00098780); //ADC on //0b10011000011110000000
+//    select_REG(PMBW); //PMWB
+//    w32_REG(0x00000005);//fc 50kHz, low power mode
+}
+
+static void HS_cali_config (void)
+{
+    select_REG(LPDACCON0);  //2128 //DC on
+    w32_REG(0x00000001); //LPDAC enabled
+    select_REG(LPDACSW0);  //2124  //operation
+    w32_REG(0b111111); //0b101011
+
+    select_REG(DE0RESCON);  //20F8 //DE0's gain
+    w32_REG(0x000000FF);
+//    select_REG(HSRTIACON);
+//    w32_REG(0x00000200); //4pF + 200R
+
+    select_REG(ADCCON);  //21A8
+    w32_REG(0x00000101);
+    select_REG(DFTCON);  //20D0
+    w32_REG(0x00000091);
+    select_REG(SWCON);  //200C
+    w32_REG(0x00026355); //D5 | P5 | N3 | T6 | T9   0b010 0110 0011 0101 0101
+//    w32_REG(0x00026905); //0b010 0110 1001 0000 0101
+
+    select_REG(AFECON);  //2000
+    w32_REG(0x0030CFC0);
+
+    //HIGH POWER MODE
+    select_REG(PMBW); //PMWB
+    w32_REG(0x0000000D); //switch to active high power mode
+    select_REG(CLKSEL);
+    w16_REG(0x0000);
+    select_REG(CLKCON0KEY);
+    w16_REG(0xA815);
+    select_REG(CLKCON0); //16bit system clock divider
+    w16_REG(0x0442); //set divider = 2
+    select_REG(HSOSCCON); //HSOSCCON
+    w32_REG(0x00000000); //switch to 32MHz output
+    select_REG(ADCFILTERCON); //ADCFILTERCON
+    w32_REG(0x000000D0); //ADC data rate = 1.6MHz // 2 samples to average
+    select_REG(HSDACCON); //HSDACCON
+    w32_REG(0x0000000E); //DAC gain = 2, > 80 kHz
+    select_REG(ADCBUFCON); //ADCBUFCON
+    w32_REG(0x005F3D0F); //recommended
+}
+static void LP_cali_config (void)
+{
+   //Clock and Ref
+    select_REG(0x0414); //CLKSEL
+    w16_REG(0x0);
+    select_REG(0x20BC); //HSOSCCON
+    w32_REG(0x00000004); //16 MHz output
+    select_REG(0x2180); //BUFSENCON
+    w32_REG(0x00000037); //0b110110
+
+    //Configure LPDAC LPTIA
+    select_REG(0x2050); //LPREFBUFCON
+    w32_REG(0x0); //enable lpref and lp 2.5V buffer
+    select_REG(0x2124); //LPDACSW0
+    w32_REG(0x0000003E);
+    select_REG(0x20E4); //LPTIASW0
+    w32_REG(0x00008034); // SW2 | SW4 | SW5
+    select_REG(0x20EC); //LPTIACON0
+    w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
+    select_REG(0x2128); //LPDACCON0
+    w32_REG(0x00000001);
+
+    //Configure ADC | ADCDAT (0x2074)
+    select_REG(0x21A8); //ADCCON
+    w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
+    select_REG(0x2044); //ADCFILTERCON
+    w32_REG(0x00006091); //AVR 4 | Sinc3 En | OSR 2
+//    w32_REG(0x00012011); //Disable avr | sinc3 enable | osr 2
+    select_REG(0x20D0); //DFTCON
+    w32_REG(0x001000C1); //sinc3 + average input for DFT | dftnum max
+
+    //AFE and PWMB
+    select_REG(0x2000); //AFECON
+    w32_REG(0x00098780); //ADC on //0b10011000011110000000
+    select_REG(0x22F0); //PWMB
+    w32_REG(0x00000005);//fc 50kHz, low power mode
+}
+
+#endif
@@ -0,0 +1,179 @@
+{
+  "name": "Elite-ZM",
+  "version": "1.2.30",
+  "match_rule": {
+    "local_name_pattern": "Elite-ZM.+",
+    "major_product_number": 0,
+    "minor_product_number": 2,
+    "major_version_number": 1,
+    "minor_version_number": 2
+  },
+  "constant": {
+    "ADC_CHANNEL_NUMBER": [
+      12,
+      13,
+      14,
+      15
+    ],
+    "VOLT_MAX": 4095
+  },
+  "parameters": {
+    "CHANNEL": {
+      "description": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": [
+        0,
+        1,
+        2
+      ]
+    },
+    "SAMPLE_RATE": {
+      "description": "data sampling rate",
+      "record_meta": true,
+      "domain": "constant",
+      "value": 1
+    },
+    "AMP_GAIN": {
+      "description": "amp gain",
+      "record_meta": true,
+      "domain": "constant",
+      "value": 1
+    },
+    "MODE": {
+      "description": "working mode",
+      "value": [
+        "I-V Curve",
+        "Cyclic Voltammetry",
+        "Function Generator",
+        "Z-T Curve",
+        "V-T Curve",
+        "I-T Curve",
+        "ADC test"
+      ]
+    },
+    "VOLT_ORIGIN": {
+      "description": "Origin Voltage of Scan",
+      "domain": [
+        "VOLT_MAX"
+      ]
+    },
+    "VOLT_FINAL": {
+      "description": "The last Voltage of Scan",
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": "1365 * VALUE"
+    },
+    "VOLT_STEP": {
+      "description": "Voltage Step",
+      "domain": [
+        5
+      ]
+    },
+    "STEP_TIME": {
+      "description": "How much time between two step",
+      "domain": [
+        4
+      ]
+    },
+    "DAC_VOLT": {
+      "description": "DAC output Voltage",
+      "domain": [
+        "VOLT_MAX"
+      ]
+    },
+    "ADC_CHANNEL": {
+      "description": "read ADC data",
+      "value": [
+        "ANA0",
+        "ANA1",
+        "ANA2",
+        "ANA3"
+      ]
+    }
+  },
+  "instruction": {
+    "start": [
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "curve_iv",
+          "1": "curve_cv",
+          "2": "func_gen",
+          "6": "adc_test"
+        }
+      }
+    ],
+    "data_format": [
+      "_data_format('TDC4VAF2')"
+    ],
+    "curve_iv": [
+      "data_format",
+      "_notify(True)",
+      "curve_iv0",
+      "_sync(True)",
+      "VIS_STI"
+    ],
+    "curve_iv0": {
+      "type": "RIS",
+      "parameter": {
+        "va": "(VOLT_ORIGIN + 1) * 0x0010",
+        "vb": "(VOLT_FINAL + 1) * 0x0010",
+        "dv": "VOLT_STEP * 0x40",
+        "dt": "STEP_TIME * 0x12"
+      },
+      "data": [
+        "1X10;2B>va;2B>vb;B>dv;B>dt"
+      ]
+    },
+    "curve_cv": [
+      "data_format",
+      "_notify(True)",
+      "curve_cv0",
+      "_sync(True)",
+      "VIS_STI"
+    ],
+    "curve_cv0": {
+      "type": "RIS",
+      "parameter": {
+        "va": "(VOLT_ORIGIN + 1) * 0x0010",
+        "vb": "(VOLT_FINAL + 1) * 0x0010",
+        "dv": "VOLT_STEP * 0x40",
+        "dt": "STEP_TIME * 0x12"
+      },
+      "data": [
+        "1X20;2B>va;2B>vb;B>dv;B>dt"
+      ]
+    },
+    "func_gen": [
+      "data_format",
+      "func_gen0",
+      "VIS_STI"
+    ],
+    "func_gen0": {
+      "type": "RIS",
+      "parameter": {
+        "v": "(DAC_VOLT + 1) * 0x0010"
+      },
+      "data": [
+        "X30;X30;2B>v"
+      ]
+    },
+    "adc_test": [
+      "data_format",
+      "_notify(True)",
+      "adc_test0",
+      "_sync(True)",
+      "VIS_STI"
+    ],
+    "adc_test0": {
+      "type": "RIS",
+      "data": [
+        "X90;B>ADC_CHANNEL"
+      ]
+    }
+  }
+}
+
+
@@ -0,0 +1,246 @@
+//
+//#ifndef Elite15_PIN
+//#define Elite_15PIN
+//
+//#include "Elite_PIN.h"
+//
+//static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow) {
+//    switch (latch_num) {
+//        case LOAD0: {
+//            switch (elite_pin) {
+//                case D0: {
+//                    LH.LATCH0[0] = highlow;
+//                    break;
+//                }
+//                case D1: {
+//                    LH.LATCH0[1] = highlow;
+//                    break;
+//                }
+//                case D2: {
+//                    LH.LATCH0[2] = highlow;
+//                    break;
+//                }
+//                case D3: {
+//                    LH.LATCH0[3] = highlow;
+//                    break;
+//                }
+//                case D4: {
+//                    LH.LATCH0[4] = highlow;
+//                    break;
+//                }
+//                case D5: {
+//                    LH.LATCH0[5] = highlow;
+//                    break;
+//                }
+//                case D6: {
+//                    LH.LATCH0[6] = highlow;
+//                    break;
+//                }
+//                case D7: {
+//                    LH.LATCH0[7] = highlow;
+//                    break;
+//                }
+//                default: {
+//                    break;
+//                }
+//            }
+//            break;
+//        }
+//        case LOAD1: {
+//            switch (elite_pin) {
+//                case D0: {
+//                    LH.LATCH1[0] = highlow;
+//                    break;
+//                }
+//                case D1: {
+//                    LH.LATCH1[1] = highlow;
+//                    break;
+//                }
+//                case D2: {
+//                    LH.LATCH1[2] = highlow;
+//                    break;
+//                }
+//                case D3: {
+//                    LH.LATCH1[3] = highlow;
+//                    break;
+//                }
+//                case D4: {
+//                    LH.LATCH1[4] = highlow;
+//                    break;
+//                }
+//                case D5: {
+//                    LH.LATCH1[5] = highlow;
+//                    break;
+//                }
+//                case D6: {
+//                    LH.LATCH1[6] = highlow;
+//                    break;
+//                }
+//                case D7: {
+//                    LH.LATCH1[7] = highlow;
+//                    break;
+//                }
+//                default: {
+//                    break;
+//                }
+//            }
+//            break;
+//        }
+//        case LOAD2: {
+//            switch (elite_pin) {
+//                case D0: {
+//                    LH.LATCH2[0] = highlow;
+//                    break;
+//                }
+//                case D1: {
+//                    LH.LATCH2[1] = highlow;
+//                    break;
+//                }
+//                case D2: {
+//                    LH.LATCH2[2] = highlow;
+//                    break;
+//                }
+//                case D3: {
+//                    LH.LATCH2[3] = highlow;
+//                    break;
+//                }
+//                case D4: {
+//                    LH.LATCH2[4] = highlow;
+//                    break;
+//                }
+//                case D5: {
+//                    LH.LATCH2[5] = highlow;
+//                    break;
+//                }
+//                case D6: {
+//                    LH.LATCH2[6] = highlow;
+//                    break;
+//                }
+//                case D7: {
+//                    LH.LATCH2[7] = highlow;
+//                    break;
+//                }
+//                default: {
+//                    break;
+//                }
+//            }
+//             break;
+//        }
+//        default: {
+//            break;
+//        }
+//    }
+//}
+//
+//static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow) {
+//    ELITE15_SPI_CLOSE();
+//    add_elite_pin();
+//    update_latch_status (latch_num, pin_num, highlow);
+////    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
+//
+//    switch (latch_num) {
+//        case LOAD0: {
+////            PIN_setOutputValue(&ZM_rst, D0, LH.LATCH0[0]);
+////            PIN_setOutputValue(&ZM_rst, D1, LH.LATCH0[1]);
+////            PIN_setOutputValue(&ZM_rst, D2, LH.LATCH0[2]);
+////            PIN_setOutputValue(&ZM_rst, D3, LH.LATCH0[3]);
+//            PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);
+//            PIN_setOutputValue(pin_handle, D5, LH.LATCH0[5]);
+//            PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);
+//            PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);
+//            break;
+//        }
+//        case LOAD1: {
+//            PIN_setOutputValue(pin_handle, D0, LH.LATCH1[0]);
+//            PIN_setOutputValue(pin_handle, D1, LH.LATCH1[1]);
+//            PIN_setOutputValue(pin_handle, D2, LH.LATCH1[2]);
+//            PIN_setOutputValue(pin_handle, D3, LH.LATCH1[3]);
+//            PIN_setOutputValue(pin_handle, D4, LH.LATCH1[4]);
+//            PIN_setOutputValue(pin_handle, D5, LH.LATCH1[5]);
+//            PIN_setOutputValue(pin_handle, D6, LH.LATCH1[6]);
+//            PIN_setOutputValue(pin_handle, D7, LH.LATCH1[7]);
+//            break;
+//        }
+//        case LOAD2: {
+//            PIN_setOutputValue(pin_handle, D0, LH.LATCH2[0]);
+//            PIN_setOutputValue(pin_handle, D1, LH.LATCH2[1]);
+//            PIN_setOutputValue(pin_handle, D2, LH.LATCH2[2]);
+//            PIN_setOutputValue(pin_handle, D3, LH.LATCH2[3]);
+//            PIN_setOutputValue(pin_handle, D4, LH.LATCH2[4]);
+//            PIN_setOutputValue(pin_handle, D5, LH.LATCH2[5]);
+//            PIN_setOutputValue(pin_handle, D6, LH.LATCH2[6]);
+//            PIN_setOutputValue(pin_handle, D7, LH.LATCH2[7]);
+//            break;
+//        }
+//        default: {
+//            break;
+//        }
+//    }
+//    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
+////    CPUdelay(10);
+//    PIN_setOutputValue(&ZM_rst, latch_num, 0);               // Turn off latch
+//    remove_elite_pin();
+//    ELITE15_SPI_HOLD();
+//}
+//
+//static void Init_Elite15_PIN () {
+//    InitLH();
+//    add_elite_pin();
+//
+//    PIN_setOutputValue(pin_handle, D0, 0);
+//    PIN_setOutputValue(pin_handle, D1, 0);
+//    PIN_setOutputValue(pin_handle, D2, 0);
+//    PIN_setOutputValue(pin_handle, D3, 0);
+//    PIN_setOutputValue(pin_handle, D4, 0);
+//    PIN_setOutputValue(pin_handle, D5, 0);
+//    PIN_setOutputValue(pin_handle, D6, 0);
+//    PIN_setOutputValue(pin_handle, D7, 0);
+//    PIN_setOutputValue(pin_handle, LOAD0, 0);
+//    PIN_setOutputValue(pin_handle, LOAD1, 1);
+//    PIN_setOutputValue(pin_handle, LOAD2, 1);
+//    CPUdelay(10);
+//    PIN_setOutputValue(pin_handle, LOAD1, 0);
+//    PIN_setOutputValue(pin_handle, LOAD2, 0);
+//
+//
+//    PIN_setOutputValue(pin_handle, D0, 0);
+//    PIN_setOutputValue(pin_handle, D1, 0);
+//    PIN_setOutputValue(pin_handle, D2, 0);
+//    PIN_setOutputValue(pin_handle, D3, 0);
+//    PIN_setOutputValue(pin_handle, D4, 1);
+//    PIN_setOutputValue(pin_handle, D5, 1);
+//    PIN_setOutputValue(pin_handle, D6, 1);
+//    PIN_setOutputValue(pin_handle, D7, 1);
+//    CPUdelay(10);
+//    PIN_setOutputValue(pin_handle, LOAD0, 1);
+//    PIN_setOutputValue(pin_handle, LOAD0, 0);
+//
+//    remove_elite_pin();
+//
+////    InitLH();
+////    add_elite_pin();
+////
+////    PIN_setOutputValue(pin_handle, LOAD0, 1);
+////    PIN_setOutputValue(pin_handle, LOAD1, 1);
+////    PIN_setOutputValue(pin_handle, LOAD2, 1);
+////    CPUdelay(10);
+////    PIN_setOutputValue(pin_handle, D0, 0);
+////    PIN_setOutputValue(pin_handle, D1, 0);
+////    PIN_setOutputValue(pin_handle, D2, 0);
+////    PIN_setOutputValue(pin_handle, D3, 0);
+////    PIN_setOutputValue(pin_handle, D4, 0);
+////    PIN_setOutputValue(pin_handle, D5, 0);
+////    PIN_setOutputValue(pin_handle, D6, 0);
+////    PIN_setOutputValue(pin_handle, D7, 0);
+////    CPUdelay(10);
+////    PIN_setOutputValue(pin_handle, LOAD0, 0);
+////    PIN_setOutputValue(pin_handle, LOAD1, 0);
+////    PIN_setOutputValue(pin_handle, LOAD2, 0);
+////
+////    remove_elite_pin();
+//}
+//
+//
+//
+//
+//#endif
@@ -0,0 +1,111 @@
+#ifndef ELITECV3
+#define ELITECV3
+
+#define Vset instru.Vset
+
+static void cv_vscan(void)
+{
+    struct wm_cv_ctx_t *cv = (struct wm_cv_ctx_t *)wm_get();
+    static bool VminCounter;
+    static bool VmaxCounter;
+
+    NotifyCycleNumber = (instru.cycleNumber - cv->_cycleNumber + 1);
+
+    if (vscanReset) {
+        VmaxCounter = false;
+        VminCounter = false;
+
+        if (instru.directionInit == 1) {
+            cv->_direction_up         = true;
+            cv->_current_direction_up = true;
+        } else {
+            cv->_direction_up         = false;
+            cv->_current_direction_up = false;
+        }
+
+//        Vstep = x * 20 * N, x=xmV ; N=VscanRate   Vstep unit [5nV]/[0.1ms]
+        if (instru.step <= 10) {
+            cv->_Vstep = instru.step *  instru.VsetRate / 5;
+        } else {
+            cv->_Vstep = instru.step / 5 *  instru.VsetRate;
+        }
+
+
+        if (cv->_Vmin == cv->_Vinit) {
+            VminCounter = true;
+        }
+        if (cv->_Vmax == cv->_Vinit) {
+            VmaxCounter = true;
+        }
+
+        Vset = cv->_Vinit;
+    }
+
+    if (!vscanReset) {
+        cv->bFirst = false;
+        if ((instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) ||
+        (instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2)
+        ) {
+            if (cv->_current_direction_up) {
+                Vset = Vset + cv->_Vstep; //* GPT.GptimerMultiple;
+            } else {
+                Vset = Vset - cv->_Vstep; //* GPT.GptimerMultiple;
+            }
+
+            if (instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) {
+                if (Vset == cv->_Vmin) {
+                    VminCounter = true;
+                    instru.Vinit = instru.Vmin;
+                    cv->_Vinit = cv->_Vmin;
+                }
+            } else if (instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2) {
+                if (Vset == cv->_Vmax) {
+                    VmaxCounter = true;
+                    instru.Vinit = instru.Vmax;
+                    cv->_Vinit = cv->_Vmax;
+                }
+            }
+        } else {
+            if (Vset >= cv->_Vmax) {
+                VmaxCounter = true;
+            } else if (Vset <= cv->_Vmin) {
+                VminCounter = true;
+            }
+
+            if (cv->_current_direction_up) {
+                Vset = Vset + cv->_Vstep;// * GPT.GptimerMultiple;
+            } else {
+                Vset = Vset - cv->_Vstep;// * GPT.GptimerMultiple;
+            }
+
+            if (VmaxCounter && VminCounter) {
+                if (cv->_direction_up && cv->_current_direction_up) {
+                    if (Vset >= cv->_Vinit) {
+                        cv->_cycleNumber--;
+                        VminCounter = false;
+                        VmaxCounter = false;
+                    }
+                }
+                if (!cv->_direction_up && !cv->_current_direction_up) {
+                    if (Vset <= cv->_Vinit) {
+                        cv->_cycleNumber--;
+                        VminCounter = false;
+                        VmaxCounter = false;
+                    }
+                }
+            }
+
+            if (Vset >= cv->_Vmax) {
+                cv->_current_direction_up = false;
+            } else if (Vset <= cv->_Vmin) {
+                cv->_current_direction_up = true;
+            }
+
+            /*stop condition*/
+            if (cv->_cycleNumber == 0) {
+                PeriodicEvent = false;
+            }
+        }
+    }
+}
+#endif
@@ -0,0 +1,365 @@
+
+#ifndef EliteDAC
+#define EliteDAC
+
+static bool DACReset;
+
+
+//#ifdef ELITE_VERSION_1_3
+//#define DACOUT 0x30
+//
+//static void DAC_outputV(uint16_t voltLV) {
+//    // C = command, X = don't care, D = data
+//    // CCCC XXXX = command
+//    // DDDD DDDD = v1
+//    // DDDD XXXX = v2
+//
+//    uint8_t v1, v2 = 0;
+//    v1 = (uint8_t) (voltLV >> 4) & 0xFF;
+//    v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
+//
+//    spi_DACtxbuf[0] = command;
+//    spi_DACtxbuf[1] = v1;
+//    spi_DACtxbuf[2] = v2;
+//    for (int i = 3; i < SPI_DAC_SIZE; i++) {
+//        spi_DACtxbuf[i] = 0;
+//    }
+//
+//    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+//}
+//#endif
+
+//#ifdef ELITE_VERSION_1_4
+//#define DACCLS 0x02
+//#define DACOUT 0x31
+//
+//static uint16_t DAC_outputV(uint16_t voltLV) {
+//    // C = command, X = don't care, D = data
+//    // CCCC CCCC = command
+//    // DDDD DDDD = v1
+//    // DDDD DDDD = v2
+//
+//    // command
+//    // 0x02 = clear
+//    // 0x31 = output voltage
+//
+//    uint8_t v1, v2 = 0;
+//    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
+//    v2 = (uint8_t) (voltLV & 0x00FF);
+//
+//    spi_DACtxbuf[0] = DACOUT;
+//    spi_DACtxbuf[1] = v1;
+//    spi_DACtxbuf[2] = v2;
+//
+//    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+//
+//    return voltLV;
+//}
+//#endif
+
+
+#define VBIAS_LSB       107422          // 2200/4096 [mV] = 107422 [5nV]
+#define VZERO_LSB       6875008         // VBIAS_LSB * 64
+#define DAC12BIT_LSB    107422
+
+static int32_t DAC_outputV(int32_t voltLV) {   // LPDAC output, voltLV = Vbias-Vzero
+    static int32_t vztemp, vscan;
+    static uint32_t vb, vz, vbcode, vzcode, DACOutCode = 0;
+
+    vztemp = (-0.45 * voltLV) + 249000000;
+    if (voltLV < 0) {
+        vztemp -= DAC12BIT_LSB;
+    }
+    vzcode = (vztemp - 40000000 + VZERO_LSB / 2) / VZERO_LSB;
+    vz = vzcode * VZERO_LSB + 40000000;
+
+    vb = voltLV + vz;
+    vbcode = ((vb - 40000000 + VBIAS_LSB / 2) / VBIAS_LSB);
+    DACOutCode = (0x0003FFFF & ((vzcode << 12) + vbcode));
+
+    DACOutCode = Cali_LPDAC(DACOutCode);
+
+    select_REG(LPDACDAT0);
+    w32_REG(DACOutCode);
+
+    vscan = (int32_t)(vb - vz) / 200;
+    return vscan;
+}
+
+static uint32_t DAC_outputF(uint32_t freq) {
+    select_REG(WGFCW);
+    w32_REG(freq);
+    return freq;
+}
+
+static void VoutGainControl(uint8_t VOUTLevel){
+    if(VOUTLevel == 0){
+        // VOUT gain level = 0, using 240K resister
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 0);
+    }
+    else if(VOUTLevel == 1){
+        // VOUT gain level = 1, using 15K resister
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
+    }
+    else if(VOUTLevel == 2){
+        // VOUT gain level = 2, using 15K resister
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
+    }
+    else{
+        // default using 15K resister
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
+    }
+    record_flag = false;
+}
+
+static uint32_t CalcPeriod(uint32_t freq){ //One Second = 10000
+
+    uint32_t period;
+
+    if (freq == 1) {
+        period = 666667;
+    } else {
+        period = (1000000 + freq / 2) / freq; // [sec]
+    }
+
+    if (period < 20){
+        period = 20;
+    }
+
+    return period;
+}
+
+static uint32_t CalcDelayTime(uint32_t freq){
+    uint32_t delayTime, decadeSamplingTime;
+    delayTime = CalcPeriod(freq) * instru.delay;    //get delay time
+    if (delayTime < 20) {
+        delayTime = 20;
+    } else {
+        delayTime = (delayTime + 5) / 10;
+    }
+
+    // 1000Hz
+    if (freq >= 100000) {
+        decadeSamplingTime = 1025;
+    }
+
+    // 100Hz
+    else if (freq >= 10000) {
+        decadeSamplingTime = 1025;
+    }
+
+    // 10Hz
+    else if (freq >= 1000) {
+        decadeSamplingTime = 11393;
+    }
+
+    // 1Hz
+    else if (freq >= 100) {
+        decadeSamplingTime = 91034;
+    }
+
+    //0.1Hz
+    else if (freq >= 10) {
+        decadeSamplingTime = 550000;
+    }
+
+    // 0.015Hz | 136s
+    else if (freq >= 1) {
+        decadeSamplingTime = 1360000;
+    }
+
+    delayTime += decadeSamplingTime; //delay+reading time
+
+    return delayTime;
+}
+
+static uint32_t User2Freq(uint32_t UserCode){
+    uint32_t freq;
+    freq = (UserCode * 149 + 50)/ 100;
+    return freq; //[100mHz]
+}
+
+static uint32_t Freq2DAC(uint32_t freq){
+    uint32_t code;
+    code = (freq * 100 + 75) / 149;
+    return code; //return code
+}
+
+// DAC Vout theoretical boundary <300, 100~ (mV)
+#define DAC_VOUT_GAIN_SMALL_BOUNDARY           100000  // 25500(usercode) = 100 mV
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY           300000  // 26500(usercode) = 300 mV
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE   26500  // 26500(usercode) = 300 mV
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE  23500  // 23500(usercode) = -300 mV
+
+static void AutoGainChangeVout(int32_t userCode){
+    int32_t RealVolt = (userCode - 25000) * 200; // (userCode - 25000) / 5 * 1000  [1uV]
+    // switch to 1 level volt(small)   15K
+    // switch to 2 level volt(large)   240K
+
+    if(instru.VoutGainLevel == VOUT_GAIN_AUTO){
+        instru.VoutGainLevel = VOUT_GAIN_15K;
+        VoutGainControl(instru.VoutGainLevel);
+    }
+
+    if(instru.VoutGainLevel == VOUT_GAIN_15K){
+        if(RealVolt > DAC_VOUT_GAIN_LARGE_BOUNDARY || RealVolt < -1 * DAC_VOUT_GAIN_LARGE_BOUNDARY){
+            // switch to 2 level volt(large)
+            instru.VoutGainLevel = VOUT_GAIN_240K;
+            VoutGainControl(instru.VoutGainLevel);
+        }
+    }
+    else if(instru.VoutGainLevel == VOUT_GAIN_240K){
+        if(RealVolt < DAC_VOUT_GAIN_SMALL_BOUNDARY && RealVolt > -1 * DAC_VOUT_GAIN_SMALL_BOUNDARY ){
+            // switch to 1 level volt(small)
+            instru.VoutGainLevel = VOUT_GAIN_15K;
+            VoutGainControl(instru.VoutGainLevel);
+        }
+    }
+}
+
+static void SetWGAmp(uint16_t ampcode){
+//    uint32_t amplitude = Cali_HSAMP(ampcode);
+
+//    static uint64_t amp_cutoff = 40000000;
+//    uint32_t corrected_amp;
+//
+//    corrected_amp = ((uint64_t)ampcode * 800 * 1000 / 2047) * (1 + ((uint64_t)instru.fset * (uint64_t)instru.fset) / (amp_cutoff * amp_cutoff)); //[uV]
+//
+//    ampcode = corrected_amp * 2047 / 800000;
+
+    select_REG(WGCON);
+    w32_REG(0x0); // 0x0: DC disable ac first
+    select_REG(WGAMPLITUDE);
+    w32_REG(ampcode);
+    select_REG(WGCON);
+    w32_REG(0x00000004); //0x4: Sinusoid
+}
+
+static void SetEISHIGHZ(uint8_t ret){
+    uint32_t code;
+
+    select_REG(LPTIASW0); //LPTIASW0
+    code = r32_REG();
+    code = (code & (~(1 << 2))) | (ret << 2); //ret = 0 HighZ on | ret = 1 HighZ off
+    w32_REG(code);
+}
+
+static void HSDAC_GainControl(uint8_t G_EXA_PGA) {
+/* Set the Gain value of PGA and Excitation amp */
+    uint32_t reg = 0;
+    uint8_t DACUpdateRate = 0x07;
+
+    switch (G_EXA_PGA) {
+        case 0x00:{
+            reg = 0x00000000;
+            break;
+        }
+        case 0x01:{
+            reg = 0x00000001;
+            break;
+        }
+        case 0x10:{
+            reg = 0x00001000;
+            break;
+        }
+        case 0x11:{
+            reg = 0x00001001;
+            break;
+        }
+        default:{
+            reg = 0x0000000E;       // Default update rate = 7
+            break;
+        }
+    }
+
+    reg = reg | ((uint32_t)(DACUpdateRate) << 1);
+    select_REG(HSDACCON);                 // HSDACCON address
+    w32_REG(reg);
+}
+
+static void HSDAC_output(uint16_t amp) {
+/* Set and write the amplitude of HSDAC. Full scale: 0x0200 ~ 0x0E00, 0x0800 = 0V */
+/* Set and write the amplitude of HSDAC. Full scale: 512 ~ 3584, 2048 = 0V */
+    uint32_t amplitude = 0;
+
+    if (amp > 0x0E00) {
+        amplitude = 0x00000E00;
+    } else if (amp < 0x0200) {
+        amplitude = 0x00000200;
+    } else {
+        amplitude = (uint32_t) (amp & 0x0FFF);
+    }
+
+    select_REG(HSDACDAT);                 // HSDACDAT address
+    w32_REG(amplitude);
+}
+
+static void PowerMode_CutoffFrequencyControl (uint8_t bandwidth, uint8_t PowerMode) {
+    uint32_t reg = 0;
+
+    switch (bandwidth) {
+        case cutoff_auto :{
+            reg = (((uint32_t)(cutoff_auto)) & 0x0000000F) << 2;
+            break;
+        }
+        case cutoff_50k :{
+            reg = (((uint32_t)(cutoff_50k)) & 0x0000000F) << 2;
+            break;
+        }
+        case cutoff_100k :{
+            reg = (((uint32_t)(cutoff_100k)) & 0x0000000F) << 2;
+            break;
+        }
+        case cutoff_250k :{
+            reg = (((uint32_t)(cutoff_250k)) & 0x0000000F) << 2;
+            break;
+        }
+        default :{
+            reg = (((uint32_t)(cutoff_auto)) & 0x0000000F) << 2;
+            break;
+        }
+    }
+
+    switch (PowerMode) {
+        case LOW_PW_MODE :{
+            reg = reg | ((uint32_t)(LOW_PW_MODE) & 0x00000000F);
+            break;
+        }
+        case HIGH_PW_MODE :{
+            reg = reg | ((uint32_t)(HIGH_PW_MODE) & 0x00000000F);
+            break;
+        }
+        default :{
+            break;
+        }
+    }
+
+    select_REG(PMBW);
+    w32_REG(reg);
+}
+
+static int32_t cali_DAC_outputV(int32_t voltLV) {   // LPDAC output, voltLV = Vbias-Vzero
+    static int32_t vztemp, vscan;
+    static uint32_t vb, vz, vbcode, vzcode, DACOutCode = 0;
+
+    vztemp = (-0.45 * voltLV) + 249000000;
+    if (voltLV < 0) {
+        vztemp -= DAC12BIT_LSB;
+    }
+    vzcode = (vztemp - 40000000 + VZERO_LSB / 2) / VZERO_LSB;
+    vz = vzcode * VZERO_LSB + 40000000;
+
+    vb = voltLV + vz;
+    vbcode = ((vb - 40000000 + VBIAS_LSB / 2) / VBIAS_LSB);
+    DACOutCode = (0x0003FFFF & ((vzcode << 12) + vbcode));
+
+    select_REG(LPDACDAT0);
+    w32_REG(DACOutCode);
+
+    vscan = (int32_t)(vb - vz) / 200;
+//    InputNotify(NOTIFY_VOLT, voltLV);
+//    InputNotify(NOTIFY_CURRENT, vztemp);
+    return vscan;
+}
+
+#endif
@@ -0,0 +1,150 @@
+
+#ifndef ELITEEIS
+#define ELITEEIS
+
+static void eis_fscan(void)
+{
+    struct wm_eis_ctx_t *eis = (struct wm_eis_ctx_t *)wm_get();
+
+    if (vscanReset) {
+        eis->_in_reset_flag = true;
+
+        eis->_f1 = User2Freq(eis->_f1);
+        eis->_f2 = User2Freq(eis->_f2);
+        eis->_fmax = User2Freq(eis->_fmax);
+        eis->_fmin = User2Freq(eis->_fmin);
+
+        if (instru.directionInit == 1) {
+            eis->_direction_up         = true;
+        } else if (instru.directionInit == 0) {
+            eis->_direction_up         = false;
+        }
+
+        eis->_decades = CalcDecade(instru.fmin, instru.fmax);
+
+        instru.fset = eis->_f1;
+
+        vscanReset = false;
+    }
+
+    if (!vscanReset) {
+        if(eis->_direction_up) {
+            if(eis->_sweepIndex == 0){
+                if(eis->_decadeIndex < eis->_decades) {
+                    eis->_fd1 = eis->_f1 * TenPowerTable[eis->_decadeIndex];
+                    eis->_fd2 = eis->_f1 * TenPowerTable[eis->_decadeIndex + 1];
+                } else if (eis->_decadeIndex == eis->_decades) {
+                    eis->_fd1 = eis->_fd2;//eis->_f1 * TenPowerTable[decadeIndex];
+                    eis->_fd2 = eis->_fmax;
+                }
+            }
+
+            if(eis->_decadeIndex != 0 && eis->_sweepIndex == 0){
+                eis->_sweepIndex++;
+            }
+
+            if(instru.scale == 0) { // logarithm
+                if (eis->_ppd == 10) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable10[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 9){
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable9[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 8) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable8[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 7) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable7[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 6) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable6[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 5) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable5[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 4) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable4[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 3) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable3[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 2) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable2[eis->_sweepIndex] + 500)/ 1000;
+                }
+            }
+            else if (instru.scale == 1) { // linear
+                instru.fset = eis->_fd1 + eis->_sweepIndex * ((eis->_fd2 - eis->_fd1) / (eis->_ppd - 1));
+            }
+
+            if(instru.fset > eis->_fmax){
+                instru.fset = eis->_fmax;
+            }
+
+        } else { //reverse
+            if(eis->_sweepIndex == 0){
+                if(eis->_decadeIndex < eis->_decades){
+                    eis->_fd1 = eis->_f1 / TenPowerTable[eis->_decadeIndex];
+                    eis->_fd2 = eis->_f1 / TenPowerTable[eis->_decadeIndex + 1];
+                } else if (eis->_decadeIndex == eis->_decades){
+                    eis->_fd1 = eis->_fd2; //eis->_f1 / TenPowerTable[eis->_decadeIndex];
+                    eis->_fd2 = eis->_fmin;
+                }
+            }
+
+            if(eis->_decadeIndex != 0 && eis->_sweepIndex == 0){
+                eis->_sweepIndex++;
+            }
+
+            if(instru.scale == 0) { // logarithm
+                if (eis->_ppd == 10) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable10[9 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 9) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable9[8 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 8) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable8[7 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 7) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable7[6 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 6) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable6[5 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 5) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable5[4 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 4) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable4[3 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 3) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable3[2 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 2) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable2[1 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+            }
+            else if(instru.scale == 1) { // linear
+                instru.fset = eis->_fd1 - eis->_sweepIndex * ((eis->_fd1 - eis->_fd2) / (eis->_ppd - 1));
+            }
+
+            if(instru.fset < eis->_fmin){
+                instru.fset = eis->_fmin;
+            }
+        }
+        if (!gainChange_flag) {
+            if (++eis->_sweepIndex == eis->_ppd) {
+                eis->_sweepIndex = 0;
+                eis->_decadeIndex ++;
+            }
+        }
+    }
+
+
+    SetSamplingTime(instru.fset);
+
+    instru.sampleRate = 2000;
+}
+
+#endif
+
@@ -0,0 +1,41 @@
+
+#ifndef ELITE_FLAG_CT_INIT
+#define ELITE_FLAG_CT_INIT
+
+// CT counter
+struct _CT{
+    uint32_t SampleRate_counter;
+    uint16_t StepTimeCounter;
+    uint16_t NotifyCounter;
+}CT = {0};
+
+// GPT counter
+struct _GPT{
+    uint32_t GptimerCounter;
+    uint32_t GptimerCounter0;
+    uint8_t  DeltaGptimerCounter;
+    uint32_t SampleRateCounter;
+    uint32_t NotifyCounter;
+    uint32_t VscanRateCounter;
+    uint32_t LeadTimeCounter;
+    uint32_t DelayTimeCounter;
+    uint32_t BatteryADCCounter;
+    uint32_t BatteryCheckCounter;
+    uint32_t GptimerMultiple;
+    uint32_t StiCounter;
+}GPT = {0};
+
+static void InitGPT(){
+    GPT.GptimerCounter      = 0;
+    GPT.GptimerCounter0     = 0;
+    GPT.DeltaGptimerCounter = 0;
+    GPT.SampleRateCounter   = 0;
+    GPT.NotifyCounter       = 0;
+    GPT.VscanRateCounter    = 0;
+    GPT.LeadTimeCounter     = 0;
+    GPT.DelayTimeCounter    = 0;
+    GPT.BatteryADCCounter   = 0;
+    GPT.BatteryCheckCounter = 0;
+    GPT.StiCounter          = 0;
+}
+#endif
@@ -0,0 +1,38 @@
+/* Copyright (c) 2019. BioPro. Scientific.
+ */
+#ifndef HEADSTAGE_GPTIMER_H
+#define HEADSTAGE_GPTIMER_H
+
+#include <Board.h>
+#include <ti/drivers/timer/GPTimerCC26XX.h>
+#include <ti/sysbios/BIOS.h>
+#include <xdc/runtime/Types.h>
+
+#define EVT_PERIODIC_GPTIMER EVT_PERIODIC_0
+
+static GPTimerCC26XX_Handle gptimer_handle;
+
+static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask);
+
+#define elite_gptimer_start() GPTimerCC26XX_start(gptimer_handle)
+#define elite_gptimer_stop() GPTimerCC26XX_stop(gptimer_handle)
+#define elite_gptimer_close() GPTimerCC26XX_close(gptimer_handle)
+#define CLOCK_FREQ 4769  // clock freq = 0.1 ms(4800), Measured(4769)
+
+#define elite_gptimer_open()                                                                          \
+    do {                                                                                              \
+        GPTimerCC26XX_Params params;                                                                  \
+        GPTimerCC26XX_Params_init(&params);                                                           \
+        params.width          = GPT_CONFIG_16BIT;                                                     \
+        params.mode           = GPT_MODE_PERIODIC_DOWN;                                               \
+        params.debugStallMode = GPTimerCC26XX_DEBUG_STALL_OFF;                                        \
+        gptimer_handle        = GPTimerCC26XX_open(Board_GPTIMER0A, &params);                         \
+        Types_FreqHz  freq;                                                                           \
+        BIOS_getCpuFreq(&freq);                                                                       \
+        GPTimerCC26XX_Value loadVal = freq.lo / 1000 - 1; /*47999*/                                   \
+        GPTimerCC26XX_setLoadValue(gptimer_handle, loadVal);                                          \
+        GPTimerCC26XX_setLoadValue(gptimer_handle, CLOCK_FREQ); /* 0.1 ms*/                           \
+        GPTimerCC26XX_registerInterrupt(gptimer_handle, elite_gptimer_callback, GPT_INT_TIMEOUT);     \
+    } while (0)
+
+#endif  // HEADSTAGE_GPTIMER_H
@@ -0,0 +1,95 @@
+
+#ifndef ELITE_I2C
+#define ELITE_I2C
+
+/*
+* Read I2C example in
+* http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/tirtos/2_14_02_22/
+*        exports/tirtos_full_2_14_02_22/docs/doxygen/html/_i2_c_c_c26_x_x_8h.html
+*
+*/
+
+#include <ti/drivers/I2C.h>
+#include <ti/drivers/Power.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+// I2C
+static I2C_Handle I2Chandle;
+static I2C_Params I2Cparams;
+static I2C_Transaction i2cTrans;
+
+#define I2CBufSize 4
+static uint8_t I2CtxBuf[I2CBufSize];      // Transmit buffer
+static uint8_t I2CrxBuf[I2CBufSize];      // Receive buffer
+bool transferDone = false;
+
+static void I2CCallbackFunction(I2C_Handle handle, I2C_Transaction *msg, bool transfer) {
+    if(transfer){
+        transferDone = true;
+    }
+}
+
+static void I2Cinit(){
+    I2C_init();
+
+    // Configure I2C parameters.
+    I2C_Params_init(&I2Cparams);
+
+    I2Cparams.transferMode  = I2C_MODE_CALLBACK;
+    I2Cparams.transferCallbackFxn = I2CCallbackFunction;
+    I2Cparams.bitRate  = I2C_100kHz;
+
+    // Initialize master I2C transaction structure
+    i2cTrans.writeCount   = I2CBufSize;
+    i2cTrans.writeBuf     = I2CtxBuf;
+    i2cTrans.readCount    = I2CBufSize;
+    i2cTrans.readBuf      = I2CrxBuf;
+    i2cTrans.slaveAddress = 0xA0;
+
+    for(int i=0 ; i<10 ; i++){
+        I2CtxBuf[i] = 0;
+        I2CrxBuf[i] = 0;
+    }
+
+    // Open I2C
+    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
+
+}
+#define WriteMem 0b10100001
+#define ReadMem  0b10100000
+
+static void I2CWrite(uint8_t addr, uint8_t data){
+    for(int i=0 ; i<I2CBufSize ; i++){
+        I2CtxBuf[i] = 0;
+        I2CrxBuf[i] = 0;
+    }
+
+    I2CtxBuf[0] = WriteMem;
+    I2CtxBuf[1] = addr;
+    I2CtxBuf[2] = data;
+
+//    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
+    I2C_transfer(I2Chandle, &i2cTrans);
+//    I2C_close(I2Chandle);
+}
+
+
+static void I2CRead(uint8_t addr){
+    for(int i=0 ; i<I2CBufSize ; i++){
+        I2CtxBuf[i] = 0;
+        I2CrxBuf[i] = 0;
+    }
+
+    I2CtxBuf[0] = ReadMem;
+    I2CtxBuf[1] = addr;
+
+//    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
+    I2C_transfer(I2Chandle, &i2cTrans);
+//    I2C_close(I2Chandle);
+}
+
+
+#endif  // ELITE_I2C
+
@@ -0,0 +1,20 @@
+
+#ifndef ELITEIV
+#define ELITEIV
+
+#define Vset instru.Vset
+
+static void vo_vscan(void)
+{
+    struct wm_vo_ctx_t *vo = (struct wm_vo_ctx_t *)wm_get();
+
+    if (vscanReset) {
+        Vset = vo->_Vinit;
+    }
+
+    if(!vscanReset) {
+        Vset = vo->_Vinit;
+    }
+}
+
+#endif
@@ -0,0 +1,305 @@
+#ifndef __INSTR_H__
+#define __INSTR_H__
+
+#ifdef __cpulsplus
+extern "C" {
+#endif
+
+/*==============================
+ ==== headstage instruction ====
+ =============================*/
+struct HEADSTAGE_INSTRUCTION {
+    uint8_t  chip_id;
+    uint8_t  eliteFxn;
+
+    /** DAC parameter **/
+    uint8_t  VsetRateIndex;
+    uint32_t VsetRate;
+    int32_t  Vset;
+    uint16_t VoltConstant;
+    uint8_t  directionInit;
+    uint32_t step;
+    uint16_t Ve1;
+    uint16_t Ve2;
+    int32_t  Vinit;
+    int32_t  Vmax;
+    int32_t  Vmin;
+
+    /** EIS **/
+    uint32_t f1;
+    uint32_t f2;
+    uint32_t fmax;
+    uint32_t fmin;
+    uint32_t fset;
+    uint16_t dcbias;
+    uint16_t delay;
+    uint16_t acamp;
+    uint8_t  avgnum;
+    uint8_t  rtia;
+    uint16_t ppd;
+    uint8_t  scale;
+    int32_t  real;
+    int32_t  imag;
+    uint8_t  periodIndex;
+    uint32_t delayTime;
+    uint8_t  settingIndex;
+
+
+    /** ADC parameter **/
+    uint8_t  notifyRateIndex;
+    uint32_t sampleRate;
+    uint8_t  VoViSwitch;
+    uint8_t  AutoGainEnable;
+    uint8_t  VinAutoGainEnable;
+    uint8_t  VoutAutoGainEnable;
+    uint8_t  ADCGainLv;
+
+     // voltage output gain
+    uint16_t VoutGainLevel;
+    uint8_t  VinADCGainLv;
+
+    /** Notify parameter **/
+    uint32_t notifyRate;
+
+    /** mode parameter **/
+    uint16_t cycleNumber;
+    uint8_t  charge;
+    int32_t  constantCurrent;
+    int32_t  Currentmax;
+    int32_t  sti_v1;
+    int32_t  sti_v2;
+    int32_t  sti_v3;
+    int32_t  sti_v4;
+    int32_t  sti_v5;
+    int32_t  sti_v6;
+    int32_t  sti_v7;
+    int32_t  sti_t1;
+    int32_t  sti_t2;
+    int32_t  sti_t3;
+    int32_t  sti_t4;
+    int32_t  sti_t5;
+    int32_t  sti_t6;
+    int32_t  sti_t7;
+    uint16_t sti_cy;
+    uint16_t sti_loop;
+
+    uint16_t StepTime;
+
+    uint8_t AdcChannel;
+
+    /* EIS DAC parameter */
+    uint8_t DAC_type;
+    uint16_t VAmpSet;          // DAC Voltage Amplitude
+
+    /* EIS ADC parameter */
+    uint8_t  HSTIAGainLv;
+    uint8_t  HSTIAAutoGainEnable;
+    uint8_t  LPTIAGainLv;
+    uint8_t  LPTIAAutoGainEnable;
+} instru = {0};
+
+/** Iin, Vin, Vout **/
+#define EIS_HSTIA           0x00
+#define EIS_LPTIA           0x01
+#define EIS_HSDAC           0x02
+#define EIS_LPDAC           0x03
+#define VOUT_DAC            0x04
+#define IIN_ADC             0x05
+#define VIN_ADC             0x06
+#define HIGH_Z              0x07
+
+/** ADC Iin gain level **/
+#define I_GAIN_3M           0x07    // largest gain
+#define I_GAIN_100K         0x08
+#define I_GAIN_3K           0x09
+#define I_GAIN_100R         0x0A    // the least gain
+#define I_GAIN_AUTO         0x04
+
+// EIS LPTIA Iin Gain Level //
+#define LPRTIA_512K         0x00
+#define LPRTIA_12K          0x01
+#define LPRTIA_4K           0x02
+#define LPRTIA_200R         0x03
+#define LPRTIA_GAIN_AUTO    0x04
+
+// EIS HSTIA Iin Gain Level
+#define HSRTIA_160K         0x00
+#define HSRTIA_20K          0x01
+#define HSRTIA_5K           0x02
+#define HSRTIA_200R         0x03
+#define HSRTIA_GAIN_AUTO    0x04
+
+/** ADC Vin gain level **/
+#define VIN_GAIN_1M         0x00
+#define VIN_GAIN_30K        0x01
+#define VIN_GAIN_1K         0x02
+#define VIN_GAIN_AUTO       0x03
+
+/** Vout gain level **/
+#define VOUT_GAIN_240K      0x00
+#define VOUT_GAIN_15K       0x01
+#define VOUT_GAIN_AUTO      0x02
+
+/* DAC reset parameter */
+#define DAC_ZERO            25000
+#define EIS_HSDAC_ZERO      0x0800
+
+// Step time macro
+#define STEPTIME_HALF_SEC   5000
+#define STEPTIME_ONE_SEC    10000
+#define STEPTIME_TWO_SEC    20000
+
+/* AVG Number */
+#define AVG2               0
+#define AVG4               1
+#define AVG8               2
+#define AVG16              3
+
+#define ADC1M6sps          0
+#define ADC800Ksps         1
+
+#define Sinc3OSR5          0
+#define Sinc3OSR4          1
+#define Sinc3OSR2          2
+
+#define Sinc2OSR22         0
+#define Sinc2OSR44         1
+#define Sinc2OSR89         2
+#define Sinc2OSR178        3
+#define Sinc2OSR267        4
+#define Sinc2OSR533        5
+#define Sinc2OSR640        6
+#define Sinc2OSR667        7
+#define Sinc2OSR800        8
+#define Sinc2OSR889        9
+#define Sinc2OSR1067      10
+#define Sinc2OSR1333      11
+
+#define DFTNUM4            0
+#define DFTNUM8            1
+#define DFTNUM16           2
+#define DFTNUM32           3
+#define DFTNUM64           4
+#define DFTNUM128          5
+#define DFTNUM256          6
+#define DFTNUM512          7
+#define DFTNUM1024         8
+#define DFTNUM2048         9
+#define DFTNUM4096        10
+#define DFTNUM8192        11
+#define DFTNUM16384       12
+
+#define AD5940_SYS_CLOCK    16000000
+#define Cutoff_Freq         37000000  // 210kHz
+
+///* LPTIA gain Level */
+//#define LPRTIA200R         1        //Max 3mA
+//#define LPRTIA4K           5        //Max 220uA
+//#define LPRTIA12K          9        //Max 74uA
+//#define LPRTIA512K        26        //Max 1.76uA
+
+static uint32_t HSRTIATable[4] = {160000, 20000, 5000, 200};
+
+/* HSTIA gain level (feedback R value) */
+#define RTIA200R            0x00        // 200R
+#define RTIA1k              0x01        // 1k
+#define RTIA5k              0x02        // 5k
+#define RTIA10k             0x03        // 10k
+#define RTIA20k             0x04        // 20k
+#define RTIA40k             0x05        // 40k
+#define RTIA80k             0x06        // 80k
+#define RTIA160k            0x07        // 160k
+#define RTIAopen            0x08        // RTIA is open
+/*********************************************************************
+ * @fn      InitEliteInstruction
+ *
+ * @brief   Init all INSTRUCTION variable.
+ *
+ * @param   None.
+ *
+ * @return  None.
+ */
+static void InitEliteInstruction(){
+    instru.chip_id              = 0;
+    instru.eliteFxn             = 0;         //default is a null event
+    instru.VsetRateIndex        = 0;
+    instru.VsetRate             = 2;
+    instru.Vset                 = 0;
+    instru.VoltConstant         = DAC_ZERO; //DAC_ZERO is about 0V
+    instru.directionInit        = 1;        //0:reverse        1:forward
+    instru.step                 = 0;
+    instru.Ve1                  = DAC_ZERO;
+    instru.Ve2                  = DAC_ZERO;
+    instru.Vinit                = 0;
+    instru.Vmax                 = 0;
+    instru.Vmin                 = 0;
+    instru.notifyRateIndex      = 100;
+    instru.sampleRate           = 15;
+    instru.VoViSwitch           = 0x01;    //0:user see Vo     1: user see Vi
+    instru.AutoGainEnable       = 1;
+    instru.VinAutoGainEnable    = 1;
+    instru.VoutAutoGainEnable   = 1;
+    instru.ADCGainLv            = I_GAIN_AUTO;
+    instru.VoutGainLevel        = VOUT_GAIN_AUTO;
+    instru.VinADCGainLv         = VIN_GAIN_AUTO;
+    instru.notifyRate           = STEPTIME_ONE_SEC;
+    instru.cycleNumber          = 1;
+    instru.charge               = 1;      //0:discharge        1:charge
+    instru.constantCurrent      = 0;
+    instru.Currentmax           = 0;
+    instru.StepTime             = STEPTIME_ONE_SEC;
+    instru.AdcChannel           = 0;
+
+    //EIS
+    instru.f1                   = 0;
+    instru.f2                   = 0;
+    instru.fset                 = 0;
+    instru.fmax                 = 0;
+    instru.fmin                 = 0;
+    instru.delay                = 0;
+    instru.scale                = 0;
+    instru.avgnum               = 0;
+    instru.dcbias               = 0;
+    instru.acamp                = 0;
+    instru.rtia                 = 0;
+    instru.ppd                  = 1;
+    instru.periodIndex          = 0;
+    instru.delayTime            = 0;
+    instru.settingIndex         = 0;
+
+
+    //pulse mode
+    instru.sti_t1          = 0;
+    instru.sti_t2          = 0;
+    instru.sti_t3          = 0;
+    instru.sti_t4          = 0;
+    instru.sti_t5          = 0;
+    instru.sti_t6          = 0;
+    instru.sti_t7          = 0;
+    instru.sti_v1          = DAC_ZERO;
+    instru.sti_v2          = DAC_ZERO;
+    instru.sti_v3          = DAC_ZERO;
+    instru.sti_v4          = DAC_ZERO;
+    instru.sti_v5          = DAC_ZERO;
+    instru.sti_v6          = DAC_ZERO;
+    instru.sti_v7          = DAC_ZERO;
+    instru.sti_loop        = 1;
+    instru.sti_cy          = 0;
+
+    // EIS DAC
+    instru.VAmpSet              = EIS_HSDAC_ZERO;
+    instru.DAC_type             = EIS_HSDAC;
+
+    // EIS ADC
+    instru.HSTIAGainLv            = 0;
+    instru.HSTIAAutoGainEnable    = 1;
+    instru.LPTIAGainLv            = 0;
+    instru.LPTIAAutoGainEnable    = 1;
+}
+
+#ifdef __cpulsplus
+}
+#endif
+#endif
+
+
@@ -0,0 +1,77 @@
+
+#ifndef ELITEKEYDETECT
+#define ELITEKEYDETECT
+
+static bool TurnOnElite(uint8_t key) {
+    static uint16_t TurnOnCounter = 0;
+
+    if (key == 0) {
+        // press 1 sec, power on LED, read bat power
+        if (TurnOnCounter >= CLOCK_ONE_SECOND) {
+//            headstage_battery_volt();
+//            uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
+//                           ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+//            if( bat < 768 && bat > 20){
+//                PIN_setOutputValue(pin_handle, enable_5v, 0);
+//                return false;
+//            }else{
+                PIN_setOutputValue(pin_handle, enable_5v, 1);  // enable 5V
+                Elite_SPI_init();
+                // TurnOn10V();
+                ModeLED(BT_WAIT);
+                AD5940_init();
+                return true;
+//            }
+        } else {
+            TurnOnCounter++;
+            return false;
+        }
+    } else {
+        TurnOnCounter = 0;
+        PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
+        return false;
+    }
+}
+
+static void EliteKeyPress(uint8_t key) {
+    static uint16_t ShutDownCounter = 0;
+    static uint8_t OriginEliteFxn  = 0;
+
+    if (key == 0) {
+        // key = 0 if press
+        // press key => bight LED
+
+        if (ShutDownCounter == CLOCK_ONE_SECOND) {
+            KEYLED();
+        }
+
+        // press 3~4 sec, shutdown 2650
+        else if (ShutDownCounter > (CLOCK_ONE_SECOND*3) ) {
+            LED_color(DARKLED, 0xFF, 0xFF, 0x00);
+            PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
+        }
+        ShutDownCounter ++;
+    } else {
+        if (OriginEliteFxn == instru.eliteFxn) {  // old function == currunt instruction
+            if (ShutDownCounter != 0) {
+                // dark LED
+                checkFlafLED();
+                ShutDownCounter = 0;
+            }
+        } else {  // old function != currunt instruction
+            OriginEliteFxn = instru.eliteFxn;
+            if (ShutDownCounter != 0) {
+                ShutDownCounter = 0;
+            }
+            checkFlafLED();
+        }
+    }
+}
+
+static void TurnOn10V() {
+    If10Von = true;
+    PIN_setOutputValue(pin_handle, enable_10v, 1);
+    CPUdelay(8000);
+}
+
+#endif
@@ -0,0 +1,188 @@
+
+#ifndef ELITELED
+#define ELITELED
+
+#define DARKLED                  0xE1
+#define LIGHTLED                 0xE8
+
+static void WorkModeLED();
+
+static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
+    spi_LEDtxbuf[0] = 0x0000;
+    spi_LEDtxbuf[1] = 0x0000;
+    for (int i = 2; i < SPI_LED_SIZE - 2; i += 2) {
+        spi_LEDtxbuf[i]     = 0xE000 | ((uint16_t)bright << 8) | blue;
+        spi_LEDtxbuf[i + 1] = ((uint16_t)green << 8) | red;
+    }
+
+    spi_LEDtxbuf[SPI_LED_SIZE - 2] = 0xffff;
+    spi_LEDtxbuf[SPI_LED_SIZE - 1] = 0xffff;
+
+    LED_SPI(SPI_LED_SIZE, spi_LEDtxbuf, spi_LEDrxbuf);
+}
+
+static void Elite_led_color(uint16_t color){
+    switch (color) {
+        case COLOR_RED: {
+            LED_color(DARKLED, 0xFF, 0x00, 0x00);
+            break;
+        }
+        case COLOR_ORANGE: {
+            LED_color(DARKLED, 0xFF, 0x58, 0x09);
+            break;
+        }
+        case COLOR_YELLOW: {
+            LED_color(LIGHTLED, 0xFF, 0x80, 0x00);
+            break;
+        }
+        case COLOR_GREEN: {
+            LED_color(DARKLED, 0x00, 0xFA, 0x00);
+            break;
+        }
+        case COLOR_YELLOWGREEN: {
+            LED_color(DARKLED, 0x64, 0xA6, 0x00);
+            break;
+        }
+        case COLOR_BLUE: {
+            LED_color(DARKLED, 0x00, 0x00, 0xAA);
+            break;
+        }
+        case COLOR_CYAN: {
+            LED_color(DARKLED, 0x00, 0x40, 0x40);
+            break;
+        }
+        case COLOR_MAGENTA: {
+            LED_color(DARKLED, 0xFF, 0x00, 0x80);
+            break;
+        }
+        case COLOR_PURPLE: {
+            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
+            break;
+        }
+        case COLOR_WHITE: {
+            LED_color(DARKLED, 0xCA, 0xFF, 0xFF);
+            break;
+        }
+        case COLOR_BLACK: {
+            LED_color(0x00, 0x00, 0x00, 0x00);
+            break;
+        }
+        //dark LED
+        case COLOR_YELLOW_DARK: {
+            LED_color(DARKLED, 0xFF, 0x80, 0x00);
+            break;
+        }
+        case COLOR_GREEN_DARK: {
+            LED_color(DARKLED, 0x00, 0x33, 0x00);
+            break;
+        }
+        case COLOR_BLUE_DARK: {
+            LED_color(DARKLED, 0x00, 0x00, 0x33);
+            break;
+        }
+        case COLOR_CYAN_DARK: {
+            LED_color(DARKLED, 0x00, 0x10, 0x10);
+            break;
+        }
+        case COLOR_PURPLE_DARK: {
+            LED_color(DARKLED, 0x55, 0x00, 0x55);
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+}
+
+static void ModeLED(uint16_t modeStatus) {
+    btWaitLedFlag   = 0;
+    noEventLedFlag  = 0;
+    preWorkLedFlag  = 0;
+    workingLedFlag  = 0;
+    postWorkLedFlag = 0;
+
+    switch (modeStatus) {
+    case BT_WAIT: {
+        btWaitLedFlag = 1;
+        BT_WAIT_LED();
+        break;
+    }
+    case NO_EVENT: {
+        noEventLedFlag = 1;
+        LEDPowerON();
+        break;
+    }
+    case PRE_WORK: {
+        preWorkLedFlag = 1;
+        Elite_led_color(COLOR_BLUE);
+        break;
+    }
+    case WORKING: {
+        workingLedFlag = 1;
+        WorkModeLED();
+        break;
+    }
+    case POST_WORK: {
+        postWorkLedFlag = 1;
+        Elite_led_color(COLOR_BLUE);
+        break;
+    }
+    default: {
+        LEDPowerON();
+        break;
+    }
+    }
+}
+
+static void checkFlafLED()
+{
+    if(btWaitLedFlag == 1){
+        ModeLED(BT_WAIT);
+    }
+    else if(noEventLedFlag == 1){
+        ModeLED(NO_EVENT);
+    }
+    else if(preWorkLedFlag == 1){
+        ModeLED(PRE_WORK);
+    }
+    else if(workingLedFlag == 1){
+        ModeLED(WORKING);
+    }
+    else if(postWorkLedFlag == 1){
+        ModeLED(POST_WORK);
+    }
+}
+
+static void WorkModeLED()
+{
+    switch (instru.eliteFxn) {
+        case CURVE_EIS:
+        case CURVE_EIS_CV:
+            WORKLED();
+            break;
+
+        case CURVE_CALI_ADC:
+            if (instru.AdcChannel == IIN_ADC) {
+                Elite_led_color(COLOR_RED);
+            } else if (instru.AdcChannel == VIN_ADC) {
+                Elite_led_color(COLOR_ORANGE);
+            } else if (instru.AdcChannel == VOUT_DAC) {
+                Elite_led_color(COLOR_BLUE);
+            }else if (instru.AdcChannel == EIS_HSDAC) {
+                Elite_led_color(COLOR_PURPLE_DARK);
+            } else if (instru.AdcChannel == EIS_HSTIA) {
+                Elite_led_color(COLOR_WHITE);
+            } else if (instru.AdcChannel == EIS_LPTIA) {
+                Elite_led_color(COLOR_RED);
+            } else if (instru.AdcChannel == EIS_LPDAC) {
+                Elite_led_color(COLOR_BLUE);
+            }
+            break;
+
+        default:
+            break;
+
+    }
+}
+
+#endif
@@ -0,0 +1,16 @@
+
+#ifndef ELITE_LATCH_INIT
+#define ELITE_LATCH_INIT
+
+static void InitLH() {
+    for (int i=0; i<LATCH_BUFF_SIZE; i++) {
+        LH.LATCH0[i]       = 0;
+        LH.LATCH1[i]       = 0;
+        LH.LATCH2[i]       = 0;
+    }
+    LH.LoadState    = 0;
+}
+
+
+#endif
+
@@ -0,0 +1,192 @@
+/**
+ * notify data buffer.
+ * the length equals to the characteristic 4 which value is 20 bytes.
+ *
+ */
+
+#ifndef ELITENOTIFY
+#define ELITENOTIFY
+
+#include "headstage.h"
+
+/*notify's input type*/
+#define NOTIFY_CURRENT   0
+#define NOTIFY_VOLT      1
+#define NOTIFY_IMPEDANCE 2
+#define NOTIFY_VOLT_BAT  3
+
+#define NOT_BUF_OFFSET_INIT 8
+
+/**
+ * the index where to start insert data into buffer.
+ * start from 6.
+ */
+static size_t   not_buf_offset = NOT_BUF_OFFSET_INIT;
+static uint32_t not_time_stamp;
+
+static uint8_t  NotifyCurrent[4]   = {0};
+static uint8_t  NotifyVolt[4]      = {0};
+static uint8_t  NotifyImpedance[4] = {0};
+static uint8_t  NotifyVoltBat[4]   = {0};
+static uint16_t NotifyCycleNumber  = 0;
+static uint8_t  finishMode         = 0;
+
+// ****************** New Notify Format ******************************** //
+/*
+ * Notify format
+ *
+ *
+         |               |   1           |       2       |           3   |
+         0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2
+         -----------------------------------------------------------------
+         |    header     |
+         |    current                                                    |
+         | voltage or impedance                                          |
+         |  mode & gain  |
+         |    time stamp                                                 |
+         |  cycle number |
+
+
+    mode & gain
+        this byte include Elite working mode and ADC gain level
+        we use "(mode & 0xF0) | (gain & 0x0F)" to encode these two information
+
+     cycle number
+         for cyclic voltammetry use, we save it as channel number.
+         0xFF
+
+  * header = device ID
+  * I = current (0.001nA), V = voltage (mV),
+  * Z = impedance (k ohm), T = time (ms)
+  *
+  *
+*/
+// ********* End New Format Notify ***************************************** //
+
+/*
+ * Notify format
+ *
+ *
+         |               |   1           |       2       |           3   |
+         0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2
+         -----------------------------------------------------------------
+         |    header     |
+         |    current                                                    |
+         |    voltage                                                    |
+         |    impedance                                                  |
+         |    time stamp                                                 |
+         |  cycle number |
+
+     cycle number
+         for cyclic voltammetry use, we save it as channel number.
+         0xFF
+
+  * header = device ID
+  * I = current (nA),    V = voltage (uV),
+  * Z = impedance (ohm), T = time (ms)
+  *
+  *
+*/
+static void SendNotify() {
+    initDATBuf();
+
+    not_buf[0] = instru.chip_id;
+
+    for (int i = 0; i < 4; i++) {
+        not_buf[i + 1] = NotifyCurrent[i]; // 1 2 3 4
+        not_buf[i + 5] = NotifyVolt[i]; // 5 6 7 8
+        not_buf[i + 9] = NotifyImpedance[i]; //9 10 11 12
+    }
+
+    // 1 Timestamp = 32 usec;  31 Timestamp ~= 1 msec
+    not_time_stamp = (Timestamp_get32()) / 31;  // msec
+
+    not_buf[13] = not_time_stamp & 0xff;
+    not_buf[14] = (not_time_stamp >> 8) & 0xff;
+    not_buf[15] = (not_time_stamp >> 16) & 0xff;
+    not_buf[16] = (not_time_stamp >> 24) & 0xff;
+
+    not_buf[17] = (NotifyCycleNumber >> 8) & 0xff;
+    not_buf[18] = NotifyCycleNumber & 0xff;
+
+    not_buf[19] = (finishMode << 7) & 0x80 | instru.ADCGainLv & 0x0F;
+
+    for (int i = 20; i < BLE_DAT_BUFF_SIZE; i++){
+        not_buf[i] = 0;
+    }
+
+    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
+}
+
+static void initDATBuf(){
+    for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++){
+        not_buf[i] = 0;
+    }
+}
+
+static void initINSBuf(){
+    for (int i = 0; i < BLE_INS_BUFF_SIZE; i++){
+        ins_buf[i] = 0;
+    }
+}
+
+static void initCISBuf(){
+    for (int i = 0; i < BLE_CIS_BUFF_SIZE; i++){
+        cis_buf[i] = 0;
+    }
+}
+
+static void initRawDataBuf(){
+    not_time_stamp    = 0;
+    NotifyCycleNumber = 0;
+    finishMode        = 0;
+
+    for (int i = 0; i < 4; i++){
+        NotifyCurrent[i]   = 0;
+        NotifyVolt[i]      = 0;
+        NotifyImpedance[i] = 0;
+    }
+}
+
+static void FlushNotify(){
+    initRawDataBuf();
+    initDATBuf();
+
+    not_buf[0] = instru.chip_id;
+
+    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
+}
+
+static void InputNotify(int NotifyType, int32_t Data){
+
+    switch (NotifyType) {
+        case NOTIFY_CURRENT:
+            NotifyCurrent[0] = (uint8_t)((Data & 0xFF000000) >> 24);
+            NotifyCurrent[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
+            NotifyCurrent[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
+            NotifyCurrent[3] = (uint8_t)(Data & 0x000000FF);
+            break;
+
+        case NOTIFY_IMPEDANCE:
+            NotifyImpedance[0] = (uint8_t)((Data & 0xFF000000) >> 24);
+            NotifyImpedance[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
+            NotifyImpedance[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
+            NotifyImpedance[3] = (uint8_t)(Data & 0x000000FF);
+            break;
+
+        case NOTIFY_VOLT :
+            NotifyVolt[0] = (uint8_t)((Data & 0xFF000000) >> 24);
+            NotifyVolt[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
+            NotifyVolt[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
+            NotifyVolt[3] = (uint8_t)(Data & 0x000000FF);
+            break;
+
+        case NOTIFY_VOLT_BAT :
+            NotifyVoltBat[0] = (uint8_t)((Data & 0xFF000000) >> 24);
+            NotifyVoltBat[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
+            NotifyVoltBat[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
+            NotifyVoltBat[3] = (uint8_t)(Data & 0x000000FF);
+            break;
+    }
+}
+#endif
@@ -0,0 +1,84 @@
+
+#ifndef ELITERESET
+#define ELITERESET
+
+static void reset() {
+    mode_init = true;
+    megaStiEnable = false;
+    PeriodicEvent = false;     // is there an PeriodicEvent?
+    Free_Work_Mode = true;      // Free(WorkModeData)
+    InitPeriodicEvent = true;      // need to create a WorkModeData?
+
+    InitGPT();
+    initINSBuf();
+    initDATBuf();
+
+    AD5940_HWReset();
+    AD5940_init();
+//    AD5940_sftreset();
+
+//    PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
+
+    HSTIAGainCtrl(HSRTIA_200R);
+    LPTIAGainCtrl(LPRTIA_200R);
+    HSDAC_GainControl(0x00);
+    HSDAC_output(0x0800);
+
+    for (int i = 0; i < SPI_LED_SIZE; i++) {
+        spi_LEDtxbuf[i] = 0;
+        spi_LEDrxbuf[i] = 0;
+    }
+
+    for (int i = 0; i < SPI_DAC_SIZE; i++) {
+        spi_DACtxbuf[i] = 0;
+        spi_rxbuf[i]    = 0;
+    }
+
+    for (int i = 0; i < SPI_ADC_SIZE; i++) {
+        spi_ADC_txbuf[i] = 0;
+        spi_ADC_rxbuf[i] = 0;
+    }
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
+    ModeLED(NO_EVENT);
+    CPUdelay(1600);
+}
+
+static void Eliteinterrupt() {
+    mode_init = true;
+    megaStiEnable = false;
+    PeriodicEvent = false;     // is there an PeriodicEvent?
+    Free_Work_Mode = true;      // Free(WorkModeData)
+    InitPeriodicEvent = true;      // need to create a WorkModeData?
+
+    InitGPT();
+    initINSBuf();
+    initDATBuf();
+    AD5940_HWReset();
+    AD5940_init();
+
+//    HSTIAGainCtrl(HSRTIA_200R);
+//    LPTIAGainCtrl(LPRTIA_200R);
+//    HSDAC_GainControl(0x00);
+//    HSDAC_output(0x0800);
+
+    for (int i = 0; i < SPI_LED_SIZE; i++) {
+        spi_LEDtxbuf[i] = 0;
+        spi_LEDrxbuf[i] = 0;
+    }
+
+    for (int i = 0; i < SPI_DAC_SIZE; i++) {
+        spi_DACtxbuf[i] = 0;
+        spi_rxbuf[i]    = 0;
+    }
+
+    for (int i = 0; i < SPI_ADC_SIZE; i++) {
+        spi_ADC_txbuf[i] = 0;
+        spi_ADC_rxbuf[i] = 0;
+    }
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
+    ModeLED(NO_EVENT);
+    CPUdelay(8000);
+}
+#endif
@@ -0,0 +1,272 @@
+
+#ifndef ELITE_SPI
+#define ELITE_SPI
+
+/*
+* Read SPI example in
+* http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/tirtos/2_14_02_22/
+*        exports/tirtos_full_2_14_02_22/docs/doxygen/html/_s_p_i_c_c26_x_x_d_m_a_8h.html
+*/
+
+#include <Board.h>
+#include <ti/drivers/SPI.h>
+#include <ti/drivers/dma/UDMACC26XX.h>
+#include <ti/drivers/spi/SPICC26XXDMA.h>
+#include "Elite_PIN.h"
+
+/* application use SPI parameters and buffers */
+#define SPI_LED_SIZE 28
+#define SPI_DAC_SIZE 6
+#define SPI_ADC_SIZE 4
+
+static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
+static uint16_t spi_LEDrxbuf[SPI_LED_SIZE] = {0};
+
+static uint8_t spi_DACtxbuf[SPI_DAC_SIZE] = {0};
+static uint8_t spi_rxbuf[SPI_DAC_SIZE]    = {0};
+
+static uint8_t spi_ADC_txbuf[SPI_ADC_SIZE] = {0};
+static uint8_t spi_ADC_rxbuf[SPI_ADC_SIZE] = {0};
+//
+//static uint32_t SeqCmdBuff;
+
+/* system use SPI parameters */
+static SPI_Handle      spiHandle0 = NULL;  // SPI0  = LED
+static SPI_Handle      spiHandle1 = NULL;  // SPI1  = ADC +DAC
+static SPI_Params      spiParams0;
+static SPI_Params      spiParams1;
+static SPI_Transaction LED_transaction;
+static SPI_Transaction ADC_DAC_transaction;
+
+static void ELITE15_SPI_HOLD();
+static void ELITE15_SPI_CLOSE();
+
+static void Elite_SPI_init(){
+    SPI_init();
+    SPI_Params_init(&spiParams0);
+    spiParams0.bitRate     = 2000;  // 2k
+    spiParams0.mode        = SPI_MASTER;
+    spiParams0.dataSize    = 16;
+    spiParams0.frameFormat = SPI_POL0_PHA1;
+    spiHandle0 = SPI_open(Board_SPI0, &spiParams0);  // LED SPI
+
+    SPI_Params_init(&spiParams1);
+    spiParams1.bitRate     = 1000000;  // 1M
+    spiParams1.mode        = SPI_MASTER;
+    spiParams1.dataSize    = 8;
+    spiParams1.frameFormat = SPI_POL0_PHA0;
+
+    spiHandle1 = SPI_open(Board_SPI1, &spiParams1);  // ADC DAC SPI
+}
+
+static void LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
+    LED_transaction.count = length;
+    LED_transaction.txBuf = spi_txbuf;
+    LED_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle0, &LED_transaction);
+}
+
+static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+    PIN_setOutputValue(pin_handle, AD_CS, 0);      // CS_ADC
+
+    ADC_DAC_transaction.count = length;
+    ADC_DAC_transaction.txBuf = spi_txbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
+}
+
+static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+    ADC_DAC_transaction.count = length;
+    ADC_DAC_transaction.txBuf = spi_txbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+}
+
+static void ELITE15_SPI_HOLD() {
+    Elite_SPI_init();
+//    #ifdef ELITE_PIN_1_5_RE
+//    PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);   // ADC_CS
+//    PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);   // DAC_CS
+//    PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);   // update HIGH_Z_MODE
+//    #endif
+//
+//    PIN_setOutputValue(pin_handle, LOAD0, 1);
+//    PIN_setOutputValue(pin_handle, LOAD1, 0);
+//    PIN_setOutputValue(pin_handle, LOAD2, 0);
+}
+static void ELITE15_SPI_CLOSE() {
+//    PIN_setOutputValue(pin_handle, LOAD0, 0);
+//    PIN_setOutputValue(pin_handle, LOAD1, 0);
+//    PIN_setOutputValue(pin_handle, LOAD2, 0);
+
+    SPI_close(spiHandle0);
+    SPI_close(spiHandle1);
+}
+
+/* Elite1.5 Calibration SPI */
+static void CAL_ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+    ADC_DAC_transaction.count = length;
+    ADC_DAC_transaction.txBuf = spi_txbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
+}
+
+static void CAL_LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
+    LED_transaction.count = length;
+    LED_transaction.txBuf = spi_txbuf;
+    LED_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle0, &LED_transaction);
+}
+
+
+
+#ifdef ELITE_VERSION_EIS
+/* define SPI command */
+// datasheet page 98
+#define SPICMD_SETADDR  0x20
+#define SPICMD_WRITEREG 0x2D
+#define SPICMD_READREG  0x6D
+
+//define REG
+#define LPDACCON0       0x2128
+#define LPDACSW0        0x2124
+#define LPDACDAT0       0x2120
+#define LPREFBUFCON     0x2050
+#define SWMUX           0x235C
+#define LPTIASW0        0x20E4
+#define SWCON           0x200C
+#define HSDACCON        0x2010
+#define HSDACDAT        0x2048
+#define LPTIACON0       0x20EC
+#define HSTIACON        0x20FC
+#define AFECON          0x2000
+#define DSWFULLCON      0x2150
+#define NSWFULLCON      0x2154
+#define PSWFULLCON      0x2158
+#define TSWFULLCON      0x215C
+#define WGFCW           0x2030
+#define WGPHASE         0x2034
+#define WGOFFSET        0x2038
+#define WGAMPLITUDE     0x203C
+#define WGCON           0x2014
+#define DE0RESCON       0x20F8
+#define ADCCON          0x21A8
+#define DFTCON          0x20D0
+#define ADCFILTERCON    0x2044
+#define PMBW            0x22F0
+#define CLKSEL          0x0414
+#define CLKCON0         0x0408
+#define CLKCON0KEY      0x0420
+#define HSOSCCON        0x20BC
+#define ADCBUFCON       0x238C
+#define HSRTIACON       0x20F0
+#define ADCDAT          0x2074
+#define DFTREAL         0x2078
+#define DFTIMAG         0x207C
+
+static void select_REG(uint16_t addr){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+//    CPUdelay(16000);
+
+    spi_DACtxbuf[0] = SPICMD_SETADDR;
+    spi_DACtxbuf[1] = (uint8_t)((addr & 0xFF00) >> 8);
+    spi_DACtxbuf[2] = (uint8_t)(addr & 0x00FF);
+
+    ADC_DAC_transaction.count = 3;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+//    CPUdelay(16000);
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static void w16_REG(uint16_t data){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_WRITEREG;
+    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF00) >> 8);
+    spi_DACtxbuf[2] = (uint8_t)(data & 0x00FF);
+
+    ADC_DAC_transaction.count = 3;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static int16_t r16_REG(){
+    int16_t ret;
+
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_READREG;
+    spi_DACtxbuf[1] = 0x00;
+    spi_DACtxbuf[2] = 0x00;
+    spi_DACtxbuf[3] = 0x00;
+
+    ADC_DAC_transaction.count = 4;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    ret = (int16_t)spi_rxbuf[2] << 8 |    \
+          (int16_t)spi_rxbuf[3];
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+
+    return ret;
+}
+
+static void w32_REG(uint32_t data){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_WRITEREG;
+    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF000000) >> 24);
+    spi_DACtxbuf[2] = (uint8_t)((data & 0x00FF0000) >> 16);
+    spi_DACtxbuf[3] = (uint8_t)((data & 0x0000FF00) >> 8);
+    spi_DACtxbuf[4] = (uint8_t)(data & 0x000000FF);
+
+    ADC_DAC_transaction.count = 5;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static int32_t r32_REG(){
+    int32_t ret;
+
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_READREG;
+    spi_DACtxbuf[1] = 0x00;
+    spi_DACtxbuf[2] = 0x00;
+    spi_DACtxbuf[3] = 0x00;
+    spi_DACtxbuf[4] = 0x00;
+    spi_DACtxbuf[5] = 0x00;
+
+    ADC_DAC_transaction.count = 6;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    ret = (int32_t)spi_rxbuf[2] << 24 |    \
+          (int32_t)spi_rxbuf[3] << 16 |    \
+          (int32_t)spi_rxbuf[4] << 8 |     \
+          (int32_t)spi_rxbuf[5];
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+
+    return ret;
+}
+
+#endif // ELITE_EIS
+
+#endif // ELITE_SPI
@@ -0,0 +1,618 @@
+/*=============================================================================
+ =                          wm.h                                              =
+ =============================================================================*/
+#ifndef ELITE_WORK_DATA
+#define ELITE_WORK_DATA
+
+#define CLOCK_ONE_SECOND 10000 // 1s
+
+#include "EliteInstruction.h"
+
+/***** Template of Measure and VoltOut parameter *****/
+#define VOUT_PARA                    \
+    int32_t  _Vinit;                 \
+    int32_t  _Vmax;                  \
+    int32_t  _Vmin;                  \
+    int32_t  _Vset;                  \
+    uint32_t _Vstep;                 \
+    bool     _direction_up;          \
+    bool     _current_direction_up;  \
+    uint16_t _cycleNumber
+
+//#define FOUT_PARA                     \
+//    uint32_t _f1;                     \
+//    uint32_t _f2;                     \
+//    uint32_t _fd1;                    \
+//    uint32_t _fd2;                    \
+//    uint32_t _fmax;                   \
+//    uint32_t _fmin;                   \
+//    uint32_t _fset;                   \
+//    uint8_t  _decades;                \ //num of decades in whole
+//    uint16_t _ppd;                    \
+//    uint8_t  _decadeIndex;            \ //index of decade max is 8
+//    uint16_t _sweepIndex;             \ //index of smaller decade max is 10
+//    bool     _direction_up
+
+#define MEAS_CURR(_m)      (((struct wm_meas_t *)(_m))->_measureCurrent)
+#define MEAS_VIN(_m)       (((struct wm_meas_t *)(_m))->_measureVin)
+#define MEAS_VOUT(_m)      (((struct wm_meas_t *)(_m))->_measureVout)
+#define MEAS_BAT(_m)       (((struct wm_meas_t *)(_m))->_measureBat)
+#define VOLT_SW(_m)        (((struct wm_meas_t *)(_m))->_VoViSwitch)
+
+struct wm_meas_t {
+    int32_t  _measureCurrent;
+    int32_t  _measureVin;
+    int32_t  _measureVout;
+    int32_t  _measureBat;
+    uint8_t  _VoViSwitch;
+};
+
+/* member of mode */
+struct wm_eis_ctx_t {
+    struct wm_meas_t measure;
+    int16_t  _phase;
+    int32_t  _mag;
+    int32_t  _real;
+    int32_t  _imag;
+    uint32_t _f1;
+    uint32_t _f2;
+    uint32_t _fd1;
+    uint32_t _fd2;
+    uint32_t _fmax;
+    uint32_t _fmin;
+    uint32_t _fset;
+    uint8_t  _decades;                 //num of decades in whole
+    uint16_t _ppd;
+    uint8_t  _cnt;
+    int8_t   _decadeIndex;             //index of decade max is 8
+    int16_t  _sweepIndex;              //index of smaller decade max is 10
+    bool     _direction_up;
+    bool     _switchNeg;
+    bool     _switchPos;
+    bool     _firstSwitch;
+    bool     _in_reset_flag;
+};
+
+struct wm_vo_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    int32_t _Vset;
+    int32_t _Vinit;
+};
+
+struct wm_it_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+};
+
+struct wm_vt_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+};
+
+struct wm_rt_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    int32_t _Vset;
+    int32_t _Vinit;
+};
+
+struct wm_iv_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    VOUT_PARA;
+};
+
+struct wm_iv_cy_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    VOUT_PARA;
+};
+
+struct wm_cc_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    int32_t _Vmax;
+    int32_t _Vmin;
+    int32_t _Vset;
+    int32_t _Iset;
+    uint8_t _charge;
+};
+
+struct wm_cv_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    VOUT_PARA;
+    int32_t _LPRtia;
+    bool bFirst;
+};
+
+struct wm_lsv_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    VOUT_PARA;
+};
+
+struct wm_ca_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    int32_t _Vinit;
+    int32_t _Vset;
+};
+
+struct wm_pulse_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    int32_t  _Vset;
+    int32_t  _sti_v1;
+    int32_t  _sti_v2;
+    int32_t  _sti_v3;
+    int32_t  _sti_v4;
+    int32_t  _sti_v5;
+    int32_t  _sti_v6;
+    int32_t  _sti_v7;
+    int32_t  _sti_t1;
+    int32_t  _sti_t2;
+    int32_t  _sti_t3;
+    int32_t  _sti_t4;
+    int32_t  _sti_t5;
+    int32_t  _sti_t6;
+    int32_t  _sti_t7;
+    int32_t  _sti_t;
+    int32_t  _sti_v;         //output voltage now
+    int32_t  _sti_t_flag;    //Where's the time stage turn
+    uint16_t _sti_cy;
+    uint16_t _sti_lp;
+};
+
+struct wm_ocp_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+};
+
+int wm_init(void); //(void *instr_ctx);
+int wm_deinit(void);
+void *wm_get(void);
+
+/*=============================================================================
+ =                          wm.c                                              =
+ =============================================================================*/
+
+static void *workMode_p = NULL;
+static bool Free_Work_Mode = false;
+
+/* init mode func */
+static int __eis_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_eis_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_eis_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_phase          = 0;
+    p->_mag            = 0;
+    p->_real           = 0;
+    p->_imag           = 0;
+    p->_f1             = instru.f1;
+    p->_f2             = instru.f2;
+    p->_fmax           = instru.fmax;
+    p->_fmin           = instru.fmin;
+    p->_fd1            = 0; //decade freq 1
+    p->_fd2            = 0; //decade freq 2
+    p->_fset           = 0;
+    p->_cnt            = 0;
+    p->_ppd            = instru.ppd; //points per decade
+    p->_decades        = 0;
+    p->_sweepIndex     = 0;
+    p->_decadeIndex    = 0;
+    p->_direction_up   = true;
+    p->_switchPos      = false;
+    p->_switchNeg      = false;
+    p->_firstSwitch    = true;
+    p->_in_reset_flag  = false;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __vo_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_vo_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_vo_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
+    p->_Vset           = 0;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __it_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_it_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_it_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __vt_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_vt_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_vt_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __rt_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_rt_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_rt_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
+    p->_Vset           = 0;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __iv_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_iv_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_iv_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vinit          = instru.Vinit; //(instru.Vinit - 25000) * 4 * 10000; //[5nV]
+    p->_Vmax           = instru.Vmax; //(instru.Vmax  - 25000) * 4 * 10000; //[5nV]
+    p->_Vmin           = instru.Vmin; //(instru.Vmin  - 25000) * 4 * 10000; //[5nV]
+    p->_Vset           = 0;
+    p->_Vstep          = 0;
+    p->_direction_up   = true;
+    p->_current_direction_up = true;
+    p->_cycleNumber    = instru.cycleNumber;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __iv_cy_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_iv_cy_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_iv_cy_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
+    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
+    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
+    p->_Vset           = 0;
+    p->_Vstep          = 0;
+    p->_direction_up   = true;
+    p->_current_direction_up = true;
+    p->_cycleNumber    = instru.cycleNumber;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __cc_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_cc_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_cc_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
+    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
+    p->_Vset           = 0;
+    p->_charge         = instru.charge;
+    p->_Iset           = instru.constantCurrent * 200 ;
+    //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA]
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __cv_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_cv_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_cv_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vinit          = (instru.Vinit - 25000) * 4 * 4000; //[5nV]
+    p->_Vmax           = (instru.Vmax - 25000) * 4 * 4000; //[5nV]
+    p->_Vmin           = (instru.Vmin - 25000) * 4 * 4000; //[5nV]
+//    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
+//    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
+//    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
+    p->_Vset           = 0;
+    p->_Vstep          = 0;
+    p->bFirst          = true;
+    p->_direction_up   = true;
+    p->_current_direction_up = true;
+    p->_cycleNumber    = instru.cycleNumber;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __lsv_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_lsv_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_lsv_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+	p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
+    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
+    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
+    p->_Vset           = 0;
+    p->_Vstep          = 0;
+    p->_direction_up   = true;
+    p->_current_direction_up = true;
+    p->_cycleNumber    = instru.cycleNumber;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __ca_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_ca_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_ca_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
+    p->_Vset           = 0;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __pulse_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_pulse_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_pulse_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vset           = 0;
+    p->_sti_v1         = instru.sti_v1;
+    p->_sti_v2         = instru.sti_v2;
+    p->_sti_v3         = instru.sti_v3;
+    p->_sti_v4         = instru.sti_v4;
+    p->_sti_v5         = instru.sti_v5;
+    p->_sti_v6         = instru.sti_v6;
+    p->_sti_v7         = instru.sti_v7;
+    p->_sti_t1         = instru.sti_t1;
+    p->_sti_t2         = instru.sti_t2;
+    p->_sti_t3         = instru.sti_t3;
+    p->_sti_t4         = instru.sti_t4;
+    p->_sti_t5         = instru.sti_t5;
+    p->_sti_t6         = instru.sti_t6;
+    p->_sti_t7         = instru.sti_t7;
+    p->_sti_t          = instru.sti_t1;
+    p->_sti_v          = instru.sti_v1;
+    p->_sti_t_flag     = 1;
+    p->_sti_cy         = instru.sti_cy;
+    p->_sti_lp         = instru.sti_loop;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __ocp_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_ocp_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_ocp_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    *wm = p;
+
+    return 0;
+}
+
+int wm_init(void)
+{
+    int mode = instru.eliteFxn;
+    void **wm = &workMode_p;
+
+    if (*wm) return -1;
+
+    switch (mode) {
+        case CURVE_EIS:
+            if (__eis_create()) return -2;
+            break;
+
+        case CURVE_EIS_CV:
+            if (__cv_create()) return -2;
+            break;
+
+        default:
+            // printf("DO NOT support!!");
+            return -3;
+    };
+
+    return 0;
+}
+
+int wm_deinit(void)
+{
+    void **wm = &workMode_p;
+
+    if (*wm) {
+        free(*wm);
+        *wm = NULL;
+    } else {
+        return -1;
+    }
+
+    return 0;
+}
+
+void *wm_get(void)
+{
+    void *wm = workMode_p;
+
+    return wm;
+}
+
+/*  CC Mode parameter
+*   @ Measure : measure current value (nA)
+*   @ Charge : Charge or Discharge
+*   @ BatteryV : Vin measure battery voltage (mV)
+*   @ value : constant current setting.
+*             Current value divide current level into 3,000,001 pieces
+*             1,500,000 is zero point; 3,000,000 is 15mA
+*             Current = (value - 1,500,000)/100,000 mA
+*   @ Done : Done = false => Ignore Vmin condition;
+*            Done will be true, if BatteryV <= Vmin last for about 12sec in discharge mode
+*   @ VMax : voltage upper bound in charge mode
+*            CC->value will set to zero if BatteryV >= VMax in charge mode
+*   @ VMin : voltage lower bound in charge mode
+*            CC->value will set to zero if BatteryV <=> VMin in charge mode
+*            Note that VMax and VMin are always larger or equal to zero
+*/
+#endif
@@ -0,0 +1,309 @@
+
+#ifndef Elite_PIN
+#define Elite_PIN
+
+#include <ti/drivers/pin/PINCC26XX.h>
+#include <Board.h>
+#include <ti/drivers/PIN.h>
+
+//#define ELITE_PIN_1_5
+//#define ELITE_PIN_1_5_RE
+#define ELITE_PIN_EIS
+
+#ifdef ELITE_PIN_EIS
+/* SPI Board */
+#define Board_SPI0_MISO                 PIN_UNASSIGNED
+#define Board_SPI0_MOSI                 IOID_4
+#define Board_SPI0_CLK                  IOID_3
+#define Board_SPI0_CS                   PIN_UNASSIGNED
+
+#define Board_SPI1_MISO                 IOID_1
+#define Board_SPI1_MOSI                 IOID_6
+#define Board_SPI1_CLK                  IOID_5
+#define Board_SPI1_CS                   PIN_UNASSIGNED
+
+#define AD_CS                           IOID_10
+
+//#define SD_MISO                         IOID_11
+//#define SD_CS                           IOID_8
+//#define SD_CLK                          IOID_7
+//#define SD_MOSI                         IOID_13
+
+#define switch_on                       IOID_14
+#define enable_5v                       IOID_9
+#define AD_reset                        IOID_13
+#define enable_10v                      PIN_UNASSIGNED
+#define HIGH_Z_MODE                     PIN_UNASSIGNED
+#define shutdown_6994                   PIN_UNASSIGNED
+
+#define Turnon_I_LARGE                  PIN_UNASSIGNED
+#define Turnon_I_MID                    PIN_UNASSIGNED
+#define Turnon_I_SMALL                  PIN_UNASSIGNED
+
+#define Turnon_V_MID                    PIN_UNASSIGNED
+#define Turnon_V_SMALL                  PIN_UNASSIGNED
+
+#define Turon_VOUT_SMALL                PIN_UNASSIGNED
+
+
+PIN_Handle       pin_handle;
+static PIN_State ZM_rst;
+
+const PIN_Config BLE_IO[] = {
+    enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,// 5V_enable
+    AD_reset | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,
+    AD_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    PIN_TERMINATE
+};
+
+static void remove_elite_pin() {
+    PIN_close(pin_handle);
+    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+}
+#endif
+
+
+#ifdef ELITE_PIN_1_5_RE
+/* SPI Board */
+#define Board_SPI0_MISO                 PIN_UNASSIGNED
+#define Board_SPI0_MOSI                 D1
+#define Board_SPI0_CLK                  D0
+#define Board_SPI0_CS                   PIN_UNASSIGNED
+
+#define Board_SPI1_MISO                 IOID_1
+#define Board_SPI1_MOSI                 D3
+#define Board_SPI1_CLK                  D2
+#define Board_SPI1_CS                   PIN_UNASSIGNED
+
+#define D0                              IOID_3
+#define D1                              IOID_4
+#define D2                              IOID_5
+#define D3                              IOID_6
+#define D4                              IOID_7
+#define D5                              IOID_8
+#define D6                              IOID_9
+#define D7                              IOID_10
+
+#define LOAD0                           IOID_13
+#define LOAD1                           IOID_12
+#define LOAD2                           IOID_11
+
+#define ADC_CS                          LOAD0, D6
+#define DAC_CS                          LOAD0, D7
+#define ADC_DAC_SPI_MOSI                LOAD0, D3
+#define ADC_DAC_SPI_CLK                 LOAD0, D2
+#define LED_MOSI                        LOAD0, D1
+#define LED_CLK                         LOAD0, D0
+#define MEM_CS                          LOAD0, D5
+
+#ifdef ELITE_PIN_1_5
+#define MEM_HOLD                        LOAD0, D4
+#define HIGH_Z_MODE                     LOAD2, D5
+#endif
+#ifdef ELITE_PIN_1_5_RE
+#define MEM_HOLD                        LOAD1, D0
+#define HIGH_Z_MODE                     LOAD0, D4
+#endif
+
+#define Turnon_I_MID                    LOAD2, D0
+#define Turnon_I_SMALL                  LOAD2, D4
+#define Turnon_I_LARGE                  LOAD2, D1
+#define Turnon_V_SMALL                  LOAD2, D2
+#define Turnon_V_MID                    LOAD2, D3
+#define Turon_VOUT_SMALL                LOAD2, D7
+#define shutdown_6994                   LOAD2, D6
+
+//#define Turnon10K                       Turnon_I_MID
+//#define Turnon200R                      Turnon_I_LARGE
+
+/* I2C */
+#ifdef ELITE_VERSION_1_4
+#define Board_I2C0_SCL0                 PIN_UNASSIGNED
+#define Board_I2C0_SDA0                 PIN_UNASSIGNED
+#endif
+
+#define switch_on                       IOID_14
+#define enable_10v                      LOAD1, D5
+#define enable_5v                       LOAD1, D6
+
+PIN_Handle       pin_handle;
+static PIN_State ZM_rst;
+
+const PIN_Config BLE_IO[] = {
+//    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+
+    LOAD0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    LOAD1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    LOAD2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+
+    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,                                    // to sense switch
+
+    PIN_TERMINATE
+};
+
+static void add_elite_pin() {
+//    PIN_Status elite15_status;
+    PIN_add(pin_handle,
+    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+
+//    if(elite15_status != PIN_SUCCESS) {
+//        LED_color(DARKLED, 0x0F, 0x0F, 0x0F);
+//    }
+}
+
+static void remove_elite_pin() {
+    PIN_close(pin_handle);
+    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+}
+#endif
+
+/*!
+ *  @def    BOOSTXL_CC2650MA_SPIName
+ *  @brief  Enum of SPI names on the CC2650 Booster Pack
+ */
+typedef enum BOOSTXL_CC2650MA_SPIName {
+    BOOSTXL_CC2650MA_SPI0 = 0,
+    BOOSTXL_CC2650MA_SPI1 = 1,
+
+    BOOSTXL_CC2650MA_SPICOUNT
+} BOOSTXL_CC2650MA_SPIName;
+
+/*
+ *  ========================== SPI DMA begin ===================================
+ */
+/* Place into subsections to allow the TI linker to remove items properly */
+#if defined(__TI_COMPILER_VERSION__)
+#pragma DATA_SECTION(SPI_config, ".const:SPI_config")
+#pragma DATA_SECTION(spiCC26XXDMAHWAttrs, ".const:spiCC26XXDMAHWAttrs")
+#endif
+
+/* Include drivers */
+#include <ti/drivers/spi/SPICC26XXDMA.h>
+
+/* SPI objects */
+SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
+
+/* SPI configuration structure, describing which pins are to be used */
+const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_SPICOUNT] = {
+    {
+        .baseAddr           = SSI0_BASE,
+        .intNum             = INT_SSI0_COMB,
+        .intPriority        = ~0,
+        .swiPriority        = 0,
+        .powerMngrId        = PowerCC26XX_PERIPH_SSI0,
+        .defaultTxBufValue  = 0,
+        .rxChannelBitMask   = 1<<UDMA_CHAN_SSI0_RX,
+        .txChannelBitMask   = 1<<UDMA_CHAN_SSI0_TX,
+        .mosiPin            = Board_SPI0_MOSI,
+        .misoPin            = Board_SPI0_MISO,
+        .clkPin             = Board_SPI0_CLK,
+        .csnPin             = Board_SPI0_CS
+    },
+    {
+        .baseAddr           = SSI1_BASE,
+        .intNum             = INT_SSI1_COMB,
+        .intPriority        = ~0,
+        .swiPriority        = 0,
+        .powerMngrId        = PowerCC26XX_PERIPH_SSI1,
+        .defaultTxBufValue  = 0,
+        .rxChannelBitMask   = 1<<UDMA_CHAN_SSI1_RX,
+        .txChannelBitMask   = 1<<UDMA_CHAN_SSI1_TX,
+        .mosiPin            = Board_SPI1_MOSI,
+        .misoPin            = Board_SPI1_MISO,
+        .clkPin             = Board_SPI1_CLK,
+        .csnPin             = Board_SPI1_CS
+    },
+};
+
+/* SPI configuration structure */
+const SPI_Config SPI_config[] = {
+    {
+         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+         .object      = &spiCC26XXDMAObjects[0],
+         .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
+    },
+    {
+         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+         .object      = &spiCC26XXDMAObjects[1],
+         .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
+    },
+    {NULL, NULL, NULL}
+};
+/*
+ *  ========================== SPI DMA end =====================================
+*/
+
+
+/*
+ *  ============================= I2C Begin=====================================
+*/
+
+#ifdef ELITE_VERSION_1_4
+
+/* Generic I2C instance identifiers */
+#define Board_I2C                   CC2650_MA_I2C0
+/*!
+ *  @def    CC2650_LAUNCHXL_I2CName
+ *  @brief  Enum of I2C names on the CC2650 dev board
+ */
+typedef enum CC2650_MA_I2CName {
+    CC2650_MA_I2C0 = 0,
+
+    CC2650_MA_I2CCOUNT
+} CC2650_MA_I2CName;
+
+/* Place into subsections to allow the TI linker to remove items properly */
+#if defined(__TI_COMPILER_VERSION__)
+#pragma DATA_SECTION(I2C_config, ".const:I2C_config")
+#pragma DATA_SECTION(i2cCC26xxHWAttrs, ".const:i2cCC26xxHWAttrs")
+#endif
+
+/* Include drivers */
+#include <ti/drivers/i2c/I2CCC26XX.h>
+
+/* I2C objects */
+I2CCC26XX_Object i2cCC26xxObjects[CC2650_MA_I2CCOUNT];
+
+/* I2C configuration structure, describing which pins are to be used */
+const I2CCC26XX_HWAttrsV1 i2cCC26xxHWAttrs[CC2650_MA_I2CCOUNT] = {
+    {
+        .baseAddr = I2C0_BASE,
+        .powerMngrId = PowerCC26XX_PERIPH_I2C0,
+        .intNum = INT_I2C_IRQ,
+        .intPriority = ~0,
+        .swiPriority = 0,
+        .sdaPin = Board_I2C0_SDA0,
+        .sclPin = Board_I2C0_SCL0,
+    }
+};
+
+/* I2C configuration structure */
+const I2C_Config I2C_config[] = {
+    {
+        .fxnTablePtr = &I2CCC26XX_fxnTable,
+        .object = &i2cCC26xxObjects[0],
+        .hwAttrs = &i2cCC26xxHWAttrs[0]
+    },
+    {NULL, NULL, NULL}
+};
+/*
+ *  ========================== I2C end =========================================
+ */
+#endif
+
+#endif
+
@@ -0,0 +1,88 @@
+/*
+***********************************************************
+    Read battery's method
+***********************************************************
+1.ReadADCBat(spi_ADC_rxbuf)
+  let "spi_ADC_rxbuf" be 8000
+  8000 * 187.5uV * 2 = 3000000uV = 3V ;
+2.AONBatMonBatteryVoltageGet()
+  let "AONBatMonBatteryVoltageGet()" be 768
+  768 * 125 / 320 / 100 = 768 / 256 = 3V ;
+
+if you want to use first method, and get value 768
+conversion: 8000 * 187.5 * 1e-6 * 2 / 125 * 320 * 100 = 768
+         => 8000 * 12 / 125 = 768
+*/
+
+#ifndef HEADSTAGE_BATT_H
+#define HEADSTAGE_BATT_H
+
+#include <driverlib/aon_batmon.h>
+#define MAX_BATTERY_CAPACITY 4200
+
+static uint8_t headstage_battery_percent() {
+    static uint8_t battery_percent = 100;
+    uint8_t  internal_battery_percent;
+    uint32_t internal_batt_sense = AONBatMonBatteryVoltageGet();
+    internal_batt_sense          = (internal_batt_sense * 125) >> 5;
+    internal_batt_sense          = (internal_batt_sense * 100) / MAX_BATTERY_CAPACITY;
+    internal_battery_percent     = internal_batt_sense & 0xFF;
+    if (internal_battery_percent < battery_percent) battery_percent = internal_battery_percent;
+    return battery_percent;
+}
+
+static void headstage_battery_volt(){
+    uint32_t bat_volt = 0;
+
+    ReadADCBat(spi_ADC_rxbuf);
+    bat_volt = (uint32_t) (spi_ADC_rxbuf[0] << 8) | (uint32_t) (spi_ADC_rxbuf[1]);
+    bat_volt = bat_volt * 12 / 125; //x  * 187.5 * 1e-6 * 2 / 125 * 320 * 100 ;
+    InputNotify(NOTIFY_VOLT_BAT, bat_volt);
+}
+
+static void EliteADCBattery(){
+    static uint8_t ADCSwitch = 0;
+    if(ADCSwitch == 0){ /**read V**/
+        ReadADCBat(spi_ADC_rxbuf);
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 1){ /**read V**/
+        ReadADCBat(spi_ADC_rxbuf);
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 2){ /**read V(buffer)**/
+        headstage_battery_volt();
+        batteryCheck_flag = false;
+        ADCSwitch = 0;
+    }
+}
+
+static void measureBat(){
+    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+    GPT.GptimerCounter0 = GPT.GptimerCounter;
+
+    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
+    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+
+    if(GPT.BatteryCheckCounter >= 50000){//5min=3000000, 5s=50000
+        GPT.BatteryCheckCounter = 0;
+        batteryCheck_flag = true;
+    }
+
+    if(GPT.BatteryADCCounter >= 15 && batteryCheck_flag){
+        GPT.BatteryADCCounter = 0; //To get the data right, ADC must be delay 1.5ms
+        batteryADC_flag = true;
+        if(batteryADC_flag){
+            EliteADCBattery();
+            batteryADC_flag = false;
+        }
+    }
+
+    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
+                   ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+    if( bat < 768 && bat > 20){
+        PIN_setOutputValue(pin_handle, enable_5v, 0);
+    }
+}
+
+#endif  // HEADSTAGE_BATT_H
@@ -0,0 +1,122 @@
+#ifndef ELITE_DEF
+#define ELITE_DEF
+
+// define BT instruction
+#define INS_TYPE_RIS                    0x30
+#define INS_TYPE_VIS                    0xC0
+#define INS_TYPE_CIS                    0x70
+
+// VIS (virtual instruction)
+#define VIS_RST                         0xF0
+#define VIS_ASK                         0x30
+#define VIS_STI                         0xC0
+#define VIS_FUH                         0x90
+#define VIS_INT                         0x60
+#define VIS_DEVICE_SHINY                0x10
+#define VIS_SHINY_DIS                   0x20
+
+// RIS (real instruction)
+enum all_mode_e {
+
+    CURVE_EIS                      =  0xD1, //Should Change to 0xD1
+    CURVE_EIS_CV                   =  0xD2,
+
+    CURVE_CALI_ADC                 =  0xF1, // Cali ADC - test                 //0x92,
+//    CURVE_CALI_ADC                 =  0x92, // Cali ADC - test                 //0x92,
+
+    SET_SAMPLE_RATE                =  0xE0,                                    //0x70,
+//    SET_SAMPLE_RATE                =  0x70,                                    //0x70,
+    SET_ADC_DAC_GAIN               =  0xE1,                                    //0x80,
+//    SET_ADC_DAC_GAIN               =  0x80,                                    //0x80,
+};
+
+// CIS (control instruction)
+#define CIS_VERSION                     0x40
+#define CIS_VOLT                        0x10
+#define CIS_LED_TEST                    0x70
+#define CIS_CALI                        0x30
+#define CIS_CALI2                       0x90
+
+#define CTL_WRT                         0x20
+#define CTL_RD                          0x21
+#define CTL_RD_DFTR                     0x78
+#define CTL_RD_DFTI                     0x7C
+#define CTL_WRT_WGAMPL                  0x3C
+#define CTL_WRT_TRAP                    0x2c
+#define CTL_RESET                       0x11
+#define CTL_IMPEDANCE                   0x12
+#define CTL_CV3                         0x13
+#define cali_LPTIA_setGain              0x29
+#define cali_LPDAC_voltout              0x39
+#define cali_HSDAC_amp                  0x49
+#define cali_HSTIA_setGain              0x59
+#define cali_HSDAC_DC                   0x69
+
+// mode parameter
+#define STEP_TO_VSETRATE(step)   step2VsetRate(step)
+#define VMAX(v1,v2)              ((v1 >= v2) ? v1 : v2)
+#define VMIN(v1,v2)              ((v1 < v2)  ? v1 : v2)
+#define VDIRECTION(v1,v2)        ((v1 > v2)  ?  0 : 1)
+#define AFTER_READ_I             0
+#define AFTER_READ_V             1
+#define PARA_1                   0x01
+#define PARA_2                   0x02
+#define PARA_3                   0x03
+#define PARA_4                   0x04
+#define PARA_5                   0x05
+#define PARA_6                   0x06
+#define PARA_7                   0x07
+#define PARA_8                   0x08
+#define PARA_9                   0x09
+#define PARA_10                  0x0A
+#define PARA_11                  0x0B
+#define PARA_12                  0x0C
+#define PARA_13                  0x0D
+#define PARA_14                  0x0E
+#define PARA_15                  0x0F
+#define PARA_16                  0x10
+#define PARA_17                  0x11
+
+//Elite LED
+#define COLOR_BLACK              0x00
+#define COLOR_RED                0x01
+#define COLOR_ORANGE             0x02
+#define COLOR_YELLOW             0x03
+#define COLOR_GREEN              0x04
+#define COLOR_BLUE               0x05
+#define COLOR_CYAN               0x06
+#define COLOR_MAGENTA            0x07
+#define COLOR_PURPLE             0x08
+#define COLOR_WHITE              0x09
+#define COLOR_YELLOWGREEN        0x0A
+#define COLOR_YELLOW_DARK        0xF3
+#define COLOR_GREEN_DARK         0xF4
+#define COLOR_BLUE_DARK          0xF5
+#define COLOR_CYAN_DARK          0xF6
+#define COLOR_PURPLE_DARK        0xF8
+
+#define LEDPowerON()             Elite_led_color(COLOR_GREEN)
+#define WORKLED()                Elite_led_color(COLOR_CYAN)
+#define KEYLED()                 Elite_led_color(COLOR_YELLOW)
+#define BT_WAIT_LED()            Elite_led_color(COLOR_YELLOWGREEN)
+
+
+#define BT_WAIT                  0x01
+#define NO_EVENT                 0x02
+#define PRE_WORK                 0x03
+#define WORKING                  0x04
+#define POST_WORK                0x05
+
+/* EIS define */
+// cutoff frequency of the filter in AD5940
+#define cutoff_auto     0x00
+#define cutoff_50k      0x01
+#define cutoff_100k     0x02
+#define cutoff_250k     0x03
+
+#define LOW_PW_MODE     0x00
+#define HIGH_PW_MODE    0x01
+
+
+#define VALUE_ZERO_TO_ONE(_v)    (_v == 0) ? 1 : _v
+#endif
@@ -0,0 +1,645 @@
+#include <math.h>
+
+#ifndef ELITE_MODE_ADC_DAC
+#define ELITE_MODE_ADC_DAC
+
+#define Vset instru.Vset
+
+static void volt_out()
+{
+    static int32_t DACOutCode;
+    static int32_t DeltaVout;
+    static int32_t Vout;
+
+    if (DACReset) {
+        Vout = Vset;
+    } else {
+        DeltaVout = Vset - (Vout);
+        Vout = Vout + DeltaVout;
+    }
+
+
+    if (Vout >= 1100000000) { //1100000000 = 5.5V
+        Vout = 1100000000;
+    } else if (Vout <= -1000000000) {  //-1000000000 = -5V
+        Vout = -1000000000;
+    }
+
+
+    instru.VoltConstant = Vout / 40000 + 25000; //5nV=>usercode
+    DACOutCode = Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.VoltConstant);
+    DAC_outputV(DACOutCode);
+
+    return;
+}
+
+static void freq_out()
+{
+    DAC_outputF(instru.fset);
+    return;
+}
+
+static void vscan_volt_out(void)
+{
+    struct wm_cv_ctx_t *cv = (struct wm_cv_ctx_t *)wm_get();
+    void *wm = wm_get();
+
+    /* in [5nV] ver */
+    MEAS_VOUT(wm) = DAC_outputV(Vset);
+
+    if (Vset == cv->_Vinit && cv->bFirst){
+        Elite_led_color(COLOR_ORANGE);
+        CPUdelay(30000);
+        Elite_led_color(COLOR_CYAN);
+    }
+
+//    InputNotify(NOTIFY_VOLT, vscan);
+
+    return;
+}
+
+static void CalcuResistance()
+{
+    /* Elite 100 = 100R
+        Elite 1000 = 1KR
+        Elite 10000 = 10KR
+        Elite 100000 = 100KR
+        Elite 1000000 = 1MR
+     */
+
+    struct wm_rt_ctx_t *rt = (struct wm_rt_ctx_t *)wm_get();
+    struct wm_meas_t *m = &rt->measure;
+    int64_t resist;
+    int64_t volt = (int64_t)(m->_measureVout) ;
+    int64_t current = (int64_t)(m->_measureCurrent);
+
+    resist = volt * 1000000 / current; //R = V / Iin; [mOhm]
+    InputNotify(NOTIFY_IMPEDANCE, resist);
+
+    return;
+}
+
+
+//////EIS PLOT RELATED FUNCTION START//////
+static uint8_t CalcDecade(uint32_t f1, uint32_t f2)
+{
+    uint8_t decades; //max is 7
+    decades = log10(f2/f1);
+    return decades;
+}
+
+static int32_t neg_18bit(int32_t ret)
+{
+//    if (ret > 131072) {
+//        ret = ret - 262144;
+//    }
+    ret &= 0x3FFFF;
+    if (ret & (1 << 17)) {
+        ret |= 0xFFFC0000;
+    }
+
+    return ret;
+}
+
+//////EIS PLOT RELATED FUNCTION END//////
+
+
+static void DACenable(uint8_t afterRead)
+{
+    void *wm = wm_get();
+
+    if (afterRead == AFTER_READ_I) {
+        switch (instru.eliteFxn) {
+
+            default:
+                break;
+        }
+    } else if (afterRead == AFTER_READ_V) {
+        switch (instru.eliteFxn) {
+            case CURVE_EIS:
+                freq_out();
+                break;
+
+            case CURVE_EIS_CV:
+                vscan_volt_out();
+                break;
+
+            default:{
+                Elite_led_color(COLOR_PURPLE);
+                break;
+            }
+        }
+    }
+}
+
+static void read_Iin_change_gain(void)
+{
+    static uint8_t rec_cnt = 0;
+    void *wm = wm_get();
+
+    if (instru.AutoGainEnable > 1)
+        return;
+
+    /* read Iin and do NOT record the Iin after changing gain twice */
+    MEAS_CURR(wm) = read_cali_Iin(spi_ADC_rxbuf);
+    if (instru.AutoGainEnable) {
+        AutoGainChangeIin(MEAS_CURR(wm));
+//        AutoChangeLPTIAGain(MEAS_CURR(wm));
+    } else {
+        if (lastIinADCGainLevel != instru.ADCGainLv) {
+            IinADCGainControl(instru.ADCGainLv);
+//              LPTIAGainCtrl(instru.ADCGainLv);
+        }
+    }
+
+    if (record_flag == false) {
+        rec_cnt++;
+    }
+
+    if (rec_cnt == 2) {
+        record_flag = true;
+        rec_cnt = 0;
+    }
+
+    return;
+}
+
+static void LPTIA_change_gain(void)
+{
+    static uint8_t rec_cnt = 0;
+    void *wm = wm_get();
+
+    if (instru.AutoGainEnable > 1)
+        return;
+
+    /* read Iin and do NOT record the Iin after changing gain twice */
+    MEAS_CURR(wm) = read_LPTIA_Iin();
+    if (instru.AutoGainEnable) {
+        AutoChangeLPTIAGain(MEAS_CURR(wm));
+    } else {
+        if (lastIinADCGainLevel != instru.ADCGainLv) {
+              LPTIAGainCtrl(instru.ADCGainLv);
+        }
+    }
+
+    if (record_flag == false) {
+        rec_cnt++;
+    }
+
+    if (rec_cnt == 2) {
+        record_flag = true;
+        rec_cnt = 0;
+    }
+
+    return;
+}
+
+static void HSTIA_change_gain(void)
+{
+//    static uint8_t rec_cnt = 0;
+    void *wm = wm_get();
+
+    if (instru.AutoGainEnable > 1)
+        return;
+
+    /* read Iin and do NOT record the Iin after changing gain twice */
+    MEAS_CURR(wm) = read_HSTIA_Iin();
+    if (instru.AutoGainEnable) {
+        AutoChangeHSTIAGain(MEAS_CURR(wm));
+    } else {
+        if (lastIinADCGainLevel != instru.ADCGainLv) {
+            HSTIAGainCtrl(instru.ADCGainLv);
+        }
+    }
+
+//    if (record_flag == false) {
+//        rec_cnt++;
+//    }
+//
+//    if (rec_cnt == 2) {
+//        record_flag = true;
+//        rec_cnt = 0;
+//    }
+
+    return;
+}
+
+static void read_Vin_change_gain(void)
+{
+    static uint8_t rec_cnt = 0;
+    void *wm = wm_get();
+
+    if (instru.AutoGainEnable > 1)
+        return;
+
+    /* read Vin and do NOT record the Vin after changing gain twice */
+    MEAS_VIN(wm) = read_cali_Vin(spi_ADC_rxbuf);
+    if (instru.VinAutoGainEnable) {
+        AutoGainChangeVin(MEAS_VIN(wm));
+    } else {
+        if (lastVinADCGainLv != instru.VinADCGainLv) {
+            VinADCGainCtrl(instru.VinADCGainLv);
+        }
+    }
+
+    if (record_flag == false) {
+        rec_cnt++;
+    }
+
+    if (rec_cnt == 2) {
+        record_flag = true;
+        rec_cnt = 0;
+    }
+
+    return;
+}
+
+static void read_Vout_change_gain(void)
+{
+    static uint8_t rec_cnt = 0;
+    void *wm = wm_get();
+
+    /* read Vout and do NOT record the Vout after changing gain twice */
+    MEAS_VOUT(wm) = read_cali_Vout(spi_ADC_rxbuf);
+
+    if (record_flag == false) {
+        rec_cnt++;
+    }
+
+    if (rec_cnt == 2) {
+        record_flag = true;
+        rec_cnt = 0;
+    }
+
+    return;
+}
+
+static void Iin_Vin_Vout_Plot(void)
+{
+    static uint8_t ADC_cnt = 0;
+    void *wm = wm_get();
+
+    /* the time for measuring battery */
+    if (batteryCheck_flag) {
+        EliteADCBattery();
+        if (!batteryCheck_flag) {
+            ReadADCIin(spi_ADC_rxbuf);
+            ADC_cnt = 5;
+        }
+
+        return;
+    }
+
+    /* the time for Not measuring battery */
+    /* ADC_cnt:  0 - read Iin and do NOT buffer the Iin after changing gain twice,
+     *               and output DAC, and read Vin, and increase ADC_cnt
+     *           1 - read Vin and increase ADC_cnt
+     *           2 - read Vin and do NOT buffer the Vin after changing gain twice,
+     *               and output DAC, and read Iin, and increase ADC_cnt
+     *           3 - read Iin and reset ADC_cnt
+     */
+    if (ADC_cnt == 0) {
+        read_Iin_change_gain();
+        DACenable(AFTER_READ_I);
+        ReadADCVin(spi_ADC_rxbuf);
+        ADC_cnt++;
+
+    } else if (ADC_cnt == 1) {
+        ReadADCVin(spi_ADC_rxbuf);
+        ADC_cnt++;
+
+    } else if (ADC_cnt == 2) {
+        read_Vin_change_gain();
+        DACenable(AFTER_READ_V);
+        ReadADCVout(spi_ADC_rxbuf);
+        ADC_cnt++;
+
+    } else if (ADC_cnt == 3) {
+        ReadADCVout(spi_ADC_rxbuf);
+        ADC_cnt++;
+
+    } else if (ADC_cnt == 4) {
+        read_Vout_change_gain();
+        DACenable(AFTER_READ_V); // to volt_out -> DACOutput(DACoutCode)
+        ReadADCIin(spi_ADC_rxbuf);
+        ADC_cnt++;
+
+    } else if (ADC_cnt == 5) {
+        ReadADCIin(spi_ADC_rxbuf);
+        ADC_cnt = 0;
+    }
+
+    return;
+}
+
+static void CV_Plot(void)
+{
+    struct wm_cv_ctx_t *cv = (struct wm_cv_ctx_t *)wm_get();
+    static uint8_t ADC_cnt = 0;
+    void *wm = wm_get();
+
+    if (ADC_cnt == 0) {
+        DACenable(AFTER_READ_V);
+        ADC_cnt++;
+
+    } else if (ADC_cnt == 1) {
+        LPTIA_change_gain();
+        ADC_cnt++;
+
+    } else if (ADC_cnt == 2) {
+        read_LPTIA_Iin();
+        ADC_cnt = 0;
+    }
+    InputNotify(NOTIFY_VOLT, MEAS_VOUT(wm));
+//    InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+//    InputNotify(NOTIFY_IMPEDANCE, instru.ADCGainLv);
+    return;
+}
+
+static void EIS_Plot(void) //real and imag impedance plot
+{
+    struct wm_eis_ctx_t *eis = (struct wm_eis_ctx_t *)wm_get();
+    static uint8_t ADC_cnt = 0;
+    static int32_t realSum, imagSum = 0;
+    int32_t avg_real, avg_imag = 0;
+    static uint8_t avg_count, high_freq_cnt = 0;
+    void *wm = wm_get();
+
+    if (fout_flag){
+        DAC_outputF(Freq2DAC(instru.fset));
+        EnDFTnADC(1);
+        instru.sampleRate = CalcDelayTime(instru.fset);
+        fout_flag = false;
+        if (eis->_in_reset_flag) {
+            avg_count = 0;
+            high_freq_cnt = 0;
+            realSum = 0;
+            imagSum = 0;
+            ADC_cnt = 0;
+            eis->_in_reset_flag = false;
+        }
+    } else {
+        if (ADC_cnt == 0){
+            HSTIA_change_gain();
+            if (gainChange_flag) {
+                gainChange_flag = false;
+                instru.sampleRate = CalcDelayTime(instru.fset);
+                instru.real = 0;
+                instru.imag = 0;
+                ADC_cnt = 0;
+            } else {
+                instru.sampleRate = 15;
+                ADC_cnt ++;
+            }
+        }
+        else if (ADC_cnt == 1) {
+            HSTIA_change_gain();
+            if (firstFreq_flag) {
+                if (instru.fset >= 10000000) {
+                    if (high_freq_cnt == 3) {
+                        firstFreq_flag = false;
+                    }
+                    high_freq_cnt ++;
+                } else {
+                    firstFreq_flag = false;
+                }
+                instru.sampleRate = CalcDelayTime(instru.fset);
+                instru.real = 0;
+                instru.imag = 0;
+                ADC_cnt = 0;
+            } else {
+                instru.sampleRate = 15;
+                ADC_cnt ++;
+            }
+        }
+        else if (ADC_cnt == 2) {
+            realSum += instru.real;
+            imagSum += instru.imag;
+            avg_count++;
+            instru.sampleRate = CalcDelayTime(instru.fset);
+            if (avg_count == avgNumTable[instru.avgnum]){
+                avg_real = (realSum + avg_count / 2) / avg_count;
+                avg_imag = (imagSum + avg_count / 2) / avg_count;
+                avg_count = 0;
+                realSum = 0;
+                imagSum = 0;
+                EnDFTnADC(0);
+                if(eis->_direction_up){
+                    if (instru.fset >= eis->_fmax) {
+                        PeriodicEvent = false;
+                        finishMode = 1;
+                    }
+                } else {
+                    if (instru.fset <= eis->_fmin) {
+                        PeriodicEvent = false;
+                        finishMode = 1;
+                    }
+                }
+                notify_flag = true;
+                high_freq_cnt = 0;
+            }
+            ADC_cnt = 0;
+        }
+    }
+
+    InputNotify(NOTIFY_CURRENT, avg_imag);
+    InputNotify(NOTIFY_VOLT, avg_real);
+    InputNotify(NOTIFY_IMPEDANCE, instru.fset);
+
+    return;
+}
+
+static void cali_IT_plot(void) {
+    void *wm = wm_get();
+
+    static int32_t ADCValueSUM = 0;
+    static uint16_t cali_count = 0;
+    static uint8_t ADC_cnt = 0;
+    static uint8_t rec_cnt = 0;
+    static uint16_t cali_count_max = 5000;
+    int32_t ADCValueAVG = 0;
+    int32_t temp = 0;
+
+    /* ADC_cnt:  0 - read Iin and do NOT buffer the Iin after changing gain twice
+     *           1 - read Iin and increase ADC_cnt
+     *           2 - read Iin and reset ADC_cnt
+     */
+    if (ADC_cnt == 0) {
+        if (instru.HSTIAAutoGainEnable) {
+            temp = 0xFFFF;
+        } else {
+//            MEAS_CURR(wm) = (ReadRawADC() & 0x0000FFFF);
+            temp = (ReadRealZ() & 0x0003FFFF);
+        }
+
+//        switch (instru.AdcChannel) {
+//            case EIS_HSTIA: {
+//                if (instru.HSTIAGainLv == 0) {
+//                    cali_count_max = 5000;
+//                } else {
+//                    cali_count_max = 1000;
+//                }
+//                break;
+//            }
+//            case EIS_LPTIA: {
+//                if (instru.LPTIAGainLv == 0) {
+//                    cali_count_max = 5000;
+//                } else {
+//                    cali_count_max = 1000;
+//                }
+//                break;
+//            }
+//            default:{
+//                cali_count_max = 1000;
+//                break;
+//            }
+//        }
+        cali_count_max = 3000;
+
+        if (record_flag == false) {
+            rec_cnt++;
+        } else {
+            if (cali_count >= cali_count_max) {
+                ADCValueAVG = ADCValueSUM / cali_count;
+
+                InputNotify(NOTIFY_CURRENT, ADCValueAVG);
+//                InputNotify(NOTIFY_VOLT, ADCValueAVG);
+                SendNotify();
+
+                uint8_t CIS_buf[9]   = {0};
+                CIS_buf[0] = instru.chip_id;
+                CIS_buf[1] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
+                CIS_buf[2] = (uint8_t) (ADCValueAVG & 0x00FF);
+                CIS_buf[3] = 0x00;
+                CIS_buf[4] = instru.HSTIAGainLv;
+                SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
+
+                PeriodicEvent = false;
+                ADCValueSUM = 0;
+                cali_count = 0;
+                ModeLED(NO_EVENT);
+            } else {
+                cali_count++;
+                ADCValueSUM = ADCValueSUM + temp;
+                InputNotify(NOTIFY_CURRENT, temp);
+                InputNotify(NOTIFY_VOLT, temp);
+//                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
+            }
+        }
+
+        if (rec_cnt == 2) {
+            record_flag = true;
+            rec_cnt = 0;
+        }
+        ADC_cnt++;
+
+        return;
+    }
+
+    if (ADC_cnt == 1) {
+        ReadRealZ();
+        ADC_cnt++;
+
+        return;
+    }
+
+    if (ADC_cnt == 2) {
+        ReadRealZ();
+        ADC_cnt = 0;
+
+        return;
+    }
+
+    return;
+}
+
+static void cali_VT_plot(void) {
+    void *wm = wm_get();
+
+    static int32_t ADCValueSUM = 0;
+    static uint16_t cali_count = 0;
+    static uint8_t ADC_cnt = 0;
+    static uint8_t rec_cnt = 0;
+    uint16_t cali_count_max = 0;
+    int32_t ADCValueAVG = 0;
+    int32_t temp = 0;
+
+    /* ADC_cnt:  0 - read Vin and do NOT buffer the Vin after changing gain twice
+     *           1 - read Vin and increase ADC_cnt
+     *           2 - read Vin and reset ADC_cnt
+     */
+    if (ADC_cnt == 0) {
+        if (instru.LPTIAAutoGainEnable) {
+//            MEAS_VIN(wm) = 0xFFFF;
+            temp = 0xFFFF;
+        } else {
+//            ReadADCVin(spi_ADC_rxbuf);
+//            MEAS_VIN(wm) = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+            temp = (ReadRealZ() & 0x0003FFFF);
+//            if (lastVinADCGainLv != instru.VinADCGainLv) VinADCGainCtrl(instru.VinADCGainLv);
+        }
+
+//        if (instru.VinADCGainLv == 0) {
+            cali_count_max = 3000;
+//        } else {
+//            cali_count_max = 1000;
+//        }
+
+        if (record_flag == false) {
+           rec_cnt++;
+        } else {
+            if (cali_count >= cali_count_max) {
+                ADCValueAVG = ADCValueSUM / cali_count;
+
+                InputNotify(NOTIFY_VOLT, ADCValueAVG);
+                SendNotify();
+
+                uint8_t CIS_buf[9]   = {0};
+                CIS_buf[0] = instru.chip_id;
+                CIS_buf[1] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
+                CIS_buf[2] = (uint8_t) (ADCValueAVG & 0x00FF);
+                CIS_buf[3] = 0x00;
+                CIS_buf[4] = instru.VinADCGainLv;
+                SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
+
+                PeriodicEvent = false;
+                ADCValueSUM = 0;
+                cali_count = 0;
+                ModeLED(NO_EVENT);
+            } else {
+                cali_count++;
+                ADCValueSUM = ADCValueSUM + temp;
+                InputNotify(NOTIFY_VOLT, temp);
+                InputNotify(NOTIFY_CURRENT, ADCValueSUM);
+                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
+            }
+        }
+
+        if (rec_cnt == 2) {
+            record_flag = true;
+            rec_cnt = 0;
+        }
+        ADC_cnt++;
+
+        return;
+    }
+
+    if (ADC_cnt == 1) {
+//        ReadRealZ();
+        ADC_cnt++;
+
+        return;
+    }
+
+    if (ADC_cnt == 2) {
+//        ReadRealZ();
+        ADC_cnt = 0;
+
+        return;
+    }
+
+    return;
+}
+
+#endif
+
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`../simplelink/ble_sdk_2_02_02_25/src/common/cc26xx/`
				`@@ -1 +0,0 @@`
				`../tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272/`
				`@@ -1 +0,0 @@`
				`../simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/`
				`@@ -1 +0,0 @@`
				`../simplelink/ble_sdk_2_02_02_25/src/icall/inc/`
				`@@ -1 +0,0 @@`
				`../simplelink/ble_sdk_2_02_02_25/src/profiles/roles/`
				`@@ -1 +0,0 @@`
				`../simplelink/ble_sdk_2_02_02_25/src/target/`