Fill w32_REG in with 0 to 4 bytes.

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

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/config/src/sysbios/makefile

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

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/EliteADC.h

@@ -46,7 +46,6 @@ static void ADC_write(uint8_t ADCin) {
     spi_ADC_txbuf[0] = ADCin;
     spi_ADC_txbuf[1] = 0b11101011;
 
-
     ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
 }
 
@@ -56,35 +55,29 @@ static void ADC_read(uint8_t *ADCdata){
         spi_ADC_rxbuf[i] = 0;
     }
 
-    ADC_SPI(SPI_ADC_SIZE, spi_ADC_txbuf, ADCdata);
+    ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
 }
 
-static void ADCGainControl(uint8_t ADCLevel){
-    if(ADCLevel == 0){
-        // ADC gain level = 0, using 200K resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 0);
-    }
-    else if(ADCLevel == 1){
-        // ADC gain level = 1, using 10K resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 1);
-        PIN_setOutputValue(pin_handle, Turnon200R, 0);
-    }
-    else if(ADCLevel == 2){
-        // ADC gain level = 2, using 200R resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 1);
-    }
-    else if(ADCLevel == 3){
-        // ADC gain level = 0, auto gain (using 200R resister)
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 1);
-    }
-    else{
-        // default using 200R resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 1);
+/* Elite1.5 Calibration Usage */
+static void CAL_ADC_read(uint8_t *ADCdata){
+     for(int i=0 ; i<SPI_ADC_SIZE ; i++){
+         spi_ADC_txbuf[i] = 0;
+         spi_ADC_rxbuf[i] = 0;
+     }
+
+     CAL_ADC_SPI(SPI_ADC_SIZE, spi_ADC_txbuf, ADCdata);
+ }
+
+static void CAL_ADC_write(uint8_t ADCin) {
+    for(int i=0 ; i<SPI_ADC_SIZE ; i++){
+        spi_ADC_txbuf[i] = 0;
+        spi_ADC_rxbuf[i] = 0;
     }
+
+    spi_ADC_txbuf[0] = ADCin;
+    spi_ADC_txbuf[1] = 0b11101011;
+
+    CAL_ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
 }
 
 static void ADCChannelSelect(uint8_t ADCChannel){
@@ -124,8 +117,20 @@ static void ADCChannelSelect(uint8_t ADCChannel){
     }
 }
 
-static void ReadVolt(uint8_t *buf){
+static void ReadADCIin(uint8_t *buf){
     // Read data twice since the first data we get is previous data
+//    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+    ADCChannelSelect(ADC_CH_CURRENT);
+    ADC_read(buf);
+
+    ADCChannelSelect(ADC_CH_CURRENT);
+    ADC_read(buf);
+}
+
+static void ReadADCVin(uint8_t *buf){
+    // Read data twice since the first data we get is previous data
+
+//    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
     ADCChannelSelect(ADC_CH_VOLT);
     ADC_read(buf);
 
@@ -133,7 +138,7 @@ static void ReadVolt(uint8_t *buf){
     ADC_read(buf);
 }
 
-static void ReadVoutVolt(uint8_t *buf){
+static void ReadADCVout(uint8_t *buf){
     // Read data twice since the first data we get is previous data
     ADCChannelSelect(ADC_CH_DAC);
     ADC_read(buf);
@@ -142,16 +147,7 @@ static void ReadVoutVolt(uint8_t *buf){
     ADC_read(buf);
 }
 
-static void ReadCurrent(uint8_t *buf){
-    // Read data twice since the first data we get is previous data
-    ADCChannelSelect(ADC_CH_CURRENT);
-    ADC_read(buf);
-
-    ADCChannelSelect(ADC_CH_CURRENT);
-    ADC_read(buf);
-}
-
-static void ReadBatVolt(uint8_t *buf){
+static void ReadADCBat(uint8_t *buf){
     // Read data twice since the first data we get is previous data
     ADCChannelSelect(ADC_CH_BAT);
     ADC_read(buf);
@@ -160,133 +156,363 @@ static void ReadBatVolt(uint8_t *buf){
     ADC_read(buf);
 }
 
+/* for Elite1.5-re */
+// Iin theoretical boundary <2.67, 1.89~80, 63~2600, >1900 (uA)
+#define I_GAIN_SMALL_BOUNDARY     4000  // 4    uA =     4,000,000 pA
+#define I_GAIN_MID1_BOUNDARY1     2000  // 2    uA =     2,000,000 pA
+#define I_GAIN_MID1_BOUNDARY2    90000  // 90   uA =    90,000,000 pA
+#define I_GAIN_MID2_BOUNDARY1    70000  // 70   uA =    70,000,000 pA
+#define I_GAIN_MID2_BOUNDARY2  1800000  // 1800 uA =     1,800,000 nA
+#define I_GAIN_LARGE_BOUNDARY   950000  // 950  uA =       950,000 nA
 
-// theoretical boundary <20, 10~500, >100 (uA)
-//#define GAIN_SMALL_BOUNDARY 40000  // 40 uA = 40,000,000 pA
-//#define GAIN_MID_BOUNDARY1  20000  // 20 uA = 20,000,000 pA
-//#define GAIN_MID_BOUNDARY2  400000 // 400 uA = 400,000,000 pA
-//#define GAIN_LARGE_BOUNDARY 200000 // 200 uA = 200,000 nA
+// Vin theoretical boundary <7, 5~200, >100 (mV)
+#define VIN_GAIN_SMALL_BOUNDARY   7000  // 7    mV =     7,000,000 nV
+#define VIN_GAIN_MID1_BOUNDARY1   5000  // 5    mV =     5,000,000 nV
+#define VIN_GAIN_MID1_BOUNDARY2 300000  // 300  mV =   300,000,000 nV
+#define VIN_GAIN_LARGE_BOUNDARY 250000  // 250  mV =   250,000,000 nV
 
-//#define GAIN_SMALL_BOUNDARY 8000  // 8 uA = 8,000,000 pA
-//#define GAIN_MID_BOUNDARY1  3000  // 3 uA = 3,000,000 pA
-//#define GAIN_MID_BOUNDARY2  90000 // 90 uA = 90,000,000 pA
-//#define GAIN_LARGE_BOUNDARY 70000 // 70 uA = 70,000 nA
+static int32_t AutoGainReadIin(uint8_t *buf){
+     int32_t RealCurrent = 0;
 
-/* for Elite1.4-re which 6.3kohm replaced by 10kohm */
-// theoretical boundary <40, 30~1350, >1000 (uA)
-#define GAIN_SMALL_BOUNDARY 35000  // 40 uA = 40,000,000 pA
-#define GAIN_MID_BOUNDARY1  30000  // 30 uA = 30,000,000 pA
-#define GAIN_MID_BOUNDARY2  1350000 // 1350 uA = 1350,000,000 pA
-#define GAIN_LARGE_BOUNDARY 1000000 // 1000 uA = 1000,000 nA
+     ReadADCIin(spi_ADC_rxbuf);
+     RealCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
 
-static int32_t AutoGainReadCurrent(uint8_t *buf){
+     return RealCurrent;
+ }
 
-    int32_t Real_Current = 0;
+static int32_t AutoGainReadVin(uint8_t *buf){
+    int32_t RealVolt = 0;
 
-    if(INSTRUCTION.ADCGainLevel == GAIN_AUTO){
-        INSTRUCTION.ADCGainLevel = GAIN_200R;
-        ADCGainControl(INSTRUCTION.ADCGainLevel);
-    }
+    ReadADCVin(spi_ADC_rxbuf);
+    RealVolt = DecodeADCValue(INSTRUCTION.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
 
-    ReadCurrent(spi_ADC_rxbuf);
-    Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-
-    return Real_Current;
+    return RealVolt;
 }
 
-static void AutoGainChange(int32_t Real_Current){
-    if(INSTRUCTION.ADCGainLevel == GAIN_200R){
-        // switch to mid range current
-        if(Real_Current < GAIN_LARGE_BOUNDARY && Real_Current > -1*GAIN_LARGE_BOUNDARY){
-            // switch to small range current
-            if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
-                GAIN_200K_counter++;
-                if(GAIN_200K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_200K;
-                    ADCGainControl(INSTRUCTION.ADCGainLevel);
-                    GAIN_200K_counter = 0;
-                    record_flag = false;
-                }
-            }else{
-                GAIN_10K_counter++;
-                if(GAIN_10K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_10K;
-                    ADCGainControl(INSTRUCTION.ADCGainLevel);
-                    GAIN_10K_counter = 0;
-                    record_flag = false;
-                }
-            }
-        }else{
-            if(GAIN_200K_counter > 0){
-                GAIN_200K_counter--;
-            }
-            if(GAIN_10K_counter > 0){
-                GAIN_10K_counter--;
-            }
-        }
-    }
-    else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
-        // switch to large range current
-        if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
-            GAIN_200R_counter++;
-            if(GAIN_200R_counter > 2){
-                INSTRUCTION.ADCGainLevel = GAIN_200R;
-                ADCGainControl(INSTRUCTION.ADCGainLevel);
-                GAIN_200R_counter = 0;
-                record_flag = false;
-            }
-        }
+//static void AutoGainChangeIin(int32_t RealCurrent){
+//    // switch to 1 level current(small)   3M
+//    // switch to 2 level current        100K
+//    // switch to 3 level current          3K
+//    // switch to 4 level current(large) 100R
+//    if(INSTRUCTION.ADCGainLevel == I_GAIN_100R){
+//        if(RealCurrent < I_GAIN_LARGE_BOUNDARY && RealCurrent > -1*I_GAIN_LARGE_BOUNDARY){
+//            // switch to 1 level current(small)
+//            if (RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+//                I_GAIN_3M_counter++;
+//                if(I_GAIN_3M_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level current
+//            else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
+//                I_GAIN_100K_counter++;
+//                if(I_GAIN_100K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 3 level current
+//            else{
+//                I_GAIN_3K_counter++;
+//                if(I_GAIN_3K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(I_GAIN_3K_counter > 0){
+//                I_GAIN_3K_counter--;
+//            }
+//            if(I_GAIN_100K_counter > 0){
+//                I_GAIN_100K_counter--;
+//            }
+//            if(I_GAIN_3M_counter > 0){
+//                I_GAIN_3M_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3K){
+//        // switch to 4 level current(large)
+//        if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+//            I_GAIN_100R_counter++;
+//            if(I_GAIN_100R_counter > 2){
+//                INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//                IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                I_GAIN_100R_counter = 0;
+//                record_flag = false;
+//            }
+//        }
+//        else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
+//            // switch to 1 level current(small)
+//            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+//                I_GAIN_3M_counter++;
+//                if(I_GAIN_3M_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level current
+//            else{
+//                I_GAIN_100K_counter++;
+//                if(I_GAIN_100K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(I_GAIN_100R_counter > 0){
+//                I_GAIN_100R_counter--;
+//            }
+//            if(I_GAIN_100K_counter > 0){
+//                I_GAIN_100K_counter--;
+//            }
+//            if(I_GAIN_3M_counter > 0){
+//                I_GAIN_3M_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_100K){
+//            // switch to 1 level current(small)
+//            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+//                I_GAIN_3M_counter++;
+//                if(I_GAIN_3M_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            else if (RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
+//                 // switch to 4 level current(large)
+//                 if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+//                    I_GAIN_100R_counter++;
+//                    if(I_GAIN_100R_counter > 2){
+//                        INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                        I_GAIN_100R_counter = 0;
+//                        record_flag = false;
+//                    }
+//                }
+//                 // switch to 3 level current
+//                 else{
+//                    I_GAIN_3K_counter++;
+//                    if(I_GAIN_3K_counter > 2){
+//                        INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+//                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                        I_GAIN_3K_counter = 0;
+//                        record_flag = false;
+//                    }
+//                }
+//            }else{
+//                if(I_GAIN_100R_counter > 0){
+//                    I_GAIN_100R_counter--;
+//                }
+//                if(I_GAIN_3K_counter > 0){
+//                    I_GAIN_3K_counter--;
+//                }
+//                if(I_GAIN_3M_counter > 0){
+//                    I_GAIN_3M_counter--;
+//                }
+//            }
+//        }
+//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3M){
+//        if(RealCurrent > I_GAIN_SMALL_BOUNDARY || RealCurrent < -1*I_GAIN_SMALL_BOUNDARY){
+//            // switch to 4 level current(large)
+//            if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+//                I_GAIN_100R_counter++;
+//                if(I_GAIN_100R_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100R_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 3 level current
+//            else if(RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
+//                I_GAIN_3K_counter++;
+//                if(I_GAIN_3K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level current
+//            else{
+//                I_GAIN_100K_counter++;
+//                if(I_GAIN_100K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100K_counter = 0;
+//                    record_flag = false;
+//                }
+//
+//            }
+//        }else{
+//            if(I_GAIN_100R_counter > 0){
+//                I_GAIN_100R_counter--;
+//            }
+//            if(I_GAIN_3K_counter > 0){
+//                I_GAIN_3K_counter--;
+//            }
+//            if(I_GAIN_100K_counter > 0){
+//                I_GAIN_100K_counter--;
+//            }
+//        }
+//    }
+//}
 
-        // switch to small range current
-        else if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
-            GAIN_200K_counter++;
-            if(GAIN_200K_counter > 2){
-                INSTRUCTION.ADCGainLevel = GAIN_200K;
-                ADCGainControl(INSTRUCTION.ADCGainLevel);
-                GAIN_200K_counter = 0;
-                record_flag = false;
-            }
-        }else{
-            if(GAIN_200R_counter > 0){
-                GAIN_200R_counter--;
-            }
-            if(GAIN_200K_counter > 0){
-                GAIN_200K_counter--;
-            }
-        }
-    }
-    else if(INSTRUCTION.ADCGainLevel == GAIN_200K){
-        // switch to mid range current
-        if(Real_Current > GAIN_SMALL_BOUNDARY || Real_Current < -1*GAIN_SMALL_BOUNDARY){
-            // switch to large range current
-            if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
-                GAIN_200R_counter++;
-                if(GAIN_200R_counter > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_200R;
-                    ADCGainControl(INSTRUCTION.ADCGainLevel);
-                    GAIN_200R_counter = 0;
-                    record_flag = false;
-                }
+//static void AutoGainChangeVin(int32_t RealVin){
+//    // switch to 1 level volt(small)      1M
+//    // switch to 2 level volt            30K
+//    // switch to 3 level volt(large)      1K
+//    if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_1M){
+//        if(RealVin > VIN_GAIN_SMALL_BOUNDARY || RealVin < -1*VIN_GAIN_SMALL_BOUNDARY){
+//            // switch to 3 level volt(large)
+//            if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
+//                VIN_GAIN_1K_counter++;
+//                if(VIN_GAIN_1K_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_1K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level volt
+//            else{
+//                VIN_GAIN_30K_counter++;
+//                if(VIN_GAIN_30K_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_30K;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_30K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(VIN_GAIN_1K_counter > 0){
+//                VIN_GAIN_1K_counter--;
+//            }
+//            if(VIN_GAIN_30K_counter > 0){
+//                VIN_GAIN_30K_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_30K){
+//        // switch to 1 level volt(small)
+//        if(RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
+//            VIN_GAIN_1M_counter++;
+//            if(VIN_GAIN_1M_counter > 2){
+//                INSTRUCTION.VinADCGainLevel = VIN_GAIN_1M;
+//                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                VIN_GAIN_1M_counter = 0;
+//                record_flag = false;
+//            }
+//        }
+//        else if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
+//            // switch to 3 level volt
+//            VIN_GAIN_1K_counter++;
+//            if(VIN_GAIN_1K_counter > 2){
+//                INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
+//                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                VIN_GAIN_1K_counter = 0;
+//                record_flag = false;
+//            }
+//        }else{
+//            if(VIN_GAIN_1K_counter > 0){
+//                VIN_GAIN_1K_counter--;
+//            }
+//            if(VIN_GAIN_1M_counter > 0){
+//                VIN_GAIN_1M_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_1K){
+//        if(RealVin < VIN_GAIN_LARGE_BOUNDARY && RealVin > -1*VIN_GAIN_LARGE_BOUNDARY){
+//            // switch to 1 level volt(small)
+//            if (RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
+//                VIN_GAIN_1M_counter++;
+//                if(VIN_GAIN_1M_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_1M;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_1M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level volt
+//            else{
+//                VIN_GAIN_30K_counter++;
+//                if(VIN_GAIN_30K_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_30K;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_30K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(VIN_GAIN_1M_counter > 0){
+//                VIN_GAIN_1M_counter--;
+//            }
+//            if(VIN_GAIN_30K_counter > 0){
+//                VIN_GAIN_30K_counter--;
+//            }
+//        }
+//    }
+//}
 
-            }else{
-                GAIN_10K_counter++;
-                if(GAIN_10K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_10K;
-                    ADCGainControl(INSTRUCTION.ADCGainLevel);
-                    GAIN_10K_counter = 0;
-                    record_flag = false;
-                }
+static uint16_t ADC_CURRENT_AVG_calibration (uint8_t ADC_channel) {
+    uint32_t ADCValueTemp           = 0;
+    uint32_t ADCValueSUM            = 0;
+    uint32_t ADCValueAVG            = 0;
+    uint16_t ADCValueAVG_RAW        = 0;
+    #define avgcount   10000
 
-            }
-       }else{
-            if(GAIN_200R_counter > 0){
-                GAIN_200R_counter--;
-            }
-            if(GAIN_10K_counter > 0){
-                GAIN_10K_counter--;
-            }
-        }
+    // Red light for start acquiring data
+    Elite_led_color(COLOR_RED);
+//    CPUdelay(10);
+    for(int i=0; i<avgcount; i++){
+        CAL_ADC_write(ADC_channel);
+        CAL_ADC_read(spi_ADC_rxbuf);
+        CPUdelay(10);
+        CAL_ADC_write(ADC_channel);
+        CAL_ADC_read(spi_ADC_rxbuf);
+        CPUdelay(500);
+
+        ADCValueTemp = 0x0000FFFF & (((uint32_t) (spi_ADC_rxbuf[0]) << 8) | ((uint32_t) (spi_ADC_rxbuf[1])));
+        ADCValueSUM = ADCValueSUM + ADCValueTemp;
     }
+
+    ADCValueAVG = ADCValueSUM / avgcount;
+    ADCValueAVG_RAW = (uint16_t) (ADCValueAVG & 0x0000FFFF);
+
+    // Blue light for data acquire done
+    Elite_led_color(COLOR_BLUE);
+
+    if (ADCValueAVG_RAW > 0x7FFF) {
+        ADCValueAVG_RAW = 0x0000;
+    }
+
+    // clean data
+    ADCValueAVG = 0;
+    ADCValueSUM = 0;
+    ADCValueTemp = 0;
+
+//    // Blue light for data acquire done
+//    Elite_led_color(COLOR_BLUE);
+
+
+
+    return ADCValueAVG_RAW;
 }
 
 #endif

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

@@ -11,9 +11,8 @@
 * Real current value : -15.00000 ~ 15.00000 mA
 *  => user code = 1500000 mapping to 0.00000 mA
 */
-static void CC_Vscan(WorkMode *WM){
+static void CC_Vscan(CCMode *CC){
     static int32_t Iin = 0;
-    static int32_t Vin = 0;
     static int32_t deltaI = 0;
     static int32_t deltaV = 0;
     uint16_t divisionRate;
@@ -21,13 +20,12 @@ static void CC_Vscan(WorkMode *WM){
     if(vscanReset){
         Vset = 0;
 
-        if(WM->CC->_charge == 0){
-            WM->CC->_Iset = INSTRUCTION.constantCurrent * 200 * (-1); //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA];
+        if(CC->_charge == 0){
+            CC->_Iset *= -1;
         }
 
-        Vin = WM->CC->_measureVin * 200;
-        Iin = WM->CC->_measureCurrent * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - WM->CC->_Iset;
+        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
+        deltaI = Iin - CC->_Iset;
 
         if(deltaI > 20000000 || deltaI < -20000000){ //1mA
             divisionRate = 1000;
@@ -45,24 +43,16 @@ static void CC_Vscan(WorkMode *WM){
 
         Vset = Vset + deltaV; //[5nV]
 
-        if (Vset >= 1100000000) { // 5.5V
-            Vset = 1100000000;
-        } else if (Vset <= -1000000000) { //-5V
-            Vset = -1000000000;
-        }
-
-        if(Vset <= WM->CC->_Vmin){
-            Vset = WM->CC->_Vmin;
-        }else if(Vset >= WM->CC->_Vmax){
-            Vset = WM->CC->_Vmax;
+        if(Vset <= CC->_Vmin){
+            Vset = CC->_Vmin;
+        }else if(Vset >= CC->_Vmax){
+            Vset = CC->_Vmax;
         }
     }
 
     if(!vscanReset){
-        Iin = WM->CC->_measureCurrent * 20; //[50pA]   nA => 50pA
-        Vin = WM->CC->_measureVin * 200;
-
-        deltaI = Iin - WM->CC->_Iset;
+        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
+        deltaI = Iin - CC->_Iset;
 
         if(deltaI > 20000000 || deltaI < -20000000){ //1mA
             divisionRate = 1000;
@@ -80,43 +70,10 @@ static void CC_Vscan(WorkMode *WM){
 
         Vset = Vset + deltaV; //[5nV]
 
-        if (Vset >= 1100000000) { // 5.5V
-            Vset = 1100000000;
-        } else if (Vset <= -1000000000) { //-5V
-            Vset = -1000000000;
-        }
-
-        static uint8_t cci0 = false;
-        if(Vin <= WM->CC->_Vmin){
-            cci0 = true;
-            if(cci0){
-                FreeWorkMode(WM);
-                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 = 0x01;//read Vscan = Vout - Vin
-                cci0 = false;
-            }
-        }else if(Vin >= WM->CC->_Vmax){
-            cci0 = true;
-            if(cci0){
-            FreeWorkMode(WM);
-            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 = 0x01;//read Vscan = Vout - Vin
-            cci0 = false;
-            }
+        if(Vset <= CC->_Vmin){
+            Vset = CC->_Vmin;
+        }else if(Vset >= CC->_Vmax){
+            Vset = CC->_Vmax;
         }
     }
 //    int32_t RealV;

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

@@ -19,7 +19,7 @@ static uint16_t CV3Curve(CV3Mode *CV3){
     }
 
     INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
 
     int32_t RealV2;
     RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
@@ -34,12 +34,12 @@ static uint16_t CV3Curve(CV3Mode *CV3){
      return DACOutCode;
 }
 
-static void CV3_Vscan(WorkMode *WM){
+static void CV3_Vscan(CV3Mode *CV3){
     static int16_t VminCounter;
     static int16_t VmaxCounter;
     static uint16_t CycleCounter;
 
-    NotifyCycleNumber = (INSTRUCTION.cycleNumber - WM->CV3->_cycleNumber + 1);
+    NotifyCycleNumber = (INSTRUCTION.cycleNumber - CV3->_cycleNumber + 1);
 
     if(vscanReset){
         VmaxCounter = 0;
@@ -47,96 +47,95 @@ static void CV3_Vscan(WorkMode *WM){
         CycleCounter = 0;
 
         if(INSTRUCTION.directionInit == 1){
-            WM->CV3->_direction_up         = true;
-            WM->CV3->_current_direction_up = true;
+            CV3->_direction_up         = true;
+            CV3->_current_direction_up = true;
         }else{
-            WM->CV3->_direction_up         = false;
-            WM->CV3->_current_direction_up = false;
+            CV3->_direction_up         = false;
+            CV3->_current_direction_up = false;
         }
 
         //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
         if(INSTRUCTION.step <= 10){
-            WM->CV3->_Vstep = INSTRUCTION.step *  INSTRUCTION.VsetRate / 5;
+            CV3->_Vstep = INSTRUCTION.step *  INSTRUCTION.VsetRate / 5;
         }else{
-            WM->CV3->_Vstep = INSTRUCTION.step / 5 *  INSTRUCTION.VsetRate;
+            CV3->_Vstep = INSTRUCTION.step / 5 *  INSTRUCTION.VsetRate;
         }
 
-        if(WM->CV3->_Vmin == WM->CV3->_Vinit){
+        if(CV3->_Vmin == CV3->_Vinit){
             VminCounter = -1;
         }
-        if(WM->CV3->_Vmax == WM->CV3->_Vinit){
+        if(CV3->_Vmax == CV3->_Vinit){
             VmaxCounter = -1;
         }
 
-        Vset = WM->CV3->_Vinit;
+        Vset = CV3->_Vinit;
     }
 
     if(!vscanReset){
         if((INSTRUCTION.Vinit < INSTRUCTION.Ve1 && INSTRUCTION.Vinit < INSTRUCTION.Ve2) ||
         (INSTRUCTION.Vinit > INSTRUCTION.Ve1 && INSTRUCTION.Vinit > INSTRUCTION.Ve2)
         ){
-            if (WM->CV3->_current_direction_up){
-                Vset = Vset + WM->CV3->_Vstep;
+            if (CV3->_current_direction_up){
+                Vset = Vset + CV3->_Vstep;
             }else{
-                Vset = Vset - WM->CV3->_Vstep;
+                Vset = Vset - CV3->_Vstep;
             }
 
             if(INSTRUCTION.Vinit < INSTRUCTION.Ve1 && INSTRUCTION.Vinit < INSTRUCTION.Ve2){
-                if(Vset == WM->CV3->_Vmin){
+                if(Vset == CV3->_Vmin){
                     VminCounter = -1;
                     INSTRUCTION.Vinit = INSTRUCTION.Vmin;
-                    WM->CV3->_Vinit = WM->CV3->_Vmin;
+                    CV3->_Vinit = CV3->_Vmin;
                 }
             }else if(INSTRUCTION.Vinit > INSTRUCTION.Ve1 && INSTRUCTION.Vinit > INSTRUCTION.Ve2){
-                if(Vset == WM->CV3->_Vmax){
+                if(Vset == CV3->_Vmax){
                     VmaxCounter = -1;
                     INSTRUCTION.Vinit = INSTRUCTION.Vmax;
-                    WM->CV3->_Vinit = WM->CV3->_Vmax;
+                    CV3->_Vinit = CV3->_Vmax;
                 }
             }
         }else{
-
-            if (Vset >= WM->CV3->_Vmax){
+            if (Vset >= CV3->_Vmax){
                 VmaxCounter++;
-            }else if (Vset <= WM->CV3->_Vmin){
+            }else if (Vset <= CV3->_Vmin){
                 VminCounter++;
             }
 
-            if (WM->CV3->_current_direction_up){
-                Vset = Vset + WM->CV3->_Vstep;
+            if (CV3->_current_direction_up){
+                Vset = Vset + CV3->_Vstep * GPT.GptimerMultiple;
             }else{
-                Vset = Vset - WM->CV3->_Vstep;
+                Vset = Vset - CV3->_Vstep * GPT.GptimerMultiple;
             }
 
             if(VmaxCounter != 0 && VminCounter != 0){
-                if(VmaxCounter == VminCounter && WM->CV3->_direction_up && WM->CV3->_current_direction_up){
+                if(VmaxCounter == VminCounter && CV3->_direction_up && CV3->_current_direction_up){
                     if(CycleCounter != VmaxCounter){
-                        if(Vset >= WM->CV3->_Vinit){
-                            WM->CV3->_cycleNumber--;
+                        if(Vset >= CV3->_Vinit){
+                            CV3->_cycleNumber--;
                             CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
                         }
                     }
                 }
-                if(VmaxCounter == VminCounter && !WM->CV3->_direction_up && !WM->CV3->_current_direction_up){
+                if(VmaxCounter == VminCounter && !CV3->_direction_up && !CV3->_current_direction_up){
                     if(CycleCounter != VmaxCounter){
-                        if(Vset <= WM->CV3->_Vinit){
-                            WM->CV3->_cycleNumber--;
+                        if(Vset <= CV3->_Vinit){
+                            CV3->_cycleNumber--;
                             CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
                         }
                     }
                 }
             }
 
-            if (Vset >= WM->CV3->_Vmax){
-                WM->CV3->_current_direction_up = false;
-            }else if (Vset <= WM->CV3->_Vmin){
-                WM->CV3->_current_direction_up = true;
+            if (Vset >= CV3->_Vmax){
+                CV3->_current_direction_up = false;
+            }else if (Vset <= CV3->_Vmin){
+                CV3->_current_direction_up = true;
             }
 
             /*stop condition*/
-            if(WM->CV3->_cycleNumber == 0){
+            if(CV3->_cycleNumber == 0){
     //            PeriodicEvent = false;
-                FreeWorkMode(WM);
+                ModeLED(POST_WORK);
                 InitEliteFlag();
                 INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
                 INSTRUCTION.sampleRate = 15;

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

@@ -177,9 +177,9 @@ static void CV_Vscan(CVMode *CV){
         }
 
         if (CV->_current_direction_up){
-            Vset = Vset + CV->_Vstep;
+            Vset = Vset + CV->_Vstep * GPT.GptimerMultiple;
         }else{
-            Vset = Vset - CV->_Vstep;
+            Vset = Vset - CV->_Vstep * GPT.GptimerMultiple;
         }
 
         if(VmaxCounter != 0 && VminCounter != 0){
@@ -209,7 +209,8 @@ static void CV_Vscan(CVMode *CV){
 
         /*stop condition*/
         if(CV->_cycleNumber == 0){
-            reset();
+            PeriodicEvent = false;
+            ModeLED(NO_EVENT);
         }
     }
 }

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

@@ -19,7 +19,7 @@ static uint16_t CVSCANCurve(CVSCANMode *CVSCAN){
     }
 
     INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
 
     int32_t RealV2;
     RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]

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

@@ -5,34 +5,31 @@
 static bool DACReset;
 
 
-//#ifdef ELITE_VERSION_1_3
-//#define DACOUT 0x30
-//
-//static void DAC_outputV(uint16_t voltLV) {
-//    // C = command, X = don't care, D = data
-//    // CCCC XXXX = command
-//    // DDDD DDDD = v1
-//    // DDDD XXXX = v2
-//
-//    uint8_t v1, v2 = 0;
-//    v1 = (uint8_t) (voltLV >> 4) & 0xFF;
-//    v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
-//
-//    spi_DACtxbuf[0] = command;
-//    spi_DACtxbuf[1] = v1;
-//    spi_DACtxbuf[2] = v2;
-//    for (int i = 3; i < SPI_DAC_SIZE; i++) {
-//        spi_DACtxbuf[i] = 0;
-//    }
-//
-//    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
-//}
-//#endif
+#ifdef ELITE_VERSION_1_3
+#define DACOUT 0x30
+static void DAC_outputV(uint16_t voltLV) {
+    // C = command, X = don't care, D = data
+    // CCCC XXXX = command
+    // DDDD DDDD = v1
+    // DDDD XXXX = v2
+
+    uint8_t v1, v2 = 0;
+    v1 = (uint8_t) (voltLV >> 4) & 0xFF;
+    v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
+
+    spi_DACtxbuf[0] = command;
+    spi_DACtxbuf[1] = v1;
+    spi_DACtxbuf[2] = v2;
+    for (int i = 3; i < SPI_DAC_SIZE; i++) {
+        spi_DACtxbuf[i] = 0;
+    }
+
+    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+}
+#endif
 
 #ifdef ELITE_VERSION_1_4
-#define DACCLS 0x02
 #define DACOUT 0x31
-
 static uint16_t DAC_outputV(uint16_t voltLV) {
     // C = command, X = don't care, D = data
     // CCCC CCCC = command
@@ -52,9 +49,22 @@ static uint16_t DAC_outputV(uint16_t voltLV) {
     spi_DACtxbuf[2] = v2;
 
     DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+
     return voltLV;
 }
+#endif
 
+#ifdef ELITE_VERSION_EIS
+static uint32_t DAC_outputV(uint32_t voltLV) {
+
+//    uint8_t v1, v2 = 0;
+//    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
+//    v2 = (uint8_t) (voltLV & 0x00FF);
+
+    EIS_LPDAC_SPI(voltLV);
+
+    return voltLV;
+}
 #endif
 
 static int32_t User2Real(uint16_t UserCode){
@@ -62,4 +72,34 @@ static int32_t User2Real(uint16_t UserCode){
     return (int32_t)((UserCode - 25000) / 5);
 }
 
+
+// DAC Vout theoretical boundary <300, 100~ (mV)
+#define DAC_VOUT_GAIN_SMALL_BOUNDARY  100000  // 100  mV =    25500(usercode)
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY  300000  // 300  mV =    26500(usercode)
+
+static void AutoGainChangeVout(int32_t RealVolt){
+    RealVolt = (RealVolt - 25000) * 200; // (RealVolt - 25000) / 5 * 1000
+    // switch to 1 level volt(small)   15K
+    // switch to 2 level volt(large)   240K
+
+    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_AUTO){
+        INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+    }
+
+    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_15K){
+        if(RealVolt > DAC_VOUT_GAIN_LARGE_BOUNDARY || RealVolt < -1 * DAC_VOUT_GAIN_LARGE_BOUNDARY){
+            // switch to 2 level volt(large)
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
+            record_flag = false;
+        }
+    }
+    else if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_240K){
+        if(RealVolt < DAC_VOUT_GAIN_SMALL_BOUNDARY && RealVolt > -1 * DAC_VOUT_GAIN_SMALL_BOUNDARY ){
+            // switch to 1 level volt(small)
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+            record_flag = false;
+        }
+    }
+}
+
 #endif

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

@@ -21,6 +21,8 @@ struct _GPT{
     uint32_t LeadTimeCounter;
     uint32_t BatteryADCCounter;
     uint32_t BatteryCheckCounter;
+    uint32_t GptimerMultiple;
+    uint32_t TestCounter;
 }GPT = {0};
 
 static void InitCT(){

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

@@ -27,18 +27,20 @@ static void IV_Vscan(IVMode *IV){
     if(!vscanReset){
         if(IV->_current_direction_up){
             if(Vset >= IV->_Vmax){
-                reset();
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
             }
         }else{
             if(Vset <= IV->_Vmin){
-                reset();
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
             }
         }
 
         if (IV->_current_direction_up){
-            Vset = Vset + IV->_Vstep;
+            Vset = Vset + IV->_Vstep * GPT.GptimerMultiple;
         }else{
-            Vset = Vset - IV->_Vstep;
+            Vset = Vset - IV->_Vstep * GPT.GptimerMultiple;
         }
     }
 }

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

@@ -2,16 +2,32 @@
 #ifndef ELITEINSTRUCTION
 #define ELITEINSTRUCTION
 
-/** ADC gain level **/
-#define GAIN_200K   0x00 // largest gain
-#define GAIN_10K    0x01
-#define GAIN_200R   0x02 // the least gain
-#define GAIN_AUTO   0x03
+/** 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
-#define DAC_POS_MAX 0x0000
-#define DAC_NEG_MAX 0xFFFF
 
 // Step time macro
 #define STEPTIME_HALF_SEC 5000
@@ -44,7 +60,12 @@ struct HEADSTAGE_INSTRUCTION {
     uint32_t sampleRate;
     uint8_t  VoViSwitch;
     uint8_t  AutoGainEnable;
+    uint8_t  VinAutoGainEnable;
+    uint8_t  VoutAutoGainEnable;
     uint8_t  ADCGainLevel;
+     // voltage output gain
+    uint16_t VoutGainLevel;
+    uint8_t  VinADCGainLevel;
 
     /** Notify parameter **/
     uint32_t notifyRate;
@@ -57,6 +78,8 @@ struct HEADSTAGE_INSTRUCTION {
 
     uint16_t StepTime;
 
+    uint8_t AdcChannel;
+
 } INSTRUCTION = {0};
 
 /*********************************************************************
@@ -86,40 +109,17 @@ static void InitEliteInstruction(){
     INSTRUCTION.sampleRate      = 100;
     INSTRUCTION.VoViSwitch      = 0x01;    //0:user see Vo     1: user see Vi
     INSTRUCTION.AutoGainEnable  = 1;
-    INSTRUCTION.ADCGainLevel    = GAIN_AUTO;
+    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;
 }
-
-/*********************************************************************
- * @fn      GetInstructionParameter
- *
- * @brief   Get Constant Current mode parameter.
- *
- * @param   ins - instruction including current value and unit
- *
- * @return  None.
- */
-static void GetInstructionParameter(uint8 *ins){
-    // CurrentLV=0 => unit is nA
-    // CurrentLV=1 => unit is uA
-    // CurrentLV=2 => unit is mA
-//    INSTRUCTION.CurrentLV = (*ins);
-
-    // ConstantCurrentRange=0 => current value is 0~499
-    // ConstantCurrentRange=1 => current value is 500~999
-//    INSTRUCTION.ConstantCurrentRange = (*ins) & 0x0F;
-
-    // ConstantCurrent divide ConstantCurrentRange into 50000 count (thus each count is 0.01)
-        // e.g. 485.7 uA can be represent by
-        // CurrentLV = 1 (unit is uA)
-        // ConstantCurrentRange = 0 (current range is 0~499)
-        // ConstantCurrent = 48570
-    INSTRUCTION.constantCurrent = (uint32_t) (*(ins+1))<<24 | (uint32_t) (*(ins+2))<<16 | (uint32_t) (*(ins+3))<<8 | (uint32_t) (*(ins+4));
-}
-
 #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){
-                PIN_setOutputValue(pin_handle, enable_5v, 0);
-                return false;
-            }else{
-                PIN_setOutputValue(pin_handle, enable_5v, 1);  // enable 5V
-                TurnOn10V();
-                LEDPowerON();
-                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;
-        PIN_setOutputValue(pin_handle, enable_5v, 0);
+        PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
         return false;
     }
 }
@@ -40,7 +34,7 @@ static void EliteKeyPress(uint8_t key) {
         // press key => bight LED
 
         if (ShutDownCounter == CLOCK_ONE_SECOND) {
-            KeyWorkModeLED();
+            KEYLED();
         }
 
         // press 3~4 sec, shutdown 2650
@@ -53,7 +47,7 @@ static void EliteKeyPress(uint8_t key) {
         if (OriginEliteFxn == INSTRUCTION.eliteFxn) {  // old function == currunt instruction
             if (ShutDownCounter != 0) {
                 // dark LED
-                WorkModeLED();
+                checkFlafLED();
                 ShutDownCounter = 0;
             }
         } else {  // old function != currunt instruction
@@ -61,16 +55,9 @@ static void EliteKeyPress(uint8_t key) {
             if (ShutDownCounter != 0) {
                 ShutDownCounter = 0;
             }
-            // dark mode LED
-            WorkModeLED();
+            checkFlafLED();
         }
     }
 }
 
-static void TurnOn10V() {
-    If10Von = true;
-    PIN_setOutputValue(pin_handle, enable_10v, 1);
-    CPUdelay(8000);
-}
-
 #endif

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

@@ -5,6 +5,8 @@
 #define DARKLED                  0xE1
 #define LIGHTLED                 0xE8
 
+static void WorkModeLED();
+
 static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
     spi_LEDtxbuf[0] = 0x0000;
     spi_LEDtxbuf[1] = 0x0000;
@@ -17,26 +19,31 @@ 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: {
             LED_color(DARKLED, 0x00, 0xFA, 0x00);
             break;
         }
+        case COLOR_YELLOWGREEN: {
+            LED_color(DARKLED, 0x64, 0xA6, 0x00);
+            break;
+        }
         case COLOR_BLUE: {
             LED_color(DARKLED, 0x00, 0x00, 0xAA);
             break;
@@ -46,104 +53,58 @@ 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 WorkModeLED() {
-    switch (INSTRUCTION.eliteFxn) {
-    case IV_CURVE: {
-        WORKLED();
+static void ModeLED(uint16_t modeStatus) {
+    btWaitLedFlag   = 0;
+    noEventLedFlag  = 0;
+    preWorkLedFlag  = 0;
+    workingLedFlag  = 0;
+    postWorkLedFlag = 0;
+
+    switch (modeStatus) {
+    case BT_WAIT: {
+        btWaitLedFlag = 1;
+        BT_WAIT_LED();
         break;
     }
-    case CV_CURVE: {
-        WORKLED();
-        break;
-    }
-    case DIFFERENTIAL_PULSE_VOLTAMMETRY: {
-        WORKLED();
-        break;
-    }
-    case SQUARE_WAVE_VOLTAMMETRY: {
-        WORKLED();
-        break;
-    }
-    case VOLT_OUTPUT: {
-        WORKLED();
-        break;
-    }
-    case ZT_CURVE: {
-        WORKLED();
-        break;
-    }
-    case VT_CURVE: {
-        WORKLED();
-        break;
-    }
-    case IT_CURVE: {
-        WORKLED();
-        break;
-    }
-    case CONSTANT_CURRENT:{
-        Elite_led_color(COLOR_BLUE);
-        break;
-    }
-    case VIS_RST: {
+    case NO_EVENT: {
+        noEventLedFlag = 1;
         LEDPowerON();
         break;
     }
-    case ADC_TEST: {
-        WORKLED();
+    case PRE_WORK: {
+        preWorkLedFlag = 1;
+        Elite_led_color(COLOR_BLUE);
         break;
     }
-    case CYCLIC_VOLTAMMETRY: {
-        WORKLED();
+    case WORKING: {
+        workingLedFlag = 1;
+        WorkModeLED();
         break;
     }
-    case LINEAR_SWEEP_VOLTAMMETRY: {
-        WORKLED();
-        break;
-    }
-    case CONSTANT_VSCAN: {
-        WORKLED();
+    case POST_WORK: {
+        postWorkLedFlag = 1;
+        Elite_led_color(COLOR_BLUE);
         break;
     }
     default: {
@@ -153,58 +114,63 @@ static void WorkModeLED() {
     }
 }
 
-static void KeyWorkModeLED() {
-    KEYLED();
-    /*
-    switch(INSTRUCTION.eliteFxn){
-        case IV_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case CV_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case DIFFERENTIAL_PULSE_VOLTAMMETRY:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case SQUARE_WAVE_VOLTAMMETRY:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case VOLT_OUTPUT:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case ZT_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case VT_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case IT_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-
-        case VIS_RST:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case ADC_TEST:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-
-        default:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
+static void checkFlafLED() {
+    if(btWaitLedFlag == 1){
+        ModeLED(BT_WAIT);
+    }
+    else if(noEventLedFlag == 1){
+        ModeLED(NO_EVENT);
+    }
+    else if(preWorkLedFlag == 1){
+        ModeLED(PRE_WORK);
+    }
+    else if(workingLedFlag == 1){
+        ModeLED(WORKING);
+    }
+    else if(postWorkLedFlag == 1){
+        ModeLED(POST_WORK);
+    }
+}
+
+static void WorkModeLED() {
+    switch (INSTRUCTION.eliteFxn) {
+    case IV_CURVE:
+    case CV_CURVE:
+    case DIFFERENTIAL_PULSE_VOLTAMMETRY:
+    case SQUARE_WAVE_VOLTAMMETRY:
+    case VOLT_OUTPUT:
+    case ZT_CURVE:
+    case VT_CURVE:
+    case IT_CURVE:
+    case ADC_TEST:
+    case CYCLIC_VOLTAMMETRY:
+    case LINEAR_SWEEP_VOLTAMMETRY:
+    case CONSTANT_VSCAN:{
+        WORKLED();
+        break;
+    }
+    case CONSTANT_CURRENT:{
+        WORKLED();
+        break;
+    }
+    case CALI_ADC_MODE:{
+        if(INSTRUCTION.AdcChannel == IIN_ADC){
+            Elite_led_color(COLOR_RED);
+        }else if(INSTRUCTION.AdcChannel == VIN_ADC){
+            Elite_led_color(COLOR_ORANGE);
+        }
+
+        break;
+    }
+//    case VIS_RST: {
+//        LEDPowerON();
+//        break;
+//    }
+    default: {
+        WORKLED();
+        break;
+    }
     }
-    */
 }
 
 #endif

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

@@ -19,7 +19,7 @@ static uint16_t LSVCurve(LSVMode *LSV){
     }
 
     INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
 
     int32_t RealV2;
     RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
@@ -34,42 +34,42 @@ static uint16_t LSVCurve(LSVMode *LSV){
      return DACOutCode;
 }
 
-static void LSV_Vscan(WorkMode *WM){
+static void LSV_Vscan(LSVMode *LSV){
 
-    NotifyCycleNumber = (INSTRUCTION.cycleNumber - WM->LSV->_cycleNumber + 1);
+    NotifyCycleNumber = (INSTRUCTION.cycleNumber - LSV->_cycleNumber + 1);
 
     if(vscanReset){
         if(INSTRUCTION.directionInit == 1){
-            WM->LSV->_direction_up         = true;
-            WM->LSV->_current_direction_up = true;
+            LSV->_direction_up         = true;
+            LSV->_current_direction_up = true;
         }else{
-            WM->LSV->_direction_up         = false;
-            WM->LSV->_current_direction_up = false;
+            LSV->_direction_up         = false;
+            LSV->_current_direction_up = false;
         }
 
          //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
         if(INSTRUCTION.step <= 10){
-            WM->LSV->_Vstep = INSTRUCTION.step *  INSTRUCTION.VsetRate / 5;
+            LSV->_Vstep = INSTRUCTION.step *  INSTRUCTION.VsetRate / 5;
         }else{
-            WM->LSV->_Vstep = INSTRUCTION.step / 5 *  INSTRUCTION.VsetRate;
+            LSV->_Vstep = INSTRUCTION.step / 5 *  INSTRUCTION.VsetRate;
         }
 
-        Vset = WM->LSV->_Vinit;
+        Vset = LSV->_Vinit;
     }
 
     if(!vscanReset){
 
-        if (WM->LSV->_current_direction_up){
-            Vset = Vset + WM->LSV->_Vstep;
+        if (LSV->_current_direction_up){
+            Vset = Vset + LSV->_Vstep * GPT.GptimerMultiple;
         }else{
-            Vset = Vset - WM->LSV->_Vstep;
+            Vset = Vset - LSV->_Vstep * GPT.GptimerMultiple;
         }
 
         /*stop condition*/
-        if (Vset >= WM->LSV->_Vmax){
+        if (Vset >= LSV->_Vmax){
+            ModeLED(POST_WORK);
 //            PeriodicEvent = false;
-            Vset = WM->LSV->_Vmin;
-            FreeWorkMode(WM);
+            Vset = LSV->_Vmin;
             InitEliteFlag();
             INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
             INSTRUCTION.sampleRate = 15;
@@ -79,10 +79,10 @@ static void LSV_Vscan(WorkMode *WM){
             INSTRUCTION.Vmin       = 0x0000;
             INSTRUCTION.notifyRate = 500;
             INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
-        }else if (Vset <= WM->LSV->_Vmin){
+        }else if (Vset <= LSV->_Vmin){
+            ModeLED(POST_WORK);
 //            PeriodicEvent = false;
-            Vset = WM->LSV->_Vmax;
-            FreeWorkMode(WM);
+            Vset = LSV->_Vmax;
             InitEliteFlag();
             INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
             INSTRUCTION.sampleRate = 15;

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

@@ -0,0 +1,16 @@
+
+#ifndef ELITE_LATCH_INIT
+#define ELITE_LATCH_INIT
+
+static void InitLH() {
+    for (int i=0; i<LATCH_BUFF_SIZE; i++) {
+        LH.LATCH0[i]       = 0;
+        LH.LATCH1[i]       = 0;
+        LH.LATCH2[i]       = 0;
+    }
+    LH.LoadState    = 0;
+}
+
+
+#endif
+

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

@@ -10,11 +10,10 @@
 #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
 
@@ -25,11 +24,10 @@
 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 uint8_t  NotifyCurrent[4]   = {0};
+static uint8_t  NotifyVolt[4]      = {0};
+static uint8_t  NotifyImpedance[4] = {0};
+static uint8_t  NotifyVoltBat[4]   = {0};
 static uint16_t NotifyCycleNumber  = 0;
 
 // ****************** New Notify Format ******************************** //
@@ -119,13 +117,13 @@ static void SendNotify() {
 
 static void initDATBuf(){
     for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++){
-            not_buf[i] = 0;
+        not_buf[i] = 0;
     }
 }
 
 static void initINSBuf(){
     for (int i = 0; i < BLE_INS_BUFF_SIZE; i++){
-            ins_buf[i] = 0;
+        ins_buf[i] = 0;
     }
 }
 
@@ -185,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,14 +3,16 @@
 #define ELITERESET
 
 static void reset() {
+    ModeLED(NO_EVENT);
     InitEliteFlag();
     InitFlag();
     InitCT();
     InitGPT();
+    InitLH();
 
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-    LEDPowerON();
+//    VinADCGainControl(VIN_GAIN_AUTO);
+//    IinADCGainControl(I_GAIN_AUTO);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
     initINSBuf();
     initDATBuf();
 
@@ -29,20 +31,23 @@ static void reset() {
         spi_ADC_rxbuf[i] = 0;
     }
 
-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
+    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
+//    PIN15_setOutputValue(DAC_CS, 1);  // DAC_CS HIGH
     CPUdelay(1600);
 }
 
 static void Eliteinterrupt() {
-    InitEliteFlag();
     InitFlag();
+    ModeLED(NO_EVENT);
+
+    InitEliteFlag();
     InitCT();
     InitGPT();
+    InitLH();
 
-    ADCGainControl(GAIN_AUTO);
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-    LEDPowerON();
+//    VinADCGainControl(VIN_GAIN_AUTO);
+//    IinADCGainControl(I_GAIN_AUTO);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
     initINSBuf();
     initDATBuf();
 
@@ -61,8 +66,7 @@ static void Eliteinterrupt() {
         spi_ADC_rxbuf[i] = 0;
     }
 
-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
+    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

@@ -16,7 +16,7 @@
 
 /* application use SPI parameters and buffers */
 #define SPI_LED_SIZE 28
-#define SPI_DAC_SIZE 3
+#define SPI_DAC_SIZE 5
 #define SPI_ADC_SIZE 4
 
 static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
@@ -36,11 +36,10 @@ static SPI_Params      spiParams1;
 static SPI_Transaction LED_transaction;
 static SPI_Transaction ADC_DAC_transaction;
 
-
 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;
@@ -50,7 +49,8 @@ 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
 }
 
@@ -63,26 +63,239 @@ static void LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
 }
 
 static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+    PIN_setOutputValue(pin_handle, AD_CS, 0);      // CS_ADC
+
     ADC_DAC_transaction.count = length;
     ADC_DAC_transaction.txBuf = spi_txbuf;
     ADC_DAC_transaction.rxBuf = spi_rxbuf;
 
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
-    PIN_setOutputValue(pin_handle, ADC_CS, 0);  // ADC_CS LOW
     SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
 
+    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
 }
 
 static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-   ADC_DAC_transaction.count = length;
-   ADC_DAC_transaction.txBuf = spi_txbuf;
-   ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    ADC_DAC_transaction.count = length;
+    ADC_DAC_transaction.txBuf = spi_txbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
 
-   PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-   PIN_setOutputValue(pin_handle, DAC_CS, 0);  // DAC_CS LOW
-   SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-   PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
 }
 
+/* Elite1.5 Calibration SPI */
+static void CAL_ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+    ADC_DAC_transaction.count = length;
+    ADC_DAC_transaction.txBuf = spi_txbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
+}
+
+static void CAL_LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
+    LED_transaction.count = length;
+    LED_transaction.txBuf = spi_txbuf;
+    LED_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle0, &LED_transaction);
+}
+
+
+
+#ifdef ELITE_VERSION_EIS
+//define SPI command
+#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(0x000402B5); //0b1000000001010110101
+
+        select_REG(HSDACCON);  //2010  //ac gain
+        w32_REG(0x0000001E);
+
+        select_REG(WGFCW);  //2030
+        w32_REG(0x00340000);  //SINEFCW/2^30 * 32 MHz
+        select_REG(WGCON);  //2014
+        w32_REG(0x00000004);   //AC on/off;  0x0:DC 0x4:AC 0x5:trapezoid
+        //0x0: 00000 DC
+        //0x4: 00100 Sinusoid
+        //0x6: 00110 Trapezoid ---Taylor
+
+        select_REG(LPDACCON0);  //2128 //DC on
+        w32_REG(0b00000001);
+        select_REG(LPDACSW0);  //2124  //operation
+        w32_REG(0b00101011);
+        select_REG(LPDACDAT0);  //2120 //output Vout
+        w32_REG(0x00000000);
+
+        // select_REG(HSTIACON);  //20FC //SE0's gain
+        // w32_REG(0x0);
+        select_REG(DE0RESCON);  //20F8 //DE0's gain
+        w32_REG(0x00000068);
+
+        select_REG(ADCCON);  //21A8
+        w32_REG(0x00000101);
+        select_REG(DFTCON);  //20D0
+        w32_REG(0x000000C1);
+        select_REG(ADCFILTERCON);  //2044
+        w32_REG(0x000000D0);
+
+        select_REG(AFECON);  //2000
+        w32_REG(0x0030CFC0);
+//        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/EliteWorkData.h

@@ -1,7 +1,7 @@
 #ifndef ELITE_WORK_DATA
 #define ELITE_WORK_DATA
 
-#define CLOCK_ONE_SECOND 10000
+#define CLOCK_ONE_SECOND 00001
 
 #include "EliteInstruction.h"
 
@@ -434,6 +434,7 @@ WorkMode *CreateWorkMode(){
 void InitWorkMode(WorkMode *WM){
     switch(INSTRUCTION.eliteFxn){
         case VOLT_OUTPUT:
+        case CALI_DAC_MODE:
             WM->VO = InitVoltOutMode();
             break;
         case IT_CURVE:
@@ -475,6 +476,7 @@ void InitWorkMode(WorkMode *WM){
 void FreeWorkMode(WorkMode *WM){
     switch(INSTRUCTION.eliteFxn){
         case VOLT_OUTPUT:
+        case CALI_DAC_MODE:
             if(WM->VO != NULL){
                 free(WM->VO);
                 WM->VO = NULL;

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

@@ -8,50 +8,42 @@
 
 /* SPI Board */
 #define Board_SPI0_MISO                 PIN_UNASSIGNED
-#define Board_SPI0_MOSI                 IOID_1
-#define Board_SPI0_CLK                  IOID_0
+#define Board_SPI0_MOSI                 IOID_4
+#define Board_SPI0_CLK                  IOID_3
 #define Board_SPI0_CS                   PIN_UNASSIGNED
 
-#define Board_SPI1_MISO                 IOID_3
-#define Board_SPI1_MOSI                 IOID_2
-#define Board_SPI1_CLK                  IOID_4
+#define Board_SPI1_MISO                 IOID_1
+#define Board_SPI1_MOSI                 IOID_6
+#define Board_SPI1_CLK                  IOID_5
 #define Board_SPI1_CS                   PIN_UNASSIGNED
 
-#define ADC_CS                          IOID_8
-#define DAC_CS                          IOID_9
+#define AD_CS                           IOID_10
 
-#define Turnon200R                      IOID_5
-#define Turnon10K                       IOID_6
+//#define SD_MISO                         IOID_11
+//#define SD_CS                           IOID_8
+//#define SD_CLK                          IOID_7
+//#define SD_MOSI                         IOID_13
 
-/* I2C */
-#ifdef ELITE_VERSION_1_4
-#define Board_I2C0_SCL0                 IOID_7
-#define Board_I2C0_SDA0                 IOID_1
-#endif
-
-#define shutdown_6994                   IOID_10
-#define switch_on                       IOID_11
-#define enable_10v                      IOID_12
-#define enable_5v                       IOID_13
+#define switch_on                       IOID_14
+#define enable_5v                       IOID_9
+#define AD_reset                        IOID_13
 
 PIN_Handle       pin_handle;
 static PIN_State ZM_rst;
 
 const PIN_Config BLE_IO[] = {
-    //
-    ADC_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // ADC_CS
-    DAC_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // DAC_CS
-
-    enable_10v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,     // 10V_enable
-    enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,      // 5V_enable
-    shutdown_6994 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // turn off power
-    Turnon200R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    Turnon10K | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,// 5V_enable
+    AD_reset | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
     switch_on | PIN_INPUT_EN | PIN_PULLDOWN,
-
+    AD_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
     PIN_TERMINATE
 };
 
+static void remove_elite_pin() {
+    PIN_close(pin_handle);
+    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+}
+
 /*!
  *  @def    BOOSTXL_CC2650MA_SPIName
  *  @brief  Enum of SPI names on the CC2650 Booster Pack
@@ -167,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_batt.h

@@ -2,7 +2,7 @@
 ***********************************************************
     Read battery's method
 ***********************************************************
-1.ReadBatVolt(spi_ADC_rxbuf)
+1.ReadADCBat(spi_ADC_rxbuf)
   let "spi_ADC_rxbuf" be 8000
   8000 * 187.5uV * 2 = 3000000uV = 3V ;
 2.AONBatMonBatteryVoltageGet()
@@ -34,7 +34,7 @@ static uint8_t headstage_battery_percent() {
 static void headstage_battery_volt(){
     uint32_t bat_volt = 0;
 
-    ReadBatVolt(spi_ADC_rxbuf);
+    ReadADCBat(spi_ADC_rxbuf);
     bat_volt = (uint32_t) (spi_ADC_rxbuf[0] << 8) | (uint32_t) (spi_ADC_rxbuf[1]);
     bat_volt = bat_volt * 12 / 125; //x  * 187.5 * 1e-6 * 2 / 125 * 320 * 100 ;
     InputNotify(NOTIFY_VOLT_BAT, bat_volt);
@@ -42,30 +42,51 @@ static void headstage_battery_volt(){
 
 static void EliteADCBattery(){
     static uint8_t ADCSwitch = 0;
-
-    if(ADCSwitch == 0){ /**read V**/
-        ReadBatVolt(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 1){ /**read V**/
-        ReadBatVolt(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 2){ /**read V(buffer)**/
-        headstage_battery_volt();
-        batteryCheck_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 int32_t headstage_temperature() {
-    int32_t curTemp;
-    curTemp = AONBatMonTemperatureGetDegC();
-    InputNotify(NOTIFY_TEMPERATURE,curTemp);
-    if(INSTRUCTION.eliteFxn == IT_CURVE){
-        InputNotify(NOTIFY_IMPEDANCE,curTemp);
+static void measureBat(){
+    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+    GPT.GptimerCounter0 = GPT.GptimerCounter;
+
+    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
+    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+
+    if(GPT.BatteryCheckCounter >= 50000){//5min=3000000, 5s=50000
+        GPT.BatteryCheckCounter = 0;
+        batteryCheck_flag = true;
+    }
+
+    if(GPT.BatteryADCCounter >= 15 && batteryCheck_flag){
+        GPT.BatteryADCCounter = 0; //To get the data right, ADC must be delay 1.5ms
+        batteryADC_flag = true;
+        if(batteryADC_flag){
+            EliteADCBattery();
+            batteryADC_flag = false;
+        }
+    }
+
+    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
+                   ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+    if( bat < 768 && bat > 20){
+        PIN_setOutputValue(pin_handle, enable_5v, 0);
     }
-    return curTemp;
 }
 
 #endif  // HEADSTAGE_BATT_H

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

@@ -27,7 +27,7 @@
 #define VT_CURVE                        0x50
 #define IT_CURVE                        0x60
 #define SET_SAMPLE_RATE                 0x70
-#define SET_ADC_GAIN                    0x80
+#define SET_ADC_DAC_GAIN                    0x80
 #define DIFFERENTIAL_PULSE_VOLTAMMETRY  0xA0
 #define SQUARE_WAVE_VOLTAMMETRY         0xB0
 #define CYCLIC_VOLTAMMETRY              0xC0
@@ -36,14 +36,20 @@
 #define HIGH_CYCLE_CYCLIC_VOLTAMMETRY   0x01
 #define LINEAR_SWEEP_VOLTAMMETRY        0x02
 #define CONSTANT_VSCAN                  0x03
-#define ADC_TEST                        0x90
+#define ADC_TEST                        0x91
+#define CALI_DAC_MODE                   0x93
+#define CALI_ADC_MODE                   0x92
+#define DEV_MODE                        0xFF
 
 // CIS (control instruction)
 #define CIS_VERSION                     0x40
 #define CIS_VOLT                        0x10
 #define CIS_LED_TEST                    0x70
-#define CIS_TEMPERATURE                 0x80
-
+#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)
@@ -51,7 +57,7 @@
 #define VDIRECTION(v1,v2)        ((v1 > v2)  ?  0 : 1)
 #define AFTER_READ_I             0
 #define AFTER_READ_V             1
-#define ReadADCVolt(x)           ((x==0)? ReadVoutVolt(spi_ADC_rxbuf) : ReadVolt(spi_ADC_rxbuf))
+#define ReadADCVolt(x)           ((x==0)? ReadADCVout(spi_ADC_rxbuf) : ReadADCVin(spi_ADC_rxbuf))
 #define PARA_1                   0x01
 #define PARA_2                   0x02
 
@@ -67,16 +73,17 @@
 #define COLOR_PURPLE             0x08
 #define COLOR_WHITE              0x09
 #define COLOR_YELLOWGREEN        0x0A
-#define COLOR_YELLOW_DARK        0xF3
-#define COLOR_GREEN_DARK         0xF4
-#define COLOR_BLUE_DARK          0xF5
-#define COLOR_CYAN_DARK          0xF6
-#define COLOR_PURPLE_DARK        0xF8
-
 #define LEDPowerON()             Elite_led_color(COLOR_GREEN)
 #define WORKLED()                Elite_led_color(COLOR_CYAN)
 #define KEYLED()                 Elite_led_color(COLOR_YELLOW)
 #define BT_WAIT_LED()            Elite_led_color(COLOR_YELLOWGREEN)
 
 
+#define BT_WAIT                  0x01
+#define NO_EVENT                 0x02
+#define PRE_WORK                 0x03
+#define WORKING                  0x04
+#define POST_WORK                0x05
+
+
 #endif

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

@@ -19,15 +19,8 @@ static uint16_t OneWayVoltScan() {
         Vout = Vout + DeltaVout;
     }
 
-
-    if (Vout >= 1100000000) { //1100000000 = 5.5V
-        Vout = 1100000000;
-    } else if (Vout <= -1000000000) {  //-1000000000 = -5V
-        Vout = -1000000000;
-    }
-
     INSTRUCTION.VoltConstant = Vout / 40000 + 25000; //5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
     DAC_outputV(DACOutCode);
 
     if ((INSTRUCTION.eliteFxn == IV_CURVE)||(INSTRUCTION.eliteFxn == CV_CURVE)||(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)){
@@ -58,7 +51,7 @@ static void DACenable(WorkMode *WorkModeData, int32_t VoltData ,uint8_t afterRea
     if(afterRead == AFTER_READ_I){
         switch (INSTRUCTION.eliteFxn) {
             case CONSTANT_CURRENT:{
-//                CC_Vscan(WorkModeData->CC);
+                CC_Vscan(WorkModeData->CC);
                 OneWayVoltScan();
                 break;
             }
@@ -163,21 +156,21 @@ static void CC_Plot(WorkMode *WorkModeData){
             if(ADCSwitch == 0){ /**read Iin(buffer),read bat**/
                 readIin(WorkModeData);
                 if(record_flag == false){
-                    static int count = 0;
-                    count++;
-                    if(count == 2){
+                    static int recordCount = 0;
+                    recordCount++;
+                    if(recordCount == 2){
                         record_flag = true;
-                        count = 0;
+                        recordCount = 0;
                     }
                 }else{
                     InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
                 }
                 DACenable(WorkModeData, VoltData, AFTER_READ_I);
 
-                ReadBatVolt(spi_ADC_rxbuf);
+                ReadADCBat(spi_ADC_rxbuf);
                 BatSwitch++;
             }else if(ADCSwitch == 1 || ADCSwitch == 3){ /**read Bat**/
-                ReadBatVolt(spi_ADC_rxbuf);
+                ReadADCBat(spi_ADC_rxbuf);
                 BatSwitch++;
             }else if(ADCSwitch == 2){ /**read V(buffer),read bat**/
                 VoltData = readVinVout(WorkModeData);
@@ -190,15 +183,15 @@ static void CC_Plot(WorkMode *WorkModeData){
                 }
                 DACenable(WorkModeData, VoltData, AFTER_READ_V);
 
-                ReadBatVolt(spi_ADC_rxbuf);
+                ReadADCBat(spi_ADC_rxbuf);
                 BatSwitch++;
             }
         }else if(BatSwitch == 1){
-            ReadBatVolt(spi_ADC_rxbuf);
+            ReadADCBat(spi_ADC_rxbuf);
             BatSwitch++;
         }else if(BatSwitch == 2){
             headstage_battery_volt();
-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
             batteryCheck_flag = false;
             BatSwitch = 0;
             ADCSwitch = 3;
@@ -208,11 +201,11 @@ static void CC_Plot(WorkMode *WorkModeData){
         if(ADCSwitch == 0){ /**read Iin(buffer),read V**/
             readIin(WorkModeData);
             if(record_flag == false){
-                static int count = 0;
-                count++;
-                if(count == 2){
+                static int recordCount = 0;
+                recordCount++;
+                if(recordCount == 2){
                     record_flag = true;
-                    count = 0;
+                    recordCount = 0;
                 }
             }else{
                 InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
@@ -237,11 +230,11 @@ static void CC_Plot(WorkMode *WorkModeData){
             }
             DACenable(WorkModeData, VoltData, AFTER_READ_V);
 
-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
             ADCSwitch++;
         }
         else if(ADCSwitch == 3){ /**read Iin**/
-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
             ADCSwitch = 0;
         }
     }
@@ -296,18 +289,18 @@ static void IT_Plot(WorkMode *WorkModeData) {
     if(batteryCheck_flag){
         EliteADCBattery();
         if(!batteryCheck_flag){
-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
             ADCSwitch = 2;
         }
     }else{
         if(ADCSwitch == 0){ /**read Iin(buffer)**/
             readIin(WorkModeData);
             if(record_flag == false){
-                static int count = 0;
-                count++;
-                if(count == 2){
+                static int recordCount = 0;
+                recordCount++;
+                if(recordCount == 2){
                     record_flag = true;
-                    count = 0;
+                    recordCount = 0;
                 }
             }else{
                 InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
@@ -315,11 +308,11 @@ static void IT_Plot(WorkMode *WorkModeData) {
             ADCSwitch++;
         }
         else if(ADCSwitch == 1){ /**read Iin**/
-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
             ADCSwitch++;
         }
         else if(ADCSwitch == 2){ /**read Iin**/
-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
             ADCSwitch = 0;
         }
     }
@@ -370,8 +363,8 @@ static void VT_Plot(WorkMode *WorkModeData) {
     }
 
     // ADC gain is don't care when measuring voltage
-    INSTRUCTION.ADCGainLevel = GAIN_200R;
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
+//    INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//    IinADCGainControl(INSTRUCTION.ADCGainLevel);
 
     static uint8_t ADCSwitch = 0;
     static int32_t VoltData;
@@ -385,7 +378,16 @@ static void VT_Plot(WorkMode *WorkModeData) {
     }else{
         if(ADCSwitch == 0){ /**read V(buffer)**/
             VoltData = readVinVout(WorkModeData);
-            InputNotify(NOTIFY_VOLT, VoltData);
+            if(record_flag == false){
+                static int recordCount = 0;
+                recordCount++;
+                if(recordCount == 2){
+                    record_flag = true;
+                    recordCount = 0;
+                }
+            }else{
+                InputNotify(NOTIFY_VOLT, VoltData);
+            }
             ADCSwitch++;
         }
         else if(ADCSwitch == 1){ /**read V**/
@@ -444,12 +446,15 @@ static void readIin(WorkMode *WorkModeData){
     }
 
     if(INSTRUCTION.AutoGainEnable){
-        TEMP_MODE->_measureCurrent = AutoGainReadCurrent(spi_ADC_rxbuf);
-        AutoGainChange(TEMP_MODE->_measureCurrent);
+        TEMP_MODE->_measureCurrent = AutoGainReadIin(spi_ADC_rxbuf);
+//        AutoGainChangeIin(TEMP_MODE->_measureCurrent);
     }else{
-        ADCGainControl(INSTRUCTION.ADCGainLevel);
-        ReadCurrent(spi_ADC_rxbuf);
+        ReadADCIin(spi_ADC_rxbuf);
         TEMP_MODE->_measureCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+        if(lastIinADCGainLevel != INSTRUCTION.ADCGainLevel){
+//            IinADCGainControl(INSTRUCTION.ADCGainLevel);
+            record_flag = false;
+        }
     }
     #undef TEMP_MODE
 }
@@ -498,11 +503,23 @@ static int32_t readVinVout(WorkMode *WorkModeData){
     }
 
     static int32_t VoltData;
-    ReadADCVolt(TEMP_MODE->_VoViSwitch);
+
     if(TEMP_MODE->_VoViSwitch == 0x01 || TEMP_MODE->_VoViSwitch == 0x02){
-        TEMP_MODE->_measureVin = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+        if(INSTRUCTION.VinAutoGainEnable){
+            TEMP_MODE->_measureVin = AutoGainReadVin(spi_ADC_rxbuf);
+//            AutoGainChangeVin(TEMP_MODE->_measureVin);
+        }else{
+            ReadADCVolt(TEMP_MODE->_VoViSwitch);
+            TEMP_MODE->_measureVin = DecodeADCValue(INSTRUCTION.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+            if(lastVinADCGainLevel != INSTRUCTION.VinADCGainLevel){
+//                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                record_flag = false;
+            }
+
+        }
         VoltData = TEMP_MODE->_measureVin;
     }else if(TEMP_MODE->_VoViSwitch == 0x00){
+        ReadADCVolt(TEMP_MODE->_VoViSwitch);
         TEMP_MODE->_measureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
         VoltData = TEMP_MODE->_measureVout;
     }
@@ -510,4 +527,234 @@ static int32_t readVinVout(WorkMode *WorkModeData){
     return VoltData;
 }
 
+static void cali_IT_plot(WorkMode *WorkModeData) {
+    switch (INSTRUCTION.eliteFxn) {
+        case IT_CURVE:{
+            #define CURRENT_MODE WorkModeData->IT
+            break;
+        }
+        case VT_CURVE:{
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+        case ZT_CURVE:{
+            #define CURRENT_MODE WorkModeData->RT
+            break;
+        }
+        case IV_CURVE:{
+            #define CURRENT_MODE WorkModeData->IV
+            break;
+        }
+        case CV_CURVE:{
+            #define CURRENT_MODE WorkModeData->CV
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            #define CURRENT_MODE WorkModeData->CC
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->CV3
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->LSV
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            #define CURRENT_MODE WorkModeData->CVSCAN
+            break;
+        }
+        default: {
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+    }
+
+    static uint8_t ADCSwitch = 0;
+    static int32_t ADCValueSUM     = 0;
+    int32_t ADCValueAVG            = 0;
+
+    if(ADCSwitch == 0){ /**read Iin(buffer)**/
+        if(INSTRUCTION.AutoGainEnable){
+            CURRENT_MODE->_measureCurrent = 0xFFFF;
+        }else{
+            ReadADCIin(spi_ADC_rxbuf);
+            CURRENT_MODE->_measureCurrent = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+            if(lastIinADCGainLevel != INSTRUCTION.ADCGainLevel){
+//                IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                record_flag = false;
+            }
+        }
+
+        if(record_flag == false){
+            static int recordCount = 0;
+            recordCount++;
+            if(recordCount == 2){
+                record_flag = true;
+                recordCount = 0;
+            }
+        }else{
+            static uint16_t cali_count = 0;
+            if(cali_count >= 1000){
+                ADCValueAVG = ADCValueSUM / cali_count;
+
+                InputNotify(NOTIFY_CURRENT, ADCValueAVG);
+                SendNotify();
+
+                uint8_t CIS_buf[9]   = {0};
+                CIS_buf[0] = INSTRUCTION.chip_id;
+                CIS_buf[1] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
+                CIS_buf[2] = (uint8_t) (ADCValueAVG & 0x00FF);
+                CIS_buf[3] = 0x00;
+                CIS_buf[4] = INSTRUCTION.ADCGainLevel;
+                SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
+                ADCValueSUM = 0;
+                cali_count = 0;
+
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
+            }else{
+                cali_count++;
+                ADCValueSUM = ADCValueSUM + CURRENT_MODE->_measureCurrent;
+                InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+                InputNotify(NOTIFY_VOLT, ADCValueSUM);
+                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
+            }
+
+        }
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 1){ /**read Iin**/
+        ReadADCIin(spi_ADC_rxbuf);
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 2){ /**read Iin**/
+        ReadADCIin(spi_ADC_rxbuf);
+        ADCSwitch = 0;
+    }
+
+    #undef CURRENT_MODE
+}
+
+static void cali_VT_plot(WorkMode *WorkModeData) {
+    switch (INSTRUCTION.eliteFxn) {
+        case IT_CURVE:{
+            #define CURRENT_MODE WorkModeData->IT
+            break;
+        }
+        case VT_CURVE:{
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+        case ZT_CURVE:{
+            #define CURRENT_MODE WorkModeData->RT
+            break;
+        }
+        case IV_CURVE:{
+            #define CURRENT_MODE WorkModeData->IV
+            break;
+        }
+        case CV_CURVE:{
+            #define CURRENT_MODE WorkModeData->CV
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            #define CURRENT_MODE WorkModeData->CC
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->CV3
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->LSV
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            #define CURRENT_MODE WorkModeData->CVSCAN
+            break;
+        }
+        default: {
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+    }
+
+    static uint8_t ADCSwitch = 0;
+    static int32_t VoltData;
+    static int32_t ADCValueSUM     = 0;
+    int32_t ADCValueAVG            = 0;
+
+    if(ADCSwitch == 0){ /**read Iin(buffer)**/
+        if(CURRENT_MODE->_VoViSwitch == 0x01 || CURRENT_MODE->_VoViSwitch == 0x02){
+            if(INSTRUCTION.VinAutoGainEnable){
+                CURRENT_MODE->_measureVin = 0xFFFF;
+            }else{
+                ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+                CURRENT_MODE->_measureVin = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+                if(lastVinADCGainLevel != INSTRUCTION.VinADCGainLevel){
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                    record_flag = false;
+                }
+
+            }
+            VoltData = CURRENT_MODE->_measureVin;
+        }
+//        else if(CURRENT_MODE->_VoViSwitch == 0x00){
+//            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+//            CURRENT_MODE->_measureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
+//            VoltData = CURRENT_MODE->_measureVout;
+//        }
+
+        if(record_flag == false){
+            static int recordCount = 0;
+            recordCount++;
+            if(recordCount == 2){
+                record_flag = true;
+                recordCount = 0;
+            }
+        }else{
+            static uint16_t cali_count = 0;
+            if(cali_count >= 1000){
+                ADCValueAVG = ADCValueSUM / cali_count;
+
+                InputNotify(NOTIFY_VOLT, ADCValueAVG);
+                SendNotify();
+
+                uint8_t CIS_buf[9]   = {0};
+                CIS_buf[0] = INSTRUCTION.chip_id;
+                CIS_buf[1] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
+                CIS_buf[2] = (uint8_t) (ADCValueAVG & 0x00FF);
+                CIS_buf[3] = 0x00;
+                CIS_buf[4] = INSTRUCTION.VinADCGainLevel;
+                SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
+                ADCValueSUM = 0;
+                cali_count = 0;
+
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
+            }else{
+                cali_count++;
+                ADCValueSUM = ADCValueSUM + CURRENT_MODE->_measureVin;
+                InputNotify(NOTIFY_VOLT, CURRENT_MODE->_measureVin);
+                InputNotify(NOTIFY_CURRENT, ADCValueSUM);
+                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
+            }
+
+        }
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 1){ /**read v**/
+        ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 2){ /**read v**/
+        ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        ADCSwitch = 0;
+    }
+
+    #undef CURRENT_MODE
+}
+
 #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     1
-#define VERSION_DATE_DAY       22
-#define VERSION_DATE_HOUR      11
-#define VERSION_DATE_MINUTE    10
+#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.h

@@ -435,8 +435,9 @@ characteristic change event
 #define MAJOR_PRODUCT_NUMBER 0 //0:Elite ,1:Neulive
 #define MINOR_PRODUCT_NUMBER 2 //1:Elite_legacy(Ori_Neulive)  2:Elite_zm  3:Elite_bat
 #define MAJOR_VERSION_NUMBER 1
-#define MINOR_VERSION_NUMBER 5
-#define ELITE_VERSION_1_4
+#define MINOR_VERSION_NUMBER 6
+#define ELITE_VERSION_EIS
+//#define ELITE_VERSION_1_4
 //#define ELITE_VERSION_1_3
 
 // buffer size
@@ -470,6 +471,19 @@ static uint8_t ins_buf[BLE_INS_BUFF_SIZE] = {0};
 static uint8_t not_buf[BLE_DAT_BUFF_SIZE] = {0};
 static uint8_t cis_buf[BLE_CIS_BUFF_SIZE] = {0};
 
+/**
+ *  Latch initialize
+ */
+#define LATCH_BUFF_SIZE  8      // define latch
+struct _LH{
+    bool LATCH0[LATCH_BUFF_SIZE];
+    bool LATCH1[LATCH_BUFF_SIZE];
+    bool LATCH2[LATCH_BUFF_SIZE];
+    uint8_t LoadState;
+} LH= {0};
+static void InitLH();
+
+
 static Clock_Struct    periodicClock;
 static bool            PeriodicEvent     = false;
 static bool            InitPeriodicEvent = true;
@@ -528,7 +542,6 @@ static uint32_t SampleRateTable[6] = {100, 1000, 10000, 50000, 100000, 1000000};
 static uint32_t VsetRateTable[5]  = {2, 10, 100, 1000, 10000};
 static bool     batteryCheck_flag;
 static bool     batteryADC_flag;
-static bool     tempCheck_flag;
 static bool     ADC_flag;
 static bool     vscan_flag;
 static bool     notify_flag;
@@ -537,20 +550,34 @@ static bool     record_flag;
 static bool     vscanReset;
 static bool     EliteWorkReset;
 static bool     leadTimeReset;
-static int16_t  GAIN_200R_counter;
-static int16_t  GAIN_200K_counter;
-static int16_t  GAIN_10K_counter;
+static int16_t  I_GAIN_100R_counter;
+static int16_t  I_GAIN_3K_counter;
+static int16_t  I_GAIN_100K_counter;
+static int16_t  I_GAIN_3M_counter;
+static int16_t  VIN_GAIN_1M_counter;
+static int16_t  VIN_GAIN_30K_counter;
+static int16_t  VIN_GAIN_1K_counter;
+static int16_t  VOUT_GAIN_240K_counter;
+static int16_t  VOUT_GAIN_15K_counter;
+static uint8_t  lastVinADCGainLevel;
+static uint8_t  lastIinADCGainLevel;
+static bool     btWaitLedFlag   = 0;
+static bool     noEventLedFlag  = 0;
+static bool     preWorkLedFlag  = 0;
+static bool     workingLedFlag  = 0;
+static bool     postWorkLedFlag = 0;
 
 // ADC function
 static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_raw);
 static void    headstage_battery_volt();
 static void    EliteADCBattery();
+//static void    VinADCGainControl(uint8_t VinADCLevel);
 
 // Elite key detection & turn on/ shutdown function (peripheral hardware control)
 static void Elite_led_color(uint16_t color);
+static void ModeLED(uint16_t modeStatus);
 //static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue);
 static bool If10Von = false;
-static void TurnOn10V();
 
 // periodic event control
 static void EliteADCControl();
@@ -558,10 +585,10 @@ static void EliteVscanControl();
 static void EliteDone();
 
 //mode (Vset)
-static void    LSV_Vscan(WorkMode *WM);
+static void    LSV_Vscan(LSVMode *LSV);
 static void    CVSCAN_Vscan(CVSCANMode *CVSCAN);
-static void    CV3_Vscan(WorkMode *WM);
-static void    CC_Vscan(WorkMode *WM);
+static void    CV3_Vscan(CV3Mode *CV3);
+static void    CC_Vscan(CCMode *CC);
 
 //mode (DAC)
 static void     DACenable(WorkMode *WorkModeData, int32_t VoltData, uint8_t afterRead);
@@ -571,8 +598,6 @@ static uint16_t CV3Curve(CV3Mode *CV3);
 static uint16_t LSVCurve(LSVMode *LSV);
 static uint16_t CVSCANCurve(CVSCANMode *CVSCAN);
 
-static int32_t headstage_temperature();
-
 //mode (notify)
 static void initDATBuf();
 
@@ -594,6 +619,7 @@ static void InitEliteFlag();
 #include "EliteDeviceCorrection.h"
 #include "EliteNotify.h"
 #include "EliteFlagCTInit.h"
+#include "EliteLatchInit.h"
 #include "EliteReset.h"
 #include "EliteLED.h"
 #include "EliteKeyDetect.h"
@@ -615,20 +641,15 @@ static void InitEliteFlag();
 static void update_ZM_instruction(uint8 *ins) {
     uint8_t ins_type    = ins[0] & 0b11110000;
     uint8_t chip_ID     = ins[0] & 0b00001111;
+    uint8_t oper        = ins[1] & 0xFF;  // this is don't care in RIS
     INSTRUCTION.chip_id = chip_ID;
 
-    uint8_t oper        = ins[1] & 0xF0;  // this is don't care in RIS
-//    uint8_t data_length = ins[1] & 0x0F;
-
-    if (!If10Von) {
-        // TurnOn10V();
-    }
-
     switch (ins_type) {
 
     case INS_TYPE_RIS: {
         switch (ins[2]) {
         case IV_CURVE: {
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn      = IV_CURVE;
             INSTRUCTION.sampleRate    = 15;
             INSTRUCTION.Ve1           = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
@@ -649,6 +670,7 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case CV_CURVE: {
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn      = CV_CURVE;
             INSTRUCTION.sampleRate    = 15;
             INSTRUCTION.Ve1           = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
@@ -669,12 +691,15 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case VOLT_OUTPUT: {
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn      = VOLT_OUTPUT;
             INSTRUCTION.VoltConstant  = ( ((uint16_t)(ins[3])) << 8) | (uint16_t)(ins[4]);
+            AutoGainChangeVout((int32_t)INSTRUCTION.VoltConstant);
             break;
         }
 
         case ZT_CURVE: {
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn      = ZT_CURVE;
             INSTRUCTION.notifyRate    = (uint32_t)INSTRUCTION.sampleRate;
             INSTRUCTION.sampleRate    = 15;
@@ -685,6 +710,7 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case VT_CURVE: {
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn      = VT_CURVE;
             INSTRUCTION.notifyRate    = (uint32_t)INSTRUCTION.sampleRate;
             INSTRUCTION.sampleRate    = 15;
@@ -693,6 +719,7 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case IT_CURVE: {
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn      = IT_CURVE;
             INSTRUCTION.notifyRate    = (uint32_t)INSTRUCTION.sampleRate;
             INSTRUCTION.sampleRate    = 15;
@@ -701,6 +728,7 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case CONSTANT_CURRENT:{
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn      = CONSTANT_CURRENT;
             INSTRUCTION.sampleRate    = 15;
             INSTRUCTION.charge        = ins[3]; //0:discharge 1:charge
@@ -731,6 +759,7 @@ static void update_ZM_instruction(uint8 *ins) {
                     INSTRUCTION.directionInit = 1;
                 }
             }else if(ins[3] == PARA_2){
+                ModeLED(WORKING);
                 INSTRUCTION.eliteFxn    = CYCLIC_VOLTAMMETRY;
                 INSTRUCTION.Currentmax  = (int32_t)(ins[10]) << 24 | (int32_t)(ins[11]) << 16 | (int32_t)(ins[12]) << 8 | (int32_t)(ins[13]);
                 INSTRUCTION.notifyRate  = (uint32_t)(ins[8]) << 8 | (uint32_t)(ins[9]);
@@ -746,6 +775,7 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case HIGH_CYCLE_CYCLIC_VOLTAMMETRY: {
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn    = CYCLIC_VOLTAMMETRY;
             INSTRUCTION.sampleRate  = 15;
             INSTRUCTION.Vinit       = ((int32_t)(ins[3]) << 8) | (int32_t)(ins[4]);
@@ -771,6 +801,7 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case LINEAR_SWEEP_VOLTAMMETRY:{
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn    = LINEAR_SWEEP_VOLTAMMETRY;
             INSTRUCTION.sampleRate  = 15;
             INSTRUCTION.Ve1         = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
@@ -792,6 +823,7 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case CONSTANT_VSCAN:{
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn    = CONSTANT_VSCAN;
             INSTRUCTION.sampleRate  = 15;
             INSTRUCTION.Vinit       = ((int32_t)(ins[3]) << 8) | (int32_t)(ins[4]);
@@ -808,16 +840,17 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case DIFFERENTIAL_PULSE_VOLTAMMETRY: {
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn = DIFFERENTIAL_PULSE_VOLTAMMETRY;
             DACReset             = true;
 
             if (ins[3] | ins[4]) {
                 INSTRUCTION.Ve1 = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
-                INSTRUCTION.Ve1 = Usercode_Correction_to_DAC(INSTRUCTION.Ve1);
+                INSTRUCTION.Ve1 = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1);
             }
             if (ins[5] | ins[6]) {
                 INSTRUCTION.Ve2 = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
-                INSTRUCTION.Ve2 = Usercode_Correction_to_DAC(INSTRUCTION.Ve2);
+                INSTRUCTION.Ve2 = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve2);
             }
 
             if (ins[7] | ins[8]) {
@@ -829,7 +862,7 @@ static void update_ZM_instruction(uint8 *ins) {
             }
             if (ins[10] | ins[11]) {
                 Amplitude = ((uint16_t)(ins[10]) << 8) | (uint16_t)(ins[11]);
-                Amplitude = Usercode_Correction_to_DAC(Amplitude);
+                Amplitude = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, Amplitude);
             }
             if (ins[12]) {
                 PulsePeriod = ins[12];
@@ -844,16 +877,17 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case SQUARE_WAVE_VOLTAMMETRY: {
+            ModeLED(WORKING);
             INSTRUCTION.eliteFxn = SQUARE_WAVE_VOLTAMMETRY;
             DACReset             = true;
 
             if (ins[3] | ins[4]) {
                 INSTRUCTION.Ve1 = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
-                INSTRUCTION.Ve1 = Usercode_Correction_to_DAC(INSTRUCTION.Ve1);
+                INSTRUCTION.Ve1 = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1);
             }
             if (ins[5] | ins[6]) {
                 INSTRUCTION.Ve2 = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
-                INSTRUCTION.Ve2 = Usercode_Correction_to_DAC(INSTRUCTION.Ve2);
+                INSTRUCTION.Ve2 = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve2);
             }
             if (ins[7] | ins[8]) {
                 INSTRUCTION.step = ((uint32_t)(ins[7]) << 8) | (uint32_t)(ins[8]);
@@ -864,7 +898,7 @@ static void update_ZM_instruction(uint8 *ins) {
             }
             if (ins[10] | ins[11]) {
                 Amplitude = ((uint16_t)(ins[10]) << 8) | (uint16_t)(ins[11]);
-                Amplitude = Usercode_Correction_to_DAC(Amplitude);
+                Amplitude = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, Amplitude);
             }
             if (ins[12]) {
                 PulseWidth = ins[12];
@@ -881,79 +915,289 @@ static void update_ZM_instruction(uint8 *ins) {
             break;
         }
 
-        case SET_ADC_GAIN: {
-            INSTRUCTION.ADCGainLevel = ins[3];
-            if(INSTRUCTION.ADCGainLevel != GAIN_AUTO){
-                INSTRUCTION.AutoGainEnable = 0;
+        case SET_ADC_DAC_GAIN: {
+            switch(ins[3]){
+                case IIN_ADC :{
+                    INSTRUCTION.ADCGainLevel = ins[4];
+                    if(INSTRUCTION.ADCGainLevel != I_GAIN_AUTO){
+                        INSTRUCTION.AutoGainEnable = 0;
+                    }
+                    else{
+                        INSTRUCTION.AutoGainEnable = 1;
+                        INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+                    }
+                    break;
+                }
+                case VIN_ADC :{
+                    INSTRUCTION.VinADCGainLevel = ins[4];
+                    if(INSTRUCTION.VinADCGainLevel != VIN_GAIN_AUTO){
+                        INSTRUCTION.VinAutoGainEnable = 0;
+                    }
+                    else{
+                        INSTRUCTION.VinAutoGainEnable = 1;
+                        INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
+                    }
+                    break;
+                }
+                case VOUT_DAC :{
+//                    INSTRUCTION.VoutGainLevel = ins[4];
+//                    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_AUTO){
+//                        INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+//                    }
+                    INSTRUCTION.VoutGainLevel = ins[4];
+                    break;
+                }
+                case HIGH_Z :{
+                    switch(ins[4]) {
+                        default :{
+                            break;
+                        }
+                    }
+                    break;
+                }
+                default :{
+                    break;
+                }
             }
-            else{
-                INSTRUCTION.AutoGainEnable = 1;
-            }
-//            if(INSTRUCTION.ADCGainLevel == GAIN_200R){
-//                LED_color(DARKLED, 0x0F, 0x00, 0x00);
-//            }
-//            else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
-//                LED_color(DARKLED, 0x0F, 0x00, 0x0F);
-//            }
-//            else if(INSTRUCTION.ADCGainLevel == GAIN_200K){
-//                LED_color(DARKLED, 0x0F, 0x02, 0xFF);
-//            }
             break;
         }
 
         case ADC_TEST: {
             INSTRUCTION.eliteFxn = ADC_TEST;
-            int32_t ADCRealValue = 0;
+//            int32_t ADCRealValue = 0;
             uint8_t CIS_buf[9]   = {0};
+            uint16_t ADCValueAVG_RAW = 0;
+            uint8_t ADC_input = 0;
+            bool AVG_done = 0;
 
-//            for(int i=0 ; i<10 ; i++){
-                ADCGainControl(ins[3]);
-                ADCChannelSelect(ins[4]);
-                CPUdelay(10);
-                ADC_read(spi_ADC_rxbuf);
-//                CPUdelay(10);
-//
-//                ADCValueTemp = ( uint16_t) (spi_ADC_rxbuf[0]) << 8 | (uint16_t) (spi_ADC_rxbuf[1]);
-//                ADCValueAVG = ADCValueAVG + ADCValueTemp;
-//            }
-//            ADCValueAVG = ADCValueAVG / 10;
-//            ADCValueTemp = (uint16_t) (ADCValueAVG);
-
-            CIS_buf[0] = chip_ID;
-            for(int i=0; i<4 ; i++){
-                CIS_buf[i+1] = spi_ADC_rxbuf[i];
-            }
-//            CIS_buf[1] = (uint8_t) ((ADCValueTemp & 0xFF00) >> 8);
-//            CIS_buf[2] = (uint8_t) (ADCValueTemp & 0x00FF);
-//            CIS_buf[3] = spi_ADC_rxbuf[2];
-//            CIS_buf[4] = spi_ADC_rxbuf[3];
-
-            // decode ADC measure value
-            ADCRealValue = DecodeADCValue(ins[3], ins[4], spi_ADC_rxbuf);
-
-            // test ADC output through CIS
-            if (ins[4] == ADC_CH_VOLT) {
-                // return ADC volt measure
-                CIS_buf[5] = (uint8_t)(ADCRealValue >> 24);
-                CIS_buf[6] = (uint8_t)((ADCRealValue & 0x00FF0000) >> 16);
-                CIS_buf[7] = (uint8_t)((ADCRealValue & 0x0000FF00) >> 8);
-                CIS_buf[8] = (uint8_t)(ADCRealValue & 0x000000FF);
-            } else if (ins[4] == ADC_CH_CURRENT) {
-                // return ADC current measure
-                CIS_buf[5] = (uint8_t)(ADCRealValue >> 24);
-                CIS_buf[6] = (uint8_t)((ADCRealValue & 0x00FF0000) >> 16);
-                CIS_buf[7] = (uint8_t)((ADCRealValue & 0x0000FF00) >> 8);
-                CIS_buf[8] = (uint8_t)(ADCRealValue & 0x000000FF);
-            } else {
-                // CIS = 0xFF...FF using as an error report
-                for (int i = 1; i < 9; i++) {
-                    CIS_buf[i + 1] = 0xFF;
+            switch(ins[3]) {
+                case IIN_ADC :{             // 0x00
+//                    IinADCGainControl(ins[4]);
+                    AVG_done = 1;
+                    ADC_input = CMD_CURRENT_MEASURE;
+                    break;
+                }
+                case VIN_ADC :{             // 0x01
+//                    VinADCGainControl(ins[4]);
+                    AVG_done = 1;
+                    ADC_input = CMD_VOLT_MEASURE;
+                    break;
+                }
+                case VOUT_DAC :{            // 0x02
+                    AVG_done = 0;
+                    break;
+                }
+                case HIGH_Z :{              // 0x03
+                    switch(ins[4]) {
+                        default :{
+                            break;
+                        }
+                    }
+                    AVG_done = 0;
+                    break;
+                }
+                default :{
+                    AVG_done = 0;
+                    break;
                 }
             }
 
+            if (AVG_done) {
+                CPUdelay(100);
+                ADCValueAVG_RAW = ADC_CURRENT_AVG_calibration(ADC_input);
+            } else {
+                AVG_done = 0;
+                for (int i = 1; i < 9; i++) {
+                    CIS_buf[i + 1] = 0x00;
+                }
+            }
+
+                CIS_buf[0] = chip_ID;
+                CIS_buf[1] = (uint8_t) ((ADCValueAVG_RAW & 0xFF00) >> 8);
+                CIS_buf[2] = (uint8_t) (ADCValueAVG_RAW & 0x00FF);
+                CIS_buf[3] = spi_ADC_rxbuf[2];
+                CIS_buf[4] = spi_ADC_rxbuf[3];
+
+            // decode ADC measure value
+//            ADCRealValue = DecodeADCValue(ins[4], ins[3], spi_ADC_rxbuf);
+
+            // test ADC output through CIS
+//            if (ins[3] == ADC_CH_VOLT) {
+//                // return ADC volt measure
+//                CIS_buf[5] = (uint8_t)(ADCRealValue >> 24);
+//                CIS_buf[6] = (uint8_t)((ADCRealValue & 0x00FF0000) >> 16);
+//                CIS_buf[7] = (uint8_t)((ADCRealValue & 0x0000FF00) >> 8);
+//                CIS_buf[8] = (uint8_t)(ADCRealValue & 0x000000FF);
+//            } else if (ins[3] == ADC_CH_CURRENT) {
+//                // return ADC current measure
+//                CIS_buf[5] = (uint8_t)(ADCRealValue >> 24);
+//                CIS_buf[6] = (uint8_t)((ADCRealValue & 0x00FF0000) >> 16);
+//                CIS_buf[7] = (uint8_t)((ADCRealValue & 0x0000FF00) >> 8);
+//                CIS_buf[8] = (uint8_t)(ADCRealValue & 0x000000FF);
+//            } else {
+//                // CIS = 0xFF...FF using as an error report
+//                for (int i = 1; i < 9; i++) {
+//                    CIS_buf[i + 1] = 0xFF;
+//                }
+//            }
+
             SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
 
-            //                    SendNotify();
+            break;
+        }
+
+        case CALI_DAC_MODE: {
+            ModeLED(WORKING);
+            INSTRUCTION.eliteFxn      = CALI_DAC_MODE;
+            INSTRUCTION.VoltConstant  = ( ((uint16_t)(ins[3])) << 8) | (uint16_t)(ins[4]);
+            break;
+        }
+
+        case CALI_ADC_MODE: {
+            switch(ins[3]) {
+                case IIN_ADC :{             // 0x00
+                    INSTRUCTION.eliteFxn      = CALI_ADC_MODE;
+                    INSTRUCTION.AdcChannel    = IIN_ADC;
+                    INSTRUCTION.notifyRate    = 1000;
+                    INSTRUCTION.sampleRate    = 15;
+                    INSTRUCTION.VoViSwitch    = 0x01;
+                    ModeLED(WORKING);
+                    break;
+                }
+                case VIN_ADC :{             // 0x01
+                    INSTRUCTION.eliteFxn      = CALI_ADC_MODE;
+                    INSTRUCTION.AdcChannel    = VIN_ADC;
+                    INSTRUCTION.notifyRate    = 1000;
+                    INSTRUCTION.sampleRate    = 15;
+                    INSTRUCTION.VoViSwitch    = 0x01;
+                    ModeLED(WORKING);
+                    break;
+                }
+                default :{
+                    break;
+                }
+            }
+            break;
+        }
+
+        case DEV_MODE: { // INS_TYPE_RIS:0x30, DEV_MODE:0xFFF
+            switch (ins[3]) {
+                case CTL_WRT: {  // ble write: 0x3000FF 20FFFFFFFFFFFF
+                    uint32_t address = ((uint16_t)(ins[4]) << 8) | (uint16_t)(ins[5]);
+                    uint32_t data = ((uint16_t)(ins[6]) << 24) | (uint16_t)(ins[7]) << 16 |
+                                    (uint16_t)(ins[8]) << 8 | (uint16_t)(ins[9]);
+
+                    select_REG(address);
+                    w32_REG(data);
+
+                    initCISBuf();
+                    cis_buf[0] = (uint8_t)((address & 0x0000FF00) >> 8);
+                    cis_buf[1] = (uint8_t)(address & 0x000000FF);
+                    cis_buf[2] = (uint8_t)((data & 0xFF000000) >> 24);
+                    cis_buf[3] = (uint8_t)((data & 0x00FF0000) >> 16);
+                    cis_buf[4] = (uint8_t)((data & 0x0000FF00) >> 8);
+                    cis_buf[5] = (uint8_t)(data & 0x000000FF);
+                    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
+                    break;
+                }
+
+                case CTL_RD: { // ble write: 0x3000FF 21FFFF
+
+                    uint32_t address = ((uint16_t)(ins[4]) << 8) | (uint16_t)(ins[5]);
+                    select_REG(address);
+                    r32_REG();
+
+                    initCISBuf();
+                    cis_buf[0] = (uint8_t)((address & 0x0000FF00) >> 8);
+                    cis_buf[1] = (uint8_t)(address & 0x000000FF);
+                    cis_buf[2] = spi_rxbuf[2];
+                    cis_buf[3] = spi_rxbuf[3];
+                    cis_buf[4] = spi_rxbuf[4];
+                    cis_buf[5] = spi_rxbuf[5];
+                    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
+                    break;
+                }
+
+                case CTL_RD_DFTR: { // ble write: 0x3000FF 78FFFFFFFF
+                    select_REG(0x2078);
+                    r32_REG();
+
+                    initCISBuf();
+                    cis_buf[0] = (uint8_t)(0x20);
+                    cis_buf[1] = (uint8_t)(0x78);
+                    cis_buf[2] = spi_rxbuf[2];
+                    cis_buf[3] = spi_rxbuf[3];
+                    cis_buf[4] = spi_rxbuf[4];
+                    cis_buf[5] = spi_rxbuf[5];
+                    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
+                    break;
+                }
+
+                case CTL_RD_DFTI: { // ble write: 0x3000FF 7CFFFFFFFF
+                    select_REG(0x207C);
+                    r32_REG();
+
+                    initCISBuf();
+                    cis_buf[0] = (uint8_t)(0x20);
+                    cis_buf[1] = (uint8_t)(0x7C);
+                    cis_buf[2] = spi_rxbuf[2];
+                    cis_buf[3] = spi_rxbuf[3];
+                    cis_buf[4] = spi_rxbuf[4];
+                    cis_buf[5] = spi_rxbuf[5];
+                    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
+                    break;
+                }
+
+                case CTL_WRT_WGAMPL: { // ble write: 0x3000FF 3CFFFFFFFF | write waveform generator amplitude
+                    uint32_t data = ((uint16_t)(ins[4]) << 24) | (uint16_t)(ins[5]) << 16 | (uint16_t)(ins[6]) << 8 | (uint16_t)(ins[7]);
+
+                    select_REG(0x2014);
+                    w32_REG(0x0); // 0x0: DC disable ac first
+
+                    select_REG(0x203C);
+                    w32_REG(data);
+
+                    initCISBuf();
+                    cis_buf[0] = (uint8_t)(0x20);
+                    cis_buf[1] = (uint8_t)(0x3C);
+                    cis_buf[2] = (uint8_t)((data & 0xFF000000) >> 24);
+                    cis_buf[3] = (uint8_t)((data & 0x00FF0000) >> 16);
+                    cis_buf[4] = (uint8_t)((data & 0x0000FF00) >> 8);
+                    cis_buf[5] = (uint8_t)(data & 0x000000FF);
+                    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
+
+                    select_REG(0x2014);
+                    w32_REG(0x4); //0x4: Sinusoid
+                    break;
+                }
+
+                case 0x01: { // ble write: 0x3000FF 01
+                    if (ins[4] == 1) {
+                        Elite_led_color(COLOR_RED); //0101
+                    } else if (ins[4] == 2){
+                        Elite_led_color(COLOR_ORANGE); //0102
+                    } else if (ins[4] == 3){
+                        Elite_led_color(COLOR_YELLOW);
+                    } else if (ins[4] == 4){
+                        Elite_led_color(COLOR_GREEN);
+                    } else if (ins[4] == 5){
+                        Elite_led_color(COLOR_BLUE);
+                    } else if (ins[4] == 6){
+                        Elite_led_color(COLOR_MAGENTA);
+                    } else if (ins[4] == 7){
+                        Elite_led_color(COLOR_PURPLE);
+                    }
+
+                    initCISBuf();
+                    cis_buf[0] = (uint8_t)(0x11);
+                    cis_buf[1] = (uint8_t)(0xFF);
+                    cis_buf[2] = ins[4];
+                    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
+
+
+                    break;
+                }
+            }
             break;
         }
 
@@ -975,14 +1219,10 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case VIS_ASK: {
-            //                    uint16_t volt = 0;
-            //                    volt = ( ((uint16_t) (ins[2])) <<8 ) | (uint16_t) (ins[3]);
-            //                    DAC_outputV(DACOUT, volt);
             for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++) {
                 not_buf[i] = i;
             }
             SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
-
             break;
         }
 
@@ -1008,27 +1248,6 @@ static void update_ZM_instruction(uint8 *ins) {
             break;
         }
 
-        case VIS_SHIFT_200K: {
-            PIN_setOutputValue(pin_handle, Turnon10K, 0);
-            PIN_setOutputValue(pin_handle, Turnon200R, 0);
-            LED_color(DARKLED, 0xFF, 0xB4, 0x00);
-            break;
-        }
-
-        case VIS_SHIFT_10K: {
-            PIN_setOutputValue(pin_handle, Turnon10K, 1);
-            PIN_setOutputValue(pin_handle, Turnon200R, 0);
-            LED_color(DARKLED, 0x14, 0xC8, 0xFF);
-            break;
-        }
-
-        case VIS_SHIFT_200R: {
-            PIN_setOutputValue(pin_handle, Turnon10K, 0);
-            PIN_setOutputValue(pin_handle, Turnon200R, 1);
-            LED_color(DARKLED, 0xFF, 0xFF, 0xFF);
-            break;
-        }
-
         case VIS_DEVICE_SHINY:{
             Elite_led_color(COLOR_PURPLE);
 //            uint8_t deviceShinySwitch = (ins[2] & 0b11110000) >> 4;//1:open 0:close
@@ -1054,6 +1273,7 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case VIS_CC_ZERO:{
+            ModeLED(PRE_WORK);
             INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
             INSTRUCTION.sampleRate = 15;
             INSTRUCTION.charge = 0x01;
@@ -1075,7 +1295,7 @@ static void update_ZM_instruction(uint8 *ins) {
     case INS_TYPE_CIS: {
         switch (oper) {
         case 0x00: {
-            I2CWrite(0x01, 0xAB);
+//            I2CWrite(0x01, 0xAB);
             break;
         }
 
@@ -1109,17 +1329,6 @@ static void update_ZM_instruction(uint8 *ins) {
             }
             break;
         }
-
-        case CIS_TEMPERATURE: { //0x7080
-            initCISBuf();
-            cis_buf[0] = CIS_TEMPERATURE;
-            cis_buf[1] = NotifyTemperature[0];
-            cis_buf[2] = NotifyTemperature[1];
-            cis_buf[3] = NotifyTemperature[2];
-            cis_buf[4] = NotifyTemperature[3];
-            SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
-            break;
-        }
         }
         break;
     }
@@ -1136,6 +1345,18 @@ static void update_ZM_instruction(uint8 *ins) {
     }
 }
 
+static void ZM_instruction_update_handle(uint8_t characteristic) {
+    switch (characteristic) {
+    case BLE_INS_BUFF_CHAR:
+        //            LED_color(0xf8, 0x00, 0xFF, 0xFF);
+        SimpleProfile_GetParameter(SIMPLEPROFILE_CHAR3, ins_buf);
+        update_ZM_instruction(ins_buf);
+        break;
+    default:
+        break;
+    }
+}
+
 // static void update_clock_period() {
 //    uint32_t clock_rate = INSTRUCTION.adc_clock_rate;
 //
@@ -1158,18 +1379,6 @@ static void update_ZM_instruction(uint8 *ins) {
 //    }
 //}
 
-static void ZM_instruction_update_handle(uint8_t characteristic) {
-    switch (characteristic) {
-    case BLE_INS_BUFF_CHAR:
-        //            LED_color(0xf8, 0x00, 0xFF, 0xFF);
-        SimpleProfile_GetParameter(SIMPLEPROFILE_CHAR3, ins_buf);
-        update_ZM_instruction(ins_buf);
-        break;
-    default:
-        break;
-    }
-}
-
 /*===================================
  ==== system function implements ====
  ==================================*/

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

@@ -47,18 +47,11 @@ static void ZM_init() {
     // initialize
     pin_handle = PIN_open(&ZM_rst, BLE_IO);
 
-    PIN_setOutputValue(pin_handle, shutdown_6994, 1);  // OFF = 1 => turn off 6994
-    PIN_setOutputValue(pin_handle, enable_10v, 0);     // enable 10V
-
-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
+    PIN_setOutputValue(pin_handle, AD_CS, 1);            // AD_CS HIGH
 
     InitEliteInstruction();
-    ADCGainControl(GAIN_AUTO);
-    elite_gptimer_open();
 
-    //    PIN_registerIntCb(pin_handle, switch_on_callback);
-    //    PIN_setInterrupt(pin_handle, switch_on | PIN_IRQ_POSEDGE);
+    elite_gptimer_open();
 }
 
 static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins) {}
@@ -66,7 +59,7 @@ static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, ui
 
 static void DACCode2Real2Notify(uint16_t DACcode) {
     int32_t RealV;
-    RealV = DAC_to_realV(DACcode);
+    RealV = DAC_to_realV(INSTRUCTION.VoutGainLevel, DACcode);
 
     NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
     NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
@@ -83,7 +76,8 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 (INSTRUCTION.eliteFxn == CONSTANT_CURRENT)         || \
 (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)       || \
 (INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY) || \
-(INSTRUCTION.eliteFxn == CONSTANT_VSCAN)              \
+(INSTRUCTION.eliteFxn == CONSTANT_VSCAN)           || \
+(INSTRUCTION.eliteFxn == CALI_ADC_MODE)               \
 )
 
 #define Ve1MatchVe2Mode() (                           \
@@ -116,10 +110,13 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
             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.Ve1));
+                    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1));
                     PeriodicEvent = false;
+                    ModeLED(NO_EVENT);
                 }
             }
         }
@@ -140,7 +137,12 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
         //vscan counter
         GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
         if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate){
-            GPT.VscanRateCounter -= INSTRUCTION.VsetRate; //To get right time
+            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);
@@ -154,7 +156,6 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
         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);
@@ -171,9 +172,6 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
                 EliteADCControl(WorkModeData);
                 ADC_flag = false;
             }
-        }else if(GPT.SampleRateCounter == 12 && tempCheck_flag){
-            headstage_temperature();
-            tempCheck_flag = false;
         }
 
         //Notify counter(Notify control, check if we need to send notify)
@@ -191,13 +189,18 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
             }
         }
 
-        EliteDone();
+//        EliteDone();
     }else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
         WorkModeData->VO->_Vset = INSTRUCTION.VoltConstant;
-        DAC_outputV(Usercode_Correction_to_DAC(WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
+        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
         FreeWorkMode(WorkModeData);
         PeriodicEvent = false;
-    }else{
+    }else if(INSTRUCTION.eliteFxn == CALI_DAC_MODE){
+        DAC_outputV(INSTRUCTION.VoltConstant); //UserCode -> DAC code -> DAC out
+        FreeWorkMode(WorkModeData);
+        PeriodicEvent = false;
+    }
+    else{
         InitFlag();
     }
 }
@@ -240,6 +243,15 @@ static void EliteADCControl(WorkMode *WorkModeData) {
             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;
         }
@@ -250,7 +262,7 @@ static void EliteDone() {
     if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)) {
         if (!PeriodicEvent) {
             SendNotify();
-            reset();
+            Eliteinterrupt();
         }
     }
 }
@@ -270,15 +282,15 @@ static void EliteVscanControl(WorkMode *WorkModeData) {
             break;
         }
         case CYCLIC_VOLTAMMETRY:{
-            CV3_Vscan(WorkModeData);
+            CV3_Vscan(WorkModeData->CV3);
             break;
         }
         case CONSTANT_CURRENT:{
-            CC_Vscan(WorkModeData);
+            CC_Vscan(WorkModeData->CC);
             break;
         }
         case LINEAR_SWEEP_VOLTAMMETRY:{
-            LSV_Vscan(WorkModeData);
+            LSV_Vscan(WorkModeData->LSV);
             break;
         }
         case CONSTANT_VSCAN:{
@@ -348,8 +360,9 @@ static void InitEliteFlag() {
     vscanReset        = true;
     EliteWorkReset    = true;
     leadTimeReset     = true;
-    GAIN_200R_counter = 0;
-    GAIN_200K_counter = 0;
-    GAIN_10K_counter  = 0;
+    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/simple_peripheral.c

@@ -548,7 +548,6 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
     SimpleBLEPeripheral_init();
 
     ZM_init();
-    Elite_SPI_init();
     WorkMode *WorkModeData = CreateWorkMode();
 
     uint8_t  key         = 0;
@@ -556,13 +555,13 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
     bool     EliteOn     = 0;
 
     // init DAC, set output ~= 0 V
-    DAC_outputV(Usercode_Correction_to_DAC(25000));
+//    DAC_outputV(25000);
     elite_gptimer_start();
 
     // Application main loops
     GPT.GptimerCounter0 = GPT.GptimerCounter;
     batteryADC_flag = false;
-    headstage_battery_volt();
+//    headstage_battery_volt();
     headstage_init_device_info();
 
     for (;;) {
@@ -617,66 +616,39 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
             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) {
-                        PIN_setOutputValue(pin_handle, 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);
-                    if(key != 0){  //detect Elite battery power when no periodic event
-                        GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-                        GPT.GptimerCounter0 = GPT.GptimerCounter;
 
-                        GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-                        GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-
-                        if(GPT.BatteryCheckCounter >= 50000){//5min=3000000, 5s=50000
-                            GPT.BatteryCheckCounter = 0;
-                            batteryCheck_flag = true;
-                        }
-
-                        if(GPT.BatteryADCCounter >= 15 && batteryCheck_flag){
-                            GPT.BatteryADCCounter = 0; //To get the data right, ADC must be delay 1.5ms
-                            batteryADC_flag = true;
-                            if(batteryADC_flag){
-                                EliteADCBattery();
-                                batteryADC_flag = false;
-                            }
-                        }
-
-                        uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
-                                       ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-                        if( bat < 768 && bat > 20){
-                            PIN_setOutputValue(pin_handle, enable_5v, 0);
-                        }
-
-                    }
-                    if(Free_Work_Mode){
-                        FreeWorkMode(WorkModeData);
-                        InitEliteInstruction();
-                        ADCGainControl(INSTRUCTION.ADCGainLevel);
-                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-
-                        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);
                 }
             }
-            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
-            }
+//            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
@@ -952,7 +924,6 @@ 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
@@ -998,7 +969,7 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)
 
     case GAPROLE_WAITING:
         SimpleBLEPeripheral_freeAttRsp(bleNotConnected);
-
+        ModeLED(BT_WAIT);
         break;
 
     case GAPROLE_WAITING_AFTER_TIMEOUT: