Clear Okay Okay (?)

Clear Okay (?)
Modify calibration parameter.
2021-12-23 17:51:01 +08:00 · 2021-12-23 17:38:43 +08:00 · 2021-12-23 17:18:56 +08:00 · 2021-10-12 17:22:51 +08:00 · 2021-10-07 13:19:39 +08:00 · 2021-10-06 09:56:21 +08:00
46 changed files with 5974 additions and 4201 deletions
@@ -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" 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" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
 							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1593934674" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.632414212" name="GNU Make.FlashROM" 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" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.154623462" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.974280107" 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">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.974280107" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1783826131" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1536570599" name="Application binary interface. (--abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1895413316" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.322983319" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.1305400753" name="Speed vs. size trade-offs (--opt_for_speed, -mf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1468985930" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 									<listOptionValue builtIn="false" value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\simple_peripheral\cc26xx\app\headstage"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/cc26xx/app"/>
@@ -70,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" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1897088" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
 									<listOptionValue builtIn="false" value="POWER_SAVING"/>
 									<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
@@ -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" 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">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.871011287" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.863089168" name="C Dialect" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1454248503" name="Enable support for GCC extensions (DEPRECATED) (--gcc)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1965115059" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="48"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1638011093" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1638011093" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.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">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1920170652" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.2038786257" name="Emit diagnostic identifier numbers (--display_error_number, -pden)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.811478344" name="Place each function in a separate subsection (--gen_func_subsections, -ms)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1229809338" name="Read options from specified file (--cmd_file, -@)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
 									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
@@ -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" 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">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.174129193" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.567300083" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1800982811" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1091211742" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1479599481" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="libc.a"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
 									<listOptionValue builtIn="false" value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.672837228" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.672837228" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.544523272" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.544523272" name="Suppress diagnostic &lt;id&gt; (--diag_suppress)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="10247-D"/>
 									<listOptionValue builtIn="false" value="16002-D"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.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"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1281207998" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.468817864" name="Emit diagnostic identifier numbers (--display_error_number)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1679096029" name="Detailed link information data-base into &lt;file&gt; (--xml_link_info, -xml_link_info)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.254835397" name="Aggressively reduce size of the DWARF information (--compress_dwarf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1848192295" name="Eliminate sections not needed in the executable (--unused_section_elimination)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1999849945" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.25027104" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.888093741" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.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" 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"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.11734737" name="Specify rom width (--romwidth, -romwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.466140455" name="Specify memory width (--memwidth, -memwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.824070691" name="Output format" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
 							</tool>
 							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.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" 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" name="Package repositories (--xdcpath)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_REPOS}"/>
 									<listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
 								</option>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.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"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.571281110" name="Target (-t)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.205178830" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1097777495" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.744121344" name="Build-profile (-r)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.165807018" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.391961861" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
@@ -3,16 +3,20 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_app"/>
 </listAttribute>
@@ -16,7 +16,7 @@
 # sources were generated) is:
 #    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src
+GEN_SRC_DIR ?= ../../config/src

 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
@@ -1,12 +1,12 @@

-XOPTS = -I"C:/ti/xdctools_3_32_00_06_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
+XOPTS = -I"C:/ti/xdctools_3_32_02_25_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3

 vpath % C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
-vpath %.c C:/ti/xdctools_3_32_00_06_core/packages/
+vpath %.c C:/ti/xdctools_3_32_02_25_core/packages/

 CCOPTS    = --endian=little -mv7M3 --abi=eabi -q -ms --opt_for_speed=0  --program_level_compile -o3 -g --optimize_with_debug  -Dti_sysbios_knl_Task_minimizeLatency__D=FALSE -Dti_sysbios_family_arm_cc26xx_Boot_driverlibVersion=2 -Dti_sysbios_knl_Clock_stopCheckNext__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_enableException__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_disablePriority__D=32U -Dti_sysbios_family_arm_m3_Hwi_numSparseInterrupts__D=0U

-XDC_ROOT  = C:/ti/xdctools_3_32_00_06_core/packages/
+XDC_ROOT  = C:/ti/xdctools_3_32_02_25_core/packages/

 BIOS_ROOT = C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/

@@ -16,14 +16,14 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa

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

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

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

-DEL = C:/ti/xdctools_3_32_00_06_core/packages/../bin/rm -f
-CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f
+DEL = C:/ti/xdctools_3_32_02_25_core/packages/../bin/rm -f
+CP = C:/ti/xdctools_3_32_02_25_core/packages/../bin/cp -f

 define RM
 	$(if $(wildcard $1),$(DEL) $1,:)
@@ -3,16 +3,20 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_stack"/>
 </listAttribute>
@@ -0,0 +1,247 @@
+
+#ifndef AD5940
+#define AD5940
+
+static void AD5940_init(){
+    select_REG(0x0908);//initiation
+    w16_REG(0x02C9);
+    select_REG(0x0C08);
+    w16_REG(0x206C);
+    select_REG(0x21F0);
+    w16_REG(0x0010);
+    select_REG(0x0410);
+    w16_REG(0x02C9);
+    select_REG(0x0A28);
+    w16_REG(0x0009);
+    select_REG(0x238C);
+    w16_REG(0x0104);
+    select_REG(0x0A04);
+    w16_REG(0x4859);
+    select_REG(0x0A04);
+    w16_REG(0xF27B);
+    select_REG(0x0A00);
+    w16_REG(0x8009);
+    select_REG(0x0A04);
+    w16_REG(0x4859);
+    select_REG(0x22F0);
+    w16_REG(0x0000);
+}
+
+static void AD5940_sftreset(){
+    select_REG(0x0424);
+    w16_REG(0xA158);
+    CPUdelay(200);
+}
+
+static void AD5940_HWReset(){
+    PIN_setOutputValue(pin_handle, AD_reset, 0);
+    CPUdelay(2000); // 200us
+    PIN_setOutputValue(pin_handle, AD_reset, 1);
+    CPUdelay(5000); // 500us
+}
+
+static void setEIS_EIS (void)
+{
+    select_REG(LPDACCON0);  //2128 //DC on
+    w32_REG(0x00000001); //LPDAC enabled
+    select_REG(LPDACSW0);  //2124  //operation
+    w32_REG(0b111111); //0b101011
+
+    select_REG(HSRTIACON);
+    w32_REG(0x00000000); //200R //1pF
+
+    select_REG(ADCCON);  //21A8
+    w32_REG(0x00000101);
+    select_REG(DFTCON);
+    w32_REG(0x00000091);
+    select_REG(SWCON);  //200C
+    w32_REG(0x00026355); //D5 | P5 | N3 | T6 | T9   0b010 0110 0011 0101 0101
+
+    if (instru.ADCGainLv != HSRTIA_GAIN_AUTO) {
+        instru.AutoGainEnable = 0;
+        HSTIAGainCtrl(instru.ADCGainLv);
+    } else {
+        instru.AutoGainEnable = 1;
+        instru.ADCGainLv = HSRTIA_200R;
+        HSTIAGainCtrl(instru.ADCGainLv);
+    }
+
+    DAC_outputV(instru.dcbias + CaliTable.DAC_offset * 200);
+    SetWGAmp(instru.acamp);
+
+    select_REG(0x2000);  //2000
+    w32_REG(0x0031CFC0);
+
+    //HIGH POWER MODE
+    select_REG(0x22F0); //PWMB
+    w32_REG(0x0000000D); //switch to active high power mode
+    select_REG(0x0414);
+    w16_REG(0x0000);
+    select_REG(0x0420);
+    w16_REG(0xA815);
+    select_REG(0x0408); //16bit system clock divider
+    w16_REG(0x0442); //set divider = 2
+    select_REG(0x20BC); //HSOSCCON
+    w32_REG(0x00000000); //switch to 32MHz output
+    select_REG(0x2044);
+    w32_REG(0x00000311);
+    select_REG(0x2010); //HSDACCON
+    w32_REG(0x0000000E); //DAC gain = 2, > 80 kHz
+    select_REG(0x238C); //ADCBUFCON
+    w32_REG(0x005F3D0F); //recommended
+    SetEISHIGHZ(0);
+}
+
+static void setEIS_CV (void)
+{
+   //Clock and Ref
+    select_REG(0x0414); //CLKSEL
+    w16_REG(0x0);
+    select_REG(0x20BC); //HSOSCCON
+    w32_REG(0x00000004); //16 MHz output
+    select_REG(0x2180); //BUFSENCON
+    w32_REG(0x00000037); //0b110110
+
+    //Configure LPDAC LPTIA
+    select_REG(0x2050); //LPREFBUFCON
+    w32_REG(0x0); //enable lpref and lp 2.5V buffer
+    select_REG(0x2124); //LPDACSW0
+    w32_REG(0x0000003E);
+    select_REG(0x20E4); //LPTIASW0
+    w32_REG(0x00008034); // SW2 | SW4 | SW5
+    select_REG(0x20EC); //LPTIACON0
+    w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
+    select_REG(0x2128); //LPDACCON0
+    w32_REG(0x00000001);
+
+    //Configure ADC | ADCDAT (0x2074)
+    select_REG(0x21A8); //ADCCON
+    w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
+    select_REG(0x2044); //ADCFILTERCON
+    w32_REG(0x00002011); // Sinc3 En | SINC3OSR2 | SINC2OSR22
+    select_REG(0x20D0); //DFTCON
+    w32_REG(0x00000001); // Sinc2 to DFT | DFTNUM4
+
+    //AFE and PWMB
+    select_REG(0x2000); //AFECON
+    w32_REG(0x00098780); //ADC on //0b10011000011110000000
+    select_REG(0x22F0); //PWMB
+    w32_REG(0x00000005);//fc 50kHz, low power mode
+
+
+//    //Clock and Ref
+//    select_REG(CLKSEL); //CLKSEL
+//    w16_REG(0x0);
+//    select_REG(HSOSCCON); //HSOSCCON
+//    w32_REG(0x00000004); //16 MHz output
+//    select_REG(0x2180); //BUFSENCON
+//    w32_REG(0x00000037); //0b110110
+//
+//    //Configure LPDAC LPTIA
+//    select_REG(LPREFBUFCON); //LPREFBUFCON
+//    w32_REG(0x0); //enable lpref and lp 2.5V buffer
+//    select_REG(LPDACSW0); //LPDACSW0
+//    w32_REG(0x0000003E);
+//    select_REG(LPTIASW0); //LPTIASW0
+//    w32_REG(0x00008034); // SW2 | SW4 | SW5
+//    select_REG(LPTIACON0); //LPTIACON0
+//    w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
+//    select_REG(LPDACCON0); //LPDACCON0
+//    w32_REG(0x00000001);
+//
+//    //Configure ADC | ADCDAT (0x2074)
+//    select_REG(ADCCON); //ADCCON
+//    w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
+//    select_REG(ADCFILTERCON); //ADCFILTERCON
+//    w32_REG(0x00014091); //AVR 4 | Sinc3 En | OSR 5
+////    w32_REG(0x00012011); //Disable avr | sinc3 enable | osr 2
+//    select_REG(DFTCON); //DFTCON
+//    w32_REG(0x00100031); //sinc3 + average input for DFT | DFTNUM 32
+//
+//    //AFE and PMWB
+//    select_REG(AFECON); //AFECON
+//    w32_REG(0x00098780); //ADC on //0b10011000011110000000
+//    select_REG(PMBW); //PMWB
+//    w32_REG(0x00000005);//fc 50kHz, low power mode
+}
+
+static void HS_cali_config (void)
+{
+    select_REG(LPDACCON0);  //2128 //DC on
+    w32_REG(0x00000001); //LPDAC enabled
+    select_REG(LPDACSW0);  //2124  //operation
+    w32_REG(0b111111); //0b101011
+
+    select_REG(DE0RESCON);  //20F8 //DE0's gain
+    w32_REG(0x000000FF);
+//    select_REG(HSRTIACON);
+//    w32_REG(0x00000200); //4pF + 200R
+
+    select_REG(ADCCON);  //21A8
+    w32_REG(0x00000101);
+    select_REG(DFTCON);  //20D0
+    w32_REG(0x00000091);
+    select_REG(SWCON);  //200C
+    w32_REG(0x00026355); //D5 | P5 | N3 | T6 | T9   0b010 0110 0011 0101 0101
+//    w32_REG(0x00026905); //0b010 0110 1001 0000 0101
+
+    select_REG(AFECON);  //2000
+    w32_REG(0x0030CFC0);
+
+    //HIGH POWER MODE
+    select_REG(PMBW); //PMWB
+    w32_REG(0x0000000D); //switch to active high power mode
+    select_REG(CLKSEL);
+    w16_REG(0x0000);
+    select_REG(CLKCON0KEY);
+    w16_REG(0xA815);
+    select_REG(CLKCON0); //16bit system clock divider
+    w16_REG(0x0442); //set divider = 2
+    select_REG(HSOSCCON); //HSOSCCON
+    w32_REG(0x00000000); //switch to 32MHz output
+    select_REG(ADCFILTERCON); //ADCFILTERCON
+    w32_REG(0x000000D0); //ADC data rate = 1.6MHz // 2 samples to average
+    select_REG(HSDACCON); //HSDACCON
+    w32_REG(0x0000000E); //DAC gain = 2, > 80 kHz
+    select_REG(ADCBUFCON); //ADCBUFCON
+    w32_REG(0x005F3D0F); //recommended
+}
+static void LP_cali_config (void)
+{
+   //Clock and Ref
+    select_REG(0x0414); //CLKSEL
+    w16_REG(0x0);
+    select_REG(0x20BC); //HSOSCCON
+    w32_REG(0x00000004); //16 MHz output
+    select_REG(0x2180); //BUFSENCON
+    w32_REG(0x00000037); //0b110110
+
+    //Configure LPDAC LPTIA
+    select_REG(0x2050); //LPREFBUFCON
+    w32_REG(0x0); //enable lpref and lp 2.5V buffer
+    select_REG(0x2124); //LPDACSW0
+    w32_REG(0x0000003E);
+    select_REG(0x20E4); //LPTIASW0
+    w32_REG(0x00008034); // SW2 | SW4 | SW5
+    select_REG(0x20EC); //LPTIACON0
+    w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
+    select_REG(0x2128); //LPDACCON0
+    w32_REG(0x00000001);
+
+    //Configure ADC | ADCDAT (0x2074)
+    select_REG(0x21A8); //ADCCON
+    w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
+    select_REG(0x2044); //ADCFILTERCON
+    w32_REG(0x00006091); //AVR 4 | Sinc3 En | OSR 2
+//    w32_REG(0x00012011); //Disable avr | sinc3 enable | osr 2
+    select_REG(0x20D0); //DFTCON
+    w32_REG(0x001000C1); //sinc3 + average input for DFT | dftnum max
+
+    //AFE and PWMB
+    select_REG(0x2000); //AFECON
+    w32_REG(0x00098780); //ADC on //0b10011000011110000000
+    select_REG(0x22F0); //PWMB
+    w32_REG(0x00000005);//fc 50kHz, low power mode
+}
+
+#endif
@@ -1,229 +1,192 @@
-
-#ifndef Elite15_PIN
-#define Elite_15PIN
-
-#include "Elite_PIN.h"
-
-static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow) {
-    switch (latch_num) {
-        case LOAD0: {
-            switch (elite_pin) {
-                case D0: {
-                    LH.LATCH0[0] = highlow;
-                    break;
-                }
-                case D1: {
-                    LH.LATCH0[1] = highlow;
-                    break;
-                }
-                case D2: {
-                    LH.LATCH0[2] = highlow;
-                    break;
-                }
-                case D3: {
-                    LH.LATCH0[3] = highlow;
-                    break;
-                }
-                case D4: {
-                    LH.LATCH0[4] = highlow;
-                    break;
-                }
-                case D5: {
-                    LH.LATCH0[5] = highlow;
-                    break;
-                }
-                case D6: {
-                    LH.LATCH0[6] = highlow;
-                    break;
-                }
-                case D7: {
-                    LH.LATCH0[7] = highlow;
-                    break;
-                }
-                default: {
-                    break;
-                }
-            }
-            break;
-        }
-        case LOAD1: {
-            switch (elite_pin) {
-                case D0: {
-                    LH.LATCH1[0] = highlow;
-                    break;
-                }
-                case D1: {
-                    LH.LATCH1[1] = highlow;
-                    break;
-                }
-                case D2: {
-                    LH.LATCH1[2] = highlow;
-                    break;
-                }
-                case D3: {
-                    LH.LATCH1[3] = highlow;
-                    break;
-                }
-                case D4: {
-                    LH.LATCH1[4] = highlow;
-                    break;
-                }
-                case D5: {
-                    LH.LATCH1[5] = highlow;
-                    break;
-                }
-                case D6: {
-                    LH.LATCH1[6] = highlow;
-                    break;
-                }
-                case D7: {
-                    LH.LATCH1[7] = highlow;
-                    break;
-                }
-                default: {
-                    break;
-                }
-            }
-            break;
-        }
-        case LOAD2: {
-            switch (elite_pin) {
-                case D0: {
-                    LH.LATCH2[0] = highlow;
-                    break;
-                }
-                case D1: {
-                    LH.LATCH2[1] = highlow;
-                    break;
-                }
-                case D2: {
-                    LH.LATCH2[2] = highlow;
-                    break;
-                }
-                case D3: {
-                    LH.LATCH2[3] = highlow;
-                    break;
-                }
-                case D4: {
-                    LH.LATCH2[4] = highlow;
-                    break;
-                }
-                case D5: {
-                    LH.LATCH2[5] = highlow;
-                    break;
-                }
-                case D6: {
-                    LH.LATCH2[6] = highlow;
-                    break;
-                }
-                case D7: {
-                    LH.LATCH2[7] = highlow;
-                    break;
-                }
-                default: {
-                    break;
-                }
-            }
-             break;
-        }
-        default: {
-            break;
-        }
-    }
-}
-
-static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow) {
-    ELITE15_SPI_CLOSE();
-    add_elite_pin();
-    update_latch_status (latch_num, pin_num, highlow);
+//
+//#ifndef Elite15_PIN
+//#define Elite_15PIN
+//
+//#include "Elite_PIN.h"
+//
+//static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow) {
+//    switch (latch_num) {
+//        case LOAD0: {
+//            switch (elite_pin) {
+//                case D0: {
+//                    LH.LATCH0[0] = highlow;
+//                    break;
+//                }
+//                case D1: {
+//                    LH.LATCH0[1] = highlow;
+//                    break;
+//                }
+//                case D2: {
+//                    LH.LATCH0[2] = highlow;
+//                    break;
+//                }
+//                case D3: {
+//                    LH.LATCH0[3] = highlow;
+//                    break;
+//                }
+//                case D4: {
+//                    LH.LATCH0[4] = highlow;
+//                    break;
+//                }
+//                case D5: {
+//                    LH.LATCH0[5] = highlow;
+//                    break;
+//                }
+//                case D6: {
+//                    LH.LATCH0[6] = highlow;
+//                    break;
+//                }
+//                case D7: {
+//                    LH.LATCH0[7] = highlow;
+//                    break;
+//                }
+//                default: {
+//                    break;
+//                }
+//            }
+//            break;
+//        }
+//        case LOAD1: {
+//            switch (elite_pin) {
+//                case D0: {
+//                    LH.LATCH1[0] = highlow;
+//                    break;
+//                }
+//                case D1: {
+//                    LH.LATCH1[1] = highlow;
+//                    break;
+//                }
+//                case D2: {
+//                    LH.LATCH1[2] = highlow;
+//                    break;
+//                }
+//                case D3: {
+//                    LH.LATCH1[3] = highlow;
+//                    break;
+//                }
+//                case D4: {
+//                    LH.LATCH1[4] = highlow;
+//                    break;
+//                }
+//                case D5: {
+//                    LH.LATCH1[5] = highlow;
+//                    break;
+//                }
+//                case D6: {
+//                    LH.LATCH1[6] = highlow;
+//                    break;
+//                }
+//                case D7: {
+//                    LH.LATCH1[7] = highlow;
+//                    break;
+//                }
+//                default: {
+//                    break;
+//                }
+//            }
+//            break;
+//        }
+//        case LOAD2: {
+//            switch (elite_pin) {
+//                case D0: {
+//                    LH.LATCH2[0] = highlow;
+//                    break;
+//                }
+//                case D1: {
+//                    LH.LATCH2[1] = highlow;
+//                    break;
+//                }
+//                case D2: {
+//                    LH.LATCH2[2] = highlow;
+//                    break;
+//                }
+//                case D3: {
+//                    LH.LATCH2[3] = highlow;
+//                    break;
+//                }
+//                case D4: {
+//                    LH.LATCH2[4] = highlow;
+//                    break;
+//                }
+//                case D5: {
+//                    LH.LATCH2[5] = highlow;
+//                    break;
+//                }
+//                case D6: {
+//                    LH.LATCH2[6] = highlow;
+//                    break;
+//                }
+//                case D7: {
+//                    LH.LATCH2[7] = highlow;
+//                    break;
+//                }
+//                default: {
+//                    break;
+//                }
+//            }
+//             break;
+//        }
+//        default: {
+//            break;
+//        }
+//    }
+//}
+//
+//static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow) {
+//    ELITE15_SPI_CLOSE();
+//    add_elite_pin();
+//    update_latch_status (latch_num, pin_num, highlow);
+////    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
+//
+//    switch (latch_num) {
+//        case LOAD0: {
+////            PIN_setOutputValue(&ZM_rst, D0, LH.LATCH0[0]);
+////            PIN_setOutputValue(&ZM_rst, D1, LH.LATCH0[1]);
+////            PIN_setOutputValue(&ZM_rst, D2, LH.LATCH0[2]);
+////            PIN_setOutputValue(&ZM_rst, D3, LH.LATCH0[3]);
+//            PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);
+//            PIN_setOutputValue(pin_handle, D5, LH.LATCH0[5]);
+//            PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);
+//            PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);
+//            break;
+//        }
+//        case LOAD1: {
+//            PIN_setOutputValue(pin_handle, D0, LH.LATCH1[0]);
+//            PIN_setOutputValue(pin_handle, D1, LH.LATCH1[1]);
+//            PIN_setOutputValue(pin_handle, D2, LH.LATCH1[2]);
+//            PIN_setOutputValue(pin_handle, D3, LH.LATCH1[3]);
+//            PIN_setOutputValue(pin_handle, D4, LH.LATCH1[4]);
+//            PIN_setOutputValue(pin_handle, D5, LH.LATCH1[5]);
+//            PIN_setOutputValue(pin_handle, D6, LH.LATCH1[6]);
+//            PIN_setOutputValue(pin_handle, D7, LH.LATCH1[7]);
+//            break;
+//        }
+//        case LOAD2: {
+//            PIN_setOutputValue(pin_handle, D0, LH.LATCH2[0]);
+//            PIN_setOutputValue(pin_handle, D1, LH.LATCH2[1]);
+//            PIN_setOutputValue(pin_handle, D2, LH.LATCH2[2]);
+//            PIN_setOutputValue(pin_handle, D3, LH.LATCH2[3]);
+//            PIN_setOutputValue(pin_handle, D4, LH.LATCH2[4]);
+//            PIN_setOutputValue(pin_handle, D5, LH.LATCH2[5]);
+//            PIN_setOutputValue(pin_handle, D6, LH.LATCH2[6]);
+//            PIN_setOutputValue(pin_handle, D7, LH.LATCH2[7]);
+//            break;
+//        }
+//        default: {
+//            break;
+//        }
+//    }
 //    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
-
-    switch (latch_num) {
-        case LOAD0: {
-//            PIN_setOutputValue(&ZM_rst, D0, LH.LATCH0[0]);
-//            PIN_setOutputValue(&ZM_rst, D1, LH.LATCH0[1]);
-//            PIN_setOutputValue(&ZM_rst, D2, LH.LATCH0[2]);
-//            PIN_setOutputValue(&ZM_rst, D3, LH.LATCH0[3]);
-            PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);
-            PIN_setOutputValue(pin_handle, D5, LH.LATCH0[5]);
-            PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);
-            PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);
-            break;
-        }
-        case LOAD1: {
-            PIN_setOutputValue(pin_handle, D0, LH.LATCH1[0]);
-            PIN_setOutputValue(pin_handle, D1, LH.LATCH1[1]);
-            PIN_setOutputValue(pin_handle, D2, LH.LATCH1[2]);
-            PIN_setOutputValue(pin_handle, D3, LH.LATCH1[3]);
-            PIN_setOutputValue(pin_handle, D4, LH.LATCH1[4]);
-            PIN_setOutputValue(pin_handle, D5, LH.LATCH1[5]);
-            PIN_setOutputValue(pin_handle, D6, LH.LATCH1[6]);
-            PIN_setOutputValue(pin_handle, D7, LH.LATCH1[7]);
-            break;
-        }
-        case LOAD2: {
-            PIN_setOutputValue(pin_handle, D0, LH.LATCH2[0]);
-            PIN_setOutputValue(pin_handle, D1, LH.LATCH2[1]);
-            PIN_setOutputValue(pin_handle, D2, LH.LATCH2[2]);
-            PIN_setOutputValue(pin_handle, D3, LH.LATCH2[3]);
-            PIN_setOutputValue(pin_handle, D4, LH.LATCH2[4]);
-            PIN_setOutputValue(pin_handle, D5, LH.LATCH2[5]);
-            PIN_setOutputValue(pin_handle, D6, LH.LATCH2[6]);
-            PIN_setOutputValue(pin_handle, D7, LH.LATCH2[7]);
-            break;
-        }
-        default: {
-            break;
-        }
-    }
-    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
-    CPUdelay(10);
-    PIN_setOutputValue(&ZM_rst, latch_num, 0);               // Turn off latch
-    remove_elite_pin();
-    ELITE15_SPI_HOLD();
-}
-
-static void Init_Elite15_PIN () {
-    InitLH();
-    add_elite_pin();
-
-    PIN_setOutputValue(pin_handle, D0, 0);
-    PIN_setOutputValue(pin_handle, D1, 0);
-    PIN_setOutputValue(pin_handle, D2, 0);
-    PIN_setOutputValue(pin_handle, D3, 0);
-    PIN_setOutputValue(pin_handle, D4, 0);
-    PIN_setOutputValue(pin_handle, D5, 0);
-    PIN_setOutputValue(pin_handle, D6, 0);
-    PIN_setOutputValue(pin_handle, D7, 0);
-    PIN_setOutputValue(pin_handle, LOAD0, 0);
-    PIN_setOutputValue(pin_handle, LOAD1, 1);
-    PIN_setOutputValue(pin_handle, LOAD2, 1);
-    CPUdelay(10);
-    PIN_setOutputValue(pin_handle, LOAD1, 0);
-    PIN_setOutputValue(pin_handle, LOAD2, 0);
-
-
-    PIN_setOutputValue(pin_handle, D0, 0);
-    PIN_setOutputValue(pin_handle, D1, 0);
-    PIN_setOutputValue(pin_handle, D2, 0);
-    PIN_setOutputValue(pin_handle, D3, 0);
-    PIN_setOutputValue(pin_handle, D4, 1);
-    PIN_setOutputValue(pin_handle, D5, 1);
-    PIN_setOutputValue(pin_handle, D6, 1);
-    PIN_setOutputValue(pin_handle, D7, 1);
-    CPUdelay(10);
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, LOAD0, 0);
-
-    remove_elite_pin();
-
+////    CPUdelay(10);
+//    PIN_setOutputValue(&ZM_rst, latch_num, 0);               // Turn off latch
+//    remove_elite_pin();
+//    ELITE15_SPI_HOLD();
+//}
+//
+//static void Init_Elite15_PIN () {
 //    InitLH();
 //    add_elite_pin();
 //
-//    PIN_setOutputValue(pin_handle, LOAD0, 1);
-//    PIN_setOutputValue(pin_handle, LOAD1, 1);
-//    PIN_setOutputValue(pin_handle, LOAD2, 1);
-//    CPUdelay(10);
 //    PIN_setOutputValue(pin_handle, D0, 0);
 //    PIN_setOutputValue(pin_handle, D1, 0);
 //    PIN_setOutputValue(pin_handle, D2, 0);
@@ -232,15 +195,52 @@ static void Init_Elite15_PIN () {
 //    PIN_setOutputValue(pin_handle, D5, 0);
 //    PIN_setOutputValue(pin_handle, D6, 0);
 //    PIN_setOutputValue(pin_handle, D7, 0);
-//    CPUdelay(10);
 //    PIN_setOutputValue(pin_handle, LOAD0, 0);
+//    PIN_setOutputValue(pin_handle, LOAD1, 1);
+//    PIN_setOutputValue(pin_handle, LOAD2, 1);
+//    CPUdelay(10);
 //    PIN_setOutputValue(pin_handle, LOAD1, 0);
 //    PIN_setOutputValue(pin_handle, LOAD2, 0);
 //
+//
+//    PIN_setOutputValue(pin_handle, D0, 0);
+//    PIN_setOutputValue(pin_handle, D1, 0);
+//    PIN_setOutputValue(pin_handle, D2, 0);
+//    PIN_setOutputValue(pin_handle, D3, 0);
+//    PIN_setOutputValue(pin_handle, D4, 1);
+//    PIN_setOutputValue(pin_handle, D5, 1);
+//    PIN_setOutputValue(pin_handle, D6, 1);
+//    PIN_setOutputValue(pin_handle, D7, 1);
+//    CPUdelay(10);
+//    PIN_setOutputValue(pin_handle, LOAD0, 1);
+//    PIN_setOutputValue(pin_handle, LOAD0, 0);
+//
 //    remove_elite_pin();
-}
-
-
-
-
-#endif
+//
+////    InitLH();
+////    add_elite_pin();
+////
+////    PIN_setOutputValue(pin_handle, LOAD0, 1);
+////    PIN_setOutputValue(pin_handle, LOAD1, 1);
+////    PIN_setOutputValue(pin_handle, LOAD2, 1);
+////    CPUdelay(10);
+////    PIN_setOutputValue(pin_handle, D0, 0);
+////    PIN_setOutputValue(pin_handle, D1, 0);
+////    PIN_setOutputValue(pin_handle, D2, 0);
+////    PIN_setOutputValue(pin_handle, D3, 0);
+////    PIN_setOutputValue(pin_handle, D4, 0);
+////    PIN_setOutputValue(pin_handle, D5, 0);
+////    PIN_setOutputValue(pin_handle, D6, 0);
+////    PIN_setOutputValue(pin_handle, D7, 0);
+////    CPUdelay(10);
+////    PIN_setOutputValue(pin_handle, LOAD0, 0);
+////    PIN_setOutputValue(pin_handle, LOAD1, 0);
+////    PIN_setOutputValue(pin_handle, LOAD2, 0);
+////
+////    remove_elite_pin();
+//}
+//
+//
+//
+//
+//#endif
@@ -1,32 +0,0 @@
-
-#ifndef ELITECCC
-#define ELITECCC
-
-#include "EliteCCMode.h"
-
-
-// XXX : should we reset DAC output after STOP?
-static void CCModeReverseCurrent(CCCMode *CCC){
-    if(CCC->StandBy){
-        if(CT.StandByCounter == CCC->StandByTime){
-            CCC->StandBy = false;
-            CT.StandByCounter = 0;
-        }
-        else{
-            CT.StandByCounter ++;
-        }
-    }
-    else{
-        // reverse charge/discharge
-        if(CCC->BatteryV == CCC->VMax){
-            CCC->StandBy = true;
-            CCC->value = CCC->DischargeCurrent;
-        }
-        else if(CCC->BatteryV == CCC->VMin){
-            CCC->StandBy = true;
-            CCC->value = CCC->ChargeCurrent;
-        }
-    }
-}
-
-#endif
@@ -1,83 +0,0 @@
-
-#ifndef ELITECCMODE
-#define ELITECCMODE
-
-#define Vset INSTRUCTION.Vset
-#define DELTAVOLTMAX 100000
-
-/* Transform setting CC into IUC
-*
-* User code in CC mode : 0 ~ 3000000
-* Real current value : -15.00000 ~ 15.00000 mA
-*  => user code = 1500000 mapping to 0.00000 mA
-*/
-static void CC_Vscan(CCMode *CC){
-    static int32_t Iin = 0;
-    static int32_t deltaI = 0;
-    static int32_t deltaV = 0;
-    uint16_t divisionRate;
-
-    if(vscanReset){
-        Vset = 0;
-
-        if(CC->_charge == 0){
-            CC->_Iset *= -1;
-        }
-
-        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - CC->_Iset;
-
-        if(deltaI > 20000000 || deltaI < -20000000){ //1mA
-            divisionRate = 1000;
-        }else{
-            divisionRate = 10;
-        }
-
-        deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
-
-        if(deltaV > DELTAVOLTMAX){ //100000 = 500uV
-            deltaV = DELTAVOLTMAX;
-        }else if(deltaV < (-DELTAVOLTMAX)){
-            deltaV = (-DELTAVOLTMAX);
-        }
-
-        Vset = Vset + deltaV; //[5nV]
-
-        if(Vset <= CC->_Vmin){
-            Vset = CC->_Vmin;
-        }else if(Vset >= CC->_Vmax){
-            Vset = CC->_Vmax;
-        }
-    }
-
-    if(!vscanReset){
-        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - CC->_Iset;
-
-        if(deltaI > 20000000 || deltaI < -20000000){ //1mA
-            divisionRate = 1000;
-        }else{
-            divisionRate = 10;
-        }
-
-        deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
-
-        if(deltaV > DELTAVOLTMAX){ //100000 = 500uV
-            deltaV = DELTAVOLTMAX;
-        }else if(deltaV < (-DELTAVOLTMAX)){
-            deltaV = (-DELTAVOLTMAX);
-        }
-
-        Vset = Vset + deltaV; //[5nV]
-
-        if(Vset <= CC->_Vmin){
-            Vset = CC->_Vmin;
-        }else if(Vset >= CC->_Vmax){
-            Vset = CC->_Vmax;
-        }
-    }
-//    int32_t RealV;
-//    RealV = (int32_t)(deltaV);
-//    InputNotify(NOTIFY_IMPEDANCE, RealV);
-}
-#endif
@@ -1,156 +1,111 @@
 #ifndef ELITECV3
 #define ELITECV3

-#define Vset INSTRUCTION.Vset
+#define Vset instru.Vset

-static uint16_t CV3Curve(CV3Mode *CV3){
-    static uint16_t DACOutCode;
-    static int32_t Vin;
-    static int32_t Vout;
-    static int32_t DeltaVout;
+static void cv_vscan(void)
+{
+    struct wm_cv_ctx_t *cv = (struct wm_cv_ctx_t *)wm_get();
+    static bool VminCounter;
+    static bool VmaxCounter;

-    Vin = CV3->_measureVin * 200;//[5nV]
-    if(DACReset){
-        Vout = Vset + Vin;
-        DACReset = false;
-    }else{
-        DeltaVout = Vset - (Vout - Vin);
-        Vout = Vout + DeltaVout;
+    NotifyCycleNumber = (instru.cycleNumber - cv->_cycleNumber + 1);
+
+    if (vscanReset) {
+        VmaxCounter = false;
+        VminCounter = false;
+
+        if (instru.directionInit == 1) {
+            cv->_direction_up         = true;
+            cv->_current_direction_up = true;
+        } else {
+            cv->_direction_up         = false;
+            cv->_current_direction_up = false;
+        }
+
+//        Vstep = x * 20 * N, x=xmV ; N=VscanRate   Vstep unit [5nV]/[0.1ms]
+        if (instru.step <= 10) {
+            cv->_Vstep = instru.step *  instru.VsetRate / 5;
+        } else {
+            cv->_Vstep = instru.step / 5 *  instru.VsetRate;
+        }
+
+
+        if (cv->_Vmin == cv->_Vinit) {
+            VminCounter = true;
+        }
+        if (cv->_Vmax == cv->_Vinit) {
+            VmaxCounter = true;
+        }
+
+        Vset = cv->_Vinit;
    }

-    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
-
-    int32_t RealV2;
-    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
-    InputNotify(NOTIFY_VOLT, RealV2);
-
-    int32_t RealV;
-    RealV = (int32_t)(Vout / 200);//[1uV]
-    InputNotify(NOTIFY_IMPEDANCE, RealV);
-
-    DAC_outputV(DACOutCode);
-
-     return DACOutCode;
-}
-
-static void CV3_Vscan(CV3Mode *CV3){
-    static int16_t VminCounter;
-    static int16_t VmaxCounter;
-    static uint16_t CycleCounter;
-
-    NotifyCycleNumber = (INSTRUCTION.cycleNumber - CV3->_cycleNumber + 1);
-
-    if(vscanReset){
-        VmaxCounter = 0;
-        VminCounter = 0;
-        CycleCounter = 0;
-
-        if(INSTRUCTION.directionInit == 1){
-            CV3->_direction_up         = true;
-            CV3->_current_direction_up = true;
-        }else{
-            CV3->_direction_up         = false;
-            CV3->_current_direction_up = false;
-        }
-
-        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if(INSTRUCTION.step <= 10){
-            CV3->_Vstep = INSTRUCTION.step *  INSTRUCTION.VsetRate / 5;
-        }else{
-            CV3->_Vstep = INSTRUCTION.step / 5 *  INSTRUCTION.VsetRate;
-        }
-
-        if(CV3->_Vmin == CV3->_Vinit){
-            VminCounter = -1;
-        }
-        if(CV3->_Vmax == CV3->_Vinit){
-            VmaxCounter = -1;
-        }
-
-        Vset = CV3->_Vinit;
-    }
-
-    if(!vscanReset){
-        if((INSTRUCTION.Vinit < INSTRUCTION.Ve1 && INSTRUCTION.Vinit < INSTRUCTION.Ve2) ||
-        (INSTRUCTION.Vinit > INSTRUCTION.Ve1 && INSTRUCTION.Vinit > INSTRUCTION.Ve2)
-        ){
-            if (CV3->_current_direction_up){
-                Vset = Vset + CV3->_Vstep;
-            }else{
-                Vset = Vset - CV3->_Vstep;
+    if (!vscanReset) {
+        cv->bFirst = false;
+        if ((instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) ||
+        (instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2)
+        ) {
+            if (cv->_current_direction_up) {
+                Vset = Vset + cv->_Vstep; //* GPT.GptimerMultiple;
+            } else {
+                Vset = Vset - cv->_Vstep; //* GPT.GptimerMultiple;
            }

-            if(INSTRUCTION.Vinit < INSTRUCTION.Ve1 && INSTRUCTION.Vinit < INSTRUCTION.Ve2){
-                if(Vset == CV3->_Vmin){
-                    VminCounter = -1;
-                    INSTRUCTION.Vinit = INSTRUCTION.Vmin;
-                    CV3->_Vinit = CV3->_Vmin;
+            if (instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) {
+                if (Vset == cv->_Vmin) {
+                    VminCounter = true;
+                    instru.Vinit = instru.Vmin;
+                    cv->_Vinit = cv->_Vmin;
                }
-            }else if(INSTRUCTION.Vinit > INSTRUCTION.Ve1 && INSTRUCTION.Vinit > INSTRUCTION.Ve2){
-                if(Vset == CV3->_Vmax){
-                    VmaxCounter = -1;
-                    INSTRUCTION.Vinit = INSTRUCTION.Vmax;
-                    CV3->_Vinit = CV3->_Vmax;
+            } else if (instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2) {
+                if (Vset == cv->_Vmax) {
+                    VmaxCounter = true;
+                    instru.Vinit = instru.Vmax;
+                    cv->_Vinit = cv->_Vmax;
                }
            }
-        }else{
-            if (Vset >= CV3->_Vmax){
-                VmaxCounter++;
-            }else if (Vset <= CV3->_Vmin){
-                VminCounter++;
+        } else {
+            if (Vset >= cv->_Vmax) {
+                VmaxCounter = true;
+            } else if (Vset <= cv->_Vmin) {
+                VminCounter = true;
            }

-            if (CV3->_current_direction_up){
-                Vset = Vset + CV3->_Vstep * GPT.GptimerMultiple;
-            }else{
-                Vset = Vset - CV3->_Vstep * GPT.GptimerMultiple;
+            if (cv->_current_direction_up) {
+                Vset = Vset + cv->_Vstep;// * GPT.GptimerMultiple;
+            } else {
+                Vset = Vset - cv->_Vstep;// * GPT.GptimerMultiple;
            }

-            if(VmaxCounter != 0 && VminCounter != 0){
-                if(VmaxCounter == VminCounter && CV3->_direction_up && CV3->_current_direction_up){
-                    if(CycleCounter != VmaxCounter){
-                        if(Vset >= CV3->_Vinit){
-                            CV3->_cycleNumber--;
-                            CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
-                        }
+            if (VmaxCounter && VminCounter) {
+                if (cv->_direction_up && cv->_current_direction_up) {
+                    if (Vset >= cv->_Vinit) {
+                        cv->_cycleNumber--;
+                        VminCounter = false;
+                        VmaxCounter = false;
                    }
                }
-                if(VmaxCounter == VminCounter && !CV3->_direction_up && !CV3->_current_direction_up){
-                    if(CycleCounter != VmaxCounter){
-                        if(Vset <= CV3->_Vinit){
-                            CV3->_cycleNumber--;
-                            CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
-                        }
+                if (!cv->_direction_up && !cv->_current_direction_up) {
+                    if (Vset <= cv->_Vinit) {
+                        cv->_cycleNumber--;
+                        VminCounter = false;
+                        VmaxCounter = false;
                    }
                }
            }

-            if (Vset >= CV3->_Vmax){
-                CV3->_current_direction_up = false;
-            }else if (Vset <= CV3->_Vmin){
-                CV3->_current_direction_up = true;
+            if (Vset >= cv->_Vmax) {
+                cv->_current_direction_up = false;
+            } else if (Vset <= cv->_Vmin) {
+                cv->_current_direction_up = true;
            }

            /*stop condition*/
-            if(CV3->_cycleNumber == 0){
-    //            PeriodicEvent = false;
-                ModeLED(POST_WORK);
-                InitEliteFlag();
-                INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
-                INSTRUCTION.sampleRate = 15;
-                INSTRUCTION.charge     = 0x01;
-                INSTRUCTION.constantCurrent = 0x00;
-                INSTRUCTION.Vmax       = 0xC350;
-                INSTRUCTION.Vmin       = 0x0000;
-                INSTRUCTION.notifyRate = 500;
-                INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
+            if (cv->_cycleNumber == 0) {
+                PeriodicEvent = false;
            }
        }
-
    }
-//    int32_t RealV;
-//    RealV = (int32_t)(Vset / 500);//[1uV]
-//    InputNotify(NOTIFY_VOLT, RealV);
 }
 #endif
@@ -1,217 +0,0 @@
-
-#ifndef ELITECV
-#define ELITECV
-
-static uint16_t SWVCurve(WorkMode *WorkModeData) {
-    static uint8_t  counter;
-    static uint16_t outputV;
-    static uint16_t Volt;
-    static bool     direction_up;
-
-    // reset origin volt at the begin
-    if (DACReset) {
-        Volt    = INSTRUCTION.Ve1;
-        outputV = INSTRUCTION.Ve1;
-        if (INSTRUCTION.Ve1 < INSTRUCTION.Ve2)
-            direction_up = true;
-        else
-            direction_up = false;
-        counter  = 1;
-        DACReset = false;
-    }
-
-    if (counter == 2 * PulseWidth)
-        counter = 1;
-    else
-        counter++;
-
-    // output a certain volt
-    outputV = Volt;
-    DAC_outputV(outputV);
-
-    // VoltValue = (ramp1*16 + ramp0/16) * 3.05;
-
-    // check if we reach the final volt
-    if ((outputV >= INSTRUCTION.Ve2 && direction_up) || (outputV <= INSTRUCTION.Ve2 && !direction_up)) {
-        PeriodicEvent = false;
-        DACReset      = true;
-    }
-
-    // prepare the next output volt
-    if (direction_up) {
-        if (counter == PulseWidth)
-            Volt = Volt + Amplitude;
-        else if (counter == 2 * PulseWidth)
-            Volt = Volt - (Amplitude - INSTRUCTION.step);
-        else
-            Volt = Volt;
-    } else {
-        if (counter == PulseWidth)
-            Volt = Volt - Amplitude;
-        else if (counter == 2 * PulseWidth)
-            Volt = Volt + (Amplitude - INSTRUCTION.step);
-        else
-            Volt = Volt;
-    }
-
-    return outputV;
-}
-
-static uint16_t DPVCurve(WorkMode *WorkModeData) {
-    static uint8_t  counter;
-    static uint16_t Volt1;
-    static uint16_t Volt2;
-    static uint16_t outputV;
-    static bool     direction_up;
-
-    // reset origin volt at the begin
-    if (DACReset) {
-        if (INSTRUCTION.Ve1 < INSTRUCTION.Ve2)
-            direction_up = true;
-        else
-            direction_up = false;
-
-        Volt1 = INSTRUCTION.Ve1;
-        if (direction_up)
-            Volt2 = INSTRUCTION.Ve1 + Amplitude;
-        else
-            Volt2 = INSTRUCTION.Ve1 - Amplitude;
-
-        counter  = 1;
-        DACReset = false;
-    }
-
-    if (counter == PulsePeriod)
-        counter = 1;
-    else
-        counter++;
-
-    // output a certain volt
-    if (counter <= (PulsePeriod - PulseWidth)) {
-        outputV = Volt1;
-        DAC_outputV(Volt1);
-    } else {
-        outputV = Volt2;
-        DAC_outputV(Volt2);
-    }
-
-
-    // VoltValue = (ramp1*16 + ramp0/16) * 3.05;
-
-    // check if we reach the final volt
-    if (((outputV >= INSTRUCTION.Ve2) && direction_up) || ((outputV <= INSTRUCTION.Ve2) && !direction_up)) {
-        PeriodicEvent = false;
-        DACReset      = true;
-    }
-
-    // check overflow/underflow and prepare for next output
-    if (direction_up) {
-        if (Volt1 + INSTRUCTION.step < Volt1)
-            Volt1 = 0xffff;
-        else
-            Volt1 = Volt1 + INSTRUCTION.step;
-        if (Volt2 + INSTRUCTION.step < Volt2)
-            Volt2 = 0xffff;
-        else
-            Volt2 = Volt2 + INSTRUCTION.step;
-    } else {
-        if (Volt1 - INSTRUCTION.step > Volt1)
-            Volt1 = 0x0000;
-        else
-            Volt1 = Volt1 - INSTRUCTION.step;
-        if (Volt2 - INSTRUCTION.step > Volt2)
-            Volt2 = 0x0000;
-        else
-            Volt2 = Volt2 - INSTRUCTION.step;
-    }
-
-    if (counter + 1 <= (PulsePeriod - PulseWidth)) {
-        return Volt1;
-    } else {
-        return Volt2;
-    }
-}
-
-static void CV_Vscan(CVMode *CV){
-    static int16_t VminCounter;
-    static int16_t VmaxCounter;
-    static uint16_t CycleCounter;
-
-    NotifyCycleNumber = (INSTRUCTION.cycleNumber - CV->_cycleNumber + 1);
-
-    if(vscanReset){
-        VmaxCounter = 0;
-        VminCounter = 0;
-        CycleCounter = 0;
-
-        if(INSTRUCTION.directionInit == 1){
-            CV->_direction_up         = true;
-            CV->_current_direction_up = true;
-        }else if(INSTRUCTION.directionInit == 0){
-            CV->_direction_up         = false;
-            CV->_current_direction_up = false;
-        }
-
-        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if(INSTRUCTION.step <= 10){
-            CV->_Vstep = INSTRUCTION.step * INSTRUCTION.VsetRate / 5;
-        }else{
-            CV->_Vstep = INSTRUCTION.step / 5 * INSTRUCTION.VsetRate;
-        }
-
-        if(CV->_Vmin == CV->_Vinit){
-            VminCounter = -1;
-        }
-        if(CV->_Vmax == CV->_Vinit){
-            VmaxCounter = -1;
-        }
-
-        Vset = CV->_Vinit;
-    }
-
-    if(!vscanReset){
-        if (Vset >= CV->_Vmax){
-            VmaxCounter++;
-        }else if (Vset <= CV->_Vmin){
-            VminCounter++;
-        }
-
-        if (CV->_current_direction_up){
-            Vset = Vset + CV->_Vstep * GPT.GptimerMultiple;
-        }else{
-            Vset = Vset - CV->_Vstep * GPT.GptimerMultiple;
-        }
-
-        if(VmaxCounter != 0 && VminCounter != 0){
-            if(VmaxCounter == VminCounter && CV->_direction_up && CV->_current_direction_up){
-                if(CycleCounter != VmaxCounter){
-                    if(Vset >= CV->_Vinit){
-                        CV->_cycleNumber--;
-                        CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
-                    }
-                }
-            }
-            if(VmaxCounter == VminCounter && !CV->_direction_up && !CV->_current_direction_up){
-                if(CycleCounter != VmaxCounter){
-                    if(Vset <= CV->_Vinit){
-                        CV->_cycleNumber--;
-                        CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
-                    }
-                }
-            }
-        }
-
-        if (Vset >= CV->_Vmax){
-            CV->_current_direction_up = false;
-        }else if (Vset <= CV->_Vmin){
-            CV->_current_direction_up = true;
-        }
-
-        /*stop condition*/
-        if(CV->_cycleNumber == 0){
-            PeriodicEvent = false;
-            ModeLED(NO_EVENT);
-        }
-    }
-}
-#endif
@@ -1,47 +0,0 @@
-#ifndef ELITECVSCAN
-#define ELITECVSCAN
-
-#define Vset INSTRUCTION.Vset
-
-static uint16_t CVSCANCurve(CVSCANMode *CVSCAN){
-    static uint16_t DACOutCode;
-    static int32_t Vin;
-    static int32_t Vout;
-    static int32_t DeltaVout;
-
-    Vin = CVSCAN->_measureVin * 200;//[5nV]
-    if(DACReset){
-        Vout = Vset + Vin;
-        DACReset = false;
-    }else{
-        DeltaVout = Vset - (Vout - Vin);
-        Vout = Vout + DeltaVout;
-    }
-
-    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
-
-    int32_t RealV2;
-    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
-    InputNotify(NOTIFY_VOLT, RealV2);
-
-    int32_t RealV;
-    RealV = (int32_t)(Vout / 200);//[1uV]
-    InputNotify(NOTIFY_IMPEDANCE, RealV);
-
-    DAC_outputV(DACOutCode);
-
-    return DACOutCode;
-}
-
-static void CVSCAN_Vscan(CVSCANMode *CVSCAN){
-
-    if(vscanReset){
-        Vset = CVSCAN->_Vinit;
-    }
-
-    if(!vscanReset){
-        Vset = CVSCAN->_Vinit;
-    }
-}
-#endif
@@ -29,92 +29,337 @@ static bool DACReset;
 //}
 //#endif

-#ifdef ELITE_VERSION_1_4
-#define DACCLS 0x02
-#define DACOUT 0x31
+//#ifdef ELITE_VERSION_1_4
+//#define DACCLS 0x02
+//#define DACOUT 0x31
+//
+//static uint16_t DAC_outputV(uint16_t voltLV) {
+//    // C = command, X = don't care, D = data
+//    // CCCC CCCC = command
+//    // DDDD DDDD = v1
+//    // DDDD DDDD = v2
+//
+//    // command
+//    // 0x02 = clear
+//    // 0x31 = output voltage
+//
+//    uint8_t v1, v2 = 0;
+//    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
+//    v2 = (uint8_t) (voltLV & 0x00FF);
+//
+//    spi_DACtxbuf[0] = DACOUT;
+//    spi_DACtxbuf[1] = v1;
+//    spi_DACtxbuf[2] = v2;
+//
+//    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+//
+//    return voltLV;
+//}
+//#endif

-static uint16_t DAC_outputV(uint16_t voltLV) {
-    // C = command, X = don't care, D = data
-    // CCCC CCCC = command
-    // DDDD DDDD = v1
-    // DDDD DDDD = v2

-    // command
-    // 0x02 = clear
-    // 0x31 = output voltage
+#define VBIAS_LSB       107422          // 2200/4096 [mV] = 107422 [5nV]
+#define VZERO_LSB       6875008         // VBIAS_LSB * 64
+#define DAC12BIT_LSB    107422

-    uint8_t v1, v2 = 0;
-    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
-    v2 = (uint8_t) (voltLV & 0x00FF);
+static int32_t DAC_outputV(int32_t voltLV) {   // LPDAC output, voltLV = Vbias-Vzero
+    static int32_t vztemp, vscan;
+    static uint32_t vb, vz, vbcode, vzcode, DACOutCode = 0;

-    spi_DACtxbuf[0] = DACOUT;
-    spi_DACtxbuf[1] = v1;
-    spi_DACtxbuf[2] = v2;
+    vztemp = (-0.45 * voltLV) + 249000000;
+    if (voltLV < 0) {
+        vztemp -= DAC12BIT_LSB;
+    }
+    vzcode = (vztemp - 40000000 + VZERO_LSB / 2) / VZERO_LSB;
+    vz = vzcode * VZERO_LSB + 40000000;

-    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+    vb = voltLV + vz;
+    vbcode = ((vb - 40000000 + VBIAS_LSB / 2) / VBIAS_LSB);
+    DACOutCode = (0x0003FFFF & ((vzcode << 12) + vbcode));

-    return voltLV;
+    DACOutCode = Cali_LPDAC(DACOutCode);
+
+    select_REG(LPDACDAT0);
+    w32_REG(DACOutCode);
+
+    vscan = (int32_t)(vb - vz) / 200;
+    return vscan;
+}
+
+static uint32_t DAC_outputF(uint32_t freq) {
+    select_REG(WGFCW);
+    w32_REG(freq);
+    return freq;
 }

 static void VoutGainControl(uint8_t VOUTLevel){
    if(VOUTLevel == 0){
        // VOUT gain level = 0, using 240K resister
-        PIN15_setOutputValue(Turon_VOUT_SMALL, 0);
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 0);
    }
    else if(VOUTLevel == 1){
        // VOUT gain level = 1, using 15K resister
-        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
    }
    else if(VOUTLevel == 2){
        // VOUT gain level = 2, using 15K resister
-        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
    }
    else{
        // default using 15K resister
-        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
    }
+    record_flag = false;
 }

-#endif
+static uint32_t CalcPeriod(uint32_t freq){ //One Second = 10000

-static int32_t User2Real(uint16_t UserCode){
-    /* transfer usercode to real voltage value (mV) */
-    return (int32_t)((UserCode - 25000) / 5);
+    uint32_t period;
+
+    if (freq == 1) {
+        period = 666667;
+    } else {
+        period = (1000000 + freq / 2) / freq; // [sec]
+    }
+
+    if (period < 20){
+        period = 20;
+    }
+
+    return period;
 }

+static uint32_t CalcDelayTime(uint32_t freq){
+    uint32_t delayTime, decadeSamplingTime;
+    delayTime = CalcPeriod(freq) * instru.delay;    //get delay time
+    if (delayTime < 20) {
+        delayTime = 20;
+    } else {
+        delayTime = (delayTime + 5) / 10;
+    }
+
+    // 1000Hz
+    if (freq >= 100000) {
+        decadeSamplingTime = 1025;
+    }
+
+    // 100Hz
+    else if (freq >= 10000) {
+        decadeSamplingTime = 1025;
+    }
+
+    // 10Hz
+    else if (freq >= 1000) {
+        decadeSamplingTime = 11393;
+    }
+
+    // 1Hz
+    else if (freq >= 100) {
+        decadeSamplingTime = 91034;
+    }
+
+    //0.1Hz
+    else if (freq >= 10) {
+        decadeSamplingTime = 550000;
+    }
+
+    // 0.015Hz | 136s
+    else if (freq >= 1) {
+        decadeSamplingTime = 1360000;
+    }
+
+    delayTime += decadeSamplingTime; //delay+reading time
+
+    return delayTime;
+}
+
+static uint32_t User2Freq(uint32_t UserCode){
+    uint32_t freq;
+    freq = (UserCode * 149 + 50)/ 100;
+    return freq; //[100mHz]
+}
+
+static uint32_t Freq2DAC(uint32_t freq){
+    uint32_t code;
+    code = (freq * 100 + 75) / 149;
+    return code; //return code
+}

 // DAC Vout theoretical boundary <300, 100~ (mV)
 #define DAC_VOUT_GAIN_SMALL_BOUNDARY           100000  // 25500(usercode) = 100 mV
 #define DAC_VOUT_GAIN_LARGE_BOUNDARY           300000  // 26500(usercode) = 300 mV
 #define DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE   26500  // 26500(usercode) = 300 mV
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE  23500  // 23500(usercode) = -300 mV

 static void AutoGainChangeVout(int32_t userCode){
    int32_t RealVolt = (userCode - 25000) * 200; // (userCode - 25000) / 5 * 1000  [1uV]
    // switch to 1 level volt(small)   15K
    // switch to 2 level volt(large)   240K

-    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_AUTO){
-        INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
-        VoutGainControl(INSTRUCTION.VoutGainLevel);
-        record_flag = false;
+    if(instru.VoutGainLevel == VOUT_GAIN_AUTO){
+        instru.VoutGainLevel = VOUT_GAIN_15K;
+        VoutGainControl(instru.VoutGainLevel);
    }

-    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_15K){
+    if(instru.VoutGainLevel == VOUT_GAIN_15K){
        if(RealVolt > DAC_VOUT_GAIN_LARGE_BOUNDARY || RealVolt < -1 * DAC_VOUT_GAIN_LARGE_BOUNDARY){
            // switch to 2 level volt(large)
-            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
-            VoutGainControl(INSTRUCTION.VoutGainLevel);
-            record_flag = false;
+            instru.VoutGainLevel = VOUT_GAIN_240K;
+            VoutGainControl(instru.VoutGainLevel);
        }
    }
-    else if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_240K){
+    else if(instru.VoutGainLevel == VOUT_GAIN_240K){
        if(RealVolt < DAC_VOUT_GAIN_SMALL_BOUNDARY && RealVolt > -1 * DAC_VOUT_GAIN_SMALL_BOUNDARY ){
            // switch to 1 level volt(small)
-            INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
-            VoutGainControl(INSTRUCTION.VoutGainLevel);
-            record_flag = false;
+            instru.VoutGainLevel = VOUT_GAIN_15K;
+            VoutGainControl(instru.VoutGainLevel);
        }
    }
 }

+static void SetWGAmp(uint16_t ampcode){
+//    uint32_t amplitude = Cali_HSAMP(ampcode);
+
+//    static uint64_t amp_cutoff = 40000000;
+//    uint32_t corrected_amp;
+//
+//    corrected_amp = ((uint64_t)ampcode * 800 * 1000 / 2047) * (1 + ((uint64_t)instru.fset * (uint64_t)instru.fset) / (amp_cutoff * amp_cutoff)); //[uV]
+//
+//    ampcode = corrected_amp * 2047 / 800000;
+
+    select_REG(WGCON);
+    w32_REG(0x0); // 0x0: DC disable ac first
+    select_REG(WGAMPLITUDE);
+    w32_REG(ampcode);
+    select_REG(WGCON);
+    w32_REG(0x00000004); //0x4: Sinusoid
+}
+
+static void SetEISHIGHZ(uint8_t ret){
+    uint32_t code;
+
+    select_REG(LPTIASW0); //LPTIASW0
+    code = r32_REG();
+    code = (code & (~(1 << 2))) | (ret << 2); //ret = 0 HighZ on | ret = 1 HighZ off
+    w32_REG(code);
+}
+
+static void HSDAC_GainControl(uint8_t G_EXA_PGA) {
+/* Set the Gain value of PGA and Excitation amp */
+    uint32_t reg = 0;
+    uint8_t DACUpdateRate = 0x07;
+
+    switch (G_EXA_PGA) {
+        case 0x00:{
+            reg = 0x00000000;
+            break;
+        }
+        case 0x01:{
+            reg = 0x00000001;
+            break;
+        }
+        case 0x10:{
+            reg = 0x00001000;
+            break;
+        }
+        case 0x11:{
+            reg = 0x00001001;
+            break;
+        }
+        default:{
+            reg = 0x0000000E;       // Default update rate = 7
+            break;
+        }
+    }
+
+    reg = reg | ((uint32_t)(DACUpdateRate) << 1);
+    select_REG(HSDACCON);                 // HSDACCON address
+    w32_REG(reg);
+}
+
+static void HSDAC_output(uint16_t amp) {
+/* Set and write the amplitude of HSDAC. Full scale: 0x0200 ~ 0x0E00, 0x0800 = 0V */
+/* Set and write the amplitude of HSDAC. Full scale: 512 ~ 3584, 2048 = 0V */
+    uint32_t amplitude = 0;
+
+    if (amp > 0x0E00) {
+        amplitude = 0x00000E00;
+    } else if (amp < 0x0200) {
+        amplitude = 0x00000200;
+    } else {
+        amplitude = (uint32_t) (amp & 0x0FFF);
+    }
+
+    select_REG(HSDACDAT);                 // HSDACDAT address
+    w32_REG(amplitude);
+}
+
+static void PowerMode_CutoffFrequencyControl (uint8_t bandwidth, uint8_t PowerMode) {
+    uint32_t reg = 0;
+
+    switch (bandwidth) {
+        case cutoff_auto :{
+            reg = (((uint32_t)(cutoff_auto)) & 0x0000000F) << 2;
+            break;
+        }
+        case cutoff_50k :{
+            reg = (((uint32_t)(cutoff_50k)) & 0x0000000F) << 2;
+            break;
+        }
+        case cutoff_100k :{
+            reg = (((uint32_t)(cutoff_100k)) & 0x0000000F) << 2;
+            break;
+        }
+        case cutoff_250k :{
+            reg = (((uint32_t)(cutoff_250k)) & 0x0000000F) << 2;
+            break;
+        }
+        default :{
+            reg = (((uint32_t)(cutoff_auto)) & 0x0000000F) << 2;
+            break;
+        }
+    }
+
+    switch (PowerMode) {
+        case LOW_PW_MODE :{
+            reg = reg | ((uint32_t)(LOW_PW_MODE) & 0x00000000F);
+            break;
+        }
+        case HIGH_PW_MODE :{
+            reg = reg | ((uint32_t)(HIGH_PW_MODE) & 0x00000000F);
+            break;
+        }
+        default :{
+            break;
+        }
+    }
+
+    select_REG(PMBW);
+    w32_REG(reg);
+}
+
+static int32_t cali_DAC_outputV(int32_t voltLV) {   // LPDAC output, voltLV = Vbias-Vzero
+    static int32_t vztemp, vscan;
+    static uint32_t vb, vz, vbcode, vzcode, DACOutCode = 0;
+
+    vztemp = (-0.45 * voltLV) + 249000000;
+    if (voltLV < 0) {
+        vztemp -= DAC12BIT_LSB;
+    }
+    vzcode = (vztemp - 40000000 + VZERO_LSB / 2) / VZERO_LSB;
+    vz = vzcode * VZERO_LSB + 40000000;
+
+    vb = voltLV + vz;
+    vbcode = ((vb - 40000000 + VBIAS_LSB / 2) / VBIAS_LSB);
+    DACOutCode = (0x0003FFFF & ((vzcode << 12) + vbcode));
+
+    select_REG(LPDACDAT0);
+    w32_REG(DACOutCode);
+
+    vscan = (int32_t)(vb - vz) / 200;
+//    InputNotify(NOTIFY_VOLT, voltLV);
+//    InputNotify(NOTIFY_CURRENT, vztemp);
+    return vscan;
+}
+
 #endif
@@ -0,0 +1,150 @@
+
+#ifndef ELITEEIS
+#define ELITEEIS
+
+static void eis_fscan(void)
+{
+    struct wm_eis_ctx_t *eis = (struct wm_eis_ctx_t *)wm_get();
+
+    if (vscanReset) {
+        eis->_in_reset_flag = true;
+
+        eis->_f1 = User2Freq(eis->_f1);
+        eis->_f2 = User2Freq(eis->_f2);
+        eis->_fmax = User2Freq(eis->_fmax);
+        eis->_fmin = User2Freq(eis->_fmin);
+
+        if (instru.directionInit == 1) {
+            eis->_direction_up         = true;
+        } else if (instru.directionInit == 0) {
+            eis->_direction_up         = false;
+        }
+
+        eis->_decades = CalcDecade(instru.fmin, instru.fmax);
+
+        instru.fset = eis->_f1;
+
+        vscanReset = false;
+    }
+
+    if (!vscanReset) {
+        if(eis->_direction_up) {
+            if(eis->_sweepIndex == 0){
+                if(eis->_decadeIndex < eis->_decades) {
+                    eis->_fd1 = eis->_f1 * TenPowerTable[eis->_decadeIndex];
+                    eis->_fd2 = eis->_f1 * TenPowerTable[eis->_decadeIndex + 1];
+                } else if (eis->_decadeIndex == eis->_decades) {
+                    eis->_fd1 = eis->_fd2;//eis->_f1 * TenPowerTable[decadeIndex];
+                    eis->_fd2 = eis->_fmax;
+                }
+            }
+
+            if(eis->_decadeIndex != 0 && eis->_sweepIndex == 0){
+                eis->_sweepIndex++;
+            }
+
+            if(instru.scale == 0) { // logarithm
+                if (eis->_ppd == 10) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable10[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 9){
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable9[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 8) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable8[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 7) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable7[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 6) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable6[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 5) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable5[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 4) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable4[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 3) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable3[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 2) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable2[eis->_sweepIndex] + 500)/ 1000;
+                }
+            }
+            else if (instru.scale == 1) { // linear
+                instru.fset = eis->_fd1 + eis->_sweepIndex * ((eis->_fd2 - eis->_fd1) / (eis->_ppd - 1));
+            }
+
+            if(instru.fset > eis->_fmax){
+                instru.fset = eis->_fmax;
+            }
+
+        } else { //reverse
+            if(eis->_sweepIndex == 0){
+                if(eis->_decadeIndex < eis->_decades){
+                    eis->_fd1 = eis->_f1 / TenPowerTable[eis->_decadeIndex];
+                    eis->_fd2 = eis->_f1 / TenPowerTable[eis->_decadeIndex + 1];
+                } else if (eis->_decadeIndex == eis->_decades){
+                    eis->_fd1 = eis->_fd2; //eis->_f1 / TenPowerTable[eis->_decadeIndex];
+                    eis->_fd2 = eis->_fmin;
+                }
+            }
+
+            if(eis->_decadeIndex != 0 && eis->_sweepIndex == 0){
+                eis->_sweepIndex++;
+            }
+
+            if(instru.scale == 0) { // logarithm
+                if (eis->_ppd == 10) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable10[9 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 9) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable9[8 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 8) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable8[7 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 7) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable7[6 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 6) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable6[5 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 5) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable5[4 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 4) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable4[3 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 3) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable3[2 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 2) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable2[1 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+            }
+            else if(instru.scale == 1) { // linear
+                instru.fset = eis->_fd1 - eis->_sweepIndex * ((eis->_fd1 - eis->_fd2) / (eis->_ppd - 1));
+            }
+
+            if(instru.fset < eis->_fmin){
+                instru.fset = eis->_fmin;
+            }
+        }
+        if (!gainChange_flag) {
+            if (++eis->_sweepIndex == eis->_ppd) {
+                eis->_sweepIndex = 0;
+                eis->_decadeIndex ++;
+            }
+        }
+    }
+
+
+    SetSamplingTime(instru.fset);
+
+    instru.sampleRate = 2000;
+}
+
+#endif
+
@@ -7,7 +7,6 @@ struct _CT{
    uint32_t SampleRate_counter;
    uint16_t StepTimeCounter;
    uint16_t NotifyCounter;
-    uint32_t StandByCounter;
 }CT = {0};

 // GPT counter
@@ -19,18 +18,13 @@ struct _GPT{
    uint32_t NotifyCounter;
    uint32_t VscanRateCounter;
    uint32_t LeadTimeCounter;
+    uint32_t DelayTimeCounter;
    uint32_t BatteryADCCounter;
    uint32_t BatteryCheckCounter;
    uint32_t GptimerMultiple;
+    uint32_t StiCounter;
 }GPT = {0};

-static void InitCT(){
-    CT.SampleRate_counter = 1;
-    CT.StepTimeCounter = 1;
-    CT.NotifyCounter = 1;
-    CT.StandByCounter = 0;
-}
-
 static void InitGPT(){
    GPT.GptimerCounter      = 0;
    GPT.GptimerCounter0     = 0;
@@ -39,7 +33,9 @@ static void InitGPT(){
    GPT.NotifyCounter       = 0;
    GPT.VscanRateCounter    = 0;
    GPT.LeadTimeCounter     = 0;
+    GPT.DelayTimeCounter    = 0;
    GPT.BatteryADCCounter   = 0;
    GPT.BatteryCheckCounter = 0;
+    GPT.StiCounter          = 0;
 }
 #endif
@@ -17,7 +17,7 @@ static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_In
 #define elite_gptimer_start() GPTimerCC26XX_start(gptimer_handle)
 #define elite_gptimer_stop() GPTimerCC26XX_stop(gptimer_handle)
 #define elite_gptimer_close() GPTimerCC26XX_close(gptimer_handle)
-#define CLOCK_FREQ 4800  // clock freq = 0.1 ms
+#define CLOCK_FREQ 4769  // clock freq = 0.1 ms(4800), Measured(4769)

 #define elite_gptimer_open()                                                                          \
    do {                                                                                              \
@@ -2,46 +2,18 @@
 #ifndef ELITEIV
 #define ELITEIV

-#define Vset INSTRUCTION.Vset
+#define Vset instru.Vset

-static void IV_Vscan(IVMode *IV){
-    if(vscanReset){
-        if(INSTRUCTION.directionInit == 1){
-            IV->_direction_up         = true;
-            IV->_current_direction_up = true;
-        }else if(INSTRUCTION.directionInit == 0){
-            IV->_direction_up         = false;
-            IV->_current_direction_up = false;
-        }
+static void vo_vscan(void)
+{
+    struct wm_vo_ctx_t *vo = (struct wm_vo_ctx_t *)wm_get();

-        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if(INSTRUCTION.step <= 10){
-            IV->_Vstep = INSTRUCTION.step * INSTRUCTION.VsetRate / 5;
-        }else{
-            IV->_Vstep = INSTRUCTION.step / 5 * INSTRUCTION.VsetRate;
-        }
-
-        Vset       = IV->_Vinit;
+    if (vscanReset) {
+        Vset = vo->_Vinit;
    }

-    if(!vscanReset){
-        if(IV->_current_direction_up){
-            if(Vset >= IV->_Vmax){
-                PeriodicEvent = false;
-                ModeLED(NO_EVENT);
-            }
-        }else{
-            if(Vset <= IV->_Vmin){
-                PeriodicEvent = false;
-                ModeLED(NO_EVENT);
-            }
-        }
-
-        if (IV->_current_direction_up){
-            Vset = Vset + IV->_Vstep * GPT.GptimerMultiple;
-        }else{
-            Vset = Vset - IV->_Vstep * GPT.GptimerMultiple;
-        }
+    if(!vscanReset) {
+        Vset = vo->_Vinit;
    }
 }

@@ -1,44 +1,14 @@
+#ifndef __INSTR_H__
+#define __INSTR_H__

-#ifndef ELITEINSTRUCTION
-#define ELITEINSTRUCTION
-
-/** Iin, Vin, Vout **/
-#define IIN_ADC         0x00
-#define VIN_ADC         0x01
-#define VOUT_DAC        0x02
-#define HIGH_Z          0x03
-
-/** ADC Iin gain level **/
-#define I_GAIN_3M       0x00    // largest gain
-#define I_GAIN_100K     0x01
-#define I_GAIN_3K       0x02
-#define I_GAIN_100R     0x03    // the least gain
-#define I_GAIN_AUTO     0x04
-
-/** ADC Vin gain level **/
-#define VIN_GAIN_1M     0x00
-#define VIN_GAIN_30K    0x01
-#define VIN_GAIN_1K     0x02
-#define VIN_GAIN_AUTO   0x03
-
-/** Vout gain level **/
-#define VOUT_GAIN_240K  0x00
-#define VOUT_GAIN_15K   0x01
-#define VOUT_GAIN_AUTO  0x02
-
-/* DAC reset parameter */
-#define DAC_ZERO    25000
-
-// Step time macro
-#define STEPTIME_HALF_SEC 5000
-#define STEPTIME_ONE_SEC 10000
-#define STEPTIME_TWO_SEC 20000
+#ifdef __cpulsplus
+extern "C" {
+#endif

 /*==============================
 ==== headstage instruction ====
 =============================*/
 struct HEADSTAGE_INSTRUCTION {
-
    uint8_t  chip_id;
    uint8_t  eliteFxn;

@@ -55,17 +25,38 @@ struct HEADSTAGE_INSTRUCTION {
    int32_t  Vmax;
    int32_t  Vmin;

+    /** EIS **/
+    uint32_t f1;
+    uint32_t f2;
+    uint32_t fmax;
+    uint32_t fmin;
+    uint32_t fset;
+    uint16_t dcbias;
+    uint16_t delay;
+    uint16_t acamp;
+    uint8_t  avgnum;
+    uint8_t  rtia;
+    uint16_t ppd;
+    uint8_t  scale;
+    int32_t  real;
+    int32_t  imag;
+    uint8_t  periodIndex;
+    uint32_t delayTime;
+    uint8_t  settingIndex;
+
+
    /** ADC parameter **/
-    uint8_t  sampleRateIndex;
+    uint8_t  notifyRateIndex;
    uint32_t sampleRate;
    uint8_t  VoViSwitch;
    uint8_t  AutoGainEnable;
    uint8_t  VinAutoGainEnable;
    uint8_t  VoutAutoGainEnable;
-    uint8_t  ADCGainLevel;
+    uint8_t  ADCGainLv;
+
     // voltage output gain
    uint16_t VoutGainLevel;
-    uint8_t  VinADCGainLevel;
+    uint8_t  VinADCGainLv;

    /** Notify parameter **/
    uint32_t notifyRate;
@@ -75,29 +66,150 @@ struct HEADSTAGE_INSTRUCTION {
    uint8_t  charge;
    int32_t  constantCurrent;
    int32_t  Currentmax;
-    int32_t  t1;
-    int32_t  t2;
-    int32_t  t3;
-    int32_t  t4;
-    int32_t  t5;
-    int32_t  v1;
-    int32_t  v2;
-    int32_t  v3;
-    int32_t  v4;
-    int32_t  v5;
-    int32_t  t1Time;
-    int32_t  t2Time;
-    int32_t  t3Time;
-    int32_t  t4Time;
-    int32_t  t5Time;
-    uint16_t loop;
+    int32_t  sti_v1;
+    int32_t  sti_v2;
+    int32_t  sti_v3;
+    int32_t  sti_v4;
+    int32_t  sti_v5;
+    int32_t  sti_v6;
+    int32_t  sti_v7;
+    int32_t  sti_t1;
+    int32_t  sti_t2;
+    int32_t  sti_t3;
+    int32_t  sti_t4;
+    int32_t  sti_t5;
+    int32_t  sti_t6;
+    int32_t  sti_t7;
+    uint16_t sti_cy;
+    uint16_t sti_loop;

    uint16_t StepTime;

    uint8_t AdcChannel;

-} INSTRUCTION = {0};
+    /* EIS DAC parameter */
+    uint8_t DAC_type;
+    uint16_t VAmpSet;          // DAC Voltage Amplitude

+    /* EIS ADC parameter */
+    uint8_t  HSTIAGainLv;
+    uint8_t  HSTIAAutoGainEnable;
+    uint8_t  LPTIAGainLv;
+    uint8_t  LPTIAAutoGainEnable;
+} instru = {0};
+
+/** Iin, Vin, Vout **/
+#define EIS_HSTIA           0x00
+#define EIS_LPTIA           0x01
+#define EIS_HSDAC           0x02
+#define EIS_LPDAC           0x03
+#define VOUT_DAC            0x04
+#define IIN_ADC             0x05
+#define VIN_ADC             0x06
+#define HIGH_Z              0x07
+
+/** ADC Iin gain level **/
+#define I_GAIN_3M           0x07    // largest gain
+#define I_GAIN_100K         0x08
+#define I_GAIN_3K           0x09
+#define I_GAIN_100R         0x0A    // the least gain
+#define I_GAIN_AUTO         0x04
+
+// EIS LPTIA Iin Gain Level //
+#define LPRTIA_512K         0x00
+#define LPRTIA_12K          0x01
+#define LPRTIA_4K           0x02
+#define LPRTIA_200R         0x03
+#define LPRTIA_GAIN_AUTO    0x04
+
+// EIS HSTIA Iin Gain Level
+#define HSRTIA_160K         0x00
+#define HSRTIA_20K          0x01
+#define HSRTIA_5K           0x02
+#define HSRTIA_200R         0x03
+#define HSRTIA_GAIN_AUTO    0x04
+
+/** ADC Vin gain level **/
+#define VIN_GAIN_1M         0x00
+#define VIN_GAIN_30K        0x01
+#define VIN_GAIN_1K         0x02
+#define VIN_GAIN_AUTO       0x03
+
+/** Vout gain level **/
+#define VOUT_GAIN_240K      0x00
+#define VOUT_GAIN_15K       0x01
+#define VOUT_GAIN_AUTO      0x02
+
+/* DAC reset parameter */
+#define DAC_ZERO            25000
+#define EIS_HSDAC_ZERO      0x0800
+
+// Step time macro
+#define STEPTIME_HALF_SEC   5000
+#define STEPTIME_ONE_SEC    10000
+#define STEPTIME_TWO_SEC    20000
+
+/* AVG Number */
+#define AVG2               0
+#define AVG4               1
+#define AVG8               2
+#define AVG16              3
+
+#define ADC1M6sps          0
+#define ADC800Ksps         1
+
+#define Sinc3OSR5          0
+#define Sinc3OSR4          1
+#define Sinc3OSR2          2
+
+#define Sinc2OSR22         0
+#define Sinc2OSR44         1
+#define Sinc2OSR89         2
+#define Sinc2OSR178        3
+#define Sinc2OSR267        4
+#define Sinc2OSR533        5
+#define Sinc2OSR640        6
+#define Sinc2OSR667        7
+#define Sinc2OSR800        8
+#define Sinc2OSR889        9
+#define Sinc2OSR1067      10
+#define Sinc2OSR1333      11
+
+#define DFTNUM4            0
+#define DFTNUM8            1
+#define DFTNUM16           2
+#define DFTNUM32           3
+#define DFTNUM64           4
+#define DFTNUM128          5
+#define DFTNUM256          6
+#define DFTNUM512          7
+#define DFTNUM1024         8
+#define DFTNUM2048         9
+#define DFTNUM4096        10
+#define DFTNUM8192        11
+#define DFTNUM16384       12
+
+#define AD5940_SYS_CLOCK    16000000
+#define Cutoff_Freq         37000000  // 210kHz
+
+///* LPTIA gain Level */
+//#define LPRTIA200R         1        //Max 3mA
+//#define LPRTIA4K           5        //Max 220uA
+//#define LPRTIA12K          9        //Max 74uA
+//#define LPRTIA512K        26        //Max 1.76uA
+
+static uint32_t HSRTIATable[4] = {160000, 20000, 5000, 200};
+
+/* HSTIA gain level (feedback R value) */
+#define RTIA200R            0x00        // 200R
+#define RTIA1k              0x01        // 1k
+#define RTIA5k              0x02        // 5k
+#define RTIA10k             0x03        // 10k
+#define RTIA20k             0x04        // 20k
+#define RTIA40k             0x05        // 40k
+#define RTIA80k             0x06        // 80k
+#define RTIA160k            0x07        // 160k
+#define RTIAopen            0x08        // RTIA is open
 /*********************************************************************
 * @fn      InitEliteInstruction
 *
@@ -108,50 +220,86 @@ struct HEADSTAGE_INSTRUCTION {
 * @return  None.
 */
 static void InitEliteInstruction(){
-    INSTRUCTION.chip_id         = 0;
-    INSTRUCTION.eliteFxn        = 0;         //default is a null event
-    INSTRUCTION.VsetRateIndex   = 0;
-    INSTRUCTION.VsetRate        = 2;
-    INSTRUCTION.Vset            = 0;
-    INSTRUCTION.VoltConstant    = DAC_ZERO; //DAC_ZERO is about 0V
-    INSTRUCTION.directionInit   = 1;        //0:reverse        1:forward
-    INSTRUCTION.step            = 0;
-    INSTRUCTION.Ve1             = DAC_ZERO;
-    INSTRUCTION.Ve2             = DAC_ZERO;
-    INSTRUCTION.Vinit           = 0;
-    INSTRUCTION.Vmax            = 0;
-    INSTRUCTION.Vmin            = 0;
-    INSTRUCTION.sampleRateIndex = 1;
-    INSTRUCTION.sampleRate      = 100;
-    INSTRUCTION.VoViSwitch      = 0x01;    //0:user see Vo     1: user see Vi
-    INSTRUCTION.AutoGainEnable  = 1;
-    INSTRUCTION.VinAutoGainEnable = 1;
-    INSTRUCTION.VoutAutoGainEnable = 1;
-    INSTRUCTION.ADCGainLevel    = I_GAIN_AUTO;
-    INSTRUCTION.VoutGainLevel   = VOUT_GAIN_AUTO;
-    INSTRUCTION.VinADCGainLevel = VIN_GAIN_AUTO;
-    INSTRUCTION.notifyRate      = STEPTIME_ONE_SEC;
-    INSTRUCTION.cycleNumber     = 1;
-    INSTRUCTION.charge          = 1;      //0:discharge        1:charge
-    INSTRUCTION.constantCurrent = 0;
-    INSTRUCTION.Currentmax      = 0;
-    INSTRUCTION.StepTime        = STEPTIME_ONE_SEC;
-    INSTRUCTION.AdcChannel      = 0;
-    INSTRUCTION.t1              = 0;
-    INSTRUCTION.t2              = 0;
-    INSTRUCTION.t3              = 0;
-    INSTRUCTION.t4              = 0;
-    INSTRUCTION.t5              = 0;
-    INSTRUCTION.t1Time          = 0;
-    INSTRUCTION.t2Time          = 0;
-    INSTRUCTION.t3Time          = 0;
-    INSTRUCTION.t4Time          = 0;
-    INSTRUCTION.t5Time          = 0;
-    INSTRUCTION.v1              = DAC_ZERO;
-    INSTRUCTION.v2              = DAC_ZERO;
-    INSTRUCTION.v3              = DAC_ZERO;
-    INSTRUCTION.v4              = DAC_ZERO;
-    INSTRUCTION.v5              = DAC_ZERO;
-    INSTRUCTION.loop            = 1;
+    instru.chip_id              = 0;
+    instru.eliteFxn             = 0;         //default is a null event
+    instru.VsetRateIndex        = 0;
+    instru.VsetRate             = 2;
+    instru.Vset                 = 0;
+    instru.VoltConstant         = DAC_ZERO; //DAC_ZERO is about 0V
+    instru.directionInit        = 1;        //0:reverse        1:forward
+    instru.step                 = 0;
+    instru.Ve1                  = DAC_ZERO;
+    instru.Ve2                  = DAC_ZERO;
+    instru.Vinit                = 0;
+    instru.Vmax                 = 0;
+    instru.Vmin                 = 0;
+    instru.notifyRateIndex      = 100;
+    instru.sampleRate           = 15;
+    instru.VoViSwitch           = 0x01;    //0:user see Vo     1: user see Vi
+    instru.AutoGainEnable       = 1;
+    instru.VinAutoGainEnable    = 1;
+    instru.VoutAutoGainEnable   = 1;
+    instru.ADCGainLv            = I_GAIN_AUTO;
+    instru.VoutGainLevel        = VOUT_GAIN_AUTO;
+    instru.VinADCGainLv         = VIN_GAIN_AUTO;
+    instru.notifyRate           = STEPTIME_ONE_SEC;
+    instru.cycleNumber          = 1;
+    instru.charge               = 1;      //0:discharge        1:charge
+    instru.constantCurrent      = 0;
+    instru.Currentmax           = 0;
+    instru.StepTime             = STEPTIME_ONE_SEC;
+    instru.AdcChannel           = 0;
+
+    //EIS
+    instru.f1                   = 0;
+    instru.f2                   = 0;
+    instru.fset                 = 0;
+    instru.fmax                 = 0;
+    instru.fmin                 = 0;
+    instru.delay                = 0;
+    instru.scale                = 0;
+    instru.avgnum               = 0;
+    instru.dcbias               = 0;
+    instru.acamp                = 0;
+    instru.rtia                 = 0;
+    instru.ppd                  = 1;
+    instru.periodIndex          = 0;
+    instru.delayTime            = 0;
+    instru.settingIndex         = 0;
+
+
+    //pulse mode
+    instru.sti_t1          = 0;
+    instru.sti_t2          = 0;
+    instru.sti_t3          = 0;
+    instru.sti_t4          = 0;
+    instru.sti_t5          = 0;
+    instru.sti_t6          = 0;
+    instru.sti_t7          = 0;
+    instru.sti_v1          = DAC_ZERO;
+    instru.sti_v2          = DAC_ZERO;
+    instru.sti_v3          = DAC_ZERO;
+    instru.sti_v4          = DAC_ZERO;
+    instru.sti_v5          = DAC_ZERO;
+    instru.sti_v6          = DAC_ZERO;
+    instru.sti_v7          = DAC_ZERO;
+    instru.sti_loop        = 1;
+    instru.sti_cy          = 0;
+
+    // EIS DAC
+    instru.VAmpSet              = EIS_HSDAC_ZERO;
+    instru.DAC_type             = EIS_HSDAC;
+
+    // EIS ADC
+    instru.HSTIAGainLv            = 0;
+    instru.HSTIAAutoGainEnable    = 1;
+    instru.LPTIAGainLv            = 0;
+    instru.LPTIAAutoGainEnable    = 1;
+}
+
+#ifdef __cpulsplus
 }
 #endif
+#endif
+
+
@@ -8,25 +8,27 @@ static bool TurnOnElite(uint8_t key) {
    if (key == 0) {
        // press 1 sec, power on LED, read bat power
        if (TurnOnCounter >= CLOCK_ONE_SECOND) {
-            headstage_battery_volt();
-            uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
-                           ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-            if( bat < 768 && bat > 20){
-                PIN15_setOutputValue(enable_5v, 0);
-                return false;
-            }else{
-                PIN15_setOutputValue(enable_5v, 1);  // enable 5V
-                TurnOn10V();
+//            headstage_battery_volt();
+//            uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
+//                           ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+//            if( bat < 768 && bat > 20){
+//                PIN_setOutputValue(pin_handle, enable_5v, 0);
+//                return false;
+//            }else{
+                PIN_setOutputValue(pin_handle, enable_5v, 1);  // enable 5V
+                Elite_SPI_init();
+                // TurnOn10V();
                ModeLED(BT_WAIT);
+                AD5940_init();
                return true;
-            }
+//            }
        } else {
            TurnOnCounter++;
            return false;
        }
    } else {
        TurnOnCounter = 0;
-        PIN15_setOutputValue(enable_5v, 0);  // disable 5V
+        PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
        return false;
    }
 }
@@ -46,18 +48,18 @@ static void EliteKeyPress(uint8_t key) {
        // press 3~4 sec, shutdown 2650
        else if (ShutDownCounter > (CLOCK_ONE_SECOND*3) ) {
            LED_color(DARKLED, 0xFF, 0xFF, 0x00);
-            PIN15_setOutputValue(enable_5v, 0);  // disable 5V
+            PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
        }
        ShutDownCounter ++;
    } else {
-        if (OriginEliteFxn == INSTRUCTION.eliteFxn) {  // old function == currunt instruction
+        if (OriginEliteFxn == instru.eliteFxn) {  // old function == currunt instruction
            if (ShutDownCounter != 0) {
                // dark LED
                checkFlafLED();
                ShutDownCounter = 0;
            }
        } else {  // old function != currunt instruction
-            OriginEliteFxn = INSTRUCTION.eliteFxn;
+            OriginEliteFxn = instru.eliteFxn;
            if (ShutDownCounter != 0) {
                ShutDownCounter = 0;
            }
@@ -68,7 +70,7 @@ static void EliteKeyPress(uint8_t key) {

 static void TurnOn10V() {
    If10Von = true;
-    PIN15_setOutputValue(enable_10v, 1);
+    PIN_setOutputValue(pin_handle, enable_10v, 1);
    CPUdelay(8000);
 }

@@ -19,21 +19,20 @@ 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, 0x50, 0x00, 0x00);
+            LED_color(DARKLED, 0xFF, 0x00, 0x00);
            break;
        }
        case COLOR_ORANGE: {
-            LED_color(DARKLED, 0x50, 0x58, 0x09);
+            LED_color(DARKLED, 0xFF, 0x58, 0x09);
            break;
        }
        case COLOR_YELLOW: {
-            LED_color(LIGHTLED, 0x50, 0x80, 0x00);
+            LED_color(LIGHTLED, 0xFF, 0x80, 0x00);
            break;
        }
        case COLOR_GREEN: {
@@ -53,21 +52,42 @@ static void Elite_led_color(uint16_t color){
            break;
        }
        case COLOR_MAGENTA: {
-            LED_color(DARKLED, 0x50, 0x00, 0x80);
+            LED_color(DARKLED, 0xFF, 0x00, 0x80);
            break;
        }
        case COLOR_PURPLE: {
-            LED_color(DARKLED, 0x50, 0x00, 0xFF);
+            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
            break;
        }
        case COLOR_WHITE: {
-            LED_color(DARKLED, 0x50, 0xFF, 0xFF);
+            LED_color(DARKLED, 0xCA, 0xFF, 0xFF);
            break;
        }
        case COLOR_BLACK: {
            LED_color(0x00, 0x00, 0x00, 0x00);
            break;
        }
+        //dark LED
+        case COLOR_YELLOW_DARK: {
+            LED_color(DARKLED, 0xFF, 0x80, 0x00);
+            break;
+        }
+        case COLOR_GREEN_DARK: {
+            LED_color(DARKLED, 0x00, 0x33, 0x00);
+            break;
+        }
+        case COLOR_BLUE_DARK: {
+            LED_color(DARKLED, 0x00, 0x00, 0x33);
+            break;
+        }
+        case COLOR_CYAN_DARK: {
+            LED_color(DARKLED, 0x00, 0x10, 0x10);
+            break;
+        }
+        case COLOR_PURPLE_DARK: {
+            LED_color(DARKLED, 0x55, 0x00, 0x55);
+            break;
+        }
        default: {
            break;
        }
@@ -114,7 +134,8 @@ static void ModeLED(uint16_t modeStatus) {
    }
 }

-static void checkFlafLED() {
+static void checkFlafLED()
+{
    if(btWaitLedFlag == 1){
        ModeLED(BT_WAIT);
    }
@@ -132,49 +153,35 @@ static void checkFlafLED() {
    }
 }

-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 PULSE_MODE:{
-//        Elite_led_color(COLOR_YELLOW);
-        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);
-        }
+static void WorkModeLED()
+{
+    switch (instru.eliteFxn) {
+        case CURVE_EIS:
+        case CURVE_EIS_CV:
+            WORKLED();
+            break;
+
+        case CURVE_CALI_ADC:
+            if (instru.AdcChannel == IIN_ADC) {
+                Elite_led_color(COLOR_RED);
+            } else if (instru.AdcChannel == VIN_ADC) {
+                Elite_led_color(COLOR_ORANGE);
+            } else if (instru.AdcChannel == VOUT_DAC) {
+                Elite_led_color(COLOR_BLUE);
+            }else if (instru.AdcChannel == EIS_HSDAC) {
+                Elite_led_color(COLOR_PURPLE_DARK);
+            } else if (instru.AdcChannel == EIS_HSTIA) {
+                Elite_led_color(COLOR_WHITE);
+            } else if (instru.AdcChannel == EIS_LPTIA) {
+                Elite_led_color(COLOR_RED);
+            } else if (instru.AdcChannel == EIS_LPDAC) {
+                Elite_led_color(COLOR_BLUE);
+            }
+            break;
+
+        default:
+            break;

-        break;
-    }
-//    case VIS_RST: {
-//        LEDPowerON();
-//        break;
-//    }
-    default: {
-        WORKLED();
-        break;
-    }
    }
 }

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

 // ****************** New Notify Format ******************************** //
 /*
@@ -89,12 +90,12 @@ static uint16_t NotifyCycleNumber  = 0;
 static void SendNotify() {
    initDATBuf();

-    not_buf[0] = INSTRUCTION.chip_id;
+    not_buf[0] = instru.chip_id;

    for (int i = 0; i < 4; i++) {
-        not_buf[i + 1] = NotifyCurrent[i];
-        not_buf[i + 5] = NotifyVolt[i];
-        not_buf[i + 9] = NotifyImpedance[i];
+        not_buf[i + 1] = NotifyCurrent[i]; // 1 2 3 4
+        not_buf[i + 5] = NotifyVolt[i]; // 5 6 7 8
+        not_buf[i + 9] = NotifyImpedance[i]; //9 10 11 12
    }

    // 1 Timestamp = 32 usec;  31 Timestamp ~= 1 msec
@@ -108,7 +109,9 @@ static void SendNotify() {
    not_buf[17] = (NotifyCycleNumber >> 8) & 0xff;
    not_buf[18] = NotifyCycleNumber & 0xff;

-    for (int i = 19; i < BLE_DAT_BUFF_SIZE; i++){
+    not_buf[19] = (finishMode << 7) & 0x80 | instru.ADCGainLv & 0x0F;
+
+    for (int i = 20; i < BLE_DAT_BUFF_SIZE; i++){
        not_buf[i] = 0;
    }

@@ -136,6 +139,7 @@ static void initCISBuf(){
 static void initRawDataBuf(){
    not_time_stamp    = 0;
    NotifyCycleNumber = 0;
+    finishMode        = 0;

    for (int i = 0; i < 4; i++){
        NotifyCurrent[i]   = 0;
@@ -148,7 +152,7 @@ static void FlushNotify(){
    initRawDataBuf();
    initDATBuf();

-    not_buf[0] = INSTRUCTION.chip_id;
+    not_buf[0] = instru.chip_id;

    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
 }
@@ -1,345 +0,0 @@
-#ifndef ELITEPULSE
-#define ELITEPULSE
-
-#define Vset INSTRUCTION.Vset
-
-//static uint16_t CV3Curve(CV3Mode *CV3){
-//    static uint16_t DACOutCode;
-//    static int32_t Vin;
-//    static int32_t Vout;
-//    static int32_t DeltaVout;
-//
-//    Vin = CV3->_measureVin * 200;//[5nV]
-//    if(DACReset){
-//        Vout = Vset + Vin;
-//        DACReset = false;
-//    }else{
-//        DeltaVout = Vset - (Vout - Vin);
-//        Vout = Vout + DeltaVout;
-//    }
-//
-//    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-//    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.DacVoutAgcLevel, INSTRUCTION.VoltConstant);
-//
-//    int32_t RealV2;
-//    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
-//    InputNotify(NOTIFY_VOLT, RealV2);
-//
-//    int32_t RealV;
-//    RealV = (int32_t)(Vout / 200);//[1uV]
-//    InputNotify(NOTIFY_IMPEDANCE, RealV);
-//
-//    DAC_outputV(DACOutCode);
-//
-//     return DACOutCode;
-//}
-
-//static void PULSE_Vscan(PULSEMode *PULSE){
-//    static uint16_t lastVolt;
-//    if (vscanReset) {
-//        lastVolt = INSTRUCTION.VoltConstant;
-//        if (PULSE->_tflag == 0) {
-//            PULSE->_tflag = PULSE->_t2;
-//            PULSE->_vflag = PULSE->_v2;
-//        }
-//        else {
-//            PULSE->_tflag = PULSE->_t1;
-//            PULSE->_vflag = PULSE->_v1;
-//        }
-//        INSTRUCTION.VoltConstant = PULSE->_vflag;
-//        if(lastVolt != INSTRUCTION.VoltConstant){
-//            lastVolt = INSTRUCTION.VoltConstant;
-//            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-//        }
-//        vscanReset = false;
-//    }
-//
-//    if (!vscanReset) {
-//        //vscan counter
-//        if (GPT.VscanRateCounter >= PULSE->_tflag) {
-//           GPT.VscanRateCounter -= PULSE->_tflag; //To get right time
-//        }
-//
-//        if (PULSE->_loop > 0 && PULSE->_cycleNumber > 0) {
-//            if (PULSE->_tflag == PULSE->_t1) {
-//                    PULSE->_tflag = PULSE->_t2;
-//                    PULSE->_vflag = PULSE->_v2;
-//            }
-//            else if (PULSE->_tflag == PULSE->_t2) {
-//                    PULSE->_tflag = PULSE->_t3;
-//                    PULSE->_vflag = PULSE->_v3;
-//            }
-//            else if (PULSE->_tflag == PULSE->_t3) {
-//                PULSE->_cycleNumber -- ;
-//                if (PULSE->_cycleNumber == 0) {
-//                    PULSE->_tflag = PULSE->_t4;
-//                    PULSE->_vflag = PULSE->_v4;
-//                }
-//                else {
-//                    PULSE->_tflag = PULSE->_t2;
-//                    PULSE->_vflag = PULSE->_v2;
-//                }
-//            }
-//            INSTRUCTION.VoltConstant = PULSE->_vflag;
-//            if(lastVolt != INSTRUCTION.VoltConstant){
-//                lastVolt = INSTRUCTION.VoltConstant;
-//                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-//            }
-//        }
-//        else if (PULSE->_loop > 0 && PULSE->_cycleNumber <= 0) {
-//            if (PULSE->_tflag == PULSE->_t1) {
-//                PULSE->_tflag = PULSE->_t4;
-//                PULSE->_vflag = PULSE->_v4;
-//            }
-//            else if (PULSE->_tflag == PULSE->_t4) {
-//                PULSE->_loop -- ;
-//                if (PULSE->_loop > 0) {
-//                    PULSE->_cycleNumber = INSTRUCTION.cycleNumber;
-//                    PULSE->_tflag = PULSE->_t2;
-//                    PULSE->_vflag = PULSE->_v2;
-//                }
-//                else {
-//                    PULSE->_tflag = PULSE->_t5;
-//                    PULSE->_vflag = PULSE->_v5;
-//                }
-//            }
-//            INSTRUCTION.VoltConstant = PULSE->_vflag;
-//            if(lastVolt != INSTRUCTION.VoltConstant){
-//                lastVolt = INSTRUCTION.VoltConstant;
-//                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-//            }
-//        }
-//        else if (PULSE->_loop <= 0) {
-//            if (PULSE->_tflag == PULSE->_t5) {
-//                PeriodicEvent = false;
-//                ELITE15_SPI_CLOSE();
-//                ModeLED(NO_EVENT);
-//            }
-//        }
-//        InputNotify(NOTIFY_IMPEDANCE, PULSE->_vflag);
-//    }
-////    int32_t RealV;
-////    RealV = (int32_t)(Vset / 500);//[1uV]
-////    InputNotify(NOTIFY_VOLT, RealV);
-//}
-
-static void PULSE_Vscan(PULSEMode *PULSE)
-{
-    static uint16_t lastVolt;
-
-    if (vscanReset) {
-        if (PULSE->_tflag == 0) {
-            PULSE->_tflag = PULSE->_t2;
-            PULSE->_vflag = PULSE->_v2;
-        }
-        else {
-            PULSE->_tflag = PULSE->_t1;
-            PULSE->_vflag = PULSE->_v1;
-        }
-
-        lastVolt = INSTRUCTION.VoltConstant;
-        INSTRUCTION.VoltConstant = PULSE->_vflag;
-
-        if (lastVolt != INSTRUCTION.VoltConstant) {
-            lastVolt = INSTRUCTION.VoltConstant;
-            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-        }
-
-        vscanReset = false;
-    }
-
-    if (!vscanReset) {
-        if (GPT.VscanRateCounter >= PULSE->_tflag) {
-           GPT.VscanRateCounter -= PULSE->_tflag; //To get right time
-        }
-
-        if (PULSE->_loop > 0 && PULSE->_cycleNumber > 0) {
-            if (PULSE->_tflag == PULSE->_t1) {
-                PULSE->_tflag = PULSE->_t2;
-                PULSE->_vflag = PULSE->_v2;
-            }
-            else if (PULSE->_tflag == PULSE->_t2) {
-                PULSE->_tflag = PULSE->_t3;
-                PULSE->_vflag = PULSE->_v3;
-            }
-            else if (PULSE->_tflag == PULSE->_t3) {
-                PULSE->_cycleNumber -- ;
-                if (PULSE->_cycleNumber == 0) {
-                    PULSE->_tflag = PULSE->_t4;
-                    PULSE->_vflag = PULSE->_v4;
-                }
-                else {
-                    PULSE->_tflag = PULSE->_t2;
-                    PULSE->_vflag = PULSE->_v2;
-                }
-            }
-
-            INSTRUCTION.VoltConstant = PULSE->_vflag;
-            if (lastVolt != INSTRUCTION.VoltConstant) {
-                lastVolt = INSTRUCTION.VoltConstant;
-                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-            }
-        }
-        else if (PULSE->_loop > 0 && PULSE->_cycleNumber <= 0) {
-            if (PULSE->_tflag == PULSE->_t1) {
-                PULSE->_tflag = PULSE->_t4;
-                PULSE->_vflag = PULSE->_v4;
-            }
-            else if (PULSE->_tflag == PULSE->_t4) {
-                PULSE->_loop -- ;
-                if (PULSE->_loop > 0) {
-                    PULSE->_cycleNumber = INSTRUCTION.cycleNumber;
-                    PULSE->_tflag = PULSE->_t2;
-                    PULSE->_vflag = PULSE->_v2;
-                }
-                else {
-                    PULSE->_tflag = PULSE->_t5;
-                    PULSE->_vflag = PULSE->_v5;
-                }
-            }
-
-            INSTRUCTION.VoltConstant = PULSE->_vflag;
-            if (lastVolt != INSTRUCTION.VoltConstant) {
-                lastVolt = INSTRUCTION.VoltConstant;
-                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-            }
-        }
-        else if (PULSE->_loop <= 0) {
-            if (PULSE->_tflag == PULSE->_t5) {
-                PeriodicEvent = false;
-                ModeLED(NO_EVENT);
-            }
-        }
-
-        InputNotify(NOTIFY_IMPEDANCE, PULSE->_vflag);
-    }
-}
-
-static void test_Vscan(PULSEMode *PULSE){
-    static uint16_t lastVolt;
-    static uint8_t testV;
-    if(firstTimeReset){
-        firstTimeReset = false;
-        lastVolt = INSTRUCTION.VoltConstant;
-        if (PULSE->_tTime == 0) {
-            PULSE->_tflag = PULSE->_t2;
-            PULSE->_vflag = PULSE->_v2;
-            PULSE->_tTime = PULSE->_t2Time;
-            testV = 1;
-        }
-        else {
-            PULSE->_tflag = PULSE->_t1;
-            PULSE->_vflag = PULSE->_v1;
-            PULSE->_tTime = PULSE->_t1Time;
-            testV = 2;
-        }
-        INSTRUCTION.VoltConstant = PULSE->_vflag;
-        if(lastVolt != INSTRUCTION.VoltConstant){
-            lastVolt = INSTRUCTION.VoltConstant;
-            DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, INSTRUCTION.VoltConstant));
-            DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, INSTRUCTION.VoltConstant));
-        }
-        InputNotify(NOTIFY_IMPEDANCE, testV);
-    }
-    else if(!firstTimeReset){
-        if(GPT.VscanRateCounter >= PULSE->_tTime){
-            GPT.VscanRateCounter -= PULSE->_tTime; //To get right time
-
-            vscan_flag = true;
-            if(vscan_flag){
-
-                if (PULSE->_loop > 0 && PULSE->_cycleNumber > 0) {
-                    if (PULSE->_tflag == PULSE->_t1) {
-                            PULSE->_tflag = PULSE->_t2;
-                            PULSE->_vflag = PULSE->_v2;
-                            PULSE->_tTime = PULSE->_t2Time;
-                            testV = 3;
-                    }
-                    else if (PULSE->_tflag == PULSE->_t2) {
-                            PULSE->_tflag = PULSE->_t3;
-                            PULSE->_vflag = PULSE->_v3;
-                            PULSE->_tTime = PULSE->_t3Time;
-                            testV = 4;
-                    }
-                    else if (PULSE->_tflag == PULSE->_t3) {
-                        PULSE->_cycleNumber -- ;
-                        if (PULSE->_cycleNumber == 0) {
-                            PULSE->_tflag = PULSE->_t4;
-                            PULSE->_vflag = PULSE->_v4;
-                            PULSE->_tTime = PULSE->_t4Time;
-                            if (PULSE->_t4Time == 0) {
-                                PULSE->_tflag = PULSE->_t2;
-                                PULSE->_vflag = PULSE->_v2;
-                                PULSE->_tTime = PULSE->_t2Time;
-                                PULSE->_loop--;
-                                PULSE->_cycleNumber = INSTRUCTION.cycleNumber;
-                                if (PULSE->_loop == 0) {
-                                    PULSE->_tflag = PULSE->_t5;
-                                    PULSE->_vflag = PULSE->_v5;
-                                    PULSE->_tTime = PULSE->_t5Time;
-                                    if (PULSE->_t5Time == 0) {
-                                        PeriodicEvent = false;
-                                        ModeLED(NO_EVENT);
-                                    }
-                                }
-
-                            }
-                            testV = 5;
-                        }
-                        else {
-                            PULSE->_tflag = PULSE->_t2;
-                            PULSE->_vflag = PULSE->_v2;
-                            PULSE->_tTime = PULSE->_t2Time;
-                            testV = 6;
-                        }
-                    }
-                    INSTRUCTION.VoltConstant = PULSE->_vflag;
-                    if(lastVolt != INSTRUCTION.VoltConstant){
-                        lastVolt = INSTRUCTION.VoltConstant;
-                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-                    }
-                }
-                else if (PULSE->_loop > 0 && PULSE->_cycleNumber <= 0) {
-                    if (PULSE->_tflag == PULSE->_t4) {
-                        PULSE->_loop -- ;
-                        if (PULSE->_loop > 0) {
-                            PULSE->_cycleNumber = INSTRUCTION.cycleNumber;
-                            PULSE->_tflag = PULSE->_t2;
-                            PULSE->_vflag = PULSE->_v2;
-                            PULSE->_tTime = PULSE->_t2Time;
-                            testV = 8;
-                        }
-                        else {
-                            PULSE->_tflag = PULSE->_t5;
-                            PULSE->_vflag = PULSE->_v5;
-                            PULSE->_tTime = PULSE->_t5Time;
-                            testV = 9;
-                        }
-                    }
-                    INSTRUCTION.VoltConstant = PULSE->_vflag;
-                    if(lastVolt != INSTRUCTION.VoltConstant){
-                        lastVolt = INSTRUCTION.VoltConstant;
-                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-                    }
-                }
-                else if (PULSE->_loop <= 0) {
-                    if (PULSE->_tflag == PULSE->_t5) {
-                        testV = 10;
-                        PeriodicEvent = false;
-                        ModeLED(NO_EVENT);
-                    }
-                }
-                InputNotify(NOTIFY_IMPEDANCE, testV);
-                vscan_flag = false;
-            }
-        }
-    }
-
-
-}
-#endif
@@ -3,24 +3,27 @@
 #define ELITERESET

 static void reset() {
-    ModeLED(NO_EVENT);
-    InitEliteFlag();
-    InitFlag();
-    InitCT();
+    mode_init = true;
+    megaStiEnable = false;
+    PeriodicEvent = false;     // is there an PeriodicEvent?
+    Free_Work_Mode = true;      // Free(WorkModeData)
+    InitPeriodicEvent = true;      // need to create a WorkModeData?
+
    InitGPT();
-
-    PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 0 => open high_z mode
-
-    VinADCGainControl(VIN_GAIN_AUTO);
-    IinADCGainControl(I_GAIN_AUTO);
-
-    INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
-    VoutGainControl(INSTRUCTION.VoutGainLevel);
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
-
    initINSBuf();
    initDATBuf();

+    AD5940_HWReset();
+    AD5940_init();
+//    AD5940_sftreset();
+
+//    PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
+
+    HSTIAGainCtrl(HSRTIA_200R);
+    LPTIAGainCtrl(LPRTIA_200R);
+    HSDAC_GainControl(0x00);
+    HSDAC_output(0x0800);
+
    for (int i = 0; i < SPI_LED_SIZE; i++) {
        spi_LEDtxbuf[i] = 0;
        spi_LEDrxbuf[i] = 0;
@@ -36,24 +39,28 @@ static void reset() {
        spi_ADC_rxbuf[i] = 0;
    }

+    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
+    ModeLED(NO_EVENT);
    CPUdelay(1600);
 }

 static void Eliteinterrupt() {
-    ModeLED(NO_EVENT);
-    InitFlag();
-    InitEliteFlag();
-    InitCT();
+    mode_init = true;
+    megaStiEnable = false;
+    PeriodicEvent = false;     // is there an PeriodicEvent?
+    Free_Work_Mode = true;      // Free(WorkModeData)
+    InitPeriodicEvent = true;      // need to create a WorkModeData?
+
    InitGPT();
-
-    PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 0 => open high_z mode
-
-    INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
-    VoutGainControl(INSTRUCTION.VoutGainLevel);
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
-
    initINSBuf();
    initDATBuf();
+    AD5940_HWReset();
+    AD5940_init();
+
+//    HSTIAGainCtrl(HSRTIA_200R);
+//    LPTIAGainCtrl(LPRTIA_200R);
+//    HSDAC_GainControl(0x00);
+//    HSDAC_output(0x0800);

    for (int i = 0; i < SPI_LED_SIZE; i++) {
        spi_LEDtxbuf[i] = 0;
@@ -70,6 +77,8 @@ static void Eliteinterrupt() {
        spi_ADC_rxbuf[i] = 0;
    }

+    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
+    ModeLED(NO_EVENT);
    CPUdelay(8000);
 }
 #endif
@@ -16,7 +16,7 @@

 /* application use SPI parameters and buffers */
 #define SPI_LED_SIZE 28
-#define SPI_DAC_SIZE 3
+#define SPI_DAC_SIZE 6
 #define SPI_ADC_SIZE 4

 static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
@@ -27,6 +27,8 @@ static uint8_t spi_rxbuf[SPI_DAC_SIZE]    = {0};

 static uint8_t spi_ADC_txbuf[SPI_ADC_SIZE] = {0};
 static uint8_t spi_ADC_rxbuf[SPI_ADC_SIZE] = {0};
+//
+//static uint32_t SeqCmdBuff;

 /* system use SPI parameters */
 static SPI_Handle      spiHandle0 = NULL;  // SPI0  = LED
@@ -42,7 +44,7 @@ static void ELITE15_SPI_CLOSE();
 static void Elite_SPI_init(){
    SPI_init();
    SPI_Params_init(&spiParams0);
-    spiParams0.bitRate     = 2000;  // 12k
+    spiParams0.bitRate     = 2000;  // 2k
    spiParams0.mode        = SPI_MASTER;
    spiParams0.dataSize    = 16;
    spiParams0.frameFormat = SPI_POL0_PHA1;
@@ -52,7 +54,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
 }

@@ -65,9 +68,7 @@ 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) {
-//    PIN15_setOutputValue(ADC_CS, 0);  // ADC_CS LOW
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, D6, 0); // ADC_CS LOW
+    PIN_setOutputValue(pin_handle, AD_CS, 0);      // CS_ADC

    ADC_DAC_transaction.count = length;
    ADC_DAC_transaction.txBuf = spi_txbuf;
@@ -75,38 +76,33 @@ static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {

    SPI_transfer(spiHandle1, &ADC_DAC_transaction);

-    PIN_setOutputValue(pin_handle, D6, 1); // ADC_CS HOGH
-    update_latch_status (ADC_CS, 1);
-//    PIN15_setOutputValue(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) {
-//    PIN15_setOutputValue(DAC_CS, 0);            // DAC_CS LOW
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, D7, 0); // DAC_CS LOW
-
    ADC_DAC_transaction.count = length;
    ADC_DAC_transaction.txBuf = spi_txbuf;
    ADC_DAC_transaction.rxBuf = spi_rxbuf;

    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, D7, 1); // DAC_CS HOGH
-    update_latch_status (DAC_CS, 1);
-//    PIN15_setOutputValue(DAC_CS, 1);            // DAC_CS HIGH
 }

 static void ELITE15_SPI_HOLD() {
    Elite_SPI_init();
-
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, LOAD1, 0);
-    PIN_setOutputValue(pin_handle, LOAD2, 0);
+//    #ifdef ELITE_PIN_1_5_RE
+//    PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);   // ADC_CS
+//    PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);   // DAC_CS
+//    PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);   // update HIGH_Z_MODE
+//    #endif
+//
+//    PIN_setOutputValue(pin_handle, LOAD0, 1);
+//    PIN_setOutputValue(pin_handle, LOAD1, 0);
+//    PIN_setOutputValue(pin_handle, LOAD2, 0);
 }
 static void ELITE15_SPI_CLOSE() {
-    PIN_setOutputValue(pin_handle, LOAD0, 0);
-    PIN_setOutputValue(pin_handle, LOAD1, 0);
-    PIN_setOutputValue(pin_handle, LOAD2, 0);
+//    PIN_setOutputValue(pin_handle, LOAD0, 0);
+//    PIN_setOutputValue(pin_handle, LOAD1, 0);
+//    PIN_setOutputValue(pin_handle, LOAD2, 0);

    SPI_close(spiHandle0);
    SPI_close(spiHandle1);
@@ -114,19 +110,163 @@ static void ELITE15_SPI_CLOSE() {

 /* Elite1.5 Calibration SPI */
 static void CAL_ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-//    PIN15_setOutputValue(ADC_CS, 0);  // ADC_CS LOW
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, D6, 0); // ADC_CS LOW
-
    ADC_DAC_transaction.count = length;
    ADC_DAC_transaction.txBuf = spi_txbuf;
    ADC_DAC_transaction.rxBuf = spi_rxbuf;

    SPI_transfer(spiHandle1, &ADC_DAC_transaction);

-    PIN_setOutputValue(pin_handle, D6, 1); // ADC_CS HOGH
-    update_latch_status (ADC_CS, 1);
-//    PIN15_setOutputValue(ADC_CS, 1);  // ADC_CS HIGH
+    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
 }

+static void CAL_LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
+    LED_transaction.count = length;
+    LED_transaction.txBuf = spi_txbuf;
+    LED_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle0, &LED_transaction);
+}
+
+
+
+#ifdef ELITE_VERSION_EIS
+/* define SPI command */
+// datasheet page 98
+#define SPICMD_SETADDR  0x20
+#define SPICMD_WRITEREG 0x2D
+#define SPICMD_READREG  0x6D
+
+//define REG
+#define LPDACCON0       0x2128
+#define LPDACSW0        0x2124
+#define LPDACDAT0       0x2120
+#define LPREFBUFCON     0x2050
+#define SWMUX           0x235C
+#define LPTIASW0        0x20E4
+#define SWCON           0x200C
+#define HSDACCON        0x2010
+#define HSDACDAT        0x2048
+#define LPTIACON0       0x20EC
+#define HSTIACON        0x20FC
+#define AFECON          0x2000
+#define DSWFULLCON      0x2150
+#define NSWFULLCON      0x2154
+#define PSWFULLCON      0x2158
+#define TSWFULLCON      0x215C
+#define WGFCW           0x2030
+#define WGPHASE         0x2034
+#define WGOFFSET        0x2038
+#define WGAMPLITUDE     0x203C
+#define WGCON           0x2014
+#define DE0RESCON       0x20F8
+#define ADCCON          0x21A8
+#define DFTCON          0x20D0
+#define ADCFILTERCON    0x2044
+#define PMBW            0x22F0
+#define CLKSEL          0x0414
+#define CLKCON0         0x0408
+#define CLKCON0KEY      0x0420
+#define HSOSCCON        0x20BC
+#define ADCBUFCON       0x238C
+#define HSRTIACON       0x20F0
+#define ADCDAT          0x2074
+#define DFTREAL         0x2078
+#define DFTIMAG         0x207C
+
+static void select_REG(uint16_t addr){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+//    CPUdelay(16000);
+
+    spi_DACtxbuf[0] = SPICMD_SETADDR;
+    spi_DACtxbuf[1] = (uint8_t)((addr & 0xFF00) >> 8);
+    spi_DACtxbuf[2] = (uint8_t)(addr & 0x00FF);
+
+    ADC_DAC_transaction.count = 3;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+//    CPUdelay(16000);
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static void w16_REG(uint16_t data){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_WRITEREG;
+    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF00) >> 8);
+    spi_DACtxbuf[2] = (uint8_t)(data & 0x00FF);
+
+    ADC_DAC_transaction.count = 3;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static int16_t r16_REG(){
+    int16_t ret;
+
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_READREG;
+    spi_DACtxbuf[1] = 0x00;
+    spi_DACtxbuf[2] = 0x00;
+    spi_DACtxbuf[3] = 0x00;
+
+    ADC_DAC_transaction.count = 4;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    ret = (int16_t)spi_rxbuf[2] << 8 |    \
+          (int16_t)spi_rxbuf[3];
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+
+    return ret;
+}
+
+static void w32_REG(uint32_t data){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_WRITEREG;
+    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF000000) >> 24);
+    spi_DACtxbuf[2] = (uint8_t)((data & 0x00FF0000) >> 16);
+    spi_DACtxbuf[3] = (uint8_t)((data & 0x0000FF00) >> 8);
+    spi_DACtxbuf[4] = (uint8_t)(data & 0x000000FF);
+
+    ADC_DAC_transaction.count = 5;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static int32_t r32_REG(){
+    int32_t ret;
+
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_READREG;
+    spi_DACtxbuf[1] = 0x00;
+    spi_DACtxbuf[2] = 0x00;
+    spi_DACtxbuf[3] = 0x00;
+    spi_DACtxbuf[4] = 0x00;
+    spi_DACtxbuf[5] = 0x00;
+
+    ADC_DAC_transaction.count = 6;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    ret = (int32_t)spi_rxbuf[2] << 24 |    \
+          (int32_t)spi_rxbuf[3] << 16 |    \
+          (int32_t)spi_rxbuf[4] << 8 |     \
+          (int32_t)spi_rxbuf[5];
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+
+    return ret;
+}
+
+#endif // ELITE_EIS
+
 #endif // ELITE_SPI
@@ -1,21 +0,0 @@
-
-#ifndef ELITEZT
-#define ELITEZT
-
-// output a certain voltage e.g. 2v
-// and measure the input voltage
-// => calculate the resister
-// change the output voltage step
-// => get a R-T curve (with resolution = 1 sample/volt step )
-
-static void ZT_Vscan(RTMode *RT){
-    if(vscanReset){
-        Vset = ((int32_t)(INSTRUCTION.VoltConstant) - 25000) * 4 * 10000; //[5nV]
-        OneWayVoltScan();
-    }
-
-    if(!vscanReset){
-
-    }
-}
-#endif
@@ -6,6 +6,65 @@
 #include <Board.h>
 #include <ti/drivers/PIN.h>

+//#define ELITE_PIN_1_5
+//#define ELITE_PIN_1_5_RE
+#define ELITE_PIN_EIS
+
+#ifdef ELITE_PIN_EIS
+/* SPI Board */
+#define Board_SPI0_MISO                 PIN_UNASSIGNED
+#define Board_SPI0_MOSI                 IOID_4
+#define Board_SPI0_CLK                  IOID_3
+#define Board_SPI0_CS                   PIN_UNASSIGNED
+
+#define Board_SPI1_MISO                 IOID_1
+#define Board_SPI1_MOSI                 IOID_6
+#define Board_SPI1_CLK                  IOID_5
+#define Board_SPI1_CS                   PIN_UNASSIGNED
+
+#define AD_CS                           IOID_10
+
+//#define SD_MISO                         IOID_11
+//#define SD_CS                           IOID_8
+//#define SD_CLK                          IOID_7
+//#define SD_MOSI                         IOID_13
+
+#define switch_on                       IOID_14
+#define enable_5v                       IOID_9
+#define AD_reset                        IOID_13
+#define enable_10v                      PIN_UNASSIGNED
+#define HIGH_Z_MODE                     PIN_UNASSIGNED
+#define shutdown_6994                   PIN_UNASSIGNED
+
+#define Turnon_I_LARGE                  PIN_UNASSIGNED
+#define Turnon_I_MID                    PIN_UNASSIGNED
+#define Turnon_I_SMALL                  PIN_UNASSIGNED
+
+#define Turnon_V_MID                    PIN_UNASSIGNED
+#define Turnon_V_SMALL                  PIN_UNASSIGNED
+
+#define Turon_VOUT_SMALL                PIN_UNASSIGNED
+
+
+PIN_Handle       pin_handle;
+static PIN_State ZM_rst;
+
+const PIN_Config BLE_IO[] = {
+    enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,// 5V_enable
+    AD_reset | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,
+    AD_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    PIN_TERMINATE
+};
+
+static void remove_elite_pin() {
+    PIN_close(pin_handle);
+    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+}
+#endif
+
+
+#ifdef ELITE_PIN_1_5_RE
 /* SPI Board */
 #define Board_SPI0_MISO                 PIN_UNASSIGNED
 #define Board_SPI0_MOSI                 D1
@@ -36,15 +95,24 @@
 #define ADC_DAC_SPI_CLK                 LOAD0, D2
 #define LED_MOSI                        LOAD0, D1
 #define LED_CLK                         LOAD0, D0
-#define MEM_HOLD                        LOAD0, D4
 #define MEM_CS                          LOAD0, D5

+#ifdef ELITE_PIN_1_5
+#define MEM_HOLD                        LOAD0, D4
+#define HIGH_Z_MODE                     LOAD2, D5
+#endif
+#ifdef ELITE_PIN_1_5_RE
+#define MEM_HOLD                        LOAD1, D0
+#define HIGH_Z_MODE                     LOAD0, D4
+#endif
+
 #define Turnon_I_MID                    LOAD2, D0
 #define Turnon_I_SMALL                  LOAD2, D4
 #define Turnon_I_LARGE                  LOAD2, D1
 #define Turnon_V_SMALL                  LOAD2, D2
 #define Turnon_V_MID                    LOAD2, D3
 #define Turon_VOUT_SMALL                LOAD2, D7
+#define shutdown_6994                   LOAD2, D6

 //#define Turnon10K                       Turnon_I_MID
 //#define Turnon200R                      Turnon_I_LARGE
@@ -55,19 +123,10 @@
 #define Board_I2C0_SDA0                 PIN_UNASSIGNED
 #endif

-#define shutdown_6994                   LOAD2, D6
 #define switch_on                       IOID_14
-#define HIGH_Z_MODE                     LOAD2, D5
 #define enable_10v                      LOAD1, D5
 #define enable_5v                       LOAD1, D6

-/* Megafly control */
-#define MEGA_G_LED                      LOAD1, D0
-#define MEGA_R_LED                      LOAD1, D1
-#define MEGA_VAL_0                      LOAD1, D2
-#define MEGA_VAL_1                      LOAD1, D3
-#define MEGA_TRIG                       IOID_0
-
 PIN_Handle       pin_handle;
 static PIN_State ZM_rst;

@@ -86,7 +145,6 @@ const PIN_Config BLE_IO[] = {
    LOAD2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,

    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,                                    // to sense switch
-    MEGA_TRIG | PIN_GPIO_OUTPUT_DIS | PIN_INPUT_EN | PIN_PULLDOWN,

    PIN_TERMINATE
 };
@@ -107,14 +165,11 @@ static void add_elite_pin() {
 //    }
 }

-static void megafly_trig_callback(PIN_Handle handle, PIN_Id pinId);
-
 static void remove_elite_pin() {
    PIN_close(pin_handle);
    pin_handle = PIN_open(&ZM_rst, BLE_IO);
-    PIN_registerIntCb(pin_handle, megafly_trig_callback);
-    PIN_setInterrupt(pin_handle, MEGA_TRIG | PIN_IRQ_NEGEDGE);
 }
+#endif

 /*!
 *  @def    BOOSTXL_CC2650MA_SPIName
@@ -42,22 +42,18 @@ static void headstage_battery_volt(){

 static void EliteADCBattery(){
    static uint8_t ADCSwitch = 0;
-    if(INSTRUCTION.eliteFxn == ADC_TEST){
+    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;
-    }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;
-        }
    }
 }

@@ -85,7 +81,7 @@ static void measureBat(){
    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
                   ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
    if( bat < 768 && bat > 20){
-        PIN15_setOutputValue(enable_5v, 0);
+        PIN_setOutputValue(pin_handle, enable_5v, 0);
    }
 }

@@ -12,39 +12,45 @@
 #define VIS_STI                         0xC0
 #define VIS_FUH                         0x90
 #define VIS_INT                         0x60
-#define VIS_SHIFT_200K                  0xA0
-#define VIS_SHIFT_10K                   0xE0
-#define VIS_SHIFT_200R                  0x80
 #define VIS_DEVICE_SHINY                0x10
 #define VIS_SHINY_DIS                   0x20
-#define VIS_CC_ZERO                     0x40

 // RIS (real instruction)
-#define IV_CURVE                        0x10
-#define CV_CURVE                        0x20
-#define VOLT_OUTPUT                     0x30
-#define ZT_CURVE                        0x40
-#define VT_CURVE                        0x50
-#define IT_CURVE                        0x60
-#define SET_SAMPLE_RATE                 0x70
-#define SET_ADC_DAC_GAIN                    0x80
-#define DIFFERENTIAL_PULSE_VOLTAMMETRY  0xA0
-#define SQUARE_WAVE_VOLTAMMETRY         0xB0
-#define CYCLIC_VOLTAMMETRY              0xC0
-#define CONSTANT_CURRENT                0xD0
-#define CYCLE_CONSTANT_CURRENT          0xF0
-#define HIGH_CYCLE_CYCLIC_VOLTAMMETRY   0x01
-#define LINEAR_SWEEP_VOLTAMMETRY        0x02
-#define CONSTANT_VSCAN                  0x03
-#define ADC_TEST                        0x91
-#define CALI_DAC_MODE                   0x93
-#define CALI_ADC_MODE                   0x92
-#define PULSE_MODE                      0x94
+enum all_mode_e {
+
+    CURVE_EIS                      =  0xD1, //Should Change to 0xD1
+    CURVE_EIS_CV                   =  0xD2,
+
+    CURVE_CALI_ADC                 =  0xF1, // Cali ADC - test                 //0x92,
+//    CURVE_CALI_ADC                 =  0x92, // Cali ADC - test                 //0x92,
+
+    SET_SAMPLE_RATE                =  0xE0,                                    //0x70,
+//    SET_SAMPLE_RATE                =  0x70,                                    //0x70,
+    SET_ADC_DAC_GAIN               =  0xE1,                                    //0x80,
+//    SET_ADC_DAC_GAIN               =  0x80,                                    //0x80,
+};

 // CIS (control instruction)
 #define CIS_VERSION                     0x40
 #define CIS_VOLT                        0x10
 #define CIS_LED_TEST                    0x70
+#define CIS_CALI                        0x30
+#define CIS_CALI2                       0x90
+
+#define CTL_WRT                         0x20
+#define CTL_RD                          0x21
+#define CTL_RD_DFTR                     0x78
+#define CTL_RD_DFTI                     0x7C
+#define CTL_WRT_WGAMPL                  0x3C
+#define CTL_WRT_TRAP                    0x2c
+#define CTL_RESET                       0x11
+#define CTL_IMPEDANCE                   0x12
+#define CTL_CV3                         0x13
+#define cali_LPTIA_setGain              0x29
+#define cali_LPDAC_voltout              0x39
+#define cali_HSDAC_amp                  0x49
+#define cali_HSTIA_setGain              0x59
+#define cali_HSDAC_DC                   0x69

 // mode parameter
 #define STEP_TO_VSETRATE(step)   step2VsetRate(step)
@@ -53,9 +59,23 @@
 #define VDIRECTION(v1,v2)        ((v1 > v2)  ?  0 : 1)
 #define AFTER_READ_I             0
 #define AFTER_READ_V             1
-#define ReadADCVolt(x)           ((x==0)? ReadADCVout(spi_ADC_rxbuf) : ReadADCVin(spi_ADC_rxbuf))
 #define PARA_1                   0x01
 #define PARA_2                   0x02
+#define PARA_3                   0x03
+#define PARA_4                   0x04
+#define PARA_5                   0x05
+#define PARA_6                   0x06
+#define PARA_7                   0x07
+#define PARA_8                   0x08
+#define PARA_9                   0x09
+#define PARA_10                  0x0A
+#define PARA_11                  0x0B
+#define PARA_12                  0x0C
+#define PARA_13                  0x0D
+#define PARA_14                  0x0E
+#define PARA_15                  0x0F
+#define PARA_16                  0x10
+#define PARA_17                  0x11

 //Elite LED
 #define COLOR_BLACK              0x00
@@ -69,6 +89,12 @@
 #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)
@@ -81,5 +107,16 @@
 #define WORKING                  0x04
 #define POST_WORK                0x05

+/* EIS define */
+// cutoff frequency of the filter in AD5940
+#define cutoff_auto     0x00
+#define cutoff_50k      0x01
+#define cutoff_100k     0x02
+#define cutoff_250k     0x03

+#define LOW_PW_MODE     0x00
+#define HIGH_PW_MODE    0x01
+
+
+#define VALUE_ZERO_TO_ONE(_v)    (_v == 0) ? 1 : _v
 #endif
@@ -2,11 +2,11 @@
 #ifndef VERSION_DATE
 #define VERSION_DATE

-#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
+#define VERSION_DATE_YEAR      21
+#define VERSION_DATE_MONTH     8
+#define VERSION_DATE_DAY       30
+#define VERSION_DATE_HOUR      15
+#define VERSION_DATE_MINUTE    47

 // this is NOT the version hash !!
 // it's the last version hash
@@ -0,0 +1,197 @@
+#include "eis_cali_table.h"
+
+/* SendCaliValue
+*  2~ : cutoff frequency
+*  4~5 : voltage amplitude
+*  2 : phase parameter a
+*  3 : phase parameter b
+*  4 : HSRTIA200R
+*  5 : HSRTIA5K
+*  6 : HSRTIA20K
+*  7 : HSRTIA160K
+*/
+
+static void SendCaliValue0(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    cali_buf[index++] = (uint8_t) (CaliTable.CutoffFreq >> 24) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.CutoffFreq >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.CutoffFreq >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.CutoffFreq & 0xFF;
+
+//    cali_buf[index++] = (uint8_t) CaliTable.Temp & 0xFF;
+
+//    cali_buf[index++] = (uint8_t) CaliTable.HSRTIA200R & 0xFF;
+//
+//    cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA5K >> 8) & 0xFF;
+//    cali_buf[index++] = (uint8_t) CaliTable.HSRTIA5K & 0xFF;
+
+//    cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA20K >> 8) & 0xFF;
+//    cali_buf[index++] = (uint8_t) CaliTable.HSRTIA20K & 0xFF;
+//
+//    cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA160K >> 24) & 0xFF;
+//    cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA160K >> 16) & 0xFF;
+//    cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA160K >> 8) & 0xFF;
+//    cali_buf[index++] = (uint8_t) CaliTable.HSRTIA160K & 0xFF;
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf);
+}
+
+static void SendCaliValue1(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t filter_number1 = 2, index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    for (int i = 0; i < filter_number1 ; i++) {
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 24)& 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 16) & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 8)& 0xFF;
+        cali_buf[index++] = (uint8_t) CaliTable.Ft[i].PhaseParaA & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 24)& 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 16) & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 8) & 0xFF;
+        cali_buf[index++] = (uint8_t) CaliTable.Ft[i].PhaseParaB & 0xFF;
+    }
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf);
+}
+
+static void SendCaliValue2(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t filter_number1 = 2, filter_number2 = 4, index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    for (int i = filter_number1; i < filter_number2 ; i++) {
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 24)& 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 16) & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 8)& 0xFF;
+        cali_buf[index++] = (uint8_t) CaliTable.Ft[i].PhaseParaA & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 24)& 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 16) & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 8) & 0xFF;
+        cali_buf[index++] = (uint8_t) CaliTable.Ft[i].PhaseParaB & 0xFF;
+    }
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
+}
+
+static void SendCaliValue3(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_a >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_a >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_a >> 8)& 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0].HSRTIA_a & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_b >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_b >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_b >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0].HSRTIA_b & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_c >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_c >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_c >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0].HSRTIA_c & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0].HSRTIA_d & 0xFF;
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
+}
+
+static void SendCaliValue4(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_a >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_a >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_a >> 8)& 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[1].HSRTIA_a & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_b >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_b >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_b >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[1].HSRTIA_b & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_c >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_c >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_c >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[1].HSRTIA_c & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[1].HSRTIA_d & 0xFF;
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
+}
+
+static void SendCaliValue5(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_a >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_a >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_a >> 8)& 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[2].HSRTIA_a & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_b >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_b >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_b >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[2].HSRTIA_b & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_c >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_c >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_c >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[2].HSRTIA_c & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[2].HSRTIA_d & 0xFF;
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
+}
+
+static void SendCaliValue6(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_a >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_a >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_a >> 8)& 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[3].HSRTIA_a & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_b >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_b >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_b >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[3].HSRTIA_b & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_c >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_c >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_c >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[3].HSRTIA_c & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_d >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_d >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_d >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[3].HSRTIA_d & 0xFF;
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
+}
@@ -0,0 +1,448 @@
+#ifndef EIS_CALI_TABLE
+#define EIS_CALI_TABLE
+
+#define BOARD_TEST
+
+typedef struct _SingleFilterCali{
+    uint32_t  PhaseParaA;
+    int32_t   PhaseParaB;
+}SingleFilterCali;
+
+typedef struct _SingleGainLvCali{
+    long long HSTIA_coeff;
+    long long HSTIA_offset;
+    long long LPTIA_coeff;
+    long long LPTIA_offset;
+    uint32_t  HSRTIA_a;
+    int32_t   HSRTIA_b;
+    int32_t   HSRTIA_c;
+    uint32_t  HSRTIA_d;
+    uint16_t  HSRTIA_root;
+}SingleGainLvCali;
+
+struct _CaliTable{
+    //CIS to Controller
+    char DeviceName[25];
+    uint32_t CutoffFreq;
+    int32_t DAC_offset;
+    SingleFilterCali Ft[7];
+
+    //EIS
+    long long HSDAC_coeff;
+    long long HSDAC_offset;
+    long long LPDAC_coeff;
+    long long LPDAC_offset;
+    long long HSAMP_coeff;
+    long long HSAMP_offset;
+    SingleGainLvCali Lv[4];
+
+}CaliTable =
+
+#ifdef BOARD_TEST
+{
+    //CIS to Controller
+    .DeviceName = "BOARD_TEST",
+    .CutoffFreq = 250000,
+    .DAC_offset = 0, // * 200 [5n]
+
+    // hsrtia160k
+    .Lv[0].HSRTIA_a = 0, // 1e8
+    .Lv[0].HSRTIA_b = 1, // 1e8
+    .Lv[0].HSRTIA_c = 0, // 1e4
+    .Lv[0].HSRTIA_d = 0,
+
+    // hsrtia20k
+    .Lv[1].HSRTIA_a = 0, // 1e8
+    .Lv[1].HSRTIA_b = 1, // 1e8
+    .Lv[1].HSRTIA_c = 0, // 1e4
+    .Lv[1].HSRTIA_d = 0,
+
+    // hsrtia5k
+    .Lv[2].HSRTIA_a = 0, //1e8
+    .Lv[2].HSRTIA_b = 1, // 1e8
+    .Lv[2].HSRTIA_c = 0, // 1e4
+    .Lv[2].HSRTIA_d = 0,
+
+    // hsrtia200r a*exp(bx) + c*exp(dx)
+    .Lv[3].HSRTIA_a = 1,
+    .Lv[3].HSRTIA_b = 0, // 1e6
+    .Lv[3].HSRTIA_c = 1, // 1e5
+    .Lv[3].HSRTIA_d = 0, // 1e6
+
+    .Ft[0].PhaseParaA = 15,
+    .Ft[0].PhaseParaB = -9000,
+    .Ft[1].PhaseParaA = 15,
+    .Ft[1].PhaseParaB = -9000,
+    .Ft[2].PhaseParaA = 15,
+    .Ft[2].PhaseParaB = -9000,
+    .Ft[3].PhaseParaA = 15,
+    .Ft[3].PhaseParaB = -9000,
+
+    //only for EIS 1e10
+    .HSAMP_coeff = 9703610267,
+    .HSAMP_offset = -12815281473,
+
+    .LPDAC_coeff = 10000464997,
+    .LPDAC_offset = -75871559054,
+
+    .HSDAC_coeff = 25196655311242,
+    .HSDAC_offset = 19932276246516,
+
+    .Lv[0].HSTIA_coeff = 1,
+    .Lv[0].HSTIA_offset = 0,
+    .Lv[1].HSTIA_coeff = 1,
+    .Lv[1].HSTIA_offset = 0,
+    .Lv[2].HSTIA_coeff = 1,
+    .Lv[2].HSTIA_offset = 0,
+    .Lv[3].HSTIA_coeff = 1,
+    .Lv[3].HSTIA_offset = 0,
+
+    .Lv[0].LPTIA_coeff = 1,
+    .Lv[0].LPTIA_offset = 0,
+    .Lv[1].LPTIA_coeff = 1,
+    .Lv[1].LPTIA_offset = 0,
+    .Lv[2].LPTIA_coeff = 1,
+    .Lv[2].LPTIA_offset = 0,
+    .Lv[3].LPTIA_coeff = 1,
+    .Lv[3].LPTIA_offset = 0
+};
+
+#elif defined(BOARD_A4_DA_32_D4_EF_CF)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_EF_CF",
+    .CutoffFreq = 271000,
+    .DAC_offset = -19250, // * 200 [5n]
+
+    // hsrtia160k
+    .Lv[0].HSRTIA_a = 0, // 1e8
+    .Lv[0].HSRTIA_b = 8005810, // 1e8
+    .Lv[0].HSRTIA_c = -171109, // 1e4
+    .Lv[0].HSRTIA_d = 0,
+
+    // hsrtia20k
+    .Lv[1].HSRTIA_a = 357, // 1e8
+    .Lv[1].HSRTIA_b = 57813915, // 1e8
+    .Lv[1].HSRTIA_c = 1543941, // 1e4
+    .Lv[1].HSRTIA_d = 0,
+
+    // hsrtia5k
+    .Lv[2].HSRTIA_a = 15417, //1e8
+    .Lv[2].HSRTIA_b = -62720427, // 1e8
+    .Lv[2].HSRTIA_c = 225612029, // 1e4
+    .Lv[2].HSRTIA_d = 0,
+
+    // hsrtia200r a*exp(bx) + c*exp(dx)
+    .Lv[3].HSRTIA_a = 20450,
+    .Lv[3].HSRTIA_b = 1611, // 1e6
+    .Lv[3].HSRTIA_c = 4069, // 1e5
+    .Lv[3].HSRTIA_d = 7499, // 1e6
+
+    .Ft[0].PhaseParaA = 141808, //1e10
+    .Ft[0].PhaseParaB = -88304901, // 10000 Hz //1e6
+    .Ft[1].PhaseParaA = 338333,
+    .Ft[1].PhaseParaB = -89912194, // 100 Hz
+    .Ft[2].PhaseParaA = 20541858,
+    .Ft[2].PhaseParaB = -90000573, // 10 Hz
+    .Ft[3].PhaseParaA = 100923290,
+    .Ft[3].PhaseParaB = -90023337, // 0.01 Hz
+
+    //only for EIS 1e10
+    .HSAMP_coeff = 9703610267,
+    .HSAMP_offset = -12815281473,
+
+    .LPDAC_coeff = 10000464997,
+    .LPDAC_offset = -75871559054,
+
+    .HSDAC_coeff = 25196655311242,
+    .HSDAC_offset = 19932276246516,
+
+    .Lv[0].HSTIA_coeff = -1062,
+    .Lv[0].HSTIA_offset = 67755568664846,
+    .Lv[1].HSTIA_coeff = 23,
+    .Lv[1].HSTIA_offset = 101767408723,
+    .Lv[2].HSTIA_coeff = -31,
+    .Lv[2].HSTIA_offset = 2037756,
+    .Lv[3].HSTIA_coeff = -66623,
+    .Lv[3].HSTIA_offset = 44299692,
+
+    .Lv[0].LPTIA_coeff = 1,
+    .Lv[0].LPTIA_offset = 0,
+    .Lv[1].LPTIA_coeff = 1,
+    .Lv[1].LPTIA_offset = 0,
+    .Lv[2].LPTIA_coeff = 1,
+    .Lv[2].LPTIA_offset = 0,
+    .Lv[3].LPTIA_coeff = 1,
+    .Lv[3].LPTIA_offset = 0
+};
+
+#elif defined(BOARD_A4_DA_32_D4_ED_BF)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_ED_BF",
+    .CutoffFreq = 262000,
+    .DAC_offset = -19250, // * 200 [5n]
+
+    // hsrtia160k
+    .Lv[0].HSRTIA_a = 0, // 1e8
+    .Lv[0].HSRTIA_b = 8053030, // 1e8
+    .Lv[0].HSRTIA_c = -217364, // 1e4
+    .Lv[0].HSRTIA_d = 0,
+
+    // hsrtia20k
+    .Lv[1].HSRTIA_a = 350, // 1e8
+    .Lv[1].HSRTIA_b = 58929847, // 1e8
+    .Lv[1].HSRTIA_c = 1111691, // 1e4
+    .Lv[1].HSRTIA_d = 0,
+
+    // hsrtia5k
+    .Lv[2].HSRTIA_a = 14842, //1e8
+    .Lv[2].HSRTIA_b = -38831335, // 1e8
+    .Lv[2].HSRTIA_c = 207680613, // 1e4
+    .Lv[2].HSRTIA_d = 0,
+
+    // hsrtia200r a*exp(bx) + c*exp(dx)
+    .Lv[3].HSRTIA_a = 20160,
+    .Lv[3].HSRTIA_b = 1609, // 1e6
+    .Lv[3].HSRTIA_c = 1085, // 1e5
+    .Lv[3].HSRTIA_d = 7883, // 1e6
+
+    .Ft[0].PhaseParaA = 144194, //1e10
+    .Ft[0].PhaseParaB = -88614855, // 10000 Hz //1e6
+    .Ft[1].PhaseParaA = 342333,
+    .Ft[1].PhaseParaB = -89906917, // 100 Hz
+    .Ft[2].PhaseParaA = 20561112,
+    .Ft[2].PhaseParaB = -90006375, // 10 Hz
+    .Ft[3].PhaseParaA = 100878445,
+    .Ft[3].PhaseParaB = -90013670, // 0.01 Hz
+
+    //only for EIS 1e10
+    .HSAMP_coeff = 9703610267,
+    .HSAMP_offset = -12815281473,
+
+    .LPDAC_coeff = 10000464997,
+    .LPDAC_offset = -75871559054,
+
+    .HSDAC_coeff = 25196655311242,
+    .HSDAC_offset = 19932276246516,
+
+    .Lv[0].HSTIA_coeff = -1062,
+    .Lv[0].HSTIA_offset = 67755568664846,
+    .Lv[1].HSTIA_coeff = 23,
+    .Lv[1].HSTIA_offset = 101767408723,
+    .Lv[2].HSTIA_coeff = -31,
+    .Lv[2].HSTIA_offset = 2037756,
+    .Lv[3].HSTIA_coeff = -66623,
+    .Lv[3].HSTIA_offset = 44299692,
+
+    .Lv[0].LPTIA_coeff = 1,
+    .Lv[0].LPTIA_offset = 0,
+    .Lv[1].LPTIA_coeff = 1,
+    .Lv[1].LPTIA_offset = 0,
+    .Lv[2].LPTIA_coeff = 1,
+    .Lv[2].LPTIA_offset = 0,
+    .Lv[3].LPTIA_coeff = 1,
+    .Lv[3].LPTIA_offset = 0
+};
+
+#elif defined(BOARD_A4_DA_32_D4_F0_59)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_F0_59",
+    .CutoffFreq = 265000,
+    .DAC_offset = -19250, // * 200 [5n]
+
+    // hsrtia160k
+    .Lv[0].HSRTIA_a = 0, // 1e8
+    .Lv[0].HSRTIA_b = 7982677, // 1e8
+    .Lv[0].HSRTIA_c = -220834, // 1e4
+    .Lv[0].HSRTIA_d = 0,
+
+    // hsrtia20k
+    .Lv[1].HSRTIA_a = 386, // 1e8
+    .Lv[1].HSRTIA_b = 56887373, // 1e8
+    .Lv[1].HSRTIA_c = 2369927, // 1e4
+    .Lv[1].HSRTIA_d = 0,
+
+    // hsrtia5k
+    .Lv[2].HSRTIA_a = 14859, //1e8
+    .Lv[2].HSRTIA_b = -43698725, // 1e8
+    .Lv[2].HSRTIA_c = 210542432, // 1e4
+    .Lv[2].HSRTIA_d = 0,
+
+    // hsrtia200r a*exp(bx) + c*exp(dx)
+    .Lv[3].HSRTIA_a = 19600,
+    .Lv[3].HSRTIA_b = 1637, // 1e6
+    .Lv[3].HSRTIA_c = 659, // 1e5
+    .Lv[3].HSRTIA_d = 8167, // 1e6
+
+    .Ft[0].PhaseParaA = 146177, //1e10
+    .Ft[0].PhaseParaB = -88604805, // 10000 Hz //1e6
+    .Ft[1].PhaseParaA = 342195,
+    .Ft[1].PhaseParaB = -89912214, // 100 Hz
+    .Ft[2].PhaseParaA = 20559398,
+    .Ft[2].PhaseParaB = -90006634, // 10 Hz
+    .Ft[3].PhaseParaA = 100415851,
+    .Ft[3].PhaseParaB = -89982615, // 0.01 Hz
+
+    //only for EIS 1e10
+    .HSAMP_coeff = 9703610267,
+    .HSAMP_offset = -12815281473,
+
+    .LPDAC_coeff = 10000464997,
+    .LPDAC_offset = -75871559054,
+
+    .HSDAC_coeff = 25196655311242,
+    .HSDAC_offset = 19932276246516,
+
+    .Lv[0].HSTIA_coeff = -1062,
+    .Lv[0].HSTIA_offset = 67755568664846,
+    .Lv[1].HSTIA_coeff = 23,
+    .Lv[1].HSTIA_offset = 101767408723,
+    .Lv[2].HSTIA_coeff = -31,
+    .Lv[2].HSTIA_offset = 2037756,
+    .Lv[3].HSTIA_coeff = -66623,
+    .Lv[3].HSTIA_offset = 44299692,
+
+    .Lv[0].LPTIA_coeff = 1,
+    .Lv[0].LPTIA_offset = 0,
+    .Lv[1].LPTIA_coeff = 1,
+    .Lv[1].LPTIA_offset = 0,
+    .Lv[2].LPTIA_coeff = 1,
+    .Lv[2].LPTIA_offset = 0,
+    .Lv[3].LPTIA_coeff = 1,
+    .Lv[3].LPTIA_offset = 0
+};
+
+#elif defined(BOARD_A4_DA_32_D4_ED_91)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_ED_91",
+    .CutoffFreq = 265550,
+    .DAC_offset = -19250,
+
+    // hsrtia160k
+    .Lv[0].HSRTIA_a = 0, // 1e8
+    .Lv[0].HSRTIA_b = 7983901, // 1e8
+    .Lv[0].HSRTIA_c = -217990, // 1e4
+    .Lv[0].HSRTIA_d = 0,
+
+    // hsrtia20k
+    .Lv[1].HSRTIA_a = 338, // 1e8
+    .Lv[1].HSRTIA_b = 58576686, // 1e8
+    .Lv[1].HSRTIA_c = 1238326, // 1e4
+    .Lv[1].HSRTIA_d = 0,
+
+    // hsrtia5k
+    .Lv[2].HSRTIA_a = 14554, //1e8
+    .Lv[2].HSRTIA_b = -36919197, // 1e8
+    .Lv[2].HSRTIA_c = 205602111, // 1e4
+    .Lv[2].HSRTIA_d = 0,
+
+    // hsrtia200r a*exp(bx) + c*exp(dx)
+    .Lv[3].HSRTIA_a = 19890,
+    .Lv[3].HSRTIA_b = 1620, // 1e6
+    .Lv[3].HSRTIA_c = 893, // 1e5
+    .Lv[3].HSRTIA_d = 7970, // 1e6
+
+    .Ft[0].PhaseParaA = 146478, //1e10
+    .Ft[0].PhaseParaB = -88583908, // 10000 Hz //1e6
+    .Ft[1].PhaseParaA = 342341,
+    .Ft[1].PhaseParaB = -89891632, // 100 Hz
+    .Ft[2].PhaseParaA = 20576527,
+    .Ft[2].PhaseParaB = -90009194, // 10 Hz
+    .Ft[3].PhaseParaA = 100884331,
+    .Ft[3].PhaseParaB = -90024204, // 0.01 Hz
+
+    //only for EIS 1e10
+    .HSAMP_coeff = 9703610267,
+    .HSAMP_offset = -12815281473,
+
+    .LPDAC_coeff = 10000464997,
+    .LPDAC_offset = -75871559054,
+
+    .HSDAC_coeff = 25196655311242,
+    .HSDAC_offset = 19932276246516,
+
+    .Lv[0].HSTIA_coeff = -1062,
+    .Lv[0].HSTIA_offset = 67755568664846,
+    .Lv[1].HSTIA_coeff = 23,
+    .Lv[1].HSTIA_offset = 101767408723,
+    .Lv[2].HSTIA_coeff = -31,
+    .Lv[2].HSTIA_offset = 2037756,
+    .Lv[3].HSTIA_coeff = -66623,
+    .Lv[3].HSTIA_offset = 44299692,
+
+    .Lv[0].LPTIA_coeff = 1,
+    .Lv[0].LPTIA_offset = 0,
+    .Lv[1].LPTIA_coeff = 1,
+    .Lv[1].LPTIA_offset = 0,
+    .Lv[2].LPTIA_coeff = 1,
+    .Lv[2].LPTIA_offset = 0,
+    .Lv[3].LPTIA_coeff = 1,
+    .Lv[3].LPTIA_offset = 0
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E7_D2)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_E7_D2",
+    .CutoffFreq = 275000,
+
+    .Ft[0].PhaseParaA = 155530, //1e10
+    .Ft[0].PhaseParaB = -87720229, // 1e6
+    .Ft[1].PhaseParaA = 341776,
+    .Ft[1].PhaseParaB = -89919625,
+    .Ft[2].PhaseParaA = 20542303,
+    .Ft[2].PhaseParaB = -89997668,
+    .Ft[3].PhaseParaA = 100310791,
+    .Ft[3].PhaseParaB = -89988818,
+
+
+    //only for EIS 1e8
+    .HSAMP_coeff = 9745467306673,
+    .HSAMP_offset = -11243183077,
+
+    .LPDAC_coeff = 1001472547,
+    .LPDAC_offset = -395332002445,
+
+    .HSDAC_coeff = 2532582201433,
+    .HSDAC_offset = 19873740865949,
+
+    .Lv[0].HSTIA_coeff = -4032141,
+    .Lv[0].HSTIA_offset = 1040297509317,
+    .Lv[1].HSTIA_coeff = -3181894,
+    .Lv[1].HSTIA_offset = 820944361270,
+    .Lv[2].HSTIA_coeff = -13482,
+    .Lv[2].HSTIA_offset = 3480817953,
+    .Lv[3].HSTIA_coeff = -333074,
+    .Lv[3].HSTIA_offset = 85901359807,
+
+    .Lv[0].LPTIA_coeff = 1,
+    .Lv[0].LPTIA_offset = 0,
+    .Lv[1].LPTIA_coeff = 1,
+    .Lv[1].LPTIA_offset = 0,
+    .Lv[2].LPTIA_coeff = 1,
+    .Lv[2].LPTIA_offset = 0,
+    .Lv[3].LPTIA_coeff = 1,
+    .Lv[3].LPTIA_offset = 0
+};
+
+#endif
+
+static uint32_t Cali_LPDAC (uint32_t value) {
+    uint32_t res;
+    res = (uint32_t)(((int64_t)CaliTable.LPDAC_coeff * value + (int64_t)CaliTable.LPDAC_offset + 5e9) / 1e10);
+    return res;
+}
+
+static uint32_t Cali_HSAMP (uint16_t value) {
+    uint32_t res;
+    res = (uint32_t)(((int64_t)CaliTable.HSAMP_coeff * value + (int64_t)CaliTable.HSAMP_offset + 5e9) / 1e10);
+
+    return res;
+}
+
+static uint32_t Cali_HSTIA (uint32_t value, uint8_t gain_level) {
+    uint32_t res;
+    res = (uint32_t)(((int64_t)CaliTable.Lv[gain_level].HSTIA_coeff * value + (int64_t)CaliTable.Lv[gain_level].HSTIA_offset + 5e9) / 1e10);
+
+    return res;
+}
+
+#endif
@@ -129,16 +129,16 @@ static void update_ins_sti_channel(uint8_t *buf, uint8 sti_chp, uint8 sti_chn) {

 static void update_ins_buffer() {
    uint8 header      = 0b10100000;
-    uint8 amp_gain    = (INSTRUCTION.amp_gain & 0b11) << 3;
-    uint8 amp_lbf     = INSTRUCTION.amp_low_band_freq & 0b111;
+    uint8 amp_gain    = (instru.amp_gain & 0b11) << 3;
+    uint8 amp_lbf     = instru.amp_low_band_freq & 0b111;
    uint8 channel     = 0;  // should be call update_ins_channel to modify this value
-    uint8 chopper     = (INSTRUCTION.chopper) ? 0b00001000 : 0;
-    uint8 fast_settle = (INSTRUCTION.fast_settle) ? 0b00000100 : 0;
-    uint8 sti_enable  = (INSTRUCTION.work_mode != STI_MODE_DISABLE) ? 0b00000010 : 0;
-    uint8 sti_volt_l  = (INSTRUCTION.sti_volt & 0b11111) >> 4;
-    uint8 sti_volt_h  = (INSTRUCTION.sti_volt & 0b01111) << 4;
-    uint8 sti_chp     = INSTRUCTION.sti_channel_pmos & 0b1111;
-    uint8 sti_chn     = (INSTRUCTION.sti_channel_nmos & 0b1111) << 4;
+    uint8 chopper     = (instru.chopper) ? 0b00001000 : 0;
+    uint8 fast_settle = (instru.fast_settle) ? 0b00000100 : 0;
+    uint8 sti_enable  = (instru.work_mode != STI_MODE_DISABLE) ? 0b00000010 : 0;
+    uint8 sti_volt_l  = (instru.sti_volt & 0b11111) >> 4;
+    uint8 sti_volt_h  = (instru.sti_volt & 0b01111) << 4;
+    uint8 sti_chp     = instru.sti_channel_pmos & 0b1111;
+    uint8 sti_chn     = (instru.sti_channel_nmos & 0b1111) << 4;
    uint8 clk_signal  = 0;  // should be call update_ins_clock to modify this value

    spi_txbuf[0] = header | amp_gain | amp_lbf;
@@ -193,7 +193,7 @@ static bool update_ins_rec_buffer() {
 * @param: buf: pointer of the SPI buffer.
 */
 static void update_ins_sti_buffer() {
-    switch (INSTRUCTION.work_mode) {
+    switch (instru.work_mode) {
    case STI_MODE_POS:
    case STI_MODE_NEG:
        // copy [4:7]
@@ -215,7 +215,7 @@ static void update_ins_sti_buffer() {
        update_ins_sti_enable(spi_txbuf, TRUE);
        // ins buf [4:7]
        update_ins_sti_enable(spi_txbuf + 4, TRUE);
-        update_ins_sti_channel(spi_txbuf + 4, 0xF, INSTRUCTION.sti_channel_pmos);
+        update_ins_sti_channel(spi_txbuf + 4, 0xF, instru.sti_channel_pmos);
        // ins buf [8:B]
        update_ins_sti_enable(spi_txbuf + 8, FALSE);
        break;
@@ -238,13 +238,13 @@ static void update_ins_sti_buffer() {
        spi_txbuf[15] = spi_txbuf[3];
        // change content
        update_ins_sti_enable(spi_txbuf + 0, TRUE);
-        update_ins_sti_channel(spi_txbuf + 0, INSTRUCTION.sti_channel_pmos, INSTRUCTION.sti_channel_nmos);
+        update_ins_sti_channel(spi_txbuf + 0, instru.sti_channel_pmos, instru.sti_channel_nmos);
        // ins buf [4:7]
        update_ins_sti_enable(spi_txbuf + 4, TRUE);
-        update_ins_sti_channel(spi_txbuf + 4, INSTRUCTION.sti_channel_nmos, INSTRUCTION.sti_channel_pmos);
+        update_ins_sti_channel(spi_txbuf + 4, instru.sti_channel_nmos, instru.sti_channel_pmos);
        // ins buf [8:B]
        update_ins_sti_enable(spi_txbuf + 8, TRUE);
-        update_ins_sti_channel(spi_txbuf + 8, 0xF, INSTRUCTION.sti_channel_nmos);
+        update_ins_sti_channel(spi_txbuf + 8, 0xF, instru.sti_channel_nmos);
        // ins buf [C:F]
        update_ins_sti_enable(spi_txbuf + 12, FALSE);
        break;
@@ -281,12 +281,12 @@ static void headstage_tni_update_instruction_callback(uint8_t ins_type, uint8_t
 }

 static uint8_t *spi_transact_rec_instruction() {
-    if (IS_REC_MODE(INSTRUCTION.work_mode)) {
+    if (IS_REC_MODE(instru.work_mode)) {
        PIN_setOutputValue(pin_handle, IOID_13, 1);  // DBS_P2S turn on
        headstage_spi_transaction(SPI_BUFFER_SIZE, spi_txbuf, spi_rxbuf);
        PIN_setOutputValue(pin_handle, IOID_13, 0);  // DBS_P2S turn off

-    } else if (IS_ARM_MODE(INSTRUCTION.work_mode) && !adc_clock_signal) {
+    } else if (IS_ARM_MODE(instru.work_mode) && !adc_clock_signal) {
        create_ramp(spi_rxbuf);
    }

@@ -22,7 +22,7 @@
 #include "EliteWorkData.h"
 #include <driverlib/aon_batmon.h>

-static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData);
+static void SimpleBLEPeripheral_performPeriodicTask(void);

 static void SimpleBLEPeripheral_clockHandler(UArg arg) {
    // Store the event.
@@ -38,12 +38,6 @@ static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_In
    GPT.GptimerCounter++;
 }

-static void megafly_trig_callback(PIN_Handle handle, PIN_Id pinId) {
-//    bool trig = 1;
-//    trig = PIN_getInputValue(MEGA_TRIG);
-    Mega_PeriodicEvent = true;
-//    PIN15_setOutputValue(MEGA_G_LED, 1);
-}

 static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins);

@@ -52,27 +46,30 @@ static void ZM_init() {

    // initialize
    pin_handle = PIN_open(&ZM_rst, BLE_IO);
-//    PIN_registerIntCb(pin_handle, megafly_trig_callback);
-//    PIN_setInterrupt(pin_handle, MEGA_TRIG | PIN_IRQ_NEGEDGE);
-
+    PIN_setOutputValue(pin_handle, AD_CS, 1);            // AD_CS HIGH
+/*
    Init_Elite15_PIN();
    ELITE15_SPI_HOLD();

-    PIN15_setOutputValue(shutdown_6994, 1);     // OFF = 1 => turn off 6994
-    PIN15_setOutputValue(enable_10v, 0);        // enable 10V
-    PIN15_setOutputValue(HIGH_Z_MODE, 1);       // HIGH Z MODE // 1 => close high_z mode

-    /* Turn off Megafly output pin */
-    PIN15_setOutputValue(MEGA_G_LED, 0);
-    PIN15_setOutputValue(MEGA_R_LED, 0);
-    PIN15_setOutputValue(MEGA_VAL_0, 0);
-    PIN15_setOutputValue(MEGA_VAL_1, 0);
+    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, HIGH_Z_MODE, 0);       // HIGH Z MODE // 1: close; 0: open;
+*/

    InitEliteInstruction();
-    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-    VoutGainControl(INSTRUCTION.VoutGainLevel);
+
+    // init DAC, set output ~= 0 V
+    // instru.VoutGainLevel = VOUT_GAIN_15K;
+    // VoutGainControl(instru.VoutGainLevel);
+    // DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
+
+    /* when elite open, must change vin level,
+    measure battery value will be right */
+    // VinADCGainControl(VIN_GAIN_AUTO);
+
    elite_gptimer_open();
+    elite_gptimer_start();

    //    PIN_registerIntCb(pin_handle, switch_on_callback);
    //    PIN_setInterrupt(pin_handle, switch_on | PIN_IRQ_POSEDGE);
@@ -83,7 +80,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(INSTRUCTION.VoutGainLevel, DACcode);
+    RealV = DAC_to_realV(instru.VoutGainLevel, DACcode);

    NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
    NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
@@ -91,24 +88,15 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
    NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
 }

-#define IsPeriodicMode() (                            \
-(INSTRUCTION.eliteFxn == IV_CURVE)                 || \
-(INSTRUCTION.eliteFxn == CV_CURVE)                 || \
-(INSTRUCTION.eliteFxn == IT_CURVE)                 || \
-(INSTRUCTION.eliteFxn == VT_CURVE)                 || \
-(INSTRUCTION.eliteFxn == ZT_CURVE)                 || \
-(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)         || \
-(INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)       || \
-(INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY) || \
-(INSTRUCTION.eliteFxn == CONSTANT_VSCAN)           || \
-(INSTRUCTION.eliteFxn == CALI_ADC_MODE)               \
+#define IsPeriodicMode() (                       \
+(instru.eliteFxn == CURVE_EIS)                || \
+(instru.eliteFxn == CURVE_EIS_CV)             || \
+(instru.eliteFxn == CURVE_CALI_ADC)              \
 )

-#define Ve1MatchVe2Mode() (                           \
-(INSTRUCTION.eliteFxn == IV_CURVE)                 || \
-(INSTRUCTION.eliteFxn == CV_CURVE)                 || \
-(INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)       || \
-(INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY)    \
+#define Ve1MatchVe2Mode() (                      \
+(instru.eliteFxn == CURVE_EIS)                || \
+(instru.eliteFxn == CURVE_EIS_CV)                \
 )

 /*********************************************************************
@@ -120,324 +108,242 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 *
 * @return  None.
 */
-static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
-    if ( IsPeriodicMode() ){
-        /** Periodic Event **/
-        // Default working flow is vscan -> ADC read -> send notify
-        // We will need a flag to control vscan, ADC and notify
+static void SimpleBLEPeripheral_performPeriodicTask(void) {
+    if (IsPeriodicMode()) {
+        if(instru.eliteFxn == CURVE_EIS){

-        GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-        GPT.GptimerCounter0 = GPT.GptimerCounter;
+            GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+            GPT.GptimerCounter0 = GPT.GptimerCounter;

-        if(EliteWorkReset){
-            InitEliteGPtimer();
-            EliteWorkReset  = false;
-            batteryADC_flag = false;
-            record_flag     = true;
-            firstTimeReset  = true;
-            VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-            IinADCGainControl(INSTRUCTION.ADCGainLevel);
-            VoutGainControl(INSTRUCTION.VoutGainLevel);
-            if( Ve1MatchVe2Mode() ){
-                if (INSTRUCTION.Ve1 == INSTRUCTION.Ve2) {
-                    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1));
+            if (mode_init){
+                GPT.SampleRateCounter = 0;
+                mode_init  = false;
+                gainChange_flag = false;
+                firstFreq_flag = true;
+                fset_flag       = true;
+                fout_flag       = true;
+                firstTimeReset  = true;
+                notifyFirst_flag = true;
+                DACReset          = true;
+                vscanReset        = true;
+                leadTimeReset     = true;
+
+                if (instru.f1 == instru.f2) {
+                    DAC_outputF(instru.f1);
                    PeriodicEvent = false;
                    ModeLED(NO_EVENT);
                }
+
+                SetEISHIGHZ(1);
            }
-        }

-
-        GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-        if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
-            vscanReset = true;
-        }else{
-            if(notifyFirst_flag){
-                GPT.NotifyCounter = INSTRUCTION.notifyRate - 20;
-                notifyFirst_flag = false;
+            //vscan counter  //fset counter
+            if (fset_flag) {
+                vscan_ctrl(); //set
+                fset_flag = false;
+                fout_flag = true;
            }
-            vscanReset = false;
-            leadTimeReset = false;
-        }

-        //vscan counter
-        GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-        if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate){
-            if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate * 2){
-                GPT.GptimerMultiple = GPT.VscanRateCounter / INSTRUCTION.VsetRate;
-            }else{
-                GPT.GptimerMultiple = 1;
+            //ADC counter
+            GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
+            if(GPT.SampleRateCounter >= instru.sampleRate){
+                GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
+                ADC_flag = true;
+                if(ADC_flag){
+                    EliteADCControl(); //read data
+                    ADC_flag = false;
+                }
            }
-            GPT.VscanRateCounter -= INSTRUCTION.VsetRate * GPT.GptimerMultiple; //To get right time
-            vscan_flag = true;
-            if(vscan_flag){
-                EliteVscanControl(WorkModeData);
-                vscan_flag = false;
-            }
-        }

-        //battery counter
-        GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-        GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-        if(GPT.BatteryCheckCounter >= 50000){
-            GPT.BatteryCheckCounter -= 50000; //To get right time
-            batteryCheck_flag = true;
-        }
-
-        uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-        if( bat < 768 && bat > 20){
-//            PIN15_setOutputValue(enable_5v, 0);
-        }
-
-        //ADC counter
-        GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-        if(GPT.SampleRateCounter >= INSTRUCTION.sampleRate){
-            GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-            ADC_flag = true;
-            if(ADC_flag){
-                EliteADCControl(WorkModeData);
-                ADC_flag = false;
-            }
-        }
-
-        //Notify counter(Notify control, check if we need to send notify)
-        //please don't put Notify counter before ADC counter, maybe get wrong data
-        GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
-        if(GPT.NotifyCounter >= INSTRUCTION.notifyRate){
-            GPT.NotifyCounter -= INSTRUCTION.notifyRate; //To get right time
-            notify_flag = true;
+            //Notify counter(Notify control, check if we need to send notify)
+            //please don't put Notify counter before ADC counter, maybe get wrong data
            if(vscanReset){
                notify_flag = false;
            }
            if(notify_flag){
-                SendNotify();
+                SendNotify(); //send
                notify_flag = false;
-            }
-        }
-
-//        EliteDone();
-    }
-    else if (INSTRUCTION.eliteFxn == PULSE_MODE){
-         /** Periodic Event **/
-         // Default working flow is vscan -> ADC read -> send notify
-         // We will need a flag to control vscan, ADC and notify
-
-         GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-         GPT.GptimerCounter0 = GPT.GptimerCounter;
-
-         if(EliteWorkReset){
-             InitEliteGPtimer();
-             EliteWorkReset  = false;
-             batteryADC_flag = false;
-             record_flag     = true;
-             firstTimeReset  = true;
-             VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-             IinADCGainControl(INSTRUCTION.ADCGainLevel);
-             VoutGainControl(INSTRUCTION.VoutGainLevel);
-             if( Ve1MatchVe2Mode() ){
-                 if (INSTRUCTION.Ve1 == INSTRUCTION.Ve2) {
-                     DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1));
-                     PeriodicEvent = false;
-                     ModeLED(NO_EVENT);
-                 }
-             }
-         }
-
-
-         GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-         if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
-             vscanReset = true;
-         }else{
-             if(notifyFirst_flag){
-                 GPT.NotifyCounter = INSTRUCTION.notifyRate - 20;
-                 notifyFirst_flag = false;
-             }
-             vscanReset = false;
-             leadTimeReset = false;
-         }
-
-         //vscan counter
-         GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-
-        if (vscanReset) {
-            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
-            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
-            vscanReset = false;
-        }else{
-            test_Vscan(WorkModeData->PULSE);
-        }
-
-//         if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate){
-//             if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate * 2){
-//                 GPT.GptimerMultiple = GPT.VscanRateCounter / INSTRUCTION.VsetRate;
-//             }else{
-//                 GPT.GptimerMultiple = 1;
-//             }
-//             GPT.VscanRateCounter -= INSTRUCTION.VsetRate * GPT.GptimerMultiple; //To get right time
-//             vscan_flag = true;
-//             if(vscan_flag){
-//                 EliteVscanControl(WorkModeData);
-//                 vscan_flag = false;
-//             }
-//         }
-
-         //battery counter
-         GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-         GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-         if(GPT.BatteryCheckCounter >= 50000){
-             GPT.BatteryCheckCounter -= 50000; //To get right time
-             batteryCheck_flag = true;
-         }
-
-         uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-         if( bat < 768 && bat > 20){
- //            PIN15_setOutputValue(enable_5v, 0);
-         }
-
-         //ADC counter
-         GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-         if(GPT.SampleRateCounter >= INSTRUCTION.sampleRate){
-             GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-             ADC_flag = true;
-             if(ADC_flag){
-                 EliteADCControl(WorkModeData);
-                 ADC_flag = false;
-             }
-         }
-
-         //Notify counter(Notify control, check if we need to send notify)
-         //please don't put Notify counter before ADC counter, maybe get wrong data
-         GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
-         if(GPT.NotifyCounter >= INSTRUCTION.notifyRate){
-             GPT.NotifyCounter -= INSTRUCTION.notifyRate; //To get right time
-             notify_flag = true;
-             if(vscanReset){
-                 notify_flag = false;
-             }
-             if(notify_flag){
-                 SendNotify();
-                 notify_flag = false;
-             }
-         }
-
- //        EliteDone();
-     }
-    else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
-        WorkModeData->VO->_Vset = INSTRUCTION.VoltConstant;
-        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
-        FreeWorkMode(WorkModeData);
-        PeriodicEvent = false;
-    }
-    else if(INSTRUCTION.eliteFxn == CALI_DAC_MODE){
-        DAC_outputV(INSTRUCTION.VoltConstant); //UserCode -> DAC code -> DAC out
-        FreeWorkMode(WorkModeData);
-        PeriodicEvent = false;
-    }
-    else{
-//        InitFlag();
-    }
-}
-
-static void EliteADCControl(WorkMode *WorkModeData) {
-    switch (INSTRUCTION.eliteFxn) {
-        case IV_CURVE:{
-            CC_Plot(WorkModeData);
-            break;
-        }
-        case CV_CURVE:{
-            CC_Plot(WorkModeData);
-            break;
-        }
-        case IT_CURVE:{
-            IT_Plot(WorkModeData);
-            break;
-        }
-        case VT_CURVE:{
-            VT_Plot(WorkModeData);
-            break;
-        }
-        case ZT_CURVE:{
-            CC_Plot(WorkModeData);
-            break;
-        }
-        case CONSTANT_CURRENT:{
-            CC_Plot(WorkModeData);
-            break;
-        }
-        case CYCLIC_VOLTAMMETRY:{
-            CC_Plot(WorkModeData);
-            break;
-        }
-        case LINEAR_SWEEP_VOLTAMMETRY:{
-            CC_Plot(WorkModeData);
-            break;
-        }
-        case CONSTANT_VSCAN:{
-            CC_Plot(WorkModeData);
-            break;
-        }
-        case CALI_ADC_MODE:{
-            if(INSTRUCTION.AdcChannel == IIN_ADC){
-                cali_IT_plot(WorkModeData);
-            }else if(INSTRUCTION.AdcChannel == VIN_ADC){
-                cali_VT_plot(WorkModeData);
+                fset_flag = true;
+                time0 = (Timestamp_get32()) / 31;
+                time1 = 0;
+                delta_time = 0;
            }

-            break;
-        }
-        case PULSE_MODE:{
-            CC_Plot(WorkModeData);
-            break;
-        }
-        default:{
-            break;
+            mode_done(); //finishMode = 1, SendNotify(), Eliteinterrupt()
+        } else {
+            /** Periodic Event **/
+            // Default working flow is vscan -> ADC read -> send notify
+            // We will need a flag to control vscan, ADC and notify
+
+            static bool first_highz_flag = false;
+
+            GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+            GPT.GptimerCounter0 = GPT.GptimerCounter;
+
+            if (mode_init) {
+                GPT.SampleRateCounter = instru.sampleRate - 10;
+                GPT.VscanRateCounter  = instru.VsetRate - 1;
+                mode_init  = false;
+                batteryADC_flag = false;
+                record_flag     = true;
+                fset_flag       = true;
+                firstTimeReset  = true;
+                notifyFirst_flag = true;
+                first_highz_flag = true;
+                I_GAIN_100R_counter = 0;
+                I_GAIN_3K_counter   = 0;
+                I_GAIN_100K_counter = 0;
+                I_GAIN_3M_counter   = 0;
+                VIN_GAIN_1M_counter = 0;
+                VIN_GAIN_30K_counter = 0;
+                VIN_GAIN_1K_counter = 0;
+                VOUT_GAIN_240K_counter = 0;
+                VOUT_GAIN_15K_counter = 0;
+                DACReset          = true;
+                vscanReset        = true;
+                leadTimeReset     = true;
+
+                /*
+                VinADCGainCtrl(instru.VinADCGainLv);
+                IinADCGainControl(instru.ADCGainLv);
+                VoutGainControl(instru.VoutGainLevel);
+                */
+
+                if (Ve1MatchVe2Mode()) {
+                    if (instru.Ve1 == instru.Ve2) {
+//                        DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.Ve1));
+                        DAC_outputV(instru.Ve1);
+                        PeriodicEvent = false;
+                        SetEISHIGHZ(1);
+                        // PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // 0: open highz;
+                        ModeLED(NO_EVENT);
+                    }
+                }
+            }
+
+            GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
+            if (leadTimeReset && GPT.LeadTimeCounter <= 2000) {
+                vscanReset = true;
+                if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
+                        SetEISHIGHZ(1); // // High Z | 1 off | 0 on
+    //                    PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 1); // HIGH Z MODE // 1: close; 0: open;
+                    first_highz_flag = false;
+                }
+            } else {
+                if (notifyFirst_flag) {
+                    GPT.NotifyCounter = instru.notifyRate - 20;
+                    notifyFirst_flag = false;
+                }
+                vscanReset = false;
+                leadTimeReset = false;
+            }
+
+            //vscan counter  //fset counter
+            GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
+            if (GPT.VscanRateCounter >= instru.VsetRate) {
+                if (GPT.VscanRateCounter >= instru.VsetRate * 2) {
+                    GPT.GptimerMultiple = GPT.VscanRateCounter / instru.VsetRate;
+                } else {
+                    GPT.GptimerMultiple = 1;
+                }
+                GPT.VscanRateCounter -= instru.VsetRate * GPT.GptimerMultiple; //To get right time
+                vscan_flag = true;
+                if (vscan_flag) {
+                    vscan_ctrl(); //set
+                    vscan_flag = false;
+                }
+            }
+
+            //ADC counter
+            GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
+            if(GPT.SampleRateCounter >= instru.sampleRate){
+                GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
+                ADC_flag = true;
+                if(ADC_flag){
+                    EliteADCControl(); //read data
+                    ADC_flag = false;
+                }
+            }
+
+            //Notify counter(Notify control, check if we need to send notify)
+            //please don't put Notify counter before ADC counter, maybe get wrong data
+            GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
+            if(GPT.NotifyCounter >= instru.notifyRate){
+                GPT.NotifyCounter -= instru.notifyRate; //To get right time
+                notify_flag = true;
+                if(vscanReset){
+                    notify_flag = false;
+                }
+                if(notify_flag){
+                    SendNotify(); //send
+                    notify_flag = false;
+                }
+            }
+
+            mode_done(); //finishMode = 1, SendNotify(), Eliteinterrupt()
+
        }
    }
 }

-static void EliteDone() {
-    if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)) {
+static void EliteADCControl(void) //CURVE_IV => CC_Plot() | CURVE_CV => Iin_Vin_Vout_Plot
+{
+    void *wm = wm_get();
+
+    switch (instru.eliteFxn) {
+        case CURVE_EIS:
+            EIS_Plot();
+            break;
+
+        case CURVE_EIS_CV:
+            CV_Plot();
+            break;
+
+        case CURVE_CALI_ADC:
+            if (instru.AdcChannel == IIN_ADC) {
+                cali_IT_plot();
+            } else if (instru.AdcChannel == VIN_ADC) {
+                cali_VT_plot();
+            } else if (instru.AdcChannel == VOUT_DAC) {
+                cali_VT_plot();
+            } else if (instru.AdcChannel == EIS_HSTIA) {
+                cali_IT_plot();
+            } else if (instru.AdcChannel == EIS_LPTIA) {
+                cali_VT_plot();
+            }
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void mode_done(void) //finishMode = 1, SendNotify(), Eliteinterrupt()
+{
+    if (instru.eliteFxn == CURVE_EIS_CV)       {
        if (!PeriodicEvent) {
+            finishMode = 1;
            SendNotify();
            Eliteinterrupt();
        }
+    } else if (instru.eliteFxn == CURVE_EIS){
+        if (!PeriodicEvent) {
+            Eliteinterrupt();
+        }
    }
 }

-static void EliteVscanControl(WorkMode *WorkModeData) {
-    switch (INSTRUCTION.eliteFxn) {
-        case IV_CURVE:{
-            IV_Vscan(WorkModeData->IV);
+static void vscan_ctrl(void) 
+{
+    switch (instru.eliteFxn) {
+        case CURVE_EIS:
+            eis_fscan();
            break;
-        }
-        case CV_CURVE:{
-            CV_Vscan(WorkModeData->CV);
+
+        case CURVE_EIS_CV:
+            cv_vscan();
            break;
-        }
-        case ZT_CURVE:{
-            ZT_Vscan(WorkModeData->RT);
-            break;
-        }
-        case CYCLIC_VOLTAMMETRY:{
-            CV3_Vscan(WorkModeData->CV3);
-            break;
-        }
-        case CONSTANT_CURRENT:{
-            CC_Vscan(WorkModeData->CC);
-            break;
-        }
-        case LINEAR_SWEEP_VOLTAMMETRY:{
-            LSV_Vscan(WorkModeData->LSV);
-            break;
-        }
-        case CONSTANT_VSCAN:{
-            CVSCAN_Vscan(WorkModeData->CVSCAN);
-            break;
-        }
-        case PULSE_MODE:{
-            PULSE_Vscan(WorkModeData->PULSE);
-            break;
-        }
+
        default:{
            break;
        }
@@ -472,38 +378,16 @@ static void step2VsetRate(uint32_t step){
             0.01mv, index = 4, n = 10000  */

    if(step >= 10000){
-        INSTRUCTION.VsetRateIndex = 0;
+        instru.VsetRateIndex = 0;
    }else if (step >= 1000){
-        INSTRUCTION.VsetRateIndex = 1;
+        instru.VsetRateIndex = 1;
    }else if (step >= 100){
-        INSTRUCTION.VsetRateIndex = 2;
+        instru.VsetRateIndex = 2;
    }else if (step >= 10){
-        INSTRUCTION.VsetRateIndex = 3;
+        instru.VsetRateIndex = 3;
    }else if (step >= 1){
-        INSTRUCTION.VsetRateIndex = 4;
+        instru.VsetRateIndex = 4;
    }
 }

-static void InitFlag(){
-    PeriodicEvent     = false;     // is there an PeriodicEvent?
-    Free_Work_Mode    = true;      // Free(WorkModeData)
-}
-
-static void InitEliteGPtimer() {
-    GPT.SampleRateCounter = INSTRUCTION.sampleRate - 10;
-    GPT.VscanRateCounter  = INSTRUCTION.VsetRate - 1;
-    notifyFirst_flag      = true;
-}
-
-static void InitEliteFlag() {
-    InitPeriodicEvent = true;      // need to create a WorkModeData?
-    DACReset          = true;
-    vscanReset        = true;
-    EliteWorkReset    = true;
-    leadTimeReset     = true;
-    I_GAIN_100R_counter = 0;
-    I_GAIN_3K_counter   = 0;
-    I_GAIN_100K_counter = 0;
-    I_GAIN_3M_counter   = 0;
-}
 #endif /* IMPEDANCE_METER_H_ */
@@ -543,30 +543,22 @@ static void SimpleBLEPeripheral_init(void) {
 // static void detectKey_clockHandler(UArg arg);

 static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
+    uint8_t  key= 0;
+    bool     EliteOn = 0;
+    uint16_t counter6994 = 0;
+    batteryADC_flag = false;

    // Initialize application
    SimpleBLEPeripheral_init();
    ZM_init();
-    WorkMode *WorkModeData = CreateWorkMode();
-
-    // init DAC, set output ~= 0 V
-    INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
-    VoutGainControl(INSTRUCTION.VoutGainLevel);
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
-
-    uint8_t  key         = 0;
-    uint16_t counter6994 = 0;
-    bool     EliteOn     = 0;
-
-    elite_gptimer_start();

    // Application main loops
    GPT.GptimerCounter0 = GPT.GptimerCounter;
-    batteryADC_flag = false;
-    headstage_battery_volt();
+
+    //headstage_battery_volt();
    headstage_init_device_info();

-    for (;;) {
+    for (;;) { //keeps going until Periodic Event != True
        // Waits for a signal to the semaphore associated with the calling thread.
        // Note that the semaphore associated with a thread is signaled when a
        // message is queued to the message receive queue of the thread or when
@@ -613,17 +605,19 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
                }
            }
        }
+
        if(events & SBP_PERIODIC_EVT){
            events &= ~SBP_PERIODIC_EVT;
            if (!PeriodicEvent) {                // if there is no periodic event
                key = PIN_getInputValue(switch_on);
-
                if (EliteOn) {
-                    if (counter6994 < CLOCK_ONE_SECOND/2) {  // counter6994 enable a IC after 35 counts
+                    if (counter6994 < CLOCK_ONE_SECOND*5) {  // counter6994 enable a IC after 35 counts
                        counter6994++;
-                    } else if (counter6994 == CLOCK_ONE_SECOND/2) {
-                        PIN15_setOutputValue(shutdown_6994, 1);  // OFF = 1 => turn off 6994
+                    } else if (counter6994 == CLOCK_ONE_SECOND*5) {
+                        //PIN_setOutputValue(pin_handle, shutdown_6994, 0);  // OFF = 1 => turn off 6994
                        counter6994++;
+                    } else if (counter6994 > CLOCK_ONE_SECOND*5) {
+                        counter6994 = 0;
                    }
                    EliteKeyPress(key);

@@ -631,33 +625,23 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
 //                        measureBat();
 //                    }
                    if(Free_Work_Mode){
-                        FreeWorkMode(WorkModeData);
+                        wm_deinit();
                        InitEliteInstruction();
                        Free_Work_Mode = false;
                    }
-                    /* Megafly trigger */
-//                    trig = PIN_getInputValue(MEGA_TRIG);        // trigger: 1 -> 0
-                    if (Mega_PeriodicEvent) {
-                        Mega_PeriodicEvent = false;
-                        PeriodicEvent = true;
-                        PIN15_setOutputValue(MEGA_R_LED, 0); // for functional test
-                        PIN15_setOutputValue(MEGA_G_LED, 1);
-                    }
-
                } else {
                    EliteOn = TurnOnElite(key);
+//                    AD5940_init();
                }
-
-
            }
            else {                               // if there is periodic event
                if(InitPeriodicEvent){
-                    InitWorkMode(WorkModeData);
+                    wm_init();
                    InitPeriodicEvent = false;
                }

                // Perform periodic application task
-                SimpleBLEPeripheral_performPeriodicTask(WorkModeData);
+                SimpleBLEPeripheral_performPeriodicTask();
                key = PIN_getInputValue(switch_on);
                EliteKeyPress(key);  // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
            }
@@ -986,6 +970,7 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)

    case GAPROLE_WAITING_AFTER_TIMEOUT:
        SimpleBLEPeripheral_freeAttRsp(bleNotConnected);
+        ModeLED(BT_WAIT);

 #ifdef PLUS_BROADCASTER
        // Reset flag for next connection.