note

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

.gitignore

@@ -5,5 +5,4 @@ xdctools_*/
 ccsv8/
 
 # CSS build files
-FlashROM/
-/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/app/.xdchelp
+FlashROM/

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/app/.settings/org.eclipse.cdt.codan.core.prefs

@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-inEditor=false
-onBuild=false

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/app/.settings/org.eclipse.cdt.debug.core.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.debug.core.toggleBreakpointModel=com.ti.ccstudio.debug.CCSBreakpointMarker

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

@@ -1,32 +0,0 @@
-eclipse.preferences.version=1
-encoding//FlashROM/Application/subdir_rules.mk=UTF-8
-encoding//FlashROM/Application/subdir_vars.mk=UTF-8
-encoding//FlashROM/Drivers/Display/subdir_rules.mk=UTF-8
-encoding//FlashROM/Drivers/Display/subdir_vars.mk=UTF-8
-encoding//FlashROM/Drivers/ECC/subdir_rules.mk=UTF-8
-encoding//FlashROM/Drivers/ECC/subdir_vars.mk=UTF-8
-encoding//FlashROM/Drivers/PIN/subdir_rules.mk=UTF-8
-encoding//FlashROM/Drivers/PIN/subdir_vars.mk=UTF-8
-encoding//FlashROM/Drivers/RF/subdir_rules.mk=UTF-8
-encoding//FlashROM/Drivers/RF/subdir_vars.mk=UTF-8
-encoding//FlashROM/Drivers/SPI/subdir_rules.mk=UTF-8
-encoding//FlashROM/Drivers/SPI/subdir_vars.mk=UTF-8
-encoding//FlashROM/Drivers/TRNG/subdir_rules.mk=UTF-8
-encoding//FlashROM/Drivers/TRNG/subdir_vars.mk=UTF-8
-encoding//FlashROM/Drivers/UART/subdir_rules.mk=UTF-8
-encoding//FlashROM/Drivers/UART/subdir_vars.mk=UTF-8
-encoding//FlashROM/Drivers/UDMA/subdir_rules.mk=UTF-8
-encoding//FlashROM/Drivers/UDMA/subdir_vars.mk=UTF-8
-encoding//FlashROM/ICall/subdir_rules.mk=UTF-8
-encoding//FlashROM/ICall/subdir_vars.mk=UTF-8
-encoding//FlashROM/ICallBLE/subdir_rules.mk=UTF-8
-encoding//FlashROM/ICallBLE/subdir_vars.mk=UTF-8
-encoding//FlashROM/PROFILES/subdir_rules.mk=UTF-8
-encoding//FlashROM/PROFILES/subdir_vars.mk=UTF-8
-encoding//FlashROM/Startup/subdir_rules.mk=UTF-8
-encoding//FlashROM/Startup/subdir_vars.mk=UTF-8
-encoding//FlashROM/TOOLS/subdir_rules.mk=UTF-8
-encoding//FlashROM/TOOLS/subdir_vars.mk=UTF-8
-encoding//FlashROM/makefile=UTF-8
-encoding//FlashROM/objects.mk=UTF-8
-encoding//FlashROM/sources.mk=UTF-8

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/stack/.settings/org.eclipse.cdt.codan.core.prefs

@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-inEditor=false
-onBuild=false

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/stack/.settings/org.eclipse.cdt.debug.core.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.debug.core.toggleBreakpointModel=com.ti.ccstudio.debug.CCSBreakpointMarker

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

@@ -34,17 +34,17 @@
 								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
 								<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
 							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.277675815" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.277675815" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
 							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1593934674" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.632414212" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.632414212" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.154623462" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.974280107" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1783826131" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1536570599" name="Application binary interface. (--abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1895413316" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.322983319" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.1305400753" name="Speed vs. size trade-offs (--opt_for_speed, -mf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1468985930" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.974280107" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1783826131" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1536570599" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1895413316" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.322983319" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.1305400753" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1468985930" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 									<listOptionValue builtIn="false" value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\simple_peripheral\cc26xx\app\headstage"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/cc26xx/app"/>
@@ -70,7 +70,7 @@
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1897088" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1897088" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
 									<listOptionValue builtIn="false" value="POWER_SAVING"/>
 									<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
@@ -86,19 +86,19 @@
 									<listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
 									<listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.871011287" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.863089168" name="C Dialect" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1454248503" name="Enable support for GCC extensions (DEPRECATED) (--gcc)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1965115059" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.871011287" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.863089168" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1454248503" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1965115059" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="48"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1638011093" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1638011093" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1920170652" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.2038786257" name="Emit diagnostic identifier numbers (--display_error_number, -pden)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.811478344" name="Place each function in a separate subsection (--gen_func_subsections, -ms)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1229809338" name="Read options from specified file (--cmd_file, -@)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1920170652" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.2038786257" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.811478344" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1229809338" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
 									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
@@ -109,48 +109,48 @@
 								<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.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">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.174129193" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.567300083" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1800982811" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1091211742" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1479599481" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="libc.a"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
 									<listOptionValue builtIn="false" value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.672837228" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.672837228" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.544523272" name="Suppress diagnostic &lt;id&gt; (--diag_suppress)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.544523272" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="10247-D"/>
 									<listOptionValue builtIn="false" value="16002-D"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.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"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1281207998" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.468817864" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1679096029" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.254835397" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1848192295" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1999849945" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.25027104" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.888093741" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.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"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.11734737" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.466140455" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.824070691" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
 							</tool>
 							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.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">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.225737408" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_REPOS}"/>
 									<listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
 								</option>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.571281110" name="Target (-t)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.205178830" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1097777495" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.744121344" name="Build-profile (-r)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.165807018" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.391961861" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.571281110" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.205178830" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1097777495" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.744121344" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.165807018" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.391961861" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>

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

@@ -3,20 +3,16 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_app"/>
 </listAttribute>

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

@@ -106,7 +106,7 @@ extern const PIN_Config BoardGpioInitTable[];
 #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_12             DIO12        /* AD_CS */
 #define Board_BP_Pin_J2_11             IOID_UNUSED   /* NC */
 
 /* Mapping of BoosterPack Connector Pins to BoosterPack Standard Functions (reflecting the BoosterPack Standard)

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

@@ -1,251 +0,0 @@
-
-#ifndef Elite15_PIN
-#define Elite_15PIN
-
-#include "Elite_PIN.h"
-
-static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow) {
-    switch (latch_num) {
-        case LOAD0: {
-            switch (elite_pin) {
-                case D0: {
-                    LH.LATCH0[0] = highlow;
-                    break;
-                }
-                case D1: {
-                    LH.LATCH0[1] = highlow;
-                    break;
-                }
-                case D2: {
-                    LH.LATCH0[2] = highlow;
-                    break;
-                }
-                case D3: {
-                    LH.LATCH0[3] = highlow;
-                    break;
-                }
-                case D4: {
-                    LH.LATCH0[4] = highlow;
-                    break;
-                }
-                case D5: {
-                    LH.LATCH0[5] = highlow;
-                    break;
-                }
-                case D6: {
-                    LH.LATCH0[6] = highlow;
-                    break;
-                }
-                case D7: {
-                    LH.LATCH0[7] = highlow;
-                    break;
-                }
-                default: {
-                    break;
-                }
-            }
-            break;
-        }
-        case LOAD1: {
-            switch (elite_pin) {
-                case D0: {
-                    LH.LATCH1[0] = highlow;
-                    break;
-                }
-                case D1: {
-                    LH.LATCH1[1] = highlow;
-                    break;
-                }
-                case D2: {
-                    LH.LATCH1[2] = highlow;
-                    break;
-                }
-                case D3: {
-                    LH.LATCH1[3] = highlow;
-                    break;
-                }
-                case D4: {
-                    LH.LATCH1[4] = highlow;
-                    break;
-                }
-                case D5: {
-                    LH.LATCH1[5] = highlow;
-                    break;
-                }
-                case D6: {
-                    LH.LATCH1[6] = highlow;
-                    break;
-                }
-                case D7: {
-                    LH.LATCH1[7] = highlow;
-                    break;
-                }
-                default: {
-                    break;
-                }
-            }
-            break;
-        }
-        case LOAD2: {
-            switch (elite_pin) {
-                case D0: {
-                    LH.LATCH2[0] = highlow;
-                    break;
-                }
-                case D1: {
-                    LH.LATCH2[1] = highlow;
-                    break;
-                }
-                case D2: {
-                    LH.LATCH2[2] = highlow;
-                    break;
-                }
-                case D3: {
-                    LH.LATCH2[3] = highlow;
-                    break;
-                }
-                case D4: {
-                    LH.LATCH2[4] = highlow;
-                    break;
-                }
-                case D5: {
-                    LH.LATCH2[5] = highlow;
-                    break;
-                }
-                case D6: {
-                    LH.LATCH2[6] = highlow;
-                    break;
-                }
-                case D7: {
-                    LH.LATCH2[7] = highlow;
-                    break;
-                }
-                default: {
-                    break;
-                }
-            }
-             break;
-        }
-        default: {
-            break;
-        }
-    }
-}
-
-static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow) {
-    ELITE15_SPI_CLOSE();
-    add_elite_pin();
-    update_latch_status (latch_num, pin_num, highlow);
-//    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
-
-    switch (latch_num) {
-        case LOAD0: {
-//            PIN_setOutputValue(&ZM_rst, D0, LH.LATCH0[0]);
-//            PIN_setOutputValue(&ZM_rst, D1, LH.LATCH0[1]);
-//            PIN_setOutputValue(&ZM_rst, D2, LH.LATCH0[2]);
-//            PIN_setOutputValue(&ZM_rst, D3, LH.LATCH0[3]);
-//            PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);
-//            PIN_setOutputValue(pin_handle, D5, LH.LATCH0[5]);
-//            PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);
-//            PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);
-            break;
-        }
-        case LOAD1: {
-            PIN_setOutputValue(pin_handle, D0, LH.LATCH1[0]);
-            PIN_setOutputValue(pin_handle, D1, LH.LATCH1[1]);
-            PIN_setOutputValue(pin_handle, D2, LH.LATCH1[2]);
-            PIN_setOutputValue(pin_handle, D3, LH.LATCH1[3]);
-            PIN_setOutputValue(pin_handle, D4, LH.LATCH1[4]);
-            PIN_setOutputValue(pin_handle, D5, LH.LATCH1[5]);
-            PIN_setOutputValue(pin_handle, D6, LH.LATCH1[6]);
-            PIN_setOutputValue(pin_handle, D7, LH.LATCH1[7]);
-            break;
-        }
-        case LOAD2: {
-            PIN_setOutputValue(pin_handle, D0, LH.LATCH2[0]);
-            PIN_setOutputValue(pin_handle, D1, LH.LATCH2[1]);
-            PIN_setOutputValue(pin_handle, D2, LH.LATCH2[2]);
-            PIN_setOutputValue(pin_handle, D3, LH.LATCH2[3]);
-            PIN_setOutputValue(pin_handle, D4, LH.LATCH2[4]);
-            PIN_setOutputValue(pin_handle, D5, LH.LATCH2[5]);
-            PIN_setOutputValue(pin_handle, D6, LH.LATCH2[6]);
-            PIN_setOutputValue(pin_handle, D7, LH.LATCH2[7]);
-            break;
-        }
-        default: {
-            break;
-        }
-    }
-    PIN_setOutputValue(pin_handle, latch_num, 1);               // Turn on latch
-//    CPUdelay(10);
-    PIN_setOutputValue(pin_handle, 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, 1);
-    PIN_setOutputValue(pin_handle, LOAD1, 1);
-    PIN_setOutputValue(pin_handle, LOAD2, 1);
-    CPUdelay(10);
-    PIN_setPortOutputValue(pin_handle, 0);      // all 2650 pin set LOW
-
-    remove_elite_pin();
-}
-
-static void PIN15_setOutputValue_refresh() {
-    ELITE15_SPI_CLOSE();
-    add_elite_pin();
-
-    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]);
-    PIN_setOutputValue(pin_handle, LOAD1, 1);
-    PIN_setOutputValue(pin_handle, LOAD1, 0);
-
-    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]);
-    PIN_setOutputValue(pin_handle, LOAD2, 1);
-    PIN_setOutputValue(pin_handle, LOAD2, 0);
-
-    remove_elite_pin();
-    ELITE15_SPI_HOLD();
-}
-static void disable_trig_output() {
-    update_latch_status(DO_PR_0    , 0);
-    update_latch_status(DO_MOS_0   , 0);
-    update_latch_status(AO_MOS_0   , 0);
-    update_latch_status(AO_MOS_2   , 0);
-    update_latch_status(AO_MOS_3   , 0);
-    update_latch_status(AO_MOS_1   , 0);
-    update_latch_status(DO_MOS_1   , 0);
-    update_latch_status(DO_PR_1    , 0);
-    update_latch_status(OUT_5V_EN_0, 1);
-    update_latch_status(OUT_5V_EN_1, 1);
-
-    PIN15_setOutputValue_refresh();
-}
-
-#endif

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

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

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

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

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

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

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

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

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

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

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

@@ -4,10 +4,32 @@
 
 static bool DACReset;
 
-#ifdef ELITE_VERSION_1_4
-#define DACCLS 0x02
-#define DACOUT 0x31
 
+#ifdef ELITE_VERSION_1_3
+#define DACOUT 0x30
+static void DAC_outputV(uint16_t voltLV) {
+    // C = command, X = don't care, D = data
+    // CCCC XXXX = command
+    // DDDD DDDD = v1
+    // DDDD XXXX = v2
+
+    uint8_t v1, v2 = 0;
+    v1 = (uint8_t) (voltLV >> 4) & 0xFF;
+    v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
+
+    spi_DACtxbuf[0] = command;
+    spi_DACtxbuf[1] = v1;
+    spi_DACtxbuf[2] = v2;
+    for (int i = 3; i < SPI_DAC_SIZE; i++) {
+        spi_DACtxbuf[i] = 0;
+    }
+
+    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+}
+#endif
+
+#ifdef ELITE_VERSION_1_4
+#define DACOUT 0x31
 static uint16_t DAC_outputV(uint16_t voltLV) {
     // C = command, X = don't care, D = data
     // CCCC CCCC = command
@@ -26,31 +48,23 @@ static uint16_t DAC_outputV(uint16_t voltLV) {
     spi_DACtxbuf[1] = v1;
     spi_DACtxbuf[2] = v2;
 
-//    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
 
     return voltLV;
 }
+#endif
 
-static void VoutGainControl(uint8_t VOUTLevel){
-    if(VOUTLevel == 0){
-        // VOUT gain level = 0, using 240K resister
-//        PIN15_setOutputValue(Turon_VOUT_SMALL, 0);
-    }
-    else if(VOUTLevel == 1){
-        // VOUT gain level = 1, using 15K resister
-//        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
-    }
-    else if(VOUTLevel == 2){
-        // VOUT gain level = 2, using 15K resister
-//        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
-    }
-    else{
-        // default using 15K resister
-//        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
-    }
-    volt_rec_en = false;
+#ifdef ELITE_VERSION_EIS
+static uint32_t DAC_outputV(uint32_t voltLV) {
+
+//    uint8_t v1, v2 = 0;
+//    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
+//    v2 = (uint8_t) (voltLV & 0x00FF);
+
+    EIS_LPDAC_SPI(voltLV);
+
+    return voltLV;
 }
-
 #endif
 
 static int32_t User2Real(uint16_t UserCode){
@@ -60,33 +74,30 @@ static int32_t User2Real(uint16_t UserCode){
 
 
 // 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
+#define DAC_VOUT_GAIN_SMALL_BOUNDARY  100000  // 100  mV =    25500(usercode)
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY  300000  // 300  mV =    26500(usercode)
 
-static void AutoGainChangeVout(int32_t userCode){
-    int32_t RealVolt = (userCode - 25000) * 200; // (userCode - 25000) / 5 * 1000  [1uV]
+static void AutoGainChangeVout(int32_t RealVolt){
+    RealVolt = (RealVolt - 25000) * 200; // (RealVolt - 25000) / 5 * 1000
     // switch to 1 level volt(small)   15K
     // switch to 2 level volt(large)   240K
 
-    if(instru.VoutGainLv == VOUT_GAIN_AUTO){
-        instru.VoutGainLv = VOUT_GAIN_15K;
-        VoutGainControl(instru.VoutGainLv);
+    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_AUTO){
+        INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
     }
 
-    if(instru.VoutGainLv == VOUT_GAIN_15K){
+    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_15K){
         if(RealVolt > DAC_VOUT_GAIN_LARGE_BOUNDARY || RealVolt < -1 * DAC_VOUT_GAIN_LARGE_BOUNDARY){
             // switch to 2 level volt(large)
-            instru.VoutGainLv = VOUT_GAIN_240K;
-            VoutGainControl(instru.VoutGainLv);
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
+            record_flag = false;
         }
     }
-    else if(instru.VoutGainLv == VOUT_GAIN_240K){
+    else if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_240K){
         if(RealVolt < DAC_VOUT_GAIN_SMALL_BOUNDARY && RealVolt > -1 * DAC_VOUT_GAIN_SMALL_BOUNDARY ){
             // switch to 1 level volt(small)
-            instru.VoutGainLv = VOUT_GAIN_15K;
-            VoutGainControl(instru.VoutGainLv);
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+            record_flag = false;
         }
     }
 }

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

@@ -2,6 +2,14 @@
 #ifndef ELITE_FLAG_CT_INIT
 #define ELITE_FLAG_CT_INIT
 
+// CT counter
+struct _CT{
+    uint32_t SampleRate_counter;
+    uint16_t StepTimeCounter;
+    uint16_t NotifyCounter;
+    uint32_t StandByCounter;
+}CT = {0};
+
 // GPT counter
 struct _GPT{
     uint32_t GptimerCounter;
@@ -14,9 +22,16 @@ struct _GPT{
     uint32_t BatteryADCCounter;
     uint32_t BatteryCheckCounter;
     uint32_t GptimerMultiple;
-    uint32_t StiCounter;
+    uint32_t TestCounter;
 }GPT = {0};
 
+static void InitCT(){
+    CT.SampleRate_counter = 1;
+    CT.StepTimeCounter = 1;
+    CT.NotifyCounter = 1;
+    CT.StandByCounter = 0;
+}
+
 static void InitGPT(){
     GPT.GptimerCounter      = 0;
     GPT.GptimerCounter0     = 0;
@@ -27,6 +42,5 @@ static void InitGPT(){
     GPT.LeadTimeCounter     = 0;
     GPT.BatteryADCCounter   = 0;
     GPT.BatteryCheckCounter = 0;
-    GPT.StiCounter          = 0;
 }
 #endif

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

@@ -17,7 +17,7 @@ static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_In
 #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 CLOCK_FREQ 4800  // clock freq = 0.1 ms
 
 #define elite_gptimer_open()                                                                          \
     do {                                                                                              \

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

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

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

@@ -1,27 +1,50 @@
-/*=============================================================================
- =                          instr.h                                              =
- =============================================================================*/
-#ifndef ELITE_INSTR_H
-#define ELITE_INSTR_H
 
-#ifdef __cpulsplus
-extern "C" {
-#endif
+#ifndef ELITEINSTRUCTION
+#define ELITEINSTRUCTION
+
+/** Iin, Vin, Vout **/
+#define IIN_ADC         0x00
+#define VIN_ADC         0x01
+#define VOUT_DAC        0x02
+#define HIGH_Z          0x03
+
+/** ADC Iin gain level **/
+#define I_GAIN_3M       0x00    // largest gain
+#define I_GAIN_100K     0x01
+#define I_GAIN_3K       0x02
+#define I_GAIN_100R     0x03    // the least gain
+#define I_GAIN_AUTO     0x04
+
+/** ADC Vin gain level **/
+#define VIN_GAIN_1M     0x00
+#define VIN_GAIN_30K    0x01
+#define VIN_GAIN_1K     0x02
+#define VIN_GAIN_AUTO   0x03
+
+/** Vout gain level **/
+#define VOUT_GAIN_240K  0x00
+#define VOUT_GAIN_15K   0x01
+#define VOUT_GAIN_AUTO  0x02
+
+/* DAC reset parameter */
+#define DAC_ZERO    25000
+
+// Step time macro
+#define STEPTIME_HALF_SEC 5000
+#define STEPTIME_ONE_SEC 10000
+#define STEPTIME_TWO_SEC 20000
 
 /*==============================
  ==== headstage instruction ====
  =============================*/
 struct HEADSTAGE_INSTRUCTION {
+
     uint8_t  chip_id;
     uint8_t  eliteFxn;
 
-    // time relation
+    /** DAC parameter **/
     uint8_t  VsetRateIndex;
     uint32_t VsetRate;
-    uint32_t sampleRate;
-    uint32_t notifyRate;
-    uint32_t period;
-
     int32_t  Vset;
     uint16_t VoltConstant;
     uint8_t  directionInit;
@@ -32,116 +55,32 @@ struct HEADSTAGE_INSTRUCTION {
     int32_t  Vmax;
     int32_t  Vmin;
 
-    uint32_t steptime;
+    /** ADC parameter **/
+    uint8_t  sampleRateIndex;
+    uint32_t sampleRate;
+    uint8_t  VoViSwitch;
+    uint8_t  AutoGainEnable;
+    uint8_t  VinAutoGainEnable;
+    uint8_t  VoutAutoGainEnable;
+    uint8_t  ADCGainLevel;
+     // voltage output gain
+    uint16_t VoutGainLevel;
+    uint8_t  VinADCGainLevel;
 
-    uint8_t  IinADCAutoGainEn;
-    uint8_t  VinADCAutoGainEn;
-    uint8_t  VoutAutoGainEn;
-    uint8_t  IinADCGainLv;
-    uint8_t  VinADCGainLv;
-    uint16_t VoutGainLv;
-    uint8_t  gain_switch_on;
-    uint8_t  AdcChannel;
-    bool     hign_z_en;
+    /** Notify parameter **/
+    uint32_t notifyRate;
 
+    /** mode parameter **/
     uint16_t cycleNumber;
     uint8_t  charge;
     int32_t  constantCurrent;
-
-    // uni pulse mode
-    int32_t  v0;
-    uint32_t t_pulse[4];
-    int32_t  v_initial[4];
-    int32_t  v_slope[4];
-    int32_t  v_step[4];
-    uint32_t t_pulse_min[4];
-    uint32_t t_pulse_max[4];
-
-    // pulse mode
-    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;
-
-    int32_t Vout;
-
-    // not use
     int32_t  Currentmax;
-    uint8_t  VoViSwitch;
 
-    /** TRIG chan **/
-    bool tri_pr0_en;
-    bool tri_d0_en;
-    bool tri_a0_en;
-    bool tri_a2_en;
-    bool tri_a3_en;
-    bool tri_a1_en;
-    bool tri_d1_en;
-    bool tri_pr1_en;
-    bool output_5v_en0;
-    bool output_5v_en1;
+    uint16_t StepTime;
 
-    /** trigger mode enable **/
-    bool trig0_en;
-    bool trig1_en;
-    uint8_t trig0_edge;
-    uint8_t trig1_edge;
+    uint8_t AdcChannel;
 
-    uint16_t Trig_CurCon[4];
-
-} instru = {0};
-
-/** Iin, Vin, Vout **/
-#define RIS_ADC_IIN         0x00
-#define RIS_ADC_VIN         0x01
-#define RIS_DAC_VOUT        0x02
-#define RIS_HIGH_Z          0x03
-#define RIS_ADC_VOUT        0x04
-#define RIS_ADC_BAT         0x05
-
-// ADC Iin gain level !!! move to ADC.h in future
-#define I_GAIN_3M       0x00    // lv0,largest gain
-#define I_GAIN_100K     0x01    // lv1
-#define I_GAIN_3K       0x02    // lv2
-#define I_GAIN_100R     0x03    // lv3,the least gain
-#define I_GAIN_AUTO     0x04
-
-// ADC Vin gain level !!! move to ADC.h in future
-#define VIN_GAIN_1M     0x00
-#define VIN_GAIN_30K    0x01
-#define VIN_GAIN_1K     0x02
-#define VIN_GAIN_AUTO   0x03
-
-// DAC Vout gain level !!! move to DAC.h in future
-#define VOUT_GAIN_240K  0x00
-#define VOUT_GAIN_15K   0x01
-#define VOUT_GAIN_AUTO  0x02
-
-/* DAC reset parameter */
-#define DAC_ZERO    25000 // DAC_ZERO is about 0V
-
-/** TRIG01 trigger edge type **/
-#define TRIG_POSEDGE    0x00
-#define TRIG_NEGEDGE    0x01
-#define TRIG_BOTHEDGE   0x02
-#define TRIG_DIS        0x03
-
-// Step time macro
-#define STEPTIME_HALF_SEC 5000
-#define STEPTIME_ONE_SEC 10000
-#define STEPTIME_TWO_SEC 20000
+} INSTRUCTION = {0};
 
 /*********************************************************************
  * @fn      InitEliteInstruction
@@ -152,119 +91,35 @@ struct HEADSTAGE_INSTRUCTION {
  *
  * @return  None.
  */
-static void InitEliteInstruction(void)
-{
-    instru.chip_id         = 0;
-    instru.eliteFxn        = 0;         //default is a null event
-
-    instru.VsetRateIndex   = 0;         // vscan rate
-    instru.VsetRate        = 2;
-    instru.sampleRate      = 15;        // ADC's sample rate
-    instru.notifyRate      = CLOCK_ONE_SECOND;   // send data's rate
-    instru.period          = CLOCK_ONE_SECOND;
-
-    instru.Vset            = 0;         // vscan's volt[5nv]
-    instru.VoltConstant    = DAC_ZERO;  // DAC's volt[UC]
-    instru.directionInit   = 1;         // 0:reverse, 1:forward
-    instru.step            = 0;
-    instru.Ve1             = DAC_ZERO;  // user set volt[UC]
-    instru.Ve2             = DAC_ZERO;  // user set volt[UC]
-    instru.Vinit           = 0;         // user set init volt[5nv]
-    instru.Vmax            = 0;         // user set max volt[5nv]
-    instru.Vmin            = 0;         // user set min voit[5nv]
-
-    instru.IinADCAutoGainEn = 1;
-    instru.VinADCAutoGainEn = 1;
-    instru.VoutAutoGainEn   = 1;
-    instru.IinADCGainLv     = I_GAIN_AUTO;
-    instru.VinADCGainLv     = VIN_GAIN_AUTO;
-    instru.VoutGainLv       = VOUT_GAIN_AUTO;
-    instru.gain_switch_on   = 0b11110000;   // cur auto gain switch, |lv0|lv1|lv2|lv3|none|none|none|none|
-    instru.AdcChannel       = 0;         // RIS_ADC_IIN: 0x00, RIS_ADC_VIN: 0x01, RIS_DAC_VOUT: 0x02, RIS_HIGH_Z: 0x03
-    instru.hign_z_en        = 1;
-
-    instru.cycleNumber     = 1;
-    instru.charge          = 1;         // 0:discharge, 1:charge
-    instru.constantCurrent = 0;
-
-    // uni pulse mode
-    instru.v0              = DAC_ZERO;  // t < 0, volt is 0v
-    instru.t_pulse[0]      = 0;
-    instru.t_pulse[1]      = 0;
-    instru.t_pulse[2]      = 0;
-    instru.t_pulse[3]      = 0;
-    instru.v_initial[0]    = 0;
-    instru.v_initial[1]    = 0;
-    instru.v_initial[2]    = 0;
-    instru.v_initial[3]    = 0;
-    instru.v_slope[0]      = 0;
-    instru.v_slope[1]      = 0;
-    instru.v_slope[2]      = 0;
-    instru.v_slope[3]      = 0;
-    instru.v_step[0]       = 0;
-    instru.v_step[1]       = 0;
-    instru.v_step[2]       = 0;
-    instru.v_step[3]       = 0;
-    instru.t_pulse_min[0]  = 0;
-    instru.t_pulse_min[1]  = 0;
-    instru.t_pulse_min[2]  = 0;
-    instru.t_pulse_min[3]  = 0;
-    instru.t_pulse_max[0]  = 0;
-    instru.t_pulse_max[1]  = 0;
-    instru.t_pulse_max[2]  = 0;
-    instru.t_pulse_max[3]  = 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;
-
-    instru.tri_pr0_en         = 0;
-    instru.tri_pr1_en         = 0;
-    instru.tri_a0_en          = 0;
-    instru.tri_a1_en          = 0;
-    instru.tri_a2_en          = 0;
-    instru.tri_a3_en          = 0;
-    instru.tri_d0_en          = 0;
-    instru.tri_d1_en          = 0;
-    instru.output_5v_en0   = 1;    // 1 => disable
-    instru.output_5v_en1   = 1;    // 1 => disable
-
-    instru.Vout            = 0;
-
-    // not use
-    instru.Currentmax      = 0;
-    instru.VoViSwitch      = 0x01;
-
-    instru.Trig_CurCon[0] = 0;
-    instru.Trig_CurCon[1] = 0;
-    instru.Trig_CurCon[2] = 0;
-    instru.Trig_CurCon[3] = 0;
-
-    instru.trig0_en       = 0;
-    instru.trig1_en       = 0;
-    instru.trig0_edge     = TRIG_NEGEDGE;
-    instru.trig1_edge     = TRIG_NEGEDGE;
-
-    return;
-}
-
-#ifdef __cpulsplus
+static void InitEliteInstruction(){
+    INSTRUCTION.chip_id         = 0;
+    INSTRUCTION.eliteFxn        = 0;         //default is a null event
+    INSTRUCTION.VsetRateIndex   = 0;
+    INSTRUCTION.VsetRate        = 2;
+    INSTRUCTION.Vset            = 0;
+    INSTRUCTION.VoltConstant    = DAC_ZERO; //DAC_ZERO is about 0V
+    INSTRUCTION.directionInit   = 1;        //0:reverse        1:forward
+    INSTRUCTION.step            = 0;
+    INSTRUCTION.Ve1             = DAC_ZERO;
+    INSTRUCTION.Ve2             = DAC_ZERO;
+    INSTRUCTION.Vinit           = 0;
+    INSTRUCTION.Vmax            = 0;
+    INSTRUCTION.Vmin            = 0;
+    INSTRUCTION.sampleRateIndex = 1;
+    INSTRUCTION.sampleRate      = 100;
+    INSTRUCTION.VoViSwitch      = 0x01;    //0:user see Vo     1: user see Vi
+    INSTRUCTION.AutoGainEnable  = 1;
+    INSTRUCTION.VinAutoGainEnable = 1;
+    INSTRUCTION.VoutAutoGainEnable = 1;
+    INSTRUCTION.ADCGainLevel    = I_GAIN_AUTO;
+    INSTRUCTION.VoutGainLevel   = VOUT_GAIN_AUTO;
+    INSTRUCTION.VinADCGainLevel = VIN_GAIN_AUTO;
+    INSTRUCTION.notifyRate      = STEPTIME_ONE_SEC;
+    INSTRUCTION.cycleNumber     = 1;
+    INSTRUCTION.charge          = 1;      //0:discharge        1:charge
+    INSTRUCTION.constantCurrent = 0;
+    INSTRUCTION.Currentmax      = 0;
+    INSTRUCTION.StepTime        = STEPTIME_ONE_SEC;
+    INSTRUCTION.AdcChannel      = 0;
 }
 #endif
-#endif
-
-

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

@@ -8,25 +8,19 @@ static bool TurnOnElite(uint8_t key) {
     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){
-                PIN15_setOutputValue(enable_5v, 0);
-                return false;
-            }else{
-                PIN15_setOutputValue(enable_5v, 1);  // enable 5V
-                TurnOn10V();
-                ModeLED(BT_WAIT);
-                return true;
-            }
+            PIN_setOutputValue(pin_handle, enable_5v, 1);// enable 5V
+            Elite_SPI_init();
+            ModeLED(BT_WAIT);
+            AD5940_init();
+            // DAC_outputV(0x3FFFF);
+            return true;
         } else {
             TurnOnCounter++;
             return false;
         }
     } else {
         TurnOnCounter = 0;
-        PIN15_setOutputValue(enable_5v, 0);  // disable 5V
+        PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
         return false;
     }
 }
@@ -46,18 +40,18 @@ static void EliteKeyPress(uint8_t key) {
         // press 3~4 sec, shutdown 2650
         else if (ShutDownCounter > (CLOCK_ONE_SECOND*3) ) {
             LED_color(DARKLED, 0xFF, 0xFF, 0x00);
-            PIN15_setOutputValue(enable_5v, 0);  // disable 5V
+            PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
         }
         ShutDownCounter ++;
     } else {
-        if (OriginEliteFxn == instru.eliteFxn) {  // old function == currunt instruction
+        if (OriginEliteFxn == INSTRUCTION.eliteFxn) {  // old function == currunt instruction
             if (ShutDownCounter != 0) {
                 // dark LED
                 checkFlafLED();
                 ShutDownCounter = 0;
             }
         } else {  // old function != currunt instruction
-            OriginEliteFxn = instru.eliteFxn;
+            OriginEliteFxn = INSTRUCTION.eliteFxn;
             if (ShutDownCounter != 0) {
                 ShutDownCounter = 0;
             }
@@ -66,10 +60,4 @@ static void EliteKeyPress(uint8_t key) {
     }
 }
 
-static void TurnOn10V() {
-    If10Von = true;
-//    PIN15_setOutputValue(enable_10v, 1);
-    CPUdelay(8000);
-}
-
 #endif

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

@@ -5,26 +5,7 @@
 #define DARKLED                  0xE1
 #define LIGHTLED                 0xE8
 
-static bool     btWaitLedFlag   = 0;
-static bool     noEventLedFlag  = 0;
-static bool     preWorkLedFlag  = 0;
-static bool     workingLedFlag  = 0;
-static bool     postWorkLedFlag = 0;
-
-/* Channels for TRIG01 LED notation */
-#define LED_PR0                  0x00
-#define LED_D0                   0x01
-#define LED_A0                   0x02
-#define LED_A2                   0x03
-#define LED_A3                   0x04
-#define LED_A1                   0x05
-#define LED_D1                   0x06
-#define LED_PR1                  0x07
-
 static void WorkModeLED();
-static void update_LED_status (uint8_t chan, uint8_t bright, uint8_t red, uint8_t green, uint8_t blue);
-static void SET_LED_CHAN(bool *chan_en, uint16_t modeStatus);
-static void refresh_LED();
 
 static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
     spi_LEDtxbuf[0] = 0x0000;
@@ -38,20 +19,21 @@ static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue)
     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);
+            LED_color(DARKLED, 0x50, 0x00, 0x00);
             break;
         }
         case COLOR_ORANGE: {
-            LED_color(DARKLED, 0xFF, 0x58, 0x09);
+            LED_color(DARKLED, 0x50, 0x58, 0x09);
             break;
         }
         case COLOR_YELLOW: {
-            LED_color(LIGHTLED, 0xFF, 0x80, 0x00);
+            LED_color(LIGHTLED, 0x50, 0x80, 0x00);
             break;
         }
         case COLOR_GREEN: {
@@ -71,129 +53,33 @@ static void Elite_led_color(uint16_t color){
             break;
         }
         case COLOR_MAGENTA: {
-            LED_color(DARKLED, 0xFF, 0x00, 0x80);
+            LED_color(DARKLED, 0x50, 0x00, 0x80);
             break;
         }
         case COLOR_PURPLE: {
-            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
+            LED_color(DARKLED, 0x50, 0x00, 0xFF);
             break;
         }
         case COLOR_WHITE: {
-            LED_color(DARKLED, 0xCA, 0xFF, 0xFF);
+            LED_color(DARKLED, 0x50, 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 Elite_chan_led_color(uint16_t color, uint8_t chan) {
-    switch (color) {
-        case COLOR_RED: {
-            update_LED_status(chan, DARKLED, 0xFF, 0x00, 0x00);
-            break;
-        }
-        case COLOR_ORANGE: {
-            update_LED_status(chan, DARKLED, 0xFF, 0x58, 0x09);
-            break;
-        }
-        case COLOR_YELLOW: {
-            update_LED_status(chan, DARKLED, 0xFF, 0x80, 0x00);
-            break;
-        }
-        case COLOR_GREEN: {
-            update_LED_status(chan, DARKLED, 0x00, 0xFA, 0x00);
-            break;
-        }
-        case COLOR_YELLOWGREEN: {
-            update_LED_status(chan, DARKLED, 0x64, 0xA6, 0x00);
-            break;
-        }
-        case COLOR_BLUE: {
-            update_LED_status(chan, DARKLED, 0x00, 0x00, 0xAA);
-            break;
-        }
-        case COLOR_CYAN: {
-            update_LED_status(chan, DARKLED, 0x00, 0x40, 0x40);
-            break;
-        }
-        case COLOR_MAGENTA: {
-            update_LED_status(chan, DARKLED, 0xFF, 0x00, 0x80);
-            break;
-        }
-        case COLOR_PURPLE: {
-            update_LED_status(chan, DARKLED, 0xFF, 0x00, 0xFF);
-            break;
-        }
-        case COLOR_WHITE: {
-            update_LED_status(chan, DARKLED, 0xCA, 0xFF, 0xFF);
-            break;
-        }
-        case COLOR_BLACK: {
-            update_LED_status(chan, 0x00, 0x00, 0x00, 0x00);
-            break;
-        }
-        //dark LED
-        case COLOR_YELLOW_DARK: {
-            update_LED_status(chan, DARKLED, 0xFF, 0x80, 0x00);
-            break;
-        }
-        case COLOR_GREEN_DARK: {
-            update_LED_status(chan, DARKLED, 0x00, 0x33, 0x00);
-            break;
-        }
-        case COLOR_BLUE_DARK: {
-            update_LED_status(chan, DARKLED, 0x00, 0x00, 0x33);
-            break;
-        }
-        case COLOR_CYAN_DARK: {
-            update_LED_status(chan, DARKLED, 0x00, 0x10, 0x10);
-            break;
-        }
-        case COLOR_PURPLE_DARK: {
-            update_LED_status(chan, DARKLED, 0x55, 0x00, 0x55);
-            break;
-        }
-        default: {
-            break;
-        }
-//        refresh_LED();
-    }
-}
-
 static void ModeLED(uint16_t modeStatus) {
     btWaitLedFlag   = 0;
     noEventLedFlag  = 0;
     preWorkLedFlag  = 0;
     workingLedFlag  = 0;
     postWorkLedFlag = 0;
-    TRIG01workFlag  = 0;
 
     switch (modeStatus) {
     case BT_WAIT: {
@@ -221,12 +107,6 @@ static void ModeLED(uint16_t modeStatus) {
         Elite_led_color(COLOR_BLUE);
         break;
     }
-    case TRIG01_WORK: {
-        TRIG01workFlag = 1;
-        WorkModeLED();
-        refresh_LED();
-        break;
-    }
     default: {
         LEDPowerON();
         break;
@@ -234,8 +114,7 @@ static void ModeLED(uint16_t modeStatus) {
     }
 }
 
-static void checkFlafLED()
-{
+static void checkFlafLED() {
     if(btWaitLedFlag == 1){
         ModeLED(BT_WAIT);
     }
@@ -251,174 +130,47 @@ static void checkFlafLED()
     else if(postWorkLedFlag == 1){
         ModeLED(POST_WORK);
     }
-    else if(TRIG01workFlag == 1){
-        ModeLED(TRIG01_WORK);
+}
+
+static void WorkModeLED() {
+    switch (INSTRUCTION.eliteFxn) {
+    case IV_CURVE:
+    case CV_CURVE:
+    case DIFFERENTIAL_PULSE_VOLTAMMETRY:
+    case SQUARE_WAVE_VOLTAMMETRY:
+    case VOLT_OUTPUT:
+    case ZT_CURVE:
+    case VT_CURVE:
+    case IT_CURVE:
+    case ADC_TEST:
+    case CYCLIC_VOLTAMMETRY:
+    case LINEAR_SWEEP_VOLTAMMETRY:
+    case CONSTANT_VSCAN:{
+        WORKLED();
+        break;
     }
-}
-
-static void WorkModeLED()
-{
-    switch (instru.eliteFxn) {
-        case CURVE_IV:
-        case CURVE_VO:
-        case CURVE_RT:
-        case CURVE_VT:
-        case CURVE_IT:
-        case CURVE_CV:
-        case CURVE_CA:
-        case CURVE_CC:
-        case CURVE_OCP:
-        case CURVE_LSV:
-        case CURVE_IV_CY:
-        case CURVE_PULSE:
-        case CURVE_UNI_PULSE:
-            WORKLED();
-            break;
-
-        case CURVE_CALI_ADC:
-            if (instru.AdcChannel == RIS_ADC_IIN) {
-                Elite_led_color(COLOR_RED);
-            } else if (instru.AdcChannel == RIS_ADC_VIN) {
-                Elite_led_color(COLOR_ORANGE);
-            } else if (instru.AdcChannel == RIS_DAC_VOUT) {
-                Elite_led_color(COLOR_BLUE);
-            }
-            break;
-
-        case CURVE_TRIG_CC:
-            SET_LED_CHAN(TRC.chan_en, WORKING);
-            break;
-
-        default:
-            break;
-
+    case CONSTANT_CURRENT:{
+        WORKLED();
+        break;
     }
-}
-
-static void LED_channel_write(uint8_t chan, uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
-    update_LED_status(chan, bright, red, green, blue);
-    refresh_LED();
-}
-
-static void update_LED_status (uint8_t chan, uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
-    switch(chan) {
-            case LED_PR0: {
-                LED.LED_buf[2]     = 0xE000 | ((uint16_t)bright << 8) | blue;
-                LED.LED_buf[3]     = ((uint16_t)green << 8) | red;
-                break;
-            }
-            case LED_D0: {
-                LED.LED_buf[4]     = 0xE000 | ((uint16_t)bright << 8) | blue;
-                LED.LED_buf[5]     = ((uint16_t)green << 8) | red;
-                break;
-            }
-            case LED_A0: {
-                LED.LED_buf[6]     = 0xE000 | ((uint16_t)bright << 8) | blue;
-                LED.LED_buf[7]     = ((uint16_t)green << 8) | red;
-                break;
-            }
-            case LED_A2: {
-                LED.LED_buf[8]     = 0xE000 | ((uint16_t)bright << 8) | blue;
-                LED.LED_buf[9]     = ((uint16_t)green << 8) | red;
-                break;
-            }
-            case LED_A3: {
-                LED.LED_buf[10]    = 0xE000 | ((uint16_t)bright << 8) | blue;
-                LED.LED_buf[11]    = ((uint16_t)green << 8) | red;
-                break;
-            }
-            case LED_A1: {
-                LED.LED_buf[12]    = 0xE000 | ((uint16_t)bright << 8) | blue;
-                LED.LED_buf[13]    = ((uint16_t)green << 8) | red;
-                break;
-            }
-            case LED_D1: {
-                LED.LED_buf[14]    = 0xE000 | ((uint16_t)bright << 8) | blue;
-                LED.LED_buf[15]    = ((uint16_t)green << 8) | red;
-                break;
-            }
-            case LED_PR1: {
-                LED.LED_buf[16]    = 0xE000 | ((uint16_t)bright << 8) | blue;
-                LED.LED_buf[17]    = ((uint16_t)green << 8) | red;
-                break;
-            }
-            default: {
-                break;
-            }
+    case CALI_ADC_MODE:{
+        if(INSTRUCTION.AdcChannel == IIN_ADC){
+            Elite_led_color(COLOR_RED);
+        }else if(INSTRUCTION.AdcChannel == VIN_ADC){
+            Elite_led_color(COLOR_ORANGE);
         }
 
-}
-static void refresh_LED() {
-    spi_LEDtxbuf[0] = 0x0000;
-    spi_LEDtxbuf[1] = 0x0000;
-
-    for (int i = 2; i < SPI_LED_SIZE - 2; i += 2) {
-        spi_LEDtxbuf[i]     = LED.LED_buf[i];
-        spi_LEDtxbuf[i+1]   = LED.LED_buf[i+1];
+        break;
     }
-
-    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 TRIG_LED_Init() {
-    spi_LEDtxbuf[0] = 0x0000;
-    spi_LEDtxbuf[1] = 0x0000;
-
-    for (int i = 2; i < SPI_LED_SIZE - 2; i += 2) {
-        spi_LEDtxbuf[i]     = 0xE000;
-        spi_LEDtxbuf[i+1]   = 0x0000;
+//    case VIS_RST: {
+//        LEDPowerON();
+//        break;
+//    }
+    default: {
+        WORKLED();
+        break;
     }
-
-    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 SET_LED_CHAN(bool *chan_en, uint16_t modeStatus){
-    uint8_t ledcolor = 0;
-    switch(modeStatus) {
-        case NO_EVENT:{
-            ledcolor = COLOR_GREEN;
-            break;
-        }
-        case WORKING:{
-            ledcolor = COLOR_CYAN;
-            break;
-        }
-        default:{
-            ledcolor = COLOR_GREEN;
-            break;
-        }
     }
-
-    uint8_t trig_chan = 0;
-    for (int i=0; i<TRIG_CHAN_COUNT-2; i++) {
-        trig_chan = (uint8_t) (i);
-        if(TRC.chan_en[i]) {
-            Elite_chan_led_color(ledcolor, trig_chan);
-        } else {
-            Elite_chan_led_color(COLOR_BLACK, trig_chan);
-        }
-    }
-    if(!TRC.chan_en[8]) {
-        Elite_chan_led_color(COLOR_PURPLE_DARK, LED_D0);
-    } else if(TRC.chan_en[1]) {
-        Elite_chan_led_color(ledcolor, LED_D0);
-    } else {
-        Elite_chan_led_color(COLOR_BLACK, LED_D0);             // determine DOUT on or off
-    }
-    if(!TRC.chan_en[9]) {
-        Elite_chan_led_color(COLOR_PURPLE_DARK, LED_D1);
-    } else if(TRC.chan_en[6]) {
-        Elite_chan_led_color(ledcolor, LED_D1);
-    } else {
-        Elite_chan_led_color(COLOR_BLACK, LED_D1);
-    }
-    refresh_LED();
-
 }
 
 #endif

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

@@ -1,14 +0,0 @@
-
-#ifndef ELITE_LED_INIT
-#define ELITE_LED_INIT
-
-static void InitLED() {
-    for (int i = 2; i < SPI_LED_SIZE - 2; i += 2) {
-        LED.LED_buf[i]     = 0xE000;
-        LED.LED_buf[i+1]   = 0x0000;
-    }
-}
-
-
-#endif
-

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

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

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

@@ -10,20 +10,57 @@
 #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 NOTIFY_TEMPERATURE  4
+#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 uint8_t  NotifyTemperature[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
@@ -52,7 +89,7 @@ static uint8_t  finishMode         = 0;
 static void SendNotify() {
     initDATBuf();
 
-    not_buf[0] = instru.chip_id;
+    not_buf[0] = INSTRUCTION.chip_id;
 
     for (int i = 0; i < 4; i++) {
         not_buf[i + 1] = NotifyCurrent[i];
@@ -71,11 +108,9 @@ static void SendNotify() {
     not_buf[17] = (NotifyCycleNumber >> 8) & 0xff;
     not_buf[18] = NotifyCycleNumber & 0xff;
 
-    not_buf[19] = (finishMode << 7) & 0x80;
-
-//    for (int i = 20; i < BLE_DAT_BUFF_SIZE; i++){
-//        not_buf[i] = 0;
-//    }
+    for (int i = 19; i < BLE_DAT_BUFF_SIZE; i++){
+        not_buf[i] = 0;
+    }
 
     SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
 }
@@ -101,7 +136,6 @@ static void initCISBuf(){
 static void initRawDataBuf(){
     not_time_stamp    = 0;
     NotifyCycleNumber = 0;
-    finishMode        = 0;
 
     for (int i = 0; i < 4; i++){
         NotifyCurrent[i]   = 0;
@@ -114,7 +148,7 @@ static void FlushNotify(){
     initRawDataBuf();
     initDATBuf();
 
-    not_buf[0] = instru.chip_id;
+    not_buf[0] = INSTRUCTION.chip_id;
 
     SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
 }
@@ -149,12 +183,6 @@ static void InputNotify(int NotifyType, int32_t Data){
             NotifyVoltBat[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
             NotifyVoltBat[3] = (uint8_t)(Data & 0x000000FF);
             break;
-        case NOTIFY_TEMPERATURE :
-            NotifyTemperature[0] = (uint8_t)((Data & 0xFF000000) >> 24);
-            NotifyTemperature[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
-            NotifyTemperature[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
-            NotifyTemperature[3] = (uint8_t)(Data & 0x000000FF);
-            break;
     }
 }
 #endif

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

@@ -3,18 +3,19 @@
 #define ELITERESET
 
 static void reset() {
-    megaStiEnable = false;
-    PeriodicEvent = false;     // is there an PeriodicEvent?
-    Free_Work_Mode = true;      // Free(WorkModeData)
+    ModeLED(NO_EVENT);
+    InitEliteFlag();
+    InitFlag();
+    InitCT();
+    InitGPT();
+    InitLH();
 
+//    VinADCGainControl(VIN_GAIN_AUTO);
+//    IinADCGainControl(I_GAIN_AUTO);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
     initINSBuf();
     initDATBuf();
 
-    InitLED();
-    InitTrigChan();
-    disable_trig_output();
-    TW1508reset();
-
     for (int i = 0; i < SPI_LED_SIZE; i++) {
         spi_LEDtxbuf[i] = 0;
         spi_LEDrxbuf[i] = 0;
@@ -30,19 +31,25 @@ static void reset() {
         spi_ADC_rxbuf[i] = 0;
     }
 
-    ModeLED(NO_EVENT);
+    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
+//    PIN15_setOutputValue(DAC_CS, 1);  // DAC_CS HIGH
     CPUdelay(1600);
 }
 
 static void Eliteinterrupt() {
-    megaStiEnable = false;
-    PeriodicEvent = false;     // is there an PeriodicEvent?
-    Free_Work_Mode = true;      // Free(WorkModeData)
+    InitFlag();
+    ModeLED(NO_EVENT);
 
+    InitEliteFlag();
+    InitCT();
+    InitGPT();
+    InitLH();
+
+//    VinADCGainControl(VIN_GAIN_AUTO);
+//    IinADCGainControl(I_GAIN_AUTO);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
     initINSBuf();
     initDATBuf();
-    disable_trig_output();
-    TW1508reset();
 
     for (int i = 0; i < SPI_LED_SIZE; i++) {
         spi_LEDtxbuf[i] = 0;
@@ -59,7 +66,7 @@ static void Eliteinterrupt() {
         spi_ADC_rxbuf[i] = 0;
     }
 
-    ModeLED(NO_EVENT);
+    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
     CPUdelay(8000);
 }
 #endif

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

@@ -15,10 +15,9 @@
 #include "Elite_PIN.h"
 
 /* application use SPI parameters and buffers */
-#define SPI_LED_SIZE    LED_BUFF_SIZE
-#define SPI_DAC_SIZE    3
-#define SPI_ADC_SIZE    4
-#define SPI_GPIO_BUFF_SIZE   10
+#define SPI_LED_SIZE 28
+#define SPI_DAC_SIZE 5
+#define SPI_ADC_SIZE 4
 
 static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
 static uint16_t spi_LEDrxbuf[SPI_LED_SIZE] = {0};
@@ -29,9 +28,6 @@ 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 uint16_t spi_GPIO_txbuf = 0;
-static uint16_t SPI_GPIO[SPI_GPIO_BUFF_SIZE] = {0};
-
 /* system use SPI parameters */
 static SPI_Handle      spiHandle0 = NULL;  // SPI0  = LED
 static SPI_Handle      spiHandle1 = NULL;  // SPI1  = ADC +DAC
@@ -40,13 +36,10 @@ 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;  // 12k
+    spiParams0.bitRate     = 2000;  // 2k
     spiParams0.mode        = SPI_MASTER;
     spiParams0.dataSize    = 16;
     spiParams0.frameFormat = SPI_POL0_PHA1;
@@ -56,102 +49,250 @@ static void Elite_SPI_init(){
     spiParams1.bitRate     = 1000000;  // 1M
     spiParams1.mode        = SPI_MASTER;
     spiParams1.dataSize    = 8;
-    spiParams1.frameFormat = SPI_POL0_PHA1;
+    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) {
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-
     LED_transaction.count = length;
     LED_transaction.txBuf = spi_txbuf;
     LED_transaction.rxBuf = spi_rxbuf;
 
     SPI_transfer(spiHandle0, &LED_transaction);
-    PIN_setOutputValue(pin_handle, LOAD0, 0);
 }
 
 static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    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, LOAD0, 0);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
 }
 
 static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-//    PIN15_setOutputValue(DAC_CS, 0);            // DAC_CS LOW
-//    PIN_setOutputValue(pin_handle, LOAD0, 1);
-//    PIN_setOutputValue(pin_handle, D7, 0); // DAC_CS LOW
-//
-//    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, D7, 1); // DAC_CS HOGH
-//    update_latch_status (DAC_CS, 1);
-//    PIN15_setOutputValue(DAC_CS, 1);            // DAC_CS HIGH
+    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
+/* 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;
 
-//    PIN_setOutputValue(pin_handle, LOAD0, 0);       // Turn off all LATCH
-//    PIN_setOutputValue(pin_handle, LOAD1, 0);
-//    PIN_setOutputValue(pin_handle, LOAD2, 0);
-}
-static void ELITE15_SPI_CLOSE() {
-//    PIN_setOutputValue(pin_handle, LOAD0, 0);       // Turn off all LATCH
-//    PIN_setOutputValue(pin_handle, LOAD1, 0);
-//    PIN_setOutputValue(pin_handle, LOAD2, 0);
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
 
-    SPI_close(spiHandle0);
-    SPI_close(spiHandle1);
+    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
 }
 
-static void GPIO_SPI_transfer(uint32_t *GPIO_CLK_CH, uint16_t spi_GPIO_txbuf) {
+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;
 
-    for (int i=0; i<SPI_GPIO_BUFF_SIZE; i++) {
-        SPI_GPIO[i] = 0;
-    }
-
-    SPI_GPIO[0] = (spi_GPIO_txbuf & 0b0000000000000001);    // MOSI
-    SPI_GPIO[1] = (spi_GPIO_txbuf & 0b0000000000000010);
-    SPI_GPIO[2] = (spi_GPIO_txbuf & 0b0000000000000100);
-    SPI_GPIO[3] = (spi_GPIO_txbuf & 0b0000000000001000);
-    SPI_GPIO[4] = (spi_GPIO_txbuf & 0b0000000000010000);
-    SPI_GPIO[5] = (spi_GPIO_txbuf & 0b0000000000100000);
-    SPI_GPIO[6] = (spi_GPIO_txbuf & 0b0000000001000000);
-    SPI_GPIO[7] = (spi_GPIO_txbuf & 0b0000000010000000);
-    SPI_GPIO[8] = (spi_GPIO_txbuf & 0b0000000100000000);
-    SPI_GPIO[9] = (spi_GPIO_txbuf & 0b0000001000000000);
-
-    ELITE15_SPI_CLOSE();
-    add_elite_pin();
-
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    for (int i=9; i>=0; i--) {
-        PIN_setOutputValue(pin_handle, GPIO_CLK_CH[1], 0);      // generate clk signal
-        PIN_setOutputValue(pin_handle, D3, SPI_GPIO[i]);        // data transfer at rising edge, MOSI = D3
-        PIN_setOutputValue(pin_handle, GPIO_CLK_CH[1], 1);      // generate clk signal
-    }
-
-    update_latch_status (GPIO_CLK_CH[0], GPIO_CLK_CH[1], 0);
-    update_latch_status (ADC_SPI_MOSI, 0);
-    PIN_setPortOutputValue(pin_handle, 0);      // turn off all pin
-
-    remove_elite_pin();
-    ELITE15_SPI_HOLD();
+    SPI_transfer(spiHandle0, &LED_transaction);
 }
 
+
+
+#ifdef ELITE_VERSION_EIS
+//define SPI command
+#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
+
+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 void r16_REG(){
+    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);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+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 void r32_REG(){
+    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);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static void AD5940_init(){
+        PIN_setOutputValue(pin_handle, AD_reset, 0);
+        PIN_setOutputValue(pin_handle, AD_reset, 1);
+        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);
+
+        select_REG(SWCON);  //200C
+        w32_REG(0x402B5);
+
+        select_REG(HSDACCON);  //2010  //ac gain
+        w32_REG(0x001E);
+
+        select_REG(WGFCW);  //2030
+        w32_REG(0x340000);
+        select_REG(WGCON);  //2014
+        w32_REG(0x4);   //AC on/off;  0x0:DC 0x4:AC 0x5:trapezoid
+
+        select_REG(LPDACCON0);  //2128 //DC on
+        w32_REG(0b0000001);
+        select_REG(LPDACSW0);  //2124  //operation
+        w32_REG(0b101011);
+        select_REG(LPDACDAT0);  //2120 //output Vout
+        w32_REG(0x00000);
+
+        // select_REG(HSTIACON);  //20FC //SE0's gain
+        // w32_REG(0x0);
+        select_REG(DE0RESCON);  //20F8 //DE0's gain
+        w32_REG(0x68);
+
+        select_REG(ADCCON);  //21A8
+        w32_REG(0x101);
+        select_REG(DFTCON);  //20D0
+        w32_REG(0x00C1);
+        select_REG(ADCFILTERCON);  //2044
+        w32_REG(0x00D0);
+
+        select_REG(AFECON);  //2000
+        w32_REG(0x30CFC0);
+//        w32_REG(0b1100011100111111000000);
+}
+
+static void EIS_LPDAC_SPI(){
+//    uint32_t con = 0b00001;//12 bit DAC
+//    uint32_t sw = 0b01010;//test mode
+//    uint32_t volt = 0;//2.4v
+//    uint32_t buf = 0;//LP reference
+//    uint32_t cm = 0;//common mode disabled
+//    select_REG(LPDACCON0);
+//    w32_REG(con);
+//    select_REG(LPDACSW0);
+//    w32_REG(sw);
+//    select_REG(LPDACDAT0);
+//    w32_REG(volt);
+//    select_REG(LPREFBUFCON);
+//    w32_REG(buf);
+//    select_REG(SWMUX);
+//    w32_REG(cm);
+}
+
+#endif
+
 #endif // ELITE_SPI

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

@@ -0,0 +1,21 @@
+
+#ifndef ELITEZT
+#define ELITEZT
+
+// output a certain voltage e.g. 2v
+// and measure the input voltage
+// => calculate the resister
+// change the output voltage step
+// => get a R-T curve (with resolution = 1 sample/volt step )
+
+static void ZT_Vscan(RTMode *RT){
+    if(vscanReset){
+        Vset = ((int32_t)(INSTRUCTION.VoltConstant) - 25000) * 4 * 10000; //[5nV]
+        OneWayVoltScan();
+    }
+
+    if(!vscanReset){
+
+    }
+}
+#endif

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

@@ -6,144 +6,42 @@
 #include <Board.h>
 #include <ti/drivers/PIN.h>
 
-//#define ELITE_PIN_1_5
-#define 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_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                 D3
-#define Board_SPI1_CLK                  D2
+#define Board_SPI1_MOSI                 IOID_6
+#define Board_SPI1_CLK                  IOID_5
 #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 AD_CS                           IOID_10
 
-#define LOAD1                           IOID_12
-#define LOAD0                           IOID_11
-#define LOAD2                           IOID_2
-
-#define TW_SCKI_2                       LOAD0, D6
-#define TW_SCKI_3                       LOAD0, D7
-#define ADC_SPI_MOSI                    LOAD0, D3
-#define ADC_SPI_CLK                     LOAD0, D2
-#define LED_MOSI                        LOAD0, D1
-#define LED_CLK                         LOAD0, D0
-#define TW_SCKI_0                       LOAD0, D4
-#define TW_SCKI_1                       LOAD0, D5
-//#define MEM_CS                          LOAD0, D5
-
-#define BAT_CHAR                        LOAD1, D0
-#define BAT_OK                          LOAD1, D1
-#define PULLUP_3V_0                     LOAD1, D2
-#define PULLUP_3V_1                     LOAD1, D3
-#define shutdown_6994                   LOAD1, D4
-#define OUT_5V_EN_0                     LOAD1, D5
-#define enable_5v                       LOAD1, D6
-#define OUT_5V_EN_1                     LOAD1, D7
-
-//#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 DO_MOS_0                        LOAD2, D0
-#define DO_MOS_1                        LOAD2, D1
-#define AO_MOS_0                        LOAD2, D2
-#define AO_MOS_1                        LOAD2, D3
-#define AO_MOS_2                        LOAD2, D4
-#define AO_MOS_3                        LOAD2, D5
-#define DO_PR_0                         LOAD2, D6
-#define DO_PR_1                         LOAD2, D7
-
-/* I2C */
-#ifdef ELITE_VERSION_1_4
-#define Board_I2C0_SCL0                 PIN_UNASSIGNED
-#define Board_I2C0_SDA0                 PIN_UNASSIGNED
-#endif
+//#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 FLT                             IOID_13
-#define TRIG_0                          IOID_0
-//#define TRIG_1                          IOID_2
-
-//#define LOAD0   0x00000000
-//#define LOAD1   0x00000001
-//#define LOAD2   0x00000002
+#define enable_5v                       IOID_9
+#define AD_reset                        IOID_13
 
 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_GPIO_OUTPUT_DIS | PIN_INPUT_EN | PIN_PULLDOWN,                                    // to sense switch
-
-    TRIG_0 | PIN_GPIO_OUTPUT_DIS | PIN_INPUT_EN | PIN_PULLDOWN,
-//    TRIG_1 | PIN_GPIO_OUTPUT_DIS | PIN_INPUT_EN | PIN_PULLDOWN,
-    FLT    | PIN_GPIO_OUTPUT_DIS | PIN_INPUT_EN | PIN_PULLDOWN,
-
+    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 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);
-    PIN_add(pin_handle,
-    D4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-    PIN_add(pin_handle,
-    D5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-    PIN_add(pin_handle,
-    D6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-    PIN_add(pin_handle,
-    D7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-//    if(elite15_status != PIN_SUCCESS) {
-//        LED_color(DARKLED, 0x0F, 0x0F, 0x0F);
-//    }
-}
-
-static void trig_callback(PIN_Handle handle, PIN_Id pinId);
-static void PIN_trig_edge_set(uint8_t trig0_edge, uint8_t trig1_edge);
-
 static void remove_elite_pin() {
     PIN_close(pin_handle);
     pin_handle = PIN_open(&ZM_rst, BLE_IO);
-
-    PIN_registerIntCb(pin_handle, trig_callback);
-    PIN_setInterrupt(pin_handle, FLT | PIN_IRQ_NEGEDGE);
-    PIN_trig_edge_set(instru.trig0_edge, instru.trig1_edge);
 }
 
 /*!
@@ -261,8 +159,6 @@ const I2CCC26XX_HWAttrsV1 i2cCC26xxHWAttrs[CC2650_MA_I2CCOUNT] = {
         .intNum = INT_I2C_IRQ,
         .intPriority = ~0,
         .swiPriority = 0,
-        .sdaPin = Board_I2C0_SDA0,
-        .sclPin = Board_I2C0_SCL0,
     }
 };
 

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

@@ -1,207 +0,0 @@
-#ifndef ELITETRIG
-#define ELITETRIG
-
-static bool trig0_event_wait    = false;
-static bool trig1_event_wait    = false;
-static bool dual_trig_mode      = false;
-static bool single_trig_mode    = false;
-
-static void TRC_chen_en_refresh();
-
-static void InitTrigChan () {
-    for(int i=0; i<TRIG_CHAN_COUNT; i++) {
-        TRC.chan_en[i] = 0;
-    }
-    TRC.chan_en[8]       = true;    // 5V default disable
-    TRC.chan_en[9]       = true;
-}
-
-static void trig_en_check( ) {
-    if (instru.trig0_en) {
-        trig0_event_wait        = true;
-    }
-    if (instru.trig1_en) {
-        trig1_event_wait        = true;
-    }
-
-    if (trig0_event_wait & trig1_event_wait) {
-        dual_trig_mode      = true;
-        single_trig_mode    = false;
-    } else if (trig0_event_wait ^ trig1_event_wait) {
-        dual_trig_mode      = false;
-        single_trig_mode    = true;
-    } else if (!(trig0_event_wait | trig1_event_wait)) {
-        dual_trig_mode      = false;
-        single_trig_mode    = false;
-    }
-
-}
-
-static void FLT_sense( ) {
-    bool FLT_value      = true;
-    FLT_value = PIN_getInputValue(FLT);
-
-    if(!FLT_value) {        // if FLT = LOW, disable all output
-//            PIN15_setOutputValue(OUT_5V_EN_0, 1);
-//            PIN15_setOutputValue(OUT_5V_EN_1, 1);
-//        set_output_enable(allDisable);
-    } else {
-        PIN15_setOutputValue_refresh();
-    }
-}
-
-static void trig_sense( ) {
-    if (Trig_receive) {
-        Trig_receive = false;
-
-        if (dual_trig_mode) {     // both channel are triggered
-            if(trig0_event & trig1_event & trig0_event_wait & trig1_event_wait) {
-                trig0_event         = false;
-                trig1_event         = false;
-                trig0_event_wait    = false;
-                trig1_event_wait    = false;
-                trig_PeriodicEvent  = true;
-                dual_trig_mode      = false;
-            }
-        } else if (single_trig_mode) {
-            if (trig0_event_wait & trig0_event) {
-                trig0_event         = false;
-                trig0_event_wait    = false;
-                trig_PeriodicEvent  = true;
-                single_trig_mode    = false;
-            } else if (trig1_event_wait & trig1_event) {
-                trig1_event         = false;
-                trig1_event_wait    = false;
-                trig_PeriodicEvent  = true;
-                single_trig_mode    = false;
-            }
-        }
-
-        if (FLT_event) {
-            FLT_event = false;
-            FLT_sense();
-        }
-    }
-}
-
-static void trig_callback(PIN_Handle handle, PIN_Id pinId) {
-    if(TRIG_TrigEnable) {
-        Trig_receive = true;
-        switch (pinId) {
-            case TRIG_0: {
-                trig0_event = true;
-                break;
-            }
-//            case TRIG_1: {
-//                trig1_event = true;
-//                break;
-//            }
-            case FLT:{
-                FLT_event   = true;
-                break;
-            }
-            default: {
-                break;
-            }
-        }
-    }
-}
-
-static void PIN_trig_edge_set(uint8_t trig0_edge, uint8_t trig1_edge) {
-/* Set trigger signal dge type:   0: NEG, 1: POS, 2: BOTH, 3: disable*/
-    switch (trig0_edge) {
-        case TRIG_POSEDGE: {
-            PIN_setInterrupt(pin_handle, TRIG_0 | PIN_IRQ_POSEDGE);
-            break;
-        }
-        case TRIG_NEGEDGE: {
-            PIN_setInterrupt(pin_handle, TRIG_0 | PIN_IRQ_NEGEDGE);
-            break;
-        }
-        case TRIG_BOTHEDGE: {
-            PIN_setInterrupt(pin_handle, TRIG_0 | PIN_IRQ_BOTHEDGES);
-            break;
-        }
-        case TRIG_DIS: {
-            PIN_setInterrupt(pin_handle, TRIG_0 | PIN_IRQ_DIS);
-            break;
-        }
-        default: {
-            PIN_setInterrupt(pin_handle, TRIG_0 | PIN_IRQ_DIS);
-            break;
-        }
-    }
-//    switch (trig1_edge) {
-//        case TRIG_POSEDGE: {
-//            PIN_setInterrupt(pin_handle, TRIG_1 | PIN_IRQ_POSEDGE);
-//            break;
-//        }
-//        case TRIG_NEGEDGE: {
-//            PIN_setInterrupt(pin_handle, TRIG_1 | PIN_IRQ_NEGEDGE);
-//            break;
-//        }
-//        case TRIG_BOTHEDGE: {
-//            PIN_setInterrupt(pin_handle, TRIG_1 | PIN_IRQ_BOTHEDGES);
-//            break;
-//        }
-//        case TRIG_DIS: {
-//            PIN_setInterrupt(pin_handle, TRIG_1 | PIN_IRQ_DIS);
-//            break;
-//        }
-//        default: {
-//            PIN_setInterrupt(pin_handle, TRIG_1 | PIN_IRQ_DIS);
-//            break;
-//        }
-//    }
-}
-
-static void set_output_enable(bool *out_chan) {
-    TRC_chen_en_refresh();
-
-    update_latch_status(DO_PR_0    , out_chan[0]);
-    update_latch_status(DO_MOS_0   , out_chan[1]);
-    update_latch_status(AO_MOS_0   , out_chan[2]);
-    update_latch_status(AO_MOS_2   , out_chan[3]);
-    update_latch_status(AO_MOS_3   , out_chan[4]);
-    update_latch_status(AO_MOS_1   , out_chan[5]);
-    update_latch_status(DO_MOS_1   , out_chan[6]);
-    update_latch_status(DO_PR_1    , out_chan[7]);
-    update_latch_status(OUT_5V_EN_0, out_chan[8]);
-    update_latch_status(OUT_5V_EN_1, out_chan[9]);
-
-    PIN15_setOutputValue_refresh();
-}
-
-static void trig_event_flush() {
-    trig_PeriodicEvent  = false;
-    TRIG_TrigEnable     = false;
-    Trig_receive        = false;
-    trig0_event         = false;
-    trig1_event         = false;
-    FLT_event           = false;
-    trig0_event_wait    = false;
-    trig1_event_wait    = false;
-    dual_trig_mode      = false;
-    single_trig_mode    = false;
-}
-
-static void TRC_chen_en_refresh() {
-    TRC.chan_en[0]      = instru.tri_pr0_en;
-    TRC.chan_en[7]      = instru.tri_pr1_en;
-
-    TRC.chan_en[1]      = instru.tri_d0_en;
-    TRC.chan_en[6]      = instru.tri_d1_en;
-
-    TRC.chan_en[2]      = instru.tri_a0_en;
-    TRC.chan_en[3]      = instru.tri_a2_en;
-    TRC.chan_en[4]      = instru.tri_a3_en;
-    TRC.chan_en[5]      = instru.tri_a1_en;
-
-    TRC.chan_en[8]      = instru.output_5v_en0;
-    TRC.chan_en[9]      = instru.output_5v_en1;
-
-}
-
-#endif
-
-

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

@@ -2,7 +2,7 @@
 ***********************************************************
     Read battery's method
 ***********************************************************
-1.read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
+1.ReadADCBat(spi_ADC_rxbuf)
   let "spi_ADC_rxbuf" be 8000
   8000 * 187.5uV * 2 = 3000000uV = 3V ;
 2.AONBatMonBatteryVoltageGet()
@@ -34,41 +34,40 @@ static uint8_t headstage_battery_percent() {
 static void headstage_battery_volt(){
     uint32_t bat_volt = 0;
 
-    read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
+    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 ;
-//    bat_volt = (bat_volt - 1) * 187.5 * 2;
-
     InputNotify(NOTIFY_VOLT_BAT, bat_volt);
 }
 
-static void headstage_temperature(void) {
-    int32_t curTemp = 0;
-
-    curTemp = AONBatMonTemperatureGetDegC();
-    InputNotify(NOTIFY_TEMPERATURE,curTemp);
-}
-
 static void EliteADCBattery(){
     static uint8_t ADCSwitch = 0;
-    if(ADCSwitch == 0){ /**read V**/
-        read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 1){ /**read V**/
-        read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 2){ /**read V(buffer)**/
-        headstage_battery_volt();
-        batteryCheck_flag = false;
-        headstage_temperature();
-        tempCheck_flag = false;
+    if(INSTRUCTION.eliteFxn == ADC_TEST){
         ADCSwitch = 0;
+    }else{
+        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;
@@ -85,14 +84,8 @@ static void measureBat(){
 
     uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
                    ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-    if( bat < 768 && bat > 20){     // 768 = 3V
-        PIN15_setOutputValue(enable_5v, 0);
-    } else if (bat < 1070){             // 1075 = 4.2V
-        PIN15_setOutputValue(BAT_CHAR, 1);
-        PIN15_setOutputValue(BAT_OK, 0);
-    } else if (bat >= 1075){
-        PIN15_setOutputValue(BAT_CHAR, 0);
-        PIN15_setOutputValue(BAT_OK, 1);
+    if( bat < 768 && bat > 20){
+        PIN_setOutputValue(pin_handle, enable_5v, 0);
     }
 }
 

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

@@ -20,57 +20,35 @@
 #define VIS_CC_ZERO                     0x40
 
 // RIS (real instruction)
-enum all_mode_e {
-    CURVE_IV                       =  0x01, // I-V Curve                       //0x10,
-    CURVE_IV_CY                    =  0x02, // Cycle I-V                       //0x20,
-    CURVE_VO                       =  0x03, // Function Generator              //0x30,
-    CURVE_RT                       =  0x04, // R-T Graph                       //0x40,
-    CURVE_VT                       =  0x05, // V-T Graph                       //0x50,
-    CURVE_IT                       =  0x06, // I-T Graph                       //0x60,
-    CURVE_CC                       =  0x07, // Constant Current (CC)           //0xD0,
-    CURVE_OCP                      =  0x08, // Open Circuit Potential (OCP)
-    CURVE_CV                       =  0x09, // Cyclic Voltammetry (CV)         //0xC0,
-    CURVE_LSV                      =  0x0A, // Linear Sweep Voltammetry (LSV)  //0x02,
-    CURVE_CA                       =  0x0B, // Chronoamperometric Graph (CA)   //0x03,
-    CURVE_PULSE                    =  0x0C,                                    //0x94,
-    CURVE_UNI_PULSE                =  0x0D, // universal pulse
-    CURVE_TRIG_CC                  =  0x0E, // current control mode
-
-    CURVE_CALI_ADC                 =  0xF1, // Cali ADC - test                 //0x92,
-    DEV_TEST                       =  0xFF,
-
-    SET_SAMPLE_RATE                =  0xE0,                                    //0x70,
-    SET_ADC_DAC_GAIN               =  0xE1,                                    //0x80,
-    SET_EN_CHAN                    =  0x81,
-    SET_PARA                       =  0xE2,
-    SET_TRIG_EN                    =  0x41
-};
-
-enum set_para_e {
-    DAC_VOLT                        = 0x01,
-    AOUT_CURRENT                    = 0x02,
-};
-
-enum dev_para_e {
-    VERSION_DEV_TEST                = 0x01,
-    BAT_DEV_TEST                    = 0x02,
-    TEMP_DEV_TEST                   = 0x03,
-    LED_DEV_TEST                    = 0x04,
-    AOUT_DEV_TEST                   = 0x05,
-    DOUT_DEV_TEST                   = 0x06,
-    PR_DEV_TEST                     = 0x07,
-    OUT_5VEN_DEV_TEST               = 0x08,
-    SET_EN_CHAN_DEV_TEST            = 0x0F,
-    VIS_DEV_TRIG_EN                 = 0x09,
-    Init_DEV_Trig_flag              = 0x0A
-};
-
+#define IV_CURVE                        0x10
+#define CV_CURVE                        0x20
+#define VOLT_OUTPUT                     0x30
+#define ZT_CURVE                        0x40
+#define VT_CURVE                        0x50
+#define IT_CURVE                        0x60
+#define SET_SAMPLE_RATE                 0x70
+#define SET_ADC_DAC_GAIN                    0x80
+#define DIFFERENTIAL_PULSE_VOLTAMMETRY  0xA0
+#define SQUARE_WAVE_VOLTAMMETRY         0xB0
+#define CYCLIC_VOLTAMMETRY              0xC0
+#define CONSTANT_CURRENT                0xD0
+#define CYCLE_CONSTANT_CURRENT          0xF0
+#define HIGH_CYCLE_CYCLIC_VOLTAMMETRY   0x01
+#define LINEAR_SWEEP_VOLTAMMETRY        0x02
+#define CONSTANT_VSCAN                  0x03
+#define ADC_TEST                        0x91
+#define CALI_DAC_MODE                   0x93
+#define CALI_ADC_MODE                   0x92
 
 // CIS (control instruction)
 #define CIS_VERSION                     0x40
 #define CIS_VOLT                        0x10
-#define CIS_TEMPERATURE                 0x80
-
+#define CIS_LED_TEST                    0x70
+#define CTL_WRT                         0x20
+#define CTL_RD                          0x21
+#define CTL_RD_DFTR                     0x78
+#define CTL_RD_DFTI                     0x7C
+#define CTL_WRT_WGAMPL                  0x3C
 // mode parameter
 #define STEP_TO_VSETRATE(step)   step2VsetRate(step)
 #define VMAX(v1,v2)              ((v1 >= v2) ? v1 : v2)
@@ -78,6 +56,9 @@ enum dev_para_e {
 #define VDIRECTION(v1,v2)        ((v1 > v2)  ?  0 : 1)
 #define AFTER_READ_I             0
 #define AFTER_READ_V             1
+#define ReadADCVolt(x)           ((x==0)? ReadADCVout(spi_ADC_rxbuf) : ReadADCVin(spi_ADC_rxbuf))
+#define PARA_1                   0x01
+#define PARA_2                   0x02
 
 //Elite LED
 #define COLOR_BLACK              0x00
@@ -91,41 +72,17 @@ enum dev_para_e {
 #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)
 
-/* TRIG01 define */
-#define TRIG_PR                  0x00
-#define TRIG_MOS_DOUT            0x01
-#define TRIG_MOS_AOUT            0x02
-#define TRIG_5V_OUT              0x03
-#define TRIG_input               0x04
-#define TRIG_CHAN_COUNT          10     // channel count of TRIG01
 
 #define BT_WAIT                  0x01
 #define NO_EVENT                 0x02
 #define PRE_WORK                 0x03
 #define WORKING                  0x04
 #define POST_WORK                0x05
-#define TRIG01_WORK              0x06
 
-#define VALUE_ZERO_TO_ONE(_v)    (_v == 0) ? 1 : _v
-
-//plot_type
-#define IT_PLOT             1
-#define VT_PLOT             2
-#define VOUT_PLOT           3
-#define IIN_VIN_PLOT        4
-#define IIN_VIN_VOUT_PLOT   5
-
-#define CLOCK_ONE_SECOND 10000
 
 #endif

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

@@ -2,11 +2,11 @@
 #ifndef VERSION_DATE
 #define VERSION_DATE
 
-#define VERSION_DATE_YEAR      21
-#define VERSION_DATE_MONTH     10
-#define VERSION_DATE_DAY       29
-#define VERSION_DATE_HOUR      18
-#define VERSION_DATE_MINUTE    18
+#define VERSION_DATE_YEAR      20
+#define VERSION_DATE_MONTH     9
+#define VERSION_DATE_DAY       7
+#define VERSION_DATE_HOUR      17
+#define VERSION_DATE_MINUTE    58
 
 // this is NOT the version hash !!
 // it's the last version hash

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

@@ -30,12 +30,6 @@
 
 #define SPI_BUFFER_SIZE 16
 
-/**
-* the pointer to point which channel is used currently.
-* -1 for not beginning.
-*/
-static int8    channel_pointer            = -1;
-
 static uint8_t spi_txbuf[SPI_BUFFER_SIZE] = {0};
 static uint8_t spi_rxbuf[SPI_BUFFER_SIZE] = {0};
 
@@ -135,16 +129,16 @@ static void update_ins_sti_channel(uint8_t *buf, uint8 sti_chp, uint8 sti_chn) {
 
 static void update_ins_buffer() {
     uint8 header      = 0b10100000;
-    uint8 amp_gain    = (instru.amp_gain & 0b11) << 3;
-    uint8 amp_lbf     = instru.amp_low_band_freq & 0b111;
+    uint8 amp_gain    = (INSTRUCTION.amp_gain & 0b11) << 3;
+    uint8 amp_lbf     = INSTRUCTION.amp_low_band_freq & 0b111;
     uint8 channel     = 0;  // should be call update_ins_channel to modify this value
-    uint8 chopper     = (instru.chopper) ? 0b00001000 : 0;
-    uint8 fast_settle = (instru.fast_settle) ? 0b00000100 : 0;
-    uint8 sti_enable  = (instru.work_mode != STI_MODE_DISABLE) ? 0b00000010 : 0;
-    uint8 sti_volt_l  = (instru.sti_volt & 0b11111) >> 4;
-    uint8 sti_volt_h  = (instru.sti_volt & 0b01111) << 4;
-    uint8 sti_chp     = instru.sti_channel_pmos & 0b1111;
-    uint8 sti_chn     = (instru.sti_channel_nmos & 0b1111) << 4;
+    uint8 chopper     = (INSTRUCTION.chopper) ? 0b00001000 : 0;
+    uint8 fast_settle = (INSTRUCTION.fast_settle) ? 0b00000100 : 0;
+    uint8 sti_enable  = (INSTRUCTION.work_mode != STI_MODE_DISABLE) ? 0b00000010 : 0;
+    uint8 sti_volt_l  = (INSTRUCTION.sti_volt & 0b11111) >> 4;
+    uint8 sti_volt_h  = (INSTRUCTION.sti_volt & 0b01111) << 4;
+    uint8 sti_chp     = INSTRUCTION.sti_channel_pmos & 0b1111;
+    uint8 sti_chn     = (INSTRUCTION.sti_channel_nmos & 0b1111) << 4;
     uint8 clk_signal  = 0;  // should be call update_ins_clock to modify this value
 
     spi_txbuf[0] = header | amp_gain | amp_lbf;
@@ -199,7 +193,7 @@ static bool update_ins_rec_buffer() {
  * @param: buf: pointer of the SPI buffer.
  */
 static void update_ins_sti_buffer() {
-    switch (instru.work_mode) {
+    switch (INSTRUCTION.work_mode) {
     case STI_MODE_POS:
     case STI_MODE_NEG:
         // copy [4:7]
@@ -221,7 +215,7 @@ static void update_ins_sti_buffer() {
         update_ins_sti_enable(spi_txbuf, TRUE);
         // ins buf [4:7]
         update_ins_sti_enable(spi_txbuf + 4, TRUE);
-        update_ins_sti_channel(spi_txbuf + 4, 0xF, instru.sti_channel_pmos);
+        update_ins_sti_channel(spi_txbuf + 4, 0xF, INSTRUCTION.sti_channel_pmos);
         // ins buf [8:B]
         update_ins_sti_enable(spi_txbuf + 8, FALSE);
         break;
@@ -244,13 +238,13 @@ static void update_ins_sti_buffer() {
         spi_txbuf[15] = spi_txbuf[3];
         // change content
         update_ins_sti_enable(spi_txbuf + 0, TRUE);
-        update_ins_sti_channel(spi_txbuf + 0, instru.sti_channel_pmos, instru.sti_channel_nmos);
+        update_ins_sti_channel(spi_txbuf + 0, INSTRUCTION.sti_channel_pmos, INSTRUCTION.sti_channel_nmos);
         // ins buf [4:7]
         update_ins_sti_enable(spi_txbuf + 4, TRUE);
-        update_ins_sti_channel(spi_txbuf + 4, instru.sti_channel_nmos, instru.sti_channel_pmos);
+        update_ins_sti_channel(spi_txbuf + 4, INSTRUCTION.sti_channel_nmos, INSTRUCTION.sti_channel_pmos);
         // ins buf [8:B]
         update_ins_sti_enable(spi_txbuf + 8, TRUE);
-        update_ins_sti_channel(spi_txbuf + 8, 0xF, instru.sti_channel_nmos);
+        update_ins_sti_channel(spi_txbuf + 8, 0xF, INSTRUCTION.sti_channel_nmos);
         // ins buf [C:F]
         update_ins_sti_enable(spi_txbuf + 12, FALSE);
         break;
@@ -287,12 +281,12 @@ static void headstage_tni_update_instruction_callback(uint8_t ins_type, uint8_t
 }
 
 static uint8_t *spi_transact_rec_instruction() {
-    if (IS_REC_MODE(instru.work_mode)) {
+    if (IS_REC_MODE(INSTRUCTION.work_mode)) {
         PIN_setOutputValue(pin_handle, IOID_13, 1);  // DBS_P2S turn on
         headstage_spi_transaction(SPI_BUFFER_SIZE, spi_txbuf, spi_rxbuf);
         PIN_setOutputValue(pin_handle, IOID_13, 0);  // DBS_P2S turn off
 
-    } else if (IS_ARM_MODE(instru.work_mode) && !adc_clock_signal) {
+    } else if (IS_ARM_MODE(INSTRUCTION.work_mode) && !adc_clock_signal) {
         create_ramp(spi_rxbuf);
     }
 

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

@@ -22,7 +22,7 @@
 #include "EliteWorkData.h"
 #include <driverlib/aon_batmon.h>
 
-static void SimpleBLEPeripheral_performPeriodicTask(void);
+static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData);
 
 static void SimpleBLEPeripheral_clockHandler(UArg arg) {
     // Store the event.
@@ -46,355 +46,47 @@ static void ZM_init() {
 
     // initialize
     pin_handle = PIN_open(&ZM_rst, BLE_IO);
-    InitLED();
-    InitTrigChan();
-    Init_Elite15_PIN();
-    ELITE15_SPI_HOLD();
 
-    PIN15_setOutputValue(shutdown_6994, 1);     // OFF = 1 => turn off 6994
-    PIN15_setOutputValue(PULLUP_3V_0, 0);
-    PIN15_setOutputValue(PULLUP_3V_1, 0);
-
-    disable_trig_output();      // all output disable
+    PIN_setOutputValue(pin_handle, AD_CS, 1);            // AD_CS HIGH
 
     InitEliteInstruction();
 
     elite_gptimer_open();
-    elite_gptimer_start();
-
-    TW1508reset();
-//    TRIG_LED_Init();
-    //    PIN_registerIntCb(pin_handle, switch_on_callback);
-    //    PIN_setInterrupt(pin_handle, switch_on | PIN_IRQ_POSEDGE);
 }
 
 static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins) {}
 
-#define IsPeriodicMode() (                       \
-(instru.eliteFxn == CURVE_IV)                 || \
-(instru.eliteFxn == CURVE_IV_CY)              || \
-(instru.eliteFxn == CURVE_IT)                 || \
-(instru.eliteFxn == CURVE_VT)                 || \
-(instru.eliteFxn == CURVE_RT)                 || \
-(instru.eliteFxn == CURVE_CC)                 || \
-(instru.eliteFxn == CURVE_CV)                 || \
-(instru.eliteFxn == CURVE_LSV)                || \
-(instru.eliteFxn == CURVE_CA)                 || \
-(instru.eliteFxn == CURVE_VO)                 || \
-(instru.eliteFxn == CURVE_OCP)                || \
-(instru.eliteFxn == CURVE_CALI_ADC)           || \
-(instru.eliteFxn == CURVE_TRIG_CC)               \
+
+static void DACCode2Real2Notify(uint16_t DACcode) {
+    int32_t RealV;
+    RealV = DAC_to_realV(INSTRUCTION.VoutGainLevel, DACcode);
+
+    NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
+    NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
+    NotifyVolt[2] = (uint8_t)((RealV & 0x0000FF00) >> 8);
+    NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
+}
+
+#define IsPeriodicMode() (                            \
+(INSTRUCTION.eliteFxn == IV_CURVE)                 || \
+(INSTRUCTION.eliteFxn == CV_CURVE)                 || \
+(INSTRUCTION.eliteFxn == IT_CURVE)                 || \
+(INSTRUCTION.eliteFxn == VT_CURVE)                 || \
+(INSTRUCTION.eliteFxn == ZT_CURVE)                 || \
+(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)         || \
+(INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)       || \
+(INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY) || \
+(INSTRUCTION.eliteFxn == CONSTANT_VSCAN)           || \
+(INSTRUCTION.eliteFxn == CALI_ADC_MODE)               \
 )
 
-#define Ve1MatchVe2Mode() (                      \
-(instru.eliteFxn == CURVE_IV)                 || \
-(instru.eliteFxn == CURVE_IV_CY)              || \
-(instru.eliteFxn == CURVE_CV)                 || \
-(instru.eliteFxn == CURVE_LSV)                   \
+#define Ve1MatchVe2Mode() (                           \
+(INSTRUCTION.eliteFxn == IV_CURVE)                 || \
+(INSTRUCTION.eliteFxn == CV_CURVE)                 || \
+(INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)       || \
+(INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY)    \
 )
 
-static void pulse_mode(void)
-{
-     // Default working flow is vscan -> ADC read -> send notify
-     // We will need a flag to control vscan, ADC and notify
-
-     if(mode_init){
-        GPT.SampleRateCounter = instru.sampleRate - 10;
-        GPT.VscanRateCounter  = instru.VsetRate - 1;
-         mode_init       = false;
-         batteryADC_flag = false;
-         volt_rec_en     = true;
-         curr_rec_en     = true;
-         firstTimeReset  = true;
-         notifyFirst_flag = true;
-         //pulsemode variable
-         stiFirstTime  = true;
-         VinADCGainCtrl(instru.VinADCGainLv);
-         IinADCGainCtrl(instru.IinADCGainLv);
-         VoutGainControl(instru.VoutGainLv);
-         if (Ve1MatchVe2Mode()) {
-             if (instru.Ve1 == instru.Ve2) {
-                 DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, instru.Ve1));
-                 PeriodicEvent = false;
-//                 PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-                 ModeLED(NO_EVENT);
-             }
-         } else if (instru.eliteFxn == CURVE_PULSE) {
-             if(!megaStiEnable){
-                  PeriodicEvent = false;
-//                  PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-                  ModeLED(NO_EVENT);
-             }
-         }
-     }
-
-
-     GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-     if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
-         vscanReset = true;
-     }else{
-         if(notifyFirst_flag){
-             GPT.NotifyCounter = instru.notifyRate - 20;
-             notifyFirst_flag = false;
-         }
-         vscanReset = false;
-         leadTimeReset = false;
-     }
-
-    //vscan counter
-    GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-    //pulse mode counter
-    GPT.StiCounter = GPT.StiCounter + GPT.DeltaGptimerCounter;
-    if (vscanReset) {
-        DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
-        DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
-        //vscanReset = false;
-    }else{
-        if (megaStiEnable) {
-            pulse_vscan();
-        }
-    }
-
-     //battery counter
-     GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-     GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-     if(GPT.BatteryCheckCounter >= 50000){
-         GPT.BatteryCheckCounter -= 50000; //To get right time
-         batteryCheck_flag = true;
-         tempCheck_flag = true;
-     }
-
-     uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-     if( bat < 768 && bat > 20){
-         PIN15_setOutputValue(enable_5v, 0);
-     }
-
-     //ADC counter
-     GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-     if(GPT.SampleRateCounter >= instru.sampleRate){
-         GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-         EliteADCControl(0);
-     }
-
-     //Notify counter(Notify control, check if we need to send notify)
-     //please don't put Notify counter before ADC counter, maybe get wrong data
-     GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
-     if(GPT.NotifyCounter >= instru.notifyRate){
-         GPT.NotifyCounter -= instru.notifyRate; //To get right time
-         notify_flag = true;
-         if(vscanReset){
-             notify_flag = false;
-         }
-         if(notify_flag){
-             SendNotify();
-             notify_flag = false;
-         }
-     }
-
-     mode_done();
-
-}
-
-static void peri_mode(void)
-{
-
-
-    GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-    if (leadTimeReset && GPT.LeadTimeCounter <= 2000) {
-        vscanReset = true;
-        if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
-            if (instru.eliteFxn == CURVE_OCP) {
-//                PIN15_setOutputValue(HIGH_Z_MODE, 0);
-            } else {
-//                PIN15_setOutputValue(HIGH_Z_MODE, 1); // HIGH Z MODE // 1: close; 0: open;
-            }
-            first_highz_flag = false;
-        }
-    } else {
-        if (notifyFirst_flag) {
-            GPT.NotifyCounter = instru.notifyRate - 20;
-            notifyFirst_flag = false;
-        }
-        vscanReset = false;
-        leadTimeReset = false;
-    }
-
-    //vscan counter
-    GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-    if (GPT.VscanRateCounter >= instru.VsetRate) {
-        if (GPT.VscanRateCounter >= instru.VsetRate * 2) {
-            GPT.GptimerMultiple = GPT.VscanRateCounter / instru.VsetRate;
-        } else {
-            GPT.GptimerMultiple = 1;
-        }
-        GPT.VscanRateCounter -= instru.VsetRate * GPT.GptimerMultiple; //To get right time
-        vscan_ctrl(0);
-    }
-
-    //battery counter
-    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-    if(GPT.BatteryCheckCounter >= 50000){
-        GPT.BatteryCheckCounter -= 50000; //To get right time
-        batteryCheck_flag = true;
-        tempCheck_flag = true;
-    }
-
-    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-    if( bat < 768 && bat > 20){
-//            PIN15_setOutputValue(enable_5v, 0);
-    }
-
-    //ADC counter
-    GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-    if(GPT.SampleRateCounter >= instru.sampleRate){
-        GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-        EliteADCControl(0);
-    }
-
-    // Over temperature protection
-    uint16_t CC2650temp =  ((uint16_t)(NotifyTemperature[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyTemperature[3]) & 0x00FF);
-    if(CC2650temp > 40) {
-        PIN15_setOutputValue(enable_5v, 0);
-    }
-
-    //Notify counter(Notify control, check if we need to send notify)
-    //please don't put Notify counter before ADC counter, maybe get wrong data
-    GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
-    if(GPT.NotifyCounter >= instru.notifyRate){
-        GPT.NotifyCounter -= instru.notifyRate; //To get right time
-        notify_flag = true;
-        if(vscanReset){
-            notify_flag = false;
-        }
-
-        if (!volt_rec_en || !curr_rec_en) {
-            notify_flag = false;
-        }
-
-        if(notify_flag){
-            SendNotify();
-            notify_flag = false;
-        }
-    }
-
-    mode_done();
-
-}
-
-static void uni_pulse_mode(void)
-{
-    // Default working flow is vscan -> ADC read -> send notify
-    // We will need a flag to control vscan, ADC and notify
-
-    GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-    if (leadTimeReset && GPT.LeadTimeCounter <= 2000) {
-        vscanReset = true;
-        GPT.VscanRateCounter = 0xFFFFFFFF;
-        if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
-//            PIN15_setOutputValue(HIGH_Z_MODE, instru.hign_z_en); // HIGH Z MODE // 1: close; 0: open;
-            first_highz_flag = false;
-        }
-    } else {
-        if (notifyFirst_flag) {
-            GPT.NotifyCounter = instru.notifyRate - 20;
-            notifyFirst_flag = false;
-        }
-        if (vscanReset) {
-            GPT.VscanRateCounter = 0xFFFFFFFF;
-        }
-        vscanReset = false;
-        leadTimeReset = false;
-    }
-
-    //vscan counter
-    GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-    if (GPT.VscanRateCounter >= instru.period) {
-        GPT.VscanRateCounter -= instru.period; //To get right time
-    }
-    vscan_ctrl(GPT.VscanRateCounter);
-
-    //battery counter
-    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-    if(GPT.BatteryCheckCounter >= 50000){
-        GPT.BatteryCheckCounter -= 50000; //To get right time
-        batteryCheck_flag = true;
-        tempCheck_flag = true;
-    }
-
-    //ADC counter
-    GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-    if(GPT.SampleRateCounter >= instru.sampleRate){
-        GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-        EliteADCControl(GPT.VscanRateCounter);
-    }
-
-    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-    if( bat < 768 && bat > 20){
-//            PIN15_setOutputValue(enable_5v, 0);
-    }
-
-    // Over temperature protection
-    uint16_t CC2650temp =  ((uint16_t)(NotifyTemperature[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyTemperature[3]) & 0x00FF);
-    if(CC2650temp > 40) {
-        PIN15_setOutputValue(enable_5v, 0);
-    }
-
-    mode_done();
-
-}
-
-static void mode_init_set(void)
-{
-    batteryADC_flag = false;
-    volt_rec_en     = true;
-    curr_rec_en     = true;
-    firstTimeReset  = true;
-    notifyFirst_flag = true;
-    first_highz_flag = true;
-    DACReset          = true;
-    vscanReset        = true;
-    leadTimeReset     = true;
-
-    if (instru.notifyRate > 1000) {
-    // slow notify rate, < 10sps, auto gain changer only use ADC gain level = 1.2.3.4
-    // gain_switch_on: [1:4]: none
-    //                 [5]: ADC gain level = 4, if value = 1, gain 4 switch on
-    //                 [6]: ADC gain level = 3, if value = 1, gain 3 switch on
-    //                 [7]: ADC gain level = 2, if value = 1, gain 2 switch on
-    //                 [8]: ADC gain level = 1, if value = 1, gain 1 switch on
-        instru.gain_switch_on = 0b11110000;
-
-    } else {
-    // fast notify rate, >= 10sps, auto gain changer only use ADC gain level = 1.2.3
-        instru.gain_switch_on = 0b01110000;
-    }
-
-    if (instru.IinADCGainLv == I_GAIN_AUTO) {
-        instru.IinADCGainLv = I_GAIN_100R;
-    }
-
-    if (instru.VinADCAutoGainEn == VIN_GAIN_AUTO) {
-        instru.VinADCGainLv = VIN_GAIN_1K;
-    }
-
-    VinADCGainCtrl(instru.VinADCGainLv);
-    IinADCGainCtrl(instru.IinADCGainLv);
-    VoutGainControl(instru.VoutGainLv);
-
-    if (Ve1MatchVe2Mode()) {
-        if (instru.Ve1 == instru.Ve2) {
-            DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, instru.Ve1));
-            PeriodicEvent = false;
-//            PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-            ModeLED(NO_EVENT);
-        }
-    }
-
-    return;
-}
-
 /*********************************************************************
  * @fn      SimpleBLEPeripheral_performPeriodicTask
  *
@@ -404,258 +96,207 @@ static void mode_init_set(void)
  *
  * @return  None.
  */
-static void SimpleBLEPeripheral_performPeriodicTask(void)
-{
-    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-    GPT.GptimerCounter0 = GPT.GptimerCounter;
+static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
+    if ( IsPeriodicMode() ){
+        /** Periodic Event **/
+        // Default working flow is vscan -> ADC read -> send notify
+        // We will need a flag to control vscan, ADC and notify
 
-    if (IsPeriodicMode()) {
-        if (mode_init) {
-            GPT.SampleRateCounter = instru.sampleRate - 10;
-            GPT.VscanRateCounter  = instru.VsetRate - 1;
-            mode_init  = false;
-            mode_init_set();
+        GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+        GPT.GptimerCounter0 = GPT.GptimerCounter;
+
+        if(EliteWorkReset){
+            InitEliteGPtimer();
+            EliteWorkReset  = false;
+            batteryADC_flag = false;
+            record_flag     = true;
+//            VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//            IinADCGainControl(INSTRUCTION.ADCGainLevel);
+            if( Ve1MatchVe2Mode() ){
+                if (INSTRUCTION.Ve1 == INSTRUCTION.Ve2) {
+                    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1));
+                    PeriodicEvent = false;
+                    ModeLED(NO_EVENT);
+                }
+            }
         }
 
-        peri_mode();
 
-        return;
-    }
-
-    if (instru.eliteFxn == CURVE_UNI_PULSE) {
-        if (mode_init) {
-            mode_init = false;
-            mode_init_set();
-            calc_avg_en = false;
+        GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
+        if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
+            vscanReset = true;
+        }else{
+            if(notifyFirst_flag){
+                GPT.NotifyCounter = INSTRUCTION.notifyRate - 20;
+                notifyFirst_flag = false;
+            }
+            vscanReset = false;
+            leadTimeReset = false;
         }
 
-        uni_pulse_mode();
+        //vscan counter
+        GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
+        if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate){
+            if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate * 2){
+                GPT.GptimerMultiple = GPT.VscanRateCounter / INSTRUCTION.VsetRate;
+            }else{
+                GPT.GptimerMultiple = 1;
+            }
+            GPT.VscanRateCounter -= INSTRUCTION.VsetRate * GPT.GptimerMultiple; //To get right time
+            vscan_flag = true;
+            if(vscan_flag){
+                EliteVscanControl(WorkModeData);
+                vscan_flag = false;
+            }
+        }
 
-        return;
+        //battery counter
+        GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
+        GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+        if(GPT.BatteryCheckCounter >= 50000){
+            GPT.BatteryCheckCounter -= 50000; //To get right time
+            batteryCheck_flag = true;
+        }
+
+        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);
+        }
+
+        //ADC counter
+        GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
+        if(GPT.SampleRateCounter >= INSTRUCTION.sampleRate){
+            GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
+            ADC_flag = true;
+            if(ADC_flag){
+                EliteADCControl(WorkModeData);
+                ADC_flag = false;
+            }
+        }
+
+        //Notify counter(Notify control, check if we need to send notify)
+        //please don't put Notify counter before ADC counter, maybe get wrong data
+        GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
+        if(GPT.NotifyCounter >= INSTRUCTION.notifyRate){
+            GPT.NotifyCounter -= INSTRUCTION.notifyRate; //To get right time
+            notify_flag = true;
+            if(vscanReset){
+                notify_flag = false;
+            }
+            if(notify_flag){
+                SendNotify();
+                notify_flag = false;
+            }
+        }
+
+//        EliteDone();
+    }else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
+        WorkModeData->VO->_Vset = INSTRUCTION.VoltConstant;
+        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
+        FreeWorkMode(WorkModeData);
+        PeriodicEvent = false;
+    }else if(INSTRUCTION.eliteFxn == CALI_DAC_MODE){
+        DAC_outputV(INSTRUCTION.VoltConstant); //UserCode -> DAC code -> DAC out
+        FreeWorkMode(WorkModeData);
+        PeriodicEvent = false;
     }
-
-    return;
-}
-
-
-
-/*
- * EliteADCControl(): use ADC plot, and send what data to controller
- * +-----------------+-----------+-----------+-----------+
- * |      MODE       |    ch1    |    ch2    |    ch3    |
- * +-----------------+-----------+-----------+-----------+
- * | CURVE_IV        |    Iin    |    Vout   |    Vin    |
- * | CURVE_IV_CY     |    Iin    |    Vout   |    Vin    |
- * | CURVE_VO        |    Iin    |    Vout   |    Vin    |
- * | CURVE_RT        |    Iin    |    Vout   |     R     |
- * | CURVE_VT        |    Iin    |    Vin    |           |
- * | CURVE_IT        |    Iin    |    Vin    |    Vout   |
- * | CURVE_CC        |    Iin    |    Vin    |    Vout   |
- * | CURVE_CV        |    Iin    | Vout-Vin  |    Vout   |
- * | CURVE_LSV       |    Iin    | Vout-Vin  |    Vout   |
- * | CURVE_CA        |    Iin    | Vout-Vin  |    Vout   |
- * | CURVE_OCP       |    Iin    | Vmon-Vin  |    Vin    |
- * | CURVE_UNI_PULSE |  pul1_Iin | pul2_Iin  |           |
- * +-----------------+-----------+-----------+-----------+
- */
-
-static void EliteADCControl(uint32_t time)
-{
-    void *wm = wm_get();
-    uint32_t t = time;
-
-    switch (instru.eliteFxn) {
-        case CURVE_IV:
-        case CURVE_IV_CY:
-            Iin_Vin_Vout_Plot();
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, instru.Vout/200);
-                InputNotify(NOTIFY_IMPEDANCE, MEAS_VIN(wm));
-            }
-            break;
-
-        case CURVE_RT:
-            Iin_Vin_Vout_Plot();
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, instru.Vout/200);
-            }
-            break;
-
-        case CURVE_CC:
-            Iin_Vin_Vout_Plot();
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
-            }
-            break;
-
-        case CURVE_CV:
-        case CURVE_CA:
-        case CURVE_LSV:
-            Iin_Vin_Vout_Plot();
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, instru.Vout/200 - MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
-            }
-            break;
-
-        case CURVE_PULSE:
-            Iin_Vin_Vout_Plot();
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, MEAS_VOUT(wm));
-            }
-            break;
-
-        case CURVE_IT:
-            Iin_Vin_Vout_Plot();
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if(volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
-            }
-            break;
-
-        case CURVE_VT:
-            Iin_Vin_Plot();
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
-            }
-            break;
-
-        case CURVE_VO:
-            Iin_Vin_Vout_Plot();
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, instru.Vout/200);
-                InputNotify(NOTIFY_IMPEDANCE, MEAS_VIN(wm));
-            }
-            break;
-
-        case CURVE_OCP:
-            Iin_Vin_Vout_Plot();
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, MEAS_VOUT(wm) - MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, MEAS_VIN(wm));
-            }
-            break;
-
-        case CURVE_CALI_ADC:
-            if (instru.AdcChannel == RIS_ADC_IIN) {
-                cali_IT_plot();
-            } else if (instru.AdcChannel == RIS_ADC_VIN) {
-                cali_VT_plot();
-            } else if (instru.AdcChannel == RIS_DAC_VOUT) {
-                cali_Vout_plot();
-            }
-            break;
-
-        case CURVE_UNI_PULSE:
-            IT_Plot(t);
-            break;
-
-        case CURVE_TRIG_CC:
-            Iin_Vin_Vout_Plot();
-            set_output_enable(TRC.chan_en);
-//            ModeLED(TRIG01_WORK);
-            break;
-
-        default:
-            break;
+    else{
+        InitFlag();
     }
 }
 
-static void mode_done(void)
-{
-    if ((instru.eliteFxn == CURVE_IV)  ||
-        (instru.eliteFxn == CURVE_CV)  ||
-        (instru.eliteFxn == CURVE_LSV) ||
-        (instru.eliteFxn == CURVE_IV_CY)) {
+static void EliteADCControl(WorkMode *WorkModeData) {
+    switch (INSTRUCTION.eliteFxn) {
+        case IV_CURVE:{
+            CC_Plot(WorkModeData);
+            break;
+        }
+        case CV_CURVE:{
+            CC_Plot(WorkModeData);
+            break;
+        }
+        case IT_CURVE:{
+            IT_Plot(WorkModeData);
+            break;
+        }
+        case VT_CURVE:{
+            VT_Plot(WorkModeData);
+            break;
+        }
+        case ZT_CURVE:{
+            CC_Plot(WorkModeData);
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            CC_Plot(WorkModeData);
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            CC_Plot(WorkModeData);
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            CC_Plot(WorkModeData);
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            CC_Plot(WorkModeData);
+            break;
+        }
+        case CALI_ADC_MODE:{
+            if(INSTRUCTION.AdcChannel == IIN_ADC){
+                cali_IT_plot(WorkModeData);
+            }else if(INSTRUCTION.AdcChannel == VIN_ADC){
+                cali_VT_plot(WorkModeData);
+            }
+
+            break;
+        }
+        default:{
+            break;
+        }
+    }
+}
+
+static void EliteDone() {
+    if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)) {
         if (!PeriodicEvent) {
-            finishMode = 1;
             SendNotify();
             Eliteinterrupt();
         }
     }
 }
 
-static void vscan_ctrl(uint32_t time)
-{
-    uint32_t t = time;
-
-    switch (instru.eliteFxn) {
-        case CURVE_IV:
-            iv_vscan();
+static void EliteVscanControl(WorkMode *WorkModeData) {
+    switch (INSTRUCTION.eliteFxn) {
+        case IV_CURVE:{
+            IV_Vscan(WorkModeData->IV);
             break;
-
-        case CURVE_IV_CY:
-            iv_cy_vscan();
+        }
+        case CV_CURVE:{
+            CV_Vscan(WorkModeData->CV);
             break;
-
-        case CURVE_VO:
-            vo_vscan();
+        }
+        case ZT_CURVE:{
+            ZT_Vscan(WorkModeData->RT);
             break;
-
-        case CURVE_RT:
-            rt_vscan();
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            CV3_Vscan(WorkModeData->CV3);
             break;
-
-        case CURVE_IT:
-            it_vscan();
+        }
+        case CONSTANT_CURRENT:{
+            CC_Vscan(WorkModeData->CC);
             break;
-
-        case CURVE_CV:
-            cv_vscan();
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            LSV_Vscan(WorkModeData->LSV);
             break;
-
-        case CURVE_LSV:
-            lsv_vscan();
+        }
+        case CONSTANT_VSCAN:{
+            CVSCAN_Vscan(WorkModeData->CVSCAN);
             break;
-
-        case CURVE_CA:
-            ca_vscan();
-            break;
-
-        case CURVE_UNI_PULSE:
-            uni_pulse_vscan(t);
-            break;
-
-        case CURVE_TRIG_CC:
-            aout_Curscan();
-            break;
-
+        }
         default:{
             break;
         }
@@ -690,16 +331,38 @@ static void step2VsetRate(uint32_t step){
              0.01mv, index = 4, n = 10000  */
 
     if(step >= 10000){
-        instru.VsetRateIndex = 0;
+        INSTRUCTION.VsetRateIndex = 0;
     }else if (step >= 1000){
-        instru.VsetRateIndex = 1;
+        INSTRUCTION.VsetRateIndex = 1;
     }else if (step >= 100){
-        instru.VsetRateIndex = 2;
+        INSTRUCTION.VsetRateIndex = 2;
     }else if (step >= 10){
-        instru.VsetRateIndex = 3;
+        INSTRUCTION.VsetRateIndex = 3;
     }else if (step >= 1){
-        instru.VsetRateIndex = 4;
+        INSTRUCTION.VsetRateIndex = 4;
     }
 }
 
+static void InitFlag(){
+    PeriodicEvent     = false;     // is there an PeriodicEvent?
+    Free_Work_Mode    = true;      // Free(WorkModeData)
+}
+
+static void InitEliteGPtimer() {
+    GPT.SampleRateCounter = INSTRUCTION.sampleRate - 10;
+    GPT.VscanRateCounter  = INSTRUCTION.VsetRate - 1;
+    notifyFirst_flag      = true;
+}
+
+static void InitEliteFlag() {
+    InitPeriodicEvent = true;      // need to create a WorkModeData?
+    DACReset          = true;
+    vscanReset        = true;
+    EliteWorkReset    = true;
+    leadTimeReset     = true;
+    I_GAIN_100R_counter = 0;
+    I_GAIN_3K_counter   = 0;
+    I_GAIN_100K_counter = 0;
+    I_GAIN_3M_counter   = 0;
+}
 #endif /* IMPEDANCE_METER_H_ */

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

@@ -1,744 +0,0 @@
-#ifndef SCAN_VOLT_H
-#define SCAN_VOLT_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define Vset    instru.Vset
-#define Aset0   instru.Trig_CurCon[0]
-#define Aset1   instru.Trig_CurCon[1]
-#define Aset2   instru.Trig_CurCon[2]
-#define Aset3   instru.Trig_CurCon[3]
-
-static void iv_vscan(void)
-{
-    struct wm_iv_ctx_t *iv = (struct wm_iv_ctx_t *)wm_get();
-
-    if (vscanReset) {
-        if (instru.directionInit == 1) {
-            iv->_direction_up         = true;
-            iv->_current_direction_up = true;
-        } else if (instru.directionInit == 0) {
-            iv->_direction_up         = false;
-            iv->_current_direction_up = false;
-        }
-
-        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if (instru.step <= 10) {
-            iv->_Vstep = instru.step * instru.VsetRate / 5;
-        } else {
-            iv->_Vstep = instru.step / 5 * instru.VsetRate;
-        }
-
-        Vset = iv->_Vinit;
-    }
-
-    if (!vscanReset) {
-        if (iv->_current_direction_up) {
-            if (Vset >= iv->_Vmax) {
-                PeriodicEvent = false;
-            }
-        } else {
-            if (Vset <= iv->_Vmin) {
-                PeriodicEvent = false;
-            }
-        }
-
-        if (iv->_current_direction_up) {
-            Vset = Vset + iv->_Vstep * GPT.GptimerMultiple;
-        } else {
-            Vset = Vset - iv->_Vstep * GPT.GptimerMultiple;
-        }
-    }
-
-    return;
-}
-
-static void iv_cy_vscan(void)
-{
-    struct wm_iv_cy_ctx_t *iv_cy = (struct wm_iv_cy_ctx_t *)wm_get();
-    static bool VminCounter;
-    static bool VmaxCounter;
-
-    NotifyCycleNumber = (instru.cycleNumber - iv_cy->_cycleNumber + 1);
-
-    if(vscanReset){
-        VmaxCounter = false;
-        VminCounter = false;
-
-        if(instru.directionInit == 1){
-            iv_cy->_direction_up         = true;
-            iv_cy->_current_direction_up = true;
-        }else if(instru.directionInit == 0){
-            iv_cy->_direction_up         = false;
-            iv_cy->_current_direction_up = false;
-        }
-
-        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if(instru.step <= 10){
-            iv_cy->_Vstep = instru.step * instru.VsetRate / 5;
-        }else{
-            iv_cy->_Vstep = instru.step / 5 * instru.VsetRate;
-        }
-
-        if(iv_cy->_Vmin == iv_cy->_Vinit){
-            VminCounter = true;
-        }
-        if(iv_cy->_Vmax == iv_cy->_Vinit){
-            VmaxCounter = true;
-        }
-
-        Vset = iv_cy->_Vinit;
-    }
-
-    if(!vscanReset){
-        if (Vset >= iv_cy->_Vmax){
-            VmaxCounter = true;
-        }else if (Vset <= iv_cy->_Vmin){
-            VminCounter = true;
-        }
-
-        if (iv_cy->_current_direction_up){
-            Vset = Vset + iv_cy->_Vstep * GPT.GptimerMultiple;
-        }else{
-            Vset = Vset - iv_cy->_Vstep * GPT.GptimerMultiple;
-        }
-
-        if(VmaxCounter && VminCounter){
-            if(iv_cy->_direction_up && iv_cy->_current_direction_up){
-                if(Vset >= iv_cy->_Vinit){
-                    iv_cy->_cycleNumber--;
-                    VminCounter = false;
-                    VmaxCounter = false;
-                }
-            }
-            if(!iv_cy->_direction_up && !iv_cy->_current_direction_up){
-                if(Vset <= iv_cy->_Vinit){
-                    iv_cy->_cycleNumber--;
-                    VminCounter = false;
-                    VmaxCounter = false;
-                }
-            }
-        }
-
-        if (Vset >= iv_cy->_Vmax){
-            iv_cy->_current_direction_up = false;
-        }else if (Vset <= iv_cy->_Vmin){
-            iv_cy->_current_direction_up = true;
-        }
-
-        /*stop condition*/
-        if(iv_cy->_cycleNumber == 0){
-            PeriodicEvent = false;
-        }
-    }
-
-    return;
-}
-
-static void it_vscan(void)
-{
-    struct wm_it_ctx_t *it = (struct wm_it_ctx_t *)wm_get();
-
-    if (vscanReset) {
-        Vset = it->_Vinit;
-    }
-
-    if(!vscanReset) {
-        Vset = it->_Vinit;
-    }
-
-    return;
-}
-
-static void rt_vscan(void)
-{
-    struct wm_rt_ctx_t *rt = (struct wm_rt_ctx_t *)wm_get();
-
-    if (vscanReset) {
-        Vset = rt->_Vinit;
-    }
-
-    if(!vscanReset) {
-        Vset = rt->_Vinit;
-    }
-
-    return;
-}
-
-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;
-    }
-
-    return;
-}
-
-#define DELTAVOLTMAX 2000000 //2000000 = 10mV
-static void cc_vscan(void)
-{
-    /* Transform setting CC into IUC
-     *
-     * User code in CC mode : 0 ~ 3000000
-     * Real current value : -15.00000 ~ 15.00000 mA
-     *  => user code = 1500000 mapping to 0.00000 mA
-     */
-
-    struct wm_cc_ctx_t *cc = (struct wm_cc_ctx_t *)wm_get();
-    struct wm_meas_t *m = &cc->measure;
-    uint16_t divisionRate;
-    int32_t deltaI;
-    int32_t deltaV;
-    int32_t Iin;
-    int32_t Vin;
-
-    if (vscanReset) {
-        Vset = 0;
-
-        if (cc->_charge == 0) {
-            cc->_Iset = instru.constantCurrent * 200 * (-1);
-            //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA];
-        }
-
-        Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
-        Vin = m->_measureVin * 200; //[5nV]
-
-        Vset = Vin + cc->_Iset / 20 ; //[5nV]
-
-        if (Vset >= 1100000000) { // 5.5V
-            Vset = 1100000000;
-        } else if (Vset <= -1000000000) { //-5V
-            Vset = -1000000000;
-        }
-    }
-
-    if (!vscanReset) {
-        Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - cc->_Iset;
-
-        if (deltaI > 2000000 || deltaI < -2000000) { //100uA
-            divisionRate = 1;
-        } else {
-            divisionRate = 20;
-        }
-
-        deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
-
-        if (deltaV > DELTAVOLTMAX) { //2000000 = 10mV
-            deltaV = DELTAVOLTMAX;
-        } else if (deltaV < (-DELTAVOLTMAX)) {
-            deltaV = (-DELTAVOLTMAX);
-        }
-
-        Vset = Vset + deltaV; //[5nV]
-
-        if (Vset >= 1100000000) { // 5.5V
-            Vset = 1100000000;
-        } else if (Vset <= -1000000000) { //-5V
-            Vset = -1000000000;
-        }
-
-        if (Vset <= cc->_Vmin) {
-            Vset = cc->_Vmin;
-        } else if (Vset >= cc->_Vmax) {
-            Vset = cc->_Vmax;
-        }
-    }
-
-    return;
-}
-
-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;
-        }
-
-        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        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) {
-        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;
-            }
-        }
-    }
-
-    return;
-}
-
-static void lsv_vscan(void)
-{
-    struct wm_lsv_ctx_t *lsv = (struct wm_lsv_ctx_t *)wm_get();
-
-    NotifyCycleNumber = (instru.cycleNumber - lsv->_cycleNumber + 1);
-
-    if (vscanReset) {
-        if (instru.directionInit == 1) {
-            lsv->_direction_up         = true;
-            lsv->_current_direction_up = true;
-        } else {
-            lsv->_direction_up         = false;
-            lsv->_current_direction_up = false;
-        }
-
-         //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if (instru.step <= 10) {
-            lsv->_Vstep = instru.step *  instru.VsetRate / 5;
-        } else {
-            lsv->_Vstep = instru.step / 5 *  instru.VsetRate;
-        }
-
-        Vset = lsv->_Vinit;
-    }
-
-    if (!vscanReset) {
-
-        if (lsv->_current_direction_up) {
-            Vset = Vset + lsv->_Vstep * GPT.GptimerMultiple;
-        } else {
-            Vset = Vset - lsv->_Vstep * GPT.GptimerMultiple;
-        }
-
-        /*stop condition*/
-        if (Vset >= lsv->_Vmax) {
-            PeriodicEvent = false;
-        } else if (Vset <= lsv->_Vmin) {
-            PeriodicEvent = false;
-        }
-    }
-
-    return;
-}
-
-static void ca_vscan(void)
-{
-    struct wm_ca_ctx_t *ca = (struct wm_ca_ctx_t *)wm_get();
-
-    if(vscanReset){
-        Vset = ca->_Vinit;
-    }
-
-    if(!vscanReset){
-        Vset = ca->_Vinit;
-    }
-
-    return;
-}
-
-
-static void uni_pulse_vscan(uint32_t time)
-{
-    uint32_t t = time;
-    struct wm_uni_pulse_ctx_t *p = (struct wm_uni_pulse_ctx_t *)wm_get();
-    uint32_t m;
-    uint32_t t_min;
-    uint32_t t_max;
-
-    if(vscanReset){
-        Vset = p->_v0;
-
-        return;
-    }
-
-    if(!vscanReset){
-
-        if (t == 0) {
-            m = 0;
-        } else {
-           m = t % p->_t_period;
-        }
-
-        if (m < p->_t_pa[0]) {
-            p->_Vset = p->_v_initial[0] + p->_v_slope[0] * t + p->_v_step[0] * (int32_t)(t / p->_t_period);
-            Vset = p->_Vset;
-
-            t_min = p->_t_pulse_min[0];
-            t_max = p->_t_pulse_max[0];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            return;
-        }
-
-        if (m < p->_t_pa[1]) {
-            p->_Vset = p->_v_initial[1] + p->_v_slope[1] * t + p->_v_step[1] * (int32_t)(t / p->_t_period);
-            Vset = p->_Vset;
-
-            t_min = p->_t_pa[0] + p->_t_pulse_min[1];
-            t_max = p->_t_pa[0] + p->_t_pulse_max[1];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            return;
-        }
-
-        if (m < p->_t_pa[2]) {
-            p->_Vset = p->_v_initial[2] + p->_v_slope[2] * t + p->_v_step[2] * (int32_t)(t / p->_t_period);
-            Vset = p->_Vset;
-
-            t_min = p->_t_pa[1] + p->_t_pulse_min[2];
-            t_max = p->_t_pa[1] + p->_t_pulse_max[2];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            return;
-        }
-
-        if (m < p->_t_pa[3]) {
-            p->_Vset = p->_v_initial[3] + p->_v_slope[3] * t + p->_v_step[3] * (int32_t)(t / p->_t_period);
-            Vset = p->_Vset;
-
-            t_min = p->_t_pa[2] + p->_t_pulse_min[3];
-            t_max = p->_t_pa[2] + p->_t_pulse_max[3];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            return;
-        }
-
-        return;
-    }
-
-    return;
-}
-
-static void pulse_vscan(void)
-{
-    struct wm_pulse_ctx_t *pulse = (struct wm_pulse_ctx_t *)wm_get();
-    static uint16_t lastVolt;
-
-    if (stiFirstTime) {
-        stiFirstTime = false;
-        lastVolt = 25000;
-        pulse->_sti_t_flag = 1;
-        pulse->_sti_v = pulse->_sti_v1;
-        pulse->_sti_t = pulse->_sti_t1;
-        if (pulse->_sti_t == 1) {
-            pulse->_sti_v = lastVolt;
-        }
-    } else if(!stiFirstTime) {
-        if (GPT.StiCounter >= pulse->_sti_t) {
-            GPT.StiCounter -= pulse->_sti_t; //to get right time
-
-            if (pulse->_sti_lp > 0) {
-                if (pulse->_sti_cy > 0) {
-                    if (pulse->_sti_t_flag == 1) {
-                        pulse->_sti_t_flag = 2;
-                        pulse->_sti_v = pulse->_sti_v2;
-                        pulse->_sti_t = pulse->_sti_t2;
-                        if (pulse->_sti_t == 1) {
-                            pulse->_sti_v = lastVolt;
-                        }
-                    } else if (pulse->_sti_t_flag == 2) {
-                        pulse->_sti_t_flag = 3;
-                        pulse->_sti_v = pulse->_sti_v3;
-                        pulse->_sti_t = pulse->_sti_t3;
-                        if (pulse->_sti_t == 1) {
-                            pulse->_sti_v = lastVolt;
-                        }
-                    } else if (pulse->_sti_t_flag == 3) {
-                        pulse->_sti_cy -- ;
-                        if (pulse->_sti_cy == 0) {
-                            pulse->_sti_t_flag = 4;
-                            pulse->_sti_v = pulse->_sti_v4;
-                            pulse->_sti_t = pulse->_sti_t4;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        } else {
-                            pulse->_sti_t_flag = 2;
-                            pulse->_sti_v = pulse->_sti_v2;
-                            pulse->_sti_t = pulse->_sti_t2;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        }
-                    }
-                } else if (pulse->_sti_cy <= 0){
-                    if (pulse->_sti_t_flag == 4) {
-                        pulse->_sti_lp -- ;
-                        if (pulse->_sti_lp > 0) {
-                            pulse->_sti_cy = instru.sti_cy;
-                            pulse->_sti_t_flag = 2;
-                            pulse->_sti_v = pulse->_sti_v2;
-                            pulse->_sti_t = pulse->_sti_t2;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        } else {
-                            pulse->_sti_t_flag = 5;
-                            pulse->_sti_v = pulse->_sti_v5;
-                            pulse->_sti_t = pulse->_sti_t5;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        }
-                    }
-                }
-            } else if (pulse->_sti_lp <= 0) {
-                if (pulse->_sti_t_flag == 5) {
-                    pulse->_sti_t_flag = 6;
-                    pulse->_sti_v = pulse->_sti_v6;
-                    pulse->_sti_t = pulse->_sti_t6;
-                    if (pulse->_sti_t == 1) {
-                        pulse->_sti_v = lastVolt;
-                    }
-                } else if (pulse->_sti_t_flag == 6) {
-                    pulse->_sti_t_flag = 7;
-                    pulse->_sti_v = pulse->_sti_v7;
-                    pulse->_sti_t = pulse->_sti_t7;
-                    if (pulse->_sti_t == 1) {
-                        pulse->_sti_v = lastVolt;
-                    }
-                } else if (pulse->_sti_t_flag == 7) {
-                    pulse->_sti_v = 25000;
-                    PeriodicEvent  = false;
-//                    PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-                    ModeLED(NO_EVENT);
-                }
-            }
-        }
-    }
-
-    if (lastVolt != pulse->_sti_v) {
-        lastVolt = pulse->_sti_v;
-        //if (pulse->_sti_v == 25000) {
-        //    PIN15_setOutputValue(HIGH_Z_MODE, 0);   // 1 => close high_z mode
-        //} else {
-        //    PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
-        //}
-        DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
-        DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
-    }
-
-    return;
-}
-
-static void aout_Curscan(void)
-{
-    struct wm_aout_ctx_t *aout = (struct wm_aout_ctx_t *)wm_get();
-
-    if(vscanReset){
-        Aset0 = aout->_Curset0;
-        Aset1 = aout->_Curset1;
-        Aset2 = aout->_Curset2;
-        Aset3 = aout->_Curset3;
-    }
-
-    if(!vscanReset){
-        Aset0 = aout->_Curset0;
-        Aset1 = aout->_Curset1;
-        Aset2 = aout->_Curset2;
-        Aset3 = aout->_Curset3;
-    }
-
-    return;
-}
-
-static void chg_vo_para(uint16_t parameter, int32_t value)
-{
-    uint16_t pa = parameter;
-    int32_t val = value;
-    struct wm_vo_ctx_t *vo = (struct wm_vo_ctx_t *)wm_get();
-
-    if (pa == DAC_VOLT) {
-        vo->_Vinit = val;
-    }
-
-    return;
-}
-
-static void chg_it_para(uint16_t parameter, int32_t value)
-{
-    uint16_t pa = parameter;
-    int32_t val = value;
-    struct wm_it_ctx_t *it = (struct wm_it_ctx_t *)wm_get();
-
-    if (pa == DAC_VOLT) {
-        it->_Vinit = val;
-    }
-
-    return;
-}
-
-static void chg_rt_para(uint16_t parameter, int32_t value)
-{
-    uint16_t pa = parameter;
-    int32_t val = value;
-    struct wm_rt_ctx_t *rt = (struct wm_rt_ctx_t *)wm_get();
-
-    if (pa == DAC_VOLT) {
-        rt->_Vinit = val;
-    }
-
-    return;
-}
-
-static void chg_aout_para(uint16_t parameter, int32_t value)
-{
-    uint16_t pa = parameter;
-    int32_t val = value;
-    struct wm_aout_ctx_t *aout = (struct wm_aout_ctx_t *)wm_get();
-
-    if (pa == Aout_CH_0) {
-        aout->_Curset0 = val;
-    }
-    else if (pa == Aout_CH_1) {
-        aout->_Curset1 = val;
-    }
-    else if (pa == Aout_CH_2) {
-        aout->_Curset2 = val;
-    }
-    else if (pa == Aout_CH_3) {
-        aout->_Curset3 = val;
-    }
-
-    return;
-}
-
-static void set_para(uint8_t eliteFxn, uint16_t parameter, int32_t value)
-{
-    uint8_t mode = eliteFxn;
-    uint16_t pa = parameter;
-    int32_t val = value;
-
-    if (mode == CURVE_VO) {
-        chg_vo_para(pa, val);
-
-        return;
-    }
-
-    if (mode == CURVE_IT) {
-        chg_it_para(pa, val);
-
-        return;
-    }
-
-    if (mode == CURVE_RT) {
-        chg_rt_para(pa, val);
-
-        return;
-    }
-
-    if (mode == CURVE_TRIG_CC) {
-        chg_aout_para(pa, val);
-
-        return;
-    }
-    return;
-}
-
-#endif

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

@@ -543,19 +543,25 @@ static void SimpleBLEPeripheral_init(void) {
 // static void detectKey_clockHandler(UArg arg);
 
 static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
-    uint8_t  key= 0;
-    bool     EliteOn = 0;
-    uint16_t counter6994 = 0;
-    batteryADC_flag = false;
 
     // Initialize application
     SimpleBLEPeripheral_init();
+
     ZM_init();
+    WorkMode *WorkModeData = CreateWorkMode();
+
+    uint8_t  key         = 0;
+    uint16_t counter6994 = 0;
+    bool     EliteOn     = 0;
+
+    // init DAC, set output ~= 0 V
+//    DAC_outputV(25000);
+    elite_gptimer_start();
 
     // Application main loops
     GPT.GptimerCounter0 = GPT.GptimerCounter;
-
-    headstage_battery_volt();
+    batteryADC_flag = false;
+//    headstage_battery_volt();
     headstage_init_device_info();
 
     for (;;) {
@@ -605,63 +611,44 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
                 }
             }
         }
-
         if(events & SBP_PERIODIC_EVT){
             events &= ~SBP_PERIODIC_EVT;
             if (!PeriodicEvent) {                // if there is no periodic event
                 key = PIN_getInputValue(switch_on);
                 if (EliteOn) {
-                    if (counter6994 < CLOCK_ONE_SECOND*5) {  // counter6994 enable a IC after 35 counts
+                    if (counter6994 < CLOCK_ONE_SECOND/2) {  // counter6994 enable a IC after 35 counts
                         counter6994++;
-                    } else if (counter6994 == CLOCK_ONE_SECOND*5) {
-                        PIN15_setOutputValue(shutdown_6994, 0);  // OFF = 1 => turn off 6994
+                    } else if (counter6994 == CLOCK_ONE_SECOND/2) {
                         counter6994++;
-                    } else if (counter6994 > CLOCK_ONE_SECOND*5) {
-                        counter6994 = 0;
                     }
                     EliteKeyPress(key);
 
-                    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-                    GPT.GptimerCounter0 = GPT.GptimerCounter;
-
-                    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-                    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-
-                    if(key != 0){  //detect Elite battery power when no periodic event
-                        measureBat();
-                    }
-                    if(Free_Work_Mode){
-                        wm_deinit();
-                        InitEliteInstruction();
-                        Free_Work_Mode = false;
-                    }
+//                    if(key != 0){  //detect Elite battery power when no periodic event
+//                        measureBat();
+//                    }
+//                    if(Free_Work_Mode){
+//                        FreeWorkMode(WorkModeData);
+//                        InitEliteInstruction();
+////                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+//
+//                        Free_Work_Mode = false;
+//                    }
                 } else {
                     EliteOn = TurnOnElite(key);
                 }
-
-                if (TRIG_TrigEnable) {
-                    trig_sense();
-                    if (trig_PeriodicEvent) {
-                        trig_PeriodicEvent  = false;
-                        PeriodicEvent     = true;
-                        InitPeriodicEvent = true;      // need to create a WorkModeData?
-                        mode_init         = true;
-                        InitGPT();
-                    }
-                }
-
-            }
-            else {                               // if there is periodic event
-                if(InitPeriodicEvent){
-                    wm_init();
-                    InitPeriodicEvent = false;
-                }
-
-                // Perform periodic application task
-                SimpleBLEPeripheral_performPeriodicTask();
-                key = PIN_getInputValue(switch_on);
-                EliteKeyPress(key);  // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
             }
+//            else {                               // if there is periodic event
+//                if(InitPeriodicEvent){
+//                    InitWorkMode(WorkModeData);
+//                    InitPeriodicEvent = false;
+//                }
+//
+//                // Perform periodic application task
+//                SimpleBLEPeripheral_performPeriodicTask(WorkModeData);
+//                key = PIN_getInputValue(switch_on);
+//                EliteKeyPress(key);  // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
+//            }
         }
 
 #ifdef FEATURE_OAD
@@ -937,16 +924,16 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)
 
         numActive = linkDB_NumActive();
 
-        uint16_t cxnHandle;
-
-        // requestedPDUSize = LL payload = L2CAP_header + ATT header + BLE_NOT_BUFF_SIZE = 7 + BLE_NOT_BUFF_SIZE //roy
-        uint16_t requestedPDUSize = 251; //251 roy
-        uint16_t requestTxTime    = 2120; // (LL payload + 14) * 8   //2120 roy
-        GAPRole_GetParameter(GAPROLE_CONNHANDLE, &cxnHandle);
-
-        if (SUCCESS == HCI_LE_SetDataLenCmd(cxnHandle, requestedPDUSize, requestTxTime)) {
-//            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
-        }
+//        uint16_t cxnHandle;
+//
+//        // requestedPDUSize = LL payload = L2CAP_header + ATT header + BLE_NOT_BUFF_SIZE = 7 + BLE_NOT_BUFF_SIZE //roy
+//        uint16_t requestedPDUSize = 251; //251 roy
+//        uint16_t requestTxTime    = 2120; // (LL payload + 14) * 8   //2120 roy
+//        GAPRole_GetParameter(GAPROLE_CONNHANDLE, &cxnHandle);
+//
+//        if (SUCCESS == HCI_LE_SetDataLenCmd(cxnHandle, requestedPDUSize, requestTxTime)) {
+////            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
+//        }
 
         // Use numActive to determine the connection handle of the last
         // connection
@@ -987,7 +974,6 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)
 
     case GAPROLE_WAITING_AFTER_TIMEOUT:
         SimpleBLEPeripheral_freeAttRsp(bleNotConnected);
-        ModeLED(BT_WAIT);
 
 #ifdef PLUS_BROADCASTER
         // Reset flag for next connection.