test sps

CC MODE deltaV = 10mV
new 1.5re pin (use define)
2021-04-09 18:16:32 +08:00 · 2021-04-09 16:23:10 +08:00 · 2021-04-09 10:48:25 +08:00 · 2021-04-08 14:10:31 +08:00 · 2021-04-08 11:07:44 +08:00 · 2021-03-31 10:19:35 +08:00
36 changed files with 3494 additions and 2939 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>
@@ -106,7 +106,7 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_BP_Pin_J2_15             DIO8         /* MOSI */
 #define Board_BP_Pin_J2_14             DIO7         /* MISO */
 #define Board_BP_Pin_J2_13             DIO9         /* DAC_CS */
-#define Board_BP_Pin_J2_12             DIO12        /* AD_CS */
+#define Board_BP_Pin_J2_12             DIO12        /* ADC_CS */
 #define Board_BP_Pin_J2_11             IOID_UNUSED   /* NC */

 /* Mapping of BoosterPack Connector Pins to BoosterPack Standard Functions (reflecting the BoosterPack Standard)
@@ -0,0 +1,246 @@
+
+#ifndef Elite15_PIN
+#define Elite_15PIN
+
+#include "Elite_PIN.h"
+
+static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow) {
+    switch (latch_num) {
+        case LOAD0: {
+            switch (elite_pin) {
+                case D0: {
+                    LH.LATCH0[0] = highlow;
+                    break;
+                }
+                case D1: {
+                    LH.LATCH0[1] = highlow;
+                    break;
+                }
+                case D2: {
+                    LH.LATCH0[2] = highlow;
+                    break;
+                }
+                case D3: {
+                    LH.LATCH0[3] = highlow;
+                    break;
+                }
+                case D4: {
+                    LH.LATCH0[4] = highlow;
+                    break;
+                }
+                case D5: {
+                    LH.LATCH0[5] = highlow;
+                    break;
+                }
+                case D6: {
+                    LH.LATCH0[6] = highlow;
+                    break;
+                }
+                case D7: {
+                    LH.LATCH0[7] = highlow;
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+            break;
+        }
+        case LOAD1: {
+            switch (elite_pin) {
+                case D0: {
+                    LH.LATCH1[0] = highlow;
+                    break;
+                }
+                case D1: {
+                    LH.LATCH1[1] = highlow;
+                    break;
+                }
+                case D2: {
+                    LH.LATCH1[2] = highlow;
+                    break;
+                }
+                case D3: {
+                    LH.LATCH1[3] = highlow;
+                    break;
+                }
+                case D4: {
+                    LH.LATCH1[4] = highlow;
+                    break;
+                }
+                case D5: {
+                    LH.LATCH1[5] = highlow;
+                    break;
+                }
+                case D6: {
+                    LH.LATCH1[6] = highlow;
+                    break;
+                }
+                case D7: {
+                    LH.LATCH1[7] = highlow;
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+            break;
+        }
+        case LOAD2: {
+            switch (elite_pin) {
+                case D0: {
+                    LH.LATCH2[0] = highlow;
+                    break;
+                }
+                case D1: {
+                    LH.LATCH2[1] = highlow;
+                    break;
+                }
+                case D2: {
+                    LH.LATCH2[2] = highlow;
+                    break;
+                }
+                case D3: {
+                    LH.LATCH2[3] = highlow;
+                    break;
+                }
+                case D4: {
+                    LH.LATCH2[4] = highlow;
+                    break;
+                }
+                case D5: {
+                    LH.LATCH2[5] = highlow;
+                    break;
+                }
+                case D6: {
+                    LH.LATCH2[6] = highlow;
+                    break;
+                }
+                case D7: {
+                    LH.LATCH2[7] = highlow;
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+             break;
+        }
+        default: {
+            break;
+        }
+    }
+}
+
+static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow) {
+    ELITE15_SPI_CLOSE();
+    add_elite_pin();
+    update_latch_status (latch_num, pin_num, highlow);
+//    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
+
+    switch (latch_num) {
+        case LOAD0: {
+//            PIN_setOutputValue(&ZM_rst, D0, LH.LATCH0[0]);
+//            PIN_setOutputValue(&ZM_rst, D1, LH.LATCH0[1]);
+//            PIN_setOutputValue(&ZM_rst, D2, LH.LATCH0[2]);
+//            PIN_setOutputValue(&ZM_rst, D3, LH.LATCH0[3]);
+            PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);
+            PIN_setOutputValue(pin_handle, D5, LH.LATCH0[5]);
+            PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);
+            PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);
+            break;
+        }
+        case LOAD1: {
+            PIN_setOutputValue(pin_handle, D0, LH.LATCH1[0]);
+            PIN_setOutputValue(pin_handle, D1, LH.LATCH1[1]);
+            PIN_setOutputValue(pin_handle, D2, LH.LATCH1[2]);
+            PIN_setOutputValue(pin_handle, D3, LH.LATCH1[3]);
+            PIN_setOutputValue(pin_handle, D4, LH.LATCH1[4]);
+            PIN_setOutputValue(pin_handle, D5, LH.LATCH1[5]);
+            PIN_setOutputValue(pin_handle, D6, LH.LATCH1[6]);
+            PIN_setOutputValue(pin_handle, D7, LH.LATCH1[7]);
+            break;
+        }
+        case LOAD2: {
+            PIN_setOutputValue(pin_handle, D0, LH.LATCH2[0]);
+            PIN_setOutputValue(pin_handle, D1, LH.LATCH2[1]);
+            PIN_setOutputValue(pin_handle, D2, LH.LATCH2[2]);
+            PIN_setOutputValue(pin_handle, D3, LH.LATCH2[3]);
+            PIN_setOutputValue(pin_handle, D4, LH.LATCH2[4]);
+            PIN_setOutputValue(pin_handle, D5, LH.LATCH2[5]);
+            PIN_setOutputValue(pin_handle, D6, LH.LATCH2[6]);
+            PIN_setOutputValue(pin_handle, D7, LH.LATCH2[7]);
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
+//    CPUdelay(10);
+    PIN_setOutputValue(&ZM_rst, latch_num, 0);               // Turn off latch
+    remove_elite_pin();
+    ELITE15_SPI_HOLD();
+}
+
+static void Init_Elite15_PIN () {
+    InitLH();
+    add_elite_pin();
+
+    PIN_setOutputValue(pin_handle, D0, 0);
+    PIN_setOutputValue(pin_handle, D1, 0);
+    PIN_setOutputValue(pin_handle, D2, 0);
+    PIN_setOutputValue(pin_handle, D3, 0);
+    PIN_setOutputValue(pin_handle, D4, 0);
+    PIN_setOutputValue(pin_handle, D5, 0);
+    PIN_setOutputValue(pin_handle, D6, 0);
+    PIN_setOutputValue(pin_handle, D7, 0);
+    PIN_setOutputValue(pin_handle, LOAD0, 0);
+    PIN_setOutputValue(pin_handle, LOAD1, 1);
+    PIN_setOutputValue(pin_handle, LOAD2, 1);
+    CPUdelay(10);
+    PIN_setOutputValue(pin_handle, LOAD1, 0);
+    PIN_setOutputValue(pin_handle, LOAD2, 0);
+
+
+    PIN_setOutputValue(pin_handle, D0, 0);
+    PIN_setOutputValue(pin_handle, D1, 0);
+    PIN_setOutputValue(pin_handle, D2, 0);
+    PIN_setOutputValue(pin_handle, D3, 0);
+    PIN_setOutputValue(pin_handle, D4, 1);
+    PIN_setOutputValue(pin_handle, D5, 1);
+    PIN_setOutputValue(pin_handle, D6, 1);
+    PIN_setOutputValue(pin_handle, D7, 1);
+    CPUdelay(10);
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, LOAD0, 0);
+
+    remove_elite_pin();
+
+//    InitLH();
+//    add_elite_pin();
+//
+//    PIN_setOutputValue(pin_handle, LOAD0, 1);
+//    PIN_setOutputValue(pin_handle, LOAD1, 1);
+//    PIN_setOutputValue(pin_handle, LOAD2, 1);
+//    CPUdelay(10);
+//    PIN_setOutputValue(pin_handle, D0, 0);
+//    PIN_setOutputValue(pin_handle, D1, 0);
+//    PIN_setOutputValue(pin_handle, D2, 0);
+//    PIN_setOutputValue(pin_handle, D3, 0);
+//    PIN_setOutputValue(pin_handle, D4, 0);
+//    PIN_setOutputValue(pin_handle, D5, 0);
+//    PIN_setOutputValue(pin_handle, D6, 0);
+//    PIN_setOutputValue(pin_handle, D7, 0);
+//    CPUdelay(10);
+//    PIN_setOutputValue(pin_handle, LOAD0, 0);
+//    PIN_setOutputValue(pin_handle, LOAD1, 0);
+//    PIN_setOutputValue(pin_handle, LOAD2, 0);
+//
+//    remove_elite_pin();
+}
+
+
+
+
+#endif
@@ -80,6 +80,86 @@ static void CAL_ADC_write(uint8_t ADCin) {
    CAL_ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
 }

+/* Gain Control for Vin & Iin */
+static void IinADCGainControl(uint8_t IinADCLevel){
+    if(IinADCLevel == 0){
+        // ADC gain level = 0, using 3M resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 0);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+    }
+    else if(IinADCLevel == 1){
+        // ADC gain level = 1, using 100K resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 0);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 1);
+    }
+    else if(IinADCLevel == 2){
+        // ADC gain level = 2, using 3K resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 0);
+        PIN15_setOutputValue(Turnon_I_MID, 1);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+    }
+    else if(IinADCLevel == 3){
+        // ADC gain level = 3, using 100R resistor
+        PIN15_setOutputValue(Turnon_I_LARGE, 1);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+    }
+    else if(IinADCLevel == 4){
+        // ADC gain level = 3, auto gain (using 100R resister)
+        PIN15_setOutputValue(Turnon_I_LARGE, 1);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+    }
+    else{
+        // default using 100R resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 1);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+    }
+
+    if(IinADCLevel == 0 || IinADCLevel == 1 || IinADCLevel == 2 || IinADCLevel == 3){
+        lastIinADCGainLevel = IinADCLevel;
+    }else{
+        lastIinADCGainLevel = 3;
+    }
+}
+
+static void VinADCGainControl(uint8_t VinADCLevel){
+    if(VinADCLevel == 0){
+        // Vin ADC gain level = 0, using 1M resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 0);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+    else if(VinADCLevel == 1){
+        // Vin ADC gain level = 1, using 30K resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 0);
+        PIN15_setOutputValue(Turnon_V_MID, 1);
+    }
+    else if(VinADCLevel == 2){
+        // Vin ADC gain level = 2, using 1K resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 1);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+    else if(VinADCLevel == 3){
+        // Vin ADC gain level = 3, auto gain (using 1K resister)
+        PIN15_setOutputValue(Turnon_V_SMALL, 1);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+    else{
+        // default using 1K resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 1);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+
+    if(VinADCLevel == 0 || VinADCLevel == 1 || VinADCLevel == 2){
+        lastVinADCGainLevel = VinADCLevel;
+    }else{
+        lastVinADCGainLevel = 2;
+    }
+}
+
 static void ADCChannelSelect(uint8_t ADCChannel){
    // set ADC parameter
    // 0xC1~F1 = reading AIN0~AIN3. Using FSR+-6V, resolution = 187.5uV
@@ -119,7 +199,7 @@ static void ADCChannelSelect(uint8_t ADCChannel){

 static void ReadADCIin(uint8_t *buf){
    // Read data twice since the first data we get is previous data
-//    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//    IinADCGainControl(instru.ADCGainLevel);
    ADCChannelSelect(ADC_CH_CURRENT);
    ADC_read(buf);

@@ -130,7 +210,7 @@ static void ReadADCIin(uint8_t *buf){
 static void ReadADCVin(uint8_t *buf){
    // Read data twice since the first data we get is previous data

-//    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//    VinADCGainControl(instru.VinADCGainLevel);
    ADCChannelSelect(ADC_CH_VOLT);
    ADC_read(buf);

@@ -158,12 +238,20 @@ static void ReadADCBat(uint8_t *buf){

 /* for Elite1.5-re */
 // Iin theoretical boundary <2.67, 1.89~80, 63~2600, >1900 (uA)
+/* Old boundary
 #define I_GAIN_SMALL_BOUNDARY     4000  // 4    uA =     4,000,000 pA
 #define I_GAIN_MID1_BOUNDARY1     2000  // 2    uA =     2,000,000 pA
 #define I_GAIN_MID1_BOUNDARY2    90000  // 90   uA =    90,000,000 pA
 #define I_GAIN_MID2_BOUNDARY1    70000  // 70   uA =    70,000,000 pA
 #define I_GAIN_MID2_BOUNDARY2  1800000  // 1800 uA =     1,800,000 nA
 #define I_GAIN_LARGE_BOUNDARY   950000  // 950  uA =       950,000 nA
+*/
+#define I_GAIN_SMALL_BOUNDARY     4000  // 4    uA =     4,000,000 pA
+#define I_GAIN_MID1_BOUNDARY1     2500  // 2.5  uA =     2,500,000 pA
+#define I_GAIN_MID1_BOUNDARY2   100000  // 100  uA =   100,000,000 pA
+#define I_GAIN_MID2_BOUNDARY1    85000  // 85   uA =    85,000,000 pA
+#define I_GAIN_MID2_BOUNDARY2  2050000  // 2050 uA =     2,050,000 nA
+#define I_GAIN_LARGE_BOUNDARY  1800000  // 1800 uA =     1,800,000 nA

 // Vin theoretical boundary <7, 5~200, >100 (mV)
 #define VIN_GAIN_SMALL_BOUNDARY   7000  // 7    mV =     7,000,000 nV
@@ -175,7 +263,7 @@ static int32_t AutoGainReadIin(uint8_t *buf){
     int32_t RealCurrent = 0;

     ReadADCIin(spi_ADC_rxbuf);
-     RealCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+     RealCurrent = DecodeADCValue(instru.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);

     return RealCurrent;
 }
@@ -184,291 +272,291 @@ static int32_t AutoGainReadVin(uint8_t *buf){
    int32_t RealVolt = 0;

    ReadADCVin(spi_ADC_rxbuf);
-    RealVolt = DecodeADCValue(INSTRUCTION.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+    RealVolt = DecodeADCValue(instru.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);

    return RealVolt;
 }

-//static void AutoGainChangeIin(int32_t RealCurrent){
-//    // switch to 1 level current(small)   3M
-//    // switch to 2 level current        100K
-//    // switch to 3 level current          3K
-//    // switch to 4 level current(large) 100R
-//    if(INSTRUCTION.ADCGainLevel == I_GAIN_100R){
-//        if(RealCurrent < I_GAIN_LARGE_BOUNDARY && RealCurrent > -1*I_GAIN_LARGE_BOUNDARY){
-//            // switch to 1 level current(small)
-//            if (RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
-//                I_GAIN_3M_counter++;
-//                if(I_GAIN_3M_counter > 2){
-//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
-//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                    I_GAIN_3M_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//            // switch to 2 level current
-//            else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
-//                I_GAIN_100K_counter++;
-//                if(I_GAIN_100K_counter > 2){
-//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
-//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                    I_GAIN_100K_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//            // switch to 3 level current
-//            else{
-//                I_GAIN_3K_counter++;
-//                if(I_GAIN_3K_counter > 2){
-//                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
-//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                    I_GAIN_3K_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//        }else{
-//            if(I_GAIN_3K_counter > 0){
-//                I_GAIN_3K_counter--;
-//            }
-//            if(I_GAIN_100K_counter > 0){
-//                I_GAIN_100K_counter--;
-//            }
-//            if(I_GAIN_3M_counter > 0){
-//                I_GAIN_3M_counter--;
-//            }
-//        }
-//    }
-//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3K){
-//        // switch to 4 level current(large)
-//        if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
-//            I_GAIN_100R_counter++;
-//            if(I_GAIN_100R_counter > 2){
-//                INSTRUCTION.ADCGainLevel = I_GAIN_100R;
-//                IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                I_GAIN_100R_counter = 0;
-//                record_flag = false;
-//            }
-//        }
-//        else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
-//            // switch to 1 level current(small)
-//            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
-//                I_GAIN_3M_counter++;
-//                if(I_GAIN_3M_counter > 2){
-//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
-//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                    I_GAIN_3M_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//            // switch to 2 level current
-//            else{
-//                I_GAIN_100K_counter++;
-//                if(I_GAIN_100K_counter > 2){
-//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
-//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                    I_GAIN_100K_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//        }else{
-//            if(I_GAIN_100R_counter > 0){
-//                I_GAIN_100R_counter--;
-//            }
-//            if(I_GAIN_100K_counter > 0){
-//                I_GAIN_100K_counter--;
-//            }
-//            if(I_GAIN_3M_counter > 0){
-//                I_GAIN_3M_counter--;
-//            }
-//        }
-//    }
-//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_100K){
-//            // switch to 1 level current(small)
-//            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
-//                I_GAIN_3M_counter++;
-//                if(I_GAIN_3M_counter > 2){
-//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
-//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                    I_GAIN_3M_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//            else if (RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
-//                 // switch to 4 level current(large)
-//                 if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
-//                    I_GAIN_100R_counter++;
-//                    if(I_GAIN_100R_counter > 2){
-//                        INSTRUCTION.ADCGainLevel = I_GAIN_100R;
-//                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                        I_GAIN_100R_counter = 0;
-//                        record_flag = false;
-//                    }
-//                }
-//                 // switch to 3 level current
-//                 else{
-//                    I_GAIN_3K_counter++;
-//                    if(I_GAIN_3K_counter > 2){
-//                        INSTRUCTION.ADCGainLevel = I_GAIN_3K;
-//                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                        I_GAIN_3K_counter = 0;
-//                        record_flag = false;
-//                    }
-//                }
-//            }else{
-//                if(I_GAIN_100R_counter > 0){
-//                    I_GAIN_100R_counter--;
-//                }
-//                if(I_GAIN_3K_counter > 0){
-//                    I_GAIN_3K_counter--;
-//                }
-//                if(I_GAIN_3M_counter > 0){
-//                    I_GAIN_3M_counter--;
-//                }
-//            }
-//        }
-//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3M){
-//        if(RealCurrent > I_GAIN_SMALL_BOUNDARY || RealCurrent < -1*I_GAIN_SMALL_BOUNDARY){
-//            // switch to 4 level current(large)
-//            if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
-//                I_GAIN_100R_counter++;
-//                if(I_GAIN_100R_counter > 2){
-//                    INSTRUCTION.ADCGainLevel = I_GAIN_100R;
-//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                    I_GAIN_100R_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//            // switch to 3 level current
-//            else if(RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
-//                I_GAIN_3K_counter++;
-//                if(I_GAIN_3K_counter > 2){
-//                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
-//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                    I_GAIN_3K_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//            // switch to 2 level current
-//            else{
-//                I_GAIN_100K_counter++;
-//                if(I_GAIN_100K_counter > 2){
-//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
-//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                    I_GAIN_100K_counter = 0;
-//                    record_flag = false;
-//                }
-//
-//            }
-//        }else{
-//            if(I_GAIN_100R_counter > 0){
-//                I_GAIN_100R_counter--;
-//            }
-//            if(I_GAIN_3K_counter > 0){
-//                I_GAIN_3K_counter--;
-//            }
-//            if(I_GAIN_100K_counter > 0){
-//                I_GAIN_100K_counter--;
-//            }
-//        }
-//    }
-//}
+static void AutoGainChangeIin(int32_t RealCurrent){
+    // switch to 1 level current(small)   3M
+    // switch to 2 level current        100K
+    // switch to 3 level current          3K
+    // switch to 4 level current(large) 100R
+    if(instru.ADCGainLevel == I_GAIN_100R){
+        if(RealCurrent < I_GAIN_LARGE_BOUNDARY && RealCurrent > -1*I_GAIN_LARGE_BOUNDARY){
+            // switch to 1 level current(small)
+            if (RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+                I_GAIN_3M_counter++;
+                if(I_GAIN_3M_counter > 2){
+                    instru.ADCGainLevel = I_GAIN_3M;
+                    IinADCGainControl(instru.ADCGainLevel);
+                    I_GAIN_3M_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 2 level current
+            else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
+                I_GAIN_100K_counter++;
+                if(I_GAIN_100K_counter > 2){
+                    instru.ADCGainLevel = I_GAIN_100K;
+                    IinADCGainControl(instru.ADCGainLevel);
+                    I_GAIN_100K_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 3 level current
+            else{
+                I_GAIN_3K_counter++;
+                if(I_GAIN_3K_counter > 2){
+                    instru.ADCGainLevel = I_GAIN_3K;
+                    IinADCGainControl(instru.ADCGainLevel);
+                    I_GAIN_3K_counter = 0;
+                    record_flag = false;
+                }
+            }
+        }else{
+            if(I_GAIN_3K_counter > 0){
+                I_GAIN_3K_counter--;
+            }
+            if(I_GAIN_100K_counter > 0){
+                I_GAIN_100K_counter--;
+            }
+            if(I_GAIN_3M_counter > 0){
+                I_GAIN_3M_counter--;
+            }
+        }
+    }
+    else if(instru.ADCGainLevel == I_GAIN_3K){
+        // switch to 4 level current(large)
+        if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+            I_GAIN_100R_counter++;
+            if(I_GAIN_100R_counter > 2){
+                instru.ADCGainLevel = I_GAIN_100R;
+                IinADCGainControl(instru.ADCGainLevel);
+                I_GAIN_100R_counter = 0;
+                record_flag = false;
+            }
+        }
+        else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
+            // switch to 1 level current(small)
+            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+                I_GAIN_3M_counter++;
+                if(I_GAIN_3M_counter > 2){
+                    instru.ADCGainLevel = I_GAIN_3M;
+                    IinADCGainControl(instru.ADCGainLevel);
+                    I_GAIN_3M_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 2 level current
+            else{
+                I_GAIN_100K_counter++;
+                if(I_GAIN_100K_counter > 2){
+                    instru.ADCGainLevel = I_GAIN_100K;
+                    IinADCGainControl(instru.ADCGainLevel);
+                    I_GAIN_100K_counter = 0;
+                    record_flag = false;
+                }
+            }
+        }else{
+            if(I_GAIN_100R_counter > 0){
+                I_GAIN_100R_counter--;
+            }
+            if(I_GAIN_100K_counter > 0){
+                I_GAIN_100K_counter--;
+            }
+            if(I_GAIN_3M_counter > 0){
+                I_GAIN_3M_counter--;
+            }
+        }
+    }
+    else if(instru.ADCGainLevel == I_GAIN_100K){
+            // switch to 1 level current(small)
+            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+                I_GAIN_3M_counter++;
+                if(I_GAIN_3M_counter > 2){
+                    instru.ADCGainLevel = I_GAIN_3M;
+                    IinADCGainControl(instru.ADCGainLevel);
+                    I_GAIN_3M_counter = 0;
+                    record_flag = false;
+                }
+            }
+            else if (RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
+                 // switch to 4 level current(large)
+                 if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+                    I_GAIN_100R_counter++;
+                    if(I_GAIN_100R_counter > 2){
+                        instru.ADCGainLevel = I_GAIN_100R;
+                        IinADCGainControl(instru.ADCGainLevel);
+                        I_GAIN_100R_counter = 0;
+                        record_flag = false;
+                    }
+                }
+                 // switch to 3 level current
+                 else{
+                    I_GAIN_3K_counter++;
+                    if(I_GAIN_3K_counter > 2){
+                        instru.ADCGainLevel = I_GAIN_3K;
+                        IinADCGainControl(instru.ADCGainLevel);
+                        I_GAIN_3K_counter = 0;
+                        record_flag = false;
+                    }
+                }
+            }else{
+                if(I_GAIN_100R_counter > 0){
+                    I_GAIN_100R_counter--;
+                }
+                if(I_GAIN_3K_counter > 0){
+                    I_GAIN_3K_counter--;
+                }
+                if(I_GAIN_3M_counter > 0){
+                    I_GAIN_3M_counter--;
+                }
+            }
+        }
+    else if(instru.ADCGainLevel == I_GAIN_3M){
+        if(RealCurrent > I_GAIN_SMALL_BOUNDARY || RealCurrent < -1*I_GAIN_SMALL_BOUNDARY){
+            // switch to 4 level current(large)
+            if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+                I_GAIN_100R_counter++;
+                if(I_GAIN_100R_counter > 2){
+                    instru.ADCGainLevel = I_GAIN_100R;
+                    IinADCGainControl(instru.ADCGainLevel);
+                    I_GAIN_100R_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 3 level current
+            else if(RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
+                I_GAIN_3K_counter++;
+                if(I_GAIN_3K_counter > 2){
+                    instru.ADCGainLevel = I_GAIN_3K;
+                    IinADCGainControl(instru.ADCGainLevel);
+                    I_GAIN_3K_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 2 level current
+            else{
+                I_GAIN_100K_counter++;
+                if(I_GAIN_100K_counter > 2){
+                    instru.ADCGainLevel = I_GAIN_100K;
+                    IinADCGainControl(instru.ADCGainLevel);
+                    I_GAIN_100K_counter = 0;
+                    record_flag = false;
+                }

-//static void AutoGainChangeVin(int32_t RealVin){
-//    // switch to 1 level volt(small)      1M
-//    // switch to 2 level volt            30K
-//    // switch to 3 level volt(large)      1K
-//    if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_1M){
-//        if(RealVin > VIN_GAIN_SMALL_BOUNDARY || RealVin < -1*VIN_GAIN_SMALL_BOUNDARY){
-//            // switch to 3 level volt(large)
-//            if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
-//                VIN_GAIN_1K_counter++;
-//                if(VIN_GAIN_1K_counter > 2){
-//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
-//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-//                    VIN_GAIN_1K_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//            // switch to 2 level volt
-//            else{
-//                VIN_GAIN_30K_counter++;
-//                if(VIN_GAIN_30K_counter > 2){
-//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_30K;
-//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-//                    VIN_GAIN_30K_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//        }else{
-//            if(VIN_GAIN_1K_counter > 0){
-//                VIN_GAIN_1K_counter--;
-//            }
-//            if(VIN_GAIN_30K_counter > 0){
-//                VIN_GAIN_30K_counter--;
-//            }
-//        }
-//    }
-//    else if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_30K){
-//        // switch to 1 level volt(small)
-//        if(RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
-//            VIN_GAIN_1M_counter++;
-//            if(VIN_GAIN_1M_counter > 2){
-//                INSTRUCTION.VinADCGainLevel = VIN_GAIN_1M;
-//                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-//                VIN_GAIN_1M_counter = 0;
-//                record_flag = false;
-//            }
-//        }
-//        else if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
-//            // switch to 3 level volt
-//            VIN_GAIN_1K_counter++;
-//            if(VIN_GAIN_1K_counter > 2){
-//                INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
-//                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-//                VIN_GAIN_1K_counter = 0;
-//                record_flag = false;
-//            }
-//        }else{
-//            if(VIN_GAIN_1K_counter > 0){
-//                VIN_GAIN_1K_counter--;
-//            }
-//            if(VIN_GAIN_1M_counter > 0){
-//                VIN_GAIN_1M_counter--;
-//            }
-//        }
-//    }
-//    else if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_1K){
-//        if(RealVin < VIN_GAIN_LARGE_BOUNDARY && RealVin > -1*VIN_GAIN_LARGE_BOUNDARY){
-//            // switch to 1 level volt(small)
-//            if (RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
-//                VIN_GAIN_1M_counter++;
-//                if(VIN_GAIN_1M_counter > 2){
-//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_1M;
-//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-//                    VIN_GAIN_1M_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//            // switch to 2 level volt
-//            else{
-//                VIN_GAIN_30K_counter++;
-//                if(VIN_GAIN_30K_counter > 2){
-//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_30K;
-//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-//                    VIN_GAIN_30K_counter = 0;
-//                    record_flag = false;
-//                }
-//            }
-//        }else{
-//            if(VIN_GAIN_1M_counter > 0){
-//                VIN_GAIN_1M_counter--;
-//            }
-//            if(VIN_GAIN_30K_counter > 0){
-//                VIN_GAIN_30K_counter--;
-//            }
-//        }
-//    }
-//}
+            }
+        }else{
+            if(I_GAIN_100R_counter > 0){
+                I_GAIN_100R_counter--;
+            }
+            if(I_GAIN_3K_counter > 0){
+                I_GAIN_3K_counter--;
+            }
+            if(I_GAIN_100K_counter > 0){
+                I_GAIN_100K_counter--;
+            }
+        }
+    }
+}
+
+static void AutoGainChangeVin(int32_t RealVin){
+    // switch to 1 level volt(small)      1M
+    // switch to 2 level volt            30K
+    // switch to 3 level volt(large)      1K
+    if(instru.VinADCGainLevel == VIN_GAIN_1M){
+        if(RealVin > VIN_GAIN_SMALL_BOUNDARY || RealVin < -1*VIN_GAIN_SMALL_BOUNDARY){
+            // switch to 3 level volt(large)
+            if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
+                VIN_GAIN_1K_counter++;
+                if(VIN_GAIN_1K_counter > 2){
+                    instru.VinADCGainLevel = VIN_GAIN_1K;
+                    VinADCGainControl(instru.VinADCGainLevel);
+                    VIN_GAIN_1K_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 2 level volt
+            else{
+                VIN_GAIN_30K_counter++;
+                if(VIN_GAIN_30K_counter > 2){
+                    instru.VinADCGainLevel = VIN_GAIN_30K;
+                    VinADCGainControl(instru.VinADCGainLevel);
+                    VIN_GAIN_30K_counter = 0;
+                    record_flag = false;
+                }
+            }
+        }else{
+            if(VIN_GAIN_1K_counter > 0){
+                VIN_GAIN_1K_counter--;
+            }
+            if(VIN_GAIN_30K_counter > 0){
+                VIN_GAIN_30K_counter--;
+            }
+        }
+    }
+    else if(instru.VinADCGainLevel == VIN_GAIN_30K){
+        // switch to 1 level volt(small)
+        if(RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
+            VIN_GAIN_1M_counter++;
+            if(VIN_GAIN_1M_counter > 2){
+                instru.VinADCGainLevel = VIN_GAIN_1M;
+                VinADCGainControl(instru.VinADCGainLevel);
+                VIN_GAIN_1M_counter = 0;
+                record_flag = false;
+            }
+        }
+        else if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
+            // switch to 3 level volt
+            VIN_GAIN_1K_counter++;
+            if(VIN_GAIN_1K_counter > 2){
+                instru.VinADCGainLevel = VIN_GAIN_1K;
+                VinADCGainControl(instru.VinADCGainLevel);
+                VIN_GAIN_1K_counter = 0;
+                record_flag = false;
+            }
+        }else{
+            if(VIN_GAIN_1K_counter > 0){
+                VIN_GAIN_1K_counter--;
+            }
+            if(VIN_GAIN_1M_counter > 0){
+                VIN_GAIN_1M_counter--;
+            }
+        }
+    }
+    else if(instru.VinADCGainLevel == VIN_GAIN_1K){
+        if(RealVin < VIN_GAIN_LARGE_BOUNDARY && RealVin > -1*VIN_GAIN_LARGE_BOUNDARY){
+            // switch to 1 level volt(small)
+            if (RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
+                VIN_GAIN_1M_counter++;
+                if(VIN_GAIN_1M_counter > 2){
+                    instru.VinADCGainLevel = VIN_GAIN_1M;
+                    VinADCGainControl(instru.VinADCGainLevel);
+                    VIN_GAIN_1M_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 2 level volt
+            else{
+                VIN_GAIN_30K_counter++;
+                if(VIN_GAIN_30K_counter > 2){
+                    instru.VinADCGainLevel = VIN_GAIN_30K;
+                    VinADCGainControl(instru.VinADCGainLevel);
+                    VIN_GAIN_30K_counter = 0;
+                    record_flag = false;
+                }
+            }
+        }else{
+            if(VIN_GAIN_1M_counter > 0){
+                VIN_GAIN_1M_counter--;
+            }
+            if(VIN_GAIN_30K_counter > 0){
+                VIN_GAIN_30K_counter--;
+            }
+        }
+    }
+}

 static uint16_t ADC_CURRENT_AVG_calibration (uint8_t ADC_channel) {
    uint32_t ADCValueTemp           = 0;
@@ -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
@@ -2,8 +2,8 @@
 #ifndef ELITECCMODE
 #define ELITECCMODE

-#define Vset INSTRUCTION.Vset
-#define DELTAVOLTMAX 100000
+#define Vset instru.Vset
+#define DELTAVOLTMAX 2000000 //2000000 = 10mV

 /* Transform setting CC into IUC
 *
@@ -11,73 +11,67 @@
 * 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;
+static void cc_vscan(void)
+{
+    struct wm_cc_ctx_t *cc = (struct wm_cc_ctx_t *)wm_get();
+    struct wm_meas_t *m = &cc->measure;
    uint16_t divisionRate;
+    int32_t deltaI;
+    int32_t deltaV;
+    int32_t Iin;
+    int32_t Vin;

-    if(vscanReset){
+    if (vscanReset) {
        Vset = 0;

-        if(CC->_charge == 0){
-            CC->_Iset *= -1;
+        if (cc->_charge == 0) {
+            cc->_Iset = instru.constantCurrent * 200 * (-1);
+            //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA];
        }

-        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - CC->_Iset;
+        Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
+        Vin = m->_measureVin * 200; //[5nV]

-        if(deltaI > 20000000 || deltaI < -20000000){ //1mA
-            divisionRate = 1000;
-        }else{
-            divisionRate = 10;
+        Vset = Vin + cc->_Iset / 20 ; //[5nV]
+
+        if (Vset >= 1100000000) { // 5.5V
+            Vset = 1100000000;
+        } else if (Vset <= -1000000000) { //-5V
+            Vset = -1000000000;
+        }
+    }
+
+    if (!vscanReset) {
+        Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
+        deltaI = Iin - cc->_Iset;
+
+        if (deltaI > 2000000 || deltaI < -2000000) { //100uA
+            divisionRate = 1;
+        } else {
+            divisionRate = 20;
        }

        deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV

-        if(deltaV > DELTAVOLTMAX){ //100000 = 500uV
+        if (deltaV > DELTAVOLTMAX) { //2000000 = 10mV
            deltaV = DELTAVOLTMAX;
-        }else if(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 (Vset >= 1100000000) { // 5.5V
+            Vset = 1100000000;
+        } else if (Vset <= -1000000000) { //-5V
+            Vset = -1000000000;
+        }
+
+        if (Vset <= cc->_Vmin) {
+            Vset = cc->_Vmin;
+        } else if (Vset >= cc->_Vmax) {
+            Vset = cc->_Vmax;
        }
    }
-
-    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,25 +1,27 @@
 #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_volt_out(void)
+{
+    struct wm_cv_ctx_t *cv = (struct wm_cv_ctx_t *)wm_get();
+    struct wm_meas_t *m = &cv->measure;
+    uint16_t DACOutCode;
+    int32_t Vin;
+    int32_t Vout;
+    int32_t DeltaVout;

-    Vin = CV3->_measureVin * 200;//[5nV]
-    if(DACReset){
+    Vin = m->_measureVin * 200;//[5nV]
+    if (DACReset) {
        Vout = Vset + Vin;
-        DACReset = false;
-    }else{
+    } else {
        DeltaVout = Vset - (Vout - Vin);
        Vout = Vout + DeltaVout;
    }

-    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
+    instru.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
+    DACOutCode = Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.VoltConstant);

    int32_t RealV2;
    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
@@ -31,126 +33,110 @@ static uint16_t CV3Curve(CV3Mode *CV3){

    DAC_outputV(DACOutCode);

-     return DACOutCode;
+    return;
 }

-static void CV3_Vscan(CV3Mode *CV3){
-    static int16_t VminCounter;
-    static int16_t VmaxCounter;
-    static uint16_t CycleCounter;
+static void cv_vscan(void)
+{
+    struct wm_cv_ctx_t *cv = (struct wm_cv_ctx_t *)wm_get();
+    static bool VminCounter;
+    static bool VmaxCounter;

-    NotifyCycleNumber = (INSTRUCTION.cycleNumber - CV3->_cycleNumber + 1);
+    NotifyCycleNumber = (instru.cycleNumber - cv->_cycleNumber + 1);

-    if(vscanReset){
-        VmaxCounter = 0;
-        VminCounter = 0;
-        CycleCounter = 0;
+    if (vscanReset) {
+        VmaxCounter = false;
+        VminCounter = false;

-        if(INSTRUCTION.directionInit == 1){
-            CV3->_direction_up         = true;
-            CV3->_current_direction_up = true;
-        }else{
-            CV3->_direction_up         = false;
-            CV3->_current_direction_up = false;
+        if (instru.directionInit == 1) {
+            cv->_direction_up         = true;
+            cv->_current_direction_up = true;
+        } else {
+            cv->_direction_up         = false;
+            cv->_current_direction_up = false;
        }

        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if(INSTRUCTION.step <= 10){
-            CV3->_Vstep = INSTRUCTION.step *  INSTRUCTION.VsetRate / 5;
-        }else{
-            CV3->_Vstep = INSTRUCTION.step / 5 *  INSTRUCTION.VsetRate;
+        if (instru.step <= 10) {
+            cv->_Vstep = instru.step *  instru.VsetRate / 5;
+        } else {
+            cv->_Vstep = instru.step / 5 *  instru.VsetRate;
        }

-        if(CV3->_Vmin == CV3->_Vinit){
-            VminCounter = -1;
+        if (cv->_Vmin == cv->_Vinit) {
+            VminCounter = true;
        }
-        if(CV3->_Vmax == CV3->_Vinit){
-            VmaxCounter = -1;
+        if (cv->_Vmax == cv->_Vinit) {
+            VmaxCounter = true;
        }

-        Vset = CV3->_Vinit;
+        Vset = cv->_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) {
+        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
@@ -2,215 +2,82 @@
 #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;
+static void iv_cy_vscan(void)
+{
+    struct wm_iv_cy_ctx_t *iv_cy = (struct wm_iv_cy_ctx_t *)wm_get();
+    static bool VminCounter;
+    static bool VmaxCounter;

-    // 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);
+    NotifyCycleNumber = (instru.cycleNumber - iv_cy->_cycleNumber + 1);

    if(vscanReset){
-        VmaxCounter = 0;
-        VminCounter = 0;
-        CycleCounter = 0;
+        VmaxCounter = false;
+        VminCounter = false;

-        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;
+        if(instru.directionInit == 1){
+            iv_cy->_direction_up         = true;
+            iv_cy->_current_direction_up = true;
+        }else if(instru.directionInit == 0){
+            iv_cy->_direction_up         = false;
+            iv_cy->_current_direction_up = false;
        }

        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if(INSTRUCTION.step <= 10){
-            CV->_Vstep = INSTRUCTION.step * INSTRUCTION.VsetRate / 5;
+        if(instru.step <= 10){
+            iv_cy->_Vstep = instru.step * instru.VsetRate / 5;
        }else{
-            CV->_Vstep = INSTRUCTION.step / 5 * INSTRUCTION.VsetRate;
+            iv_cy->_Vstep = instru.step / 5 * instru.VsetRate;
        }

-        if(CV->_Vmin == CV->_Vinit){
-            VminCounter = -1;
+        if(iv_cy->_Vmin == iv_cy->_Vinit){
+            VminCounter = true;
        }
-        if(CV->_Vmax == CV->_Vinit){
-            VmaxCounter = -1;
+        if(iv_cy->_Vmax == iv_cy->_Vinit){
+            VmaxCounter = true;
        }

-        Vset = CV->_Vinit;
+        Vset = iv_cy->_Vinit;
    }

    if(!vscanReset){
-        if (Vset >= CV->_Vmax){
-            VmaxCounter++;
-        }else if (Vset <= CV->_Vmin){
-            VminCounter++;
+        if (Vset >= iv_cy->_Vmax){
+            VmaxCounter = true;
+        }else if (Vset <= iv_cy->_Vmin){
+            VminCounter = true;
        }

-        if (CV->_current_direction_up){
-            Vset = Vset + CV->_Vstep * GPT.GptimerMultiple;
+        if (iv_cy->_current_direction_up){
+            Vset = Vset + iv_cy->_Vstep * GPT.GptimerMultiple;
        }else{
-            Vset = Vset - CV->_Vstep * GPT.GptimerMultiple;
+            Vset = Vset - iv_cy->_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){
+            if(iv_cy->_direction_up && iv_cy->_current_direction_up){
+                if(Vset >= iv_cy->_Vinit){
+                    iv_cy->_cycleNumber--;
+                    VminCounter = false;
+                    VmaxCounter = false;
                }
            }
-            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(!iv_cy->_direction_up && !iv_cy->_current_direction_up){
+                if(Vset <= iv_cy->_Vinit){
+                    iv_cy->_cycleNumber--;
+                    VminCounter = false;
+                    VmaxCounter = false;
                }
            }
        }

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

        /*stop condition*/
-        if(CV->_cycleNumber == 0){
+        if(iv_cy->_cycleNumber == 0){
            PeriodicEvent = false;
-            ModeLED(NO_EVENT);
        }
    }
 }
@@ -1,25 +1,27 @@
 #ifndef ELITECVSCAN
 #define ELITECVSCAN

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

-static uint16_t CVSCANCurve(CVSCANMode *CVSCAN){
-    static uint16_t DACOutCode;
-    static int32_t Vin;
-    static int32_t Vout;
-    static int32_t DeltaVout;
+static void ca_volt_out(void)
+{
+    struct wm_ca_ctx_t *ca = (struct wm_ca_ctx_t *)wm_get();
+    struct wm_meas_t *m = &ca->measure;
+    uint16_t DACOutCode;
+    int32_t Vin;
+    int32_t Vout;
+    int32_t DeltaVout;

-    Vin = CVSCAN->_measureVin * 200;//[5nV]
-    if(DACReset){
+    Vin = m->_measureVin * 200;//[5nV]
+    if (DACReset) {
        Vout = Vset + Vin;
-        DACReset = false;
-    }else{
+    } else {
        DeltaVout = Vset - (Vout - Vin);
        Vout = Vout + DeltaVout;
    }

-    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
+    instru.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
+    DACOutCode = Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.VoltConstant);

    int32_t RealV2;
    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
@@ -31,17 +33,19 @@ static uint16_t CVSCANCurve(CVSCANMode *CVSCAN){

    DAC_outputV(DACOutCode);

-    return DACOutCode;
+    return;
 }

-static void CVSCAN_Vscan(CVSCANMode *CVSCAN){
+static void ca_vscan(void)
+{
+    struct wm_ca_ctx_t *ca = (struct wm_ca_ctx_t *)wm_get();

    if(vscanReset){
-        Vset = CVSCAN->_Vinit;
+        Vset = ca->_Vinit;
    }

    if(!vscanReset){
-        Vset = CVSCAN->_Vinit;
+        Vset = ca->_Vinit;
    }
 }
 #endif
@@ -5,31 +5,34 @@
 static bool DACReset;


-#ifdef ELITE_VERSION_1_3
-#define DACOUT 0x30
-static void DAC_outputV(uint16_t voltLV) {
-    // C = command, X = don't care, D = data
-    // CCCC XXXX = command
-    // DDDD DDDD = v1
-    // DDDD XXXX = v2
-
-    uint8_t v1, v2 = 0;
-    v1 = (uint8_t) (voltLV >> 4) & 0xFF;
-    v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
-
-    spi_DACtxbuf[0] = command;
-    spi_DACtxbuf[1] = v1;
-    spi_DACtxbuf[2] = v2;
-    for (int i = 3; i < SPI_DAC_SIZE; i++) {
-        spi_DACtxbuf[i] = 0;
-    }
-
-    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
-}
-#endif
+//#ifdef ELITE_VERSION_1_3
+//#define DACOUT 0x30
+//
+//static void DAC_outputV(uint16_t voltLV) {
+//    // C = command, X = don't care, D = data
+//    // CCCC XXXX = command
+//    // DDDD DDDD = v1
+//    // DDDD XXXX = v2
+//
+//    uint8_t v1, v2 = 0;
+//    v1 = (uint8_t) (voltLV >> 4) & 0xFF;
+//    v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
+//
+//    spi_DACtxbuf[0] = command;
+//    spi_DACtxbuf[1] = v1;
+//    spi_DACtxbuf[2] = v2;
+//    for (int i = 3; i < SPI_DAC_SIZE; i++) {
+//        spi_DACtxbuf[i] = 0;
+//    }
+//
+//    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+//}
+//#endif

 #ifdef ELITE_VERSION_1_4
+#define DACCLS 0x02
 #define DACOUT 0x31
+
 static uint16_t DAC_outputV(uint16_t voltLV) {
    // C = command, X = don't care, D = data
    // CCCC CCCC = command
@@ -52,19 +55,26 @@ static uint16_t DAC_outputV(uint16_t voltLV) {

    return voltLV;
 }
-#endif

-#ifdef ELITE_VERSION_EIS
-static uint32_t DAC_outputV(uint32_t voltLV) {
-
-//    uint8_t v1, v2 = 0;
-//    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
-//    v2 = (uint8_t) (voltLV & 0x00FF);
-
-    EIS_LPDAC_SPI(voltLV);
-
-    return voltLV;
+static void VoutGainControl(uint8_t VOUTLevel){
+    if(VOUTLevel == 0){
+        // VOUT gain level = 0, using 240K resister
+        PIN15_setOutputValue(Turon_VOUT_SMALL, 0);
+    }
+    else if(VOUTLevel == 1){
+        // VOUT gain level = 1, using 15K resister
+        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+    }
+    else if(VOUTLevel == 2){
+        // VOUT gain level = 2, using 15K resister
+        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+    }
+    else{
+        // default using 15K resister
+        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+    }
 }
+
 #endif

 static int32_t User2Real(uint16_t UserCode){
@@ -74,29 +84,35 @@ static int32_t User2Real(uint16_t UserCode){


 // DAC Vout theoretical boundary <300, 100~ (mV)
-#define DAC_VOUT_GAIN_SMALL_BOUNDARY  100000  // 100  mV =    25500(usercode)
-#define DAC_VOUT_GAIN_LARGE_BOUNDARY  300000  // 300  mV =    26500(usercode)
+#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 RealVolt){
-    RealVolt = (RealVolt - 25000) * 200; // (RealVolt - 25000) / 5 * 1000
+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;
+    if(instru.VoutGainLevel == VOUT_GAIN_AUTO){
+        instru.VoutGainLevel = VOUT_GAIN_15K;
+        VoutGainControl(instru.VoutGainLevel);
+        record_flag = false;
    }

-    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;
+            instru.VoutGainLevel = VOUT_GAIN_240K;
+            VoutGainControl(instru.VoutGainLevel);
            record_flag = false;
        }
    }
-    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;
+            instru.VoutGainLevel = VOUT_GAIN_15K;
+            VoutGainControl(instru.VoutGainLevel);
            record_flag = false;
        }
    }
@@ -29,7 +29,7 @@
 */


-#define BOARD_C6D4
+#define BOARD_C903

 typedef struct _formula{

@@ -49,7 +49,416 @@ struct _correction{

 } Correction =

-#ifdef BOARD_C6E1
+#ifdef BOARD_C7A1 //megafly
+{
+.ADC_volt[0].coeff = (6256),
+.ADC_volt[0].offset = -101532028,
+
+.ADC_volt[1].coeff = (215138),
+.ADC_volt[1].offset = -3501890770,
+
+.ADC_volt[2].coeff = (6245014),
+.ADC_volt[2].offset = -101751226981,
+
+.ADC_current[0].coeff = 3125920,
+.ADC_current[0].offset = (-50880328288),
+
+.ADC_current[1].coeff = 71636129,
+.ADC_current[1].offset = (-1166093783868),
+
+.ADC_current[2].coeff = 1459555637,
+.ADC_current[2].offset = (-23757721396024),
+
+.ADC_current[3].coeff = 30723232882,
+.ADC_current[3].offset = (-500144809348170),
+
+.Usercode2DAC[0].coeff = (-10543817),
+.Usercode2DAC[0].offset = 583163641972,
+
+.Usercode2DAC[1].coeff = (-178077711),
+.Usercode2DAC[1].offset = 4777894559527,
+
+//.Usercode2DAC15v = 41485,
+};
+#endif
+
+#ifdef BOARD_C724 //megafly
+{
+.ADC_volt[0].coeff = (6251),
+.ADC_volt[0].offset = -99750397,
+
+.ADC_volt[1].coeff = (214419),
+.ADC_volt[1].offset = -3491659841,
+
+.ADC_volt[2].coeff = (6227737),
+.ADC_volt[2].offset = -101557618268,
+
+.ADC_current[0].coeff = 3138613,
+.ADC_current[0].offset = (-51149570420),
+
+.ADC_current[1].coeff = 71715555,
+.ADC_current[1].offset = (-1168777305352),
+
+.ADC_current[2].coeff = 1455501991,
+.ADC_current[2].offset = (-23719715469357),
+
+.ADC_current[3].coeff = 30688298312,
+.ADC_current[3].offset = (-500150163983795),
+
+.Usercode2DAC[0].coeff = (-10540182),
+.Usercode2DAC[0].offset = 584459109821,
+
+.Usercode2DAC[1].coeff = (-179175265),
+.Usercode2DAC[1].offset = 4801179734836,
+
+//.Usercode2DAC15v = MEGA_15V,
+};
+#endif
+
+#ifdef BOARD_C874 //megafly
+{
+.ADC_volt[0].coeff = (6260),
+.ADC_volt[0].offset = -99787811,
+
+.ADC_volt[1].coeff = (214494),
+.ADC_volt[1].offset = -3492178752,
+
+.ADC_volt[2].coeff = (6231057),
+.ADC_volt[2].offset = -101591914655,
+
+.ADC_current[0].coeff = 3148251,
+.ADC_current[0].offset = (-51277675282),
+
+.ADC_current[1].coeff = 71859885,
+.ADC_current[1].offset = (-1170556644217),
+
+.ADC_current[2].coeff = 1462458824,
+.ADC_current[2].offset = (-23822062635236),
+
+.ADC_current[3].coeff = 30748473913,
+.ADC_current[3].offset = (-500860829105930),
+
+.Usercode2DAC[0].coeff = (-10570366),
+.Usercode2DAC[0].offset = 585189864243,
+
+.Usercode2DAC[1].coeff = (-178920333),
+.Usercode2DAC[1].offset = 4794801719146,
+
+//.Usercode2DAC15v = 41355,
+};
+#endif
+
+#ifdef BOARD_C604
+{
+.ADC_volt[0].coeff = (6194),
+.ADC_volt[0].offset = -100974071,
+
+.ADC_volt[1].coeff = (215506),
+.ADC_volt[1].offset = -3517864544,
+
+.ADC_volt[2].coeff = (6243728),
+.ADC_volt[2].offset = -102012564806,
+
+.ADC_current[0].coeff = 3139436,
+.ADC_current[0].offset = (-51217085818),
+
+.ADC_current[1].coeff = 71622830,
+.ADC_current[1].offset = (-1168462302473),
+
+.ADC_current[2].coeff = 1462344785,
+.ADC_current[2].offset = (-23855062972762),
+
+.ADC_current[3].coeff = 30689232716,
+.ADC_current[3].offset = (-500670762245868),
+
+.Usercode2DAC[0].coeff = (-10507403),
+.Usercode2DAC[0].offset = 582940058695,
+
+.Usercode2DAC[1].coeff = (-178479878),
+.Usercode2DAC[1].offset = 4782895510276,
+};
+#endif
+
+#ifdef BOARD_C69F
+{
+.ADC_volt[0].coeff = (6118),
+.ADC_volt[0].offset = -99518615,
+
+.ADC_volt[1].coeff = (209748),
+.ADC_volt[1].offset = -3417768725,
+
+.ADC_volt[2].coeff = (6131501),
+.ADC_volt[2].offset = -99999128933,
+
+.ADC_current[0].coeff = 3148514,
+.ADC_current[0].offset = (-50485662786),
+
+.ADC_current[1].coeff = 71804564,
+.ADC_current[1].offset = (-1151299062516),
+
+.ADC_current[2].coeff = 1463584080,
+.ADC_current[2].offset = (-23465643586165),
+
+.ADC_current[3].coeff = 30747070723,
+.ADC_current[3].offset = (-492979538892707),
+
+.Usercode2DAC[0].coeff = (-10534427),
+.Usercode2DAC[0].offset = 577647889649,
+
+.Usercode2DAC[1].coeff = (-178317702),
+.Usercode2DAC[1].offset = 4773350420707,
+};
+#endif
+
+#ifdef BOARD_C903
+{
+.ADC_volt[0].coeff = (6268),
+.ADC_volt[0].offset = -103687047,
+
+.ADC_volt[1].coeff = (216289),
+.ADC_volt[1].offset = -3581110600,
+
+.ADC_volt[2].coeff = (6255165),
+.ADC_volt[2].offset = -103653080405,
+
+.ADC_current[0].coeff = 3136844,
+.ADC_current[0].offset = (-51057548335),
+
+.ADC_current[1].coeff = 71729828,
+.ADC_current[1].offset = (-1167474302377),
+
+.ADC_current[2].coeff = 1457587112,
+.ADC_current[2].offset = (-23722230272507),
+
+.ADC_current[3].coeff = 30688020320,
+.ADC_current[3].offset = (-499567626613052),
+
+.Usercode2DAC[0].coeff = (-10538549),
+.Usercode2DAC[0].offset = 582561125327,
+
+.Usercode2DAC[1].coeff = (-179443367),
+.Usercode2DAC[1].offset = 4806000714268,
+};
+#endif
+
+#ifdef BOARD_C60C
+{
+.ADC_volt[0].coeff = (6232),
+.ADC_volt[0].offset = -100384012,
+
+.ADC_volt[1].coeff = (216642),
+.ADC_volt[1].offset = -3529452462,
+
+.ADC_volt[2].coeff = (6233108),
+.ADC_volt[2].offset = -100604531870,
+
+.ADC_current[0].coeff = 3145651,
+.ADC_current[0].offset = (-51102123184),
+
+.ADC_current[1].coeff = 71727284,
+.ADC_current[1].offset = (-1165169041311),
+
+.ADC_current[2].coeff = 1463455403,
+.ADC_current[2].offset = (-23772125686630),
+
+.ADC_current[3].coeff = 30773610135,
+.ADC_current[3].offset = (-499913505030514),
+
+.Usercode2DAC[0].coeff = (-10570464),
+.Usercode2DAC[0].offset = 583479916773,
+
+.Usercode2DAC[1].coeff = (-178725281),
+.Usercode2DAC[1].offset = 4787957689974,
+};
+#endif
+
+#ifdef BOARD_C78B
+{
+.ADC_volt[0].coeff = (6242),
+.ADC_volt[0].offset = -101356025,
+
+.ADC_volt[1].coeff = (215624),
+.ADC_volt[1].offset = -3503045312,
+
+.ADC_volt[2].coeff = (6243816),
+.ADC_volt[2].offset = -101524034738,
+
+.ADC_current[0].coeff = 3131950,
+.ADC_current[0].offset = (-50953509336),
+
+.ADC_current[1].coeff = 71591803,
+.ADC_current[1].offset = (-1164676104750),
+
+.ADC_current[2].coeff = 1457994881,
+.ADC_current[2].offset = (-23717445756897),
+
+.ADC_current[3].coeff = 30731877501,
+.ADC_current[3].offset = (-499947688305697),
+
+.Usercode2DAC[0].coeff = (-10509141),
+.Usercode2DAC[0].offset = 581313489845,
+
+.Usercode2DAC[1].coeff = (-177847688),
+.Usercode2DAC[1].offset = 4765751343445,
+};
+#endif
+
+#ifdef BOARD_C615
+{
+.ADC_volt[0].coeff = (6213),
+.ADC_volt[0].offset = -100904734,
+
+.ADC_volt[1].coeff = (213486),
+.ADC_volt[1].offset = -3475774161,
+
+.ADC_volt[2].coeff = (6220838),
+.ADC_volt[2].offset = -101367452805,
+
+.ADC_current[0].coeff = 3133669,
+.ADC_current[0].offset = (-50985338691),
+
+.ADC_current[1].coeff = 71848701,
+.ADC_current[1].offset = (-1168930549263),
+
+.ADC_current[2].coeff = 1465220422,
+.ADC_current[2].offset = (-23836711044239),
+
+.ADC_current[3].coeff = 30753809644,
+.ADC_current[3].offset = (-500364315274466),
+
+.Usercode2DAC[0].coeff = (-10519306),
+.Usercode2DAC[0].offset = 583547544303,
+
+.Usercode2DAC[1].coeff = (-179481859),
+.Usercode2DAC[1].offset = 4808633144378,
+};
+#endif
+
+#ifdef BOARD_C797
+{
+.ADC_volt[0].coeff = (6285),
+.ADC_volt[0].offset = -102399765,
+
+.ADC_volt[1].coeff = (217179),
+.ADC_volt[1].offset = -3541219740,
+
+.ADC_volt[2].coeff = (6293290),
+.ADC_volt[2].offset = -102701705789,
+
+.ADC_current[0].coeff = 3124793,
+.ADC_current[0].offset = (-50785593516),
+
+.ADC_current[1].coeff = 71661923,
+.ADC_current[1].offset = (-1164632411724),
+
+.ADC_current[2].coeff = 1459117290,
+.ADC_current[2].offset = (-23712400276764),
+
+.ADC_current[3].coeff = 30624856407,
+.ADC_current[3].offset = (-497729976849926),
+
+.Usercode2DAC[0].coeff = (-10517402),
+.Usercode2DAC[0].offset = 581255473226,
+
+.Usercode2DAC[1].coeff = (-178353177),
+.Usercode2DAC[1].offset = 4777407394955,
+};
+#endif
+
+#ifdef BOARD_C639
+{
+.ADC_volt[0].coeff = (6208),
+.ADC_volt[0].offset = -100729867,
+
+.ADC_volt[1].coeff = (214500),
+.ADC_volt[1].offset = -3488858165,
+
+.ADC_volt[2].coeff = (6228268),
+.ADC_volt[2].offset = -101395718164,
+
+.ADC_current[0].coeff = 3139511,
+.ADC_current[0].offset = (-51174954874),
+
+.ADC_current[1].coeff = 71851912,
+.ADC_current[1].offset = (-1171152880960),
+
+.ADC_current[2].coeff = 1461965017,
+.ADC_current[2].offset = (-23828340962540),
+
+.ADC_current[3].coeff = 30773724865,
+.ADC_current[3].offset = (-501611882239925),
+
+.Usercode2DAC[0].coeff = (-10520659),
+.Usercode2DAC[0].offset = 581192312483,
+
+.Usercode2DAC[1].coeff = (-177973792),
+.Usercode2DAC[1].offset = 4768259045109,
+};
+#endif
+
+#ifdef BOARD_C5CD
+{
+.ADC_volt[0].coeff = (6279),
+.ADC_volt[0].offset = -100548659,
+
+.ADC_volt[1].coeff = (216253),
+.ADC_volt[1].offset = -3471891549,
+
+.ADC_volt[2].coeff = (6277392),
+.ADC_volt[2].offset = -100862395596,
+
+.ADC_current[0].coeff = 3136805,
+.ADC_current[0].offset = (-50213343000),
+
+.ADC_current[1].coeff = 72032077,
+.ADC_current[1].offset = (-1153034516566),
+
+.ADC_current[2].coeff = 1465628098,
+.ADC_current[2].offset = (-23459820455868),
+
+.ADC_current[3].coeff = 30833759075,
+.ADC_current[3].offset = (-493561287778940),
+
+.Usercode2DAC[0].coeff = (-10522269),
+.Usercode2DAC[0].offset = 578531626885,
+
+.Usercode2DAC[1].coeff = (-177684018),
+.Usercode2DAC[1].offset = 4759051659585,
+};
+#endif
+
+#ifdef BOARD_C771 //die
+{
+.ADC_volt[0].coeff = (6301),
+.ADC_volt[0].offset = -102184705,
+
+.ADC_volt[1].coeff = (216877),
+.ADC_volt[1].offset = -3519583281,
+
+.ADC_volt[2].coeff = (6298448),
+.ADC_volt[2].offset = -102304286091,
+
+.ADC_current[0].coeff = 3115431,
+.ADC_current[0].offset = (-50586460394),
+
+.ADC_current[1].coeff = 71203612,
+.ADC_current[1].offset = (-1156022105141),
+
+.ADC_current[2].coeff = 1451318434,
+.ADC_current[2].offset = (-23560731221983),
+
+.ADC_current[3].coeff = 30518004246,
+.ADC_current[3].offset = (-495456618814855),
+
+.Usercode2DAC[0].coeff = (-10568719),
+.Usercode2DAC[0].offset = 585036272447,
+
+.Usercode2DAC[1].coeff = (-179441058),
+.Usercode2DAC[1].offset = 4807380622351,
+};
+#endif
+
+#ifdef BOARD_C6E1 // not well
 {
 .ADC_volt[0].coeff = (-6251051),
 .ADC_volt[0].offset = 102081366120,
@@ -80,38 +489,7 @@ struct _correction{
 };
 #endif

-#ifdef BOARD_C7A1
-{
-.ADC_volt[0].coeff = (6204),
-.ADC_volt[0].offset = -100237253,
-
-.ADC_volt[1].coeff = (214511),
-.ADC_volt[1].offset = -3485722036,
-
-.ADC_volt[2].coeff = (6213224),
-.ADC_volt[2].offset = -101104189300,
-
-.ADC_current[0].coeff = 2078892,
-.ADC_current[0].offset = (-33685110900),
-
-.ADC_current[1].coeff = 64769469,
-.ADC_current[1].offset = (-1048938859469),
-
-.ADC_current[2].coeff = 2090182091,
-.ADC_current[2].offset = (-33847893234994),
-
-.ADC_current[3].coeff = 60030468992,
-.ADC_current[3].offset = (-972275155887907),
-
-.Usercode2DAC[0].coeff = (-10512772),
-.Usercode2DAC[0].offset = 581302323013,
-
-.Usercode2DAC[1].coeff = (-178991273),
-.Usercode2DAC[1].offset = 4794464882260,
-};
-#endif
-
-#ifdef BOARD_C6D4
+#ifdef BOARD_C6D4 // not well
 {
 .ADC_volt[0].coeff = (6226),
 .ADC_volt[0].offset = -100075170,
@@ -141,7 +519,6 @@ struct _correction{
 .Usercode2DAC[1].offset = 4789272862069,
 };
 #endif
-
 // this function turn ADC measure value (0xXXXX) into real voltage
 // unit should be uV
 static int32_t DecodeADCVolt(uint8_t ADCGain, uint16_t ADC_measure){
@@ -224,43 +601,41 @@ static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_
 // #0 board, (0x5f75 <= rawdata) && (rawdata <= 0x5fb2)
 //           ((0x5f97 < rawdata) && (rawdata < 0x6589)) || ((0x5999 < rawdata) && (rawdata < 0x5f93))

-//static void ADC_overflow(uint8_t gain, uint8_t *rawdata){
-//
-//    // Gain boundary defines different ADC gain level working area
-//    // Gain0Boundary = {lowerbound, upperbound}, is the lower and upper bound of gain level 0 working area.
-//
-//    uint16_t U16Rawdata = 0;
-//    U16Rawdata = (((uint16_t) (rawdata[0]))<<8) | ((uint16_t) (rawdata[1]));
-//
-//    if(gain == I_GAIN_3M){
-//        if( U16Rawdata <= Correction.Gain0Boundary[0]){
-//            rawdata[0] = Correction.Gain0Boundary[0] >> 4;
-//            rawdata[1] = (uint8_t) (Correction.Gain0Boundary[0] & 0x00FF);
-//        }
-//        else if(U16Rawdata >= Correction.Gain0Boundary[1]){
-//            rawdata[0] = (uint8_t) (Correction.Gain0Boundary[1] >> 4);
-//            rawdata[1] = (uint8_t) (Correction.Gain0Boundary[1] & 0x00FF);
-//        }
-//    }
-//    else if(gain == I_GAIN_100K){
-//        if( U16Rawdata <= Correction.Gain1Boundary[0]){
-//            rawdata[0] = Correction.Gain1Boundary[0] >> 4;
-//            rawdata[1] = (uint8_t) (Correction.Gain1Boundary[0] & 0x00FF);
-//        }
-//        else if(U16Rawdata >= Correction.Gain1Boundary[1]){
-//            rawdata[0] = (uint8_t) (Correction.Gain1Boundary[1] >> 4);
-//            rawdata[1] = (uint8_t) (Correction.Gain1Boundary[1] & 0x00FF);
-//        }
-//    }
-//}
+static void ADC_overflow(uint8_t gain, uint8_t *rawdata){
+
+    // Gain boundary defines different ADC gain level working area
+    // Gain0Boundary = {lowerbound, upperbound}, is the lower and upper bound of gain level 0 working area.
+
+    uint16_t U16Rawdata = 0;
+    U16Rawdata = (((uint16_t) (rawdata[0]))<<8) | ((uint16_t) (rawdata[1]));
+
+    if(gain == I_GAIN_3M){
+        if( U16Rawdata <= Correction.Gain0Boundary[0]){
+            rawdata[0] = Correction.Gain0Boundary[0] >> 4;
+            rawdata[1] = (uint8_t) (Correction.Gain0Boundary[0] & 0x00FF);
+        }
+        else if(U16Rawdata >= Correction.Gain0Boundary[1]){
+            rawdata[0] = (uint8_t) (Correction.Gain0Boundary[1] >> 4);
+            rawdata[1] = (uint8_t) (Correction.Gain0Boundary[1] & 0x00FF);
+        }
+    }
+    else if(gain == I_GAIN_100K){
+        if( U16Rawdata <= Correction.Gain1Boundary[0]){
+            rawdata[0] = Correction.Gain1Boundary[0] >> 4;
+            rawdata[1] = (uint8_t) (Correction.Gain1Boundary[0] & 0x00FF);
+        }
+        else if(U16Rawdata >= Correction.Gain1Boundary[1]){
+            rawdata[0] = (uint8_t) (Correction.Gain1Boundary[1] >> 4);
+            rawdata[1] = (uint8_t) (Correction.Gain1Boundary[1] & 0x00FF);
+        }
+    }
+}

 // User will enter -5V~+5V in UI.
 // websever and controler use 0~50000 represent -5~+5V
 // this function should turn 0~50000 into DACcode which output the exactly voltage user want
 static uint16_t Usercode_Correction_to_DAC(uint8_t DACGain, uint16_t usercode)
 {
-    AutoGainChangeVout(usercode);
-
    long long usercode_32;
    uint16_t DACcode = 0;

@@ -7,7 +7,6 @@ struct _CT{
    uint32_t SampleRate_counter;
    uint16_t StepTimeCounter;
    uint16_t NotifyCounter;
-    uint32_t StandByCounter;
 }CT = {0};

 // GPT counter
@@ -22,16 +21,9 @@ struct _GPT{
    uint32_t BatteryADCCounter;
    uint32_t BatteryCheckCounter;
    uint32_t GptimerMultiple;
-    uint32_t TestCounter;
+    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;
@@ -42,5 +34,6 @@ static void InitGPT(){
    GPT.LeadTimeCounter     = 0;
    GPT.BatteryADCCounter   = 0;
    GPT.BatteryCheckCounter = 0;
+    GPT.StiCounter          = 0;
 }
 #endif
@@ -2,47 +2,61 @@
 #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 iv_vscan(void)
+{
+    struct wm_iv_ctx_t *iv = (struct wm_iv_ctx_t *)wm_get();
+
+    if (vscanReset) {
+        if (instru.directionInit == 1) {
+            iv->_direction_up         = true;
+            iv->_current_direction_up = true;
+        } else if (instru.directionInit == 0) {
+            iv->_direction_up         = false;
+            iv->_current_direction_up = false;
        }

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

-        Vset       = IV->_Vinit;
+        Vset = iv->_Vinit;
    }

-    if(!vscanReset){
-        if(IV->_current_direction_up){
-            if(Vset >= IV->_Vmax){
+    if (!vscanReset) {
+        if (iv->_current_direction_up) {
+            if (Vset >= iv->_Vmax) {
                PeriodicEvent = false;
-                ModeLED(NO_EVENT);
            }
-        }else{
-            if(Vset <= IV->_Vmin){
+        } 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 (iv->_current_direction_up) {
+            Vset = Vset + iv->_Vstep * GPT.GptimerMultiple;
+        } else {
+            Vset = Vset - iv->_Vstep * GPT.GptimerMultiple;
        }
    }
 }

+static void vo_vscan(void)
+{
+    struct wm_vo_ctx_t *vo = (struct wm_vo_ctx_t *)wm_get();
+
+    if (vscanReset) {
+        Vset = vo->_Vinit;
+    }
+
+    if(!vscanReset) {
+        Vset = vo->_Vinit;
+    }
+}
+
 #endif
@@ -1,6 +1,72 @@
+#ifndef __INSTR_H__
+#define __INSTR_H__

-#ifndef ELITEINSTRUCTION
-#define ELITEINSTRUCTION
+#ifdef __cpulsplus
+extern "C" {
+#endif
+
+/*==============================
+ ==== headstage instruction ====
+ =============================*/
+struct HEADSTAGE_INSTRUCTION {
+    uint8_t  chip_id;
+    uint8_t  eliteFxn;
+
+    /** DAC parameter **/
+    uint8_t  VsetRateIndex;
+    uint32_t VsetRate;
+    int32_t  Vset;
+    uint16_t VoltConstant;
+    uint8_t  directionInit;
+    uint32_t step;
+    uint16_t Ve1;
+    uint16_t Ve2;
+    int32_t  Vinit;
+    int32_t  Vmax;
+    int32_t  Vmin;
+
+    /** ADC parameter **/
+    uint8_t  notifyRateIndex;
+    uint32_t sampleRate;
+    uint8_t  VoViSwitch;
+    uint8_t  AutoGainEnable;
+    uint8_t  VinAutoGainEnable;
+    uint8_t  VoutAutoGainEnable;
+    uint8_t  ADCGainLevel;
+     // voltage output gain
+    uint16_t VoutGainLevel;
+    uint8_t  VinADCGainLevel;
+
+    /** Notify parameter **/
+    uint32_t notifyRate;
+
+    /** mode parameter **/
+    uint16_t cycleNumber;
+    uint8_t  charge;
+    int32_t  constantCurrent;
+    int32_t  Currentmax;
+    int32_t  sti_v1;
+    int32_t  sti_v2;
+    int32_t  sti_v3;
+    int32_t  sti_v4;
+    int32_t  sti_v5;
+    int32_t  sti_v6;
+    int32_t  sti_v7;
+    int32_t  sti_t1;
+    int32_t  sti_t2;
+    int32_t  sti_t3;
+    int32_t  sti_t4;
+    int32_t  sti_t5;
+    int32_t  sti_t6;
+    int32_t  sti_t7;
+    uint16_t sti_cy;
+    uint16_t sti_loop;
+
+    uint16_t StepTime;
+
+    uint8_t AdcChannel;
+
+} instru = {0};

 /** Iin, Vin, Vout **/
 #define IIN_ADC         0x00
@@ -34,54 +100,6 @@
 #define STEPTIME_ONE_SEC 10000
 #define STEPTIME_TWO_SEC 20000

-/*==============================
- ==== headstage instruction ====
- =============================*/
-struct HEADSTAGE_INSTRUCTION {
-
-    uint8_t  chip_id;
-    uint8_t  eliteFxn;
-
-    /** DAC parameter **/
-    uint8_t  VsetRateIndex;
-    uint32_t VsetRate;
-    int32_t  Vset;
-    uint16_t VoltConstant;
-    uint8_t  directionInit;
-    uint32_t step;
-    uint16_t Ve1;
-    uint16_t Ve2;
-    int32_t  Vinit;
-    int32_t  Vmax;
-    int32_t  Vmin;
-
-    /** ADC parameter **/
-    uint8_t  sampleRateIndex;
-    uint32_t sampleRate;
-    uint8_t  VoViSwitch;
-    uint8_t  AutoGainEnable;
-    uint8_t  VinAutoGainEnable;
-    uint8_t  VoutAutoGainEnable;
-    uint8_t  ADCGainLevel;
-     // voltage output gain
-    uint16_t VoutGainLevel;
-    uint8_t  VinADCGainLevel;
-
-    /** Notify parameter **/
-    uint32_t notifyRate;
-
-    /** mode parameter **/
-    uint16_t cycleNumber;
-    uint8_t  charge;
-    int32_t  constantCurrent;
-    int32_t  Currentmax;
-
-    uint16_t StepTime;
-
-    uint8_t AdcChannel;
-
-} INSTRUCTION = {0};
-
 /*********************************************************************
 * @fn      InitEliteInstruction
 *
@@ -92,34 +110,58 @@ 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;
+    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.ADCGainLevel    = I_GAIN_AUTO;
+    instru.VoutGainLevel   = VOUT_GAIN_AUTO;
+    instru.VinADCGainLevel = 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;
+
+    //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;
+}
+
+#ifdef __cpulsplus
 }
 #endif
+#endif
+
+
@@ -8,19 +8,25 @@ static bool TurnOnElite(uint8_t key) {
    if (key == 0) {
        // press 1 sec, power on LED, read bat power
        if (TurnOnCounter >= CLOCK_ONE_SECOND) {
-            PIN_setOutputValue(pin_handle, enable_5v, 1);// enable 5V
-            Elite_SPI_init();
-            ModeLED(BT_WAIT);
-            AD5940_init();
-            // DAC_outputV(0x3FFFF);
-            return true;
+            headstage_battery_volt();
+            uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
+                           ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+            if( bat < 768 && bat > 20){
+                PIN15_setOutputValue(enable_5v, 0);
+                return false;
+            }else{
+                PIN15_setOutputValue(enable_5v, 1);  // enable 5V
+                TurnOn10V();
+                ModeLED(BT_WAIT);
+                return true;
+            }
        } else {
            TurnOnCounter++;
            return false;
        }
    } else {
        TurnOnCounter = 0;
-        PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
+        PIN15_setOutputValue(enable_5v, 0);  // disable 5V
        return false;
    }
 }
@@ -40,18 +46,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);
-            PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
+            PIN15_setOutputValue(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;
            }
@@ -60,4 +66,10 @@ static void EliteKeyPress(uint8_t key) {
    }
 }

+static void TurnOn10V() {
+    If10Von = true;
+    PIN15_setOutputValue(enable_10v, 1);
+    CPUdelay(8000);
+}
+
 #endif
@@ -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;
        }
@@ -133,30 +153,35 @@ static void checkFlafLED() {
 }

 static void WorkModeLED() {
-    switch (INSTRUCTION.eliteFxn) {
-    case IV_CURVE:
-    case CV_CURVE:
+    switch (instru.eliteFxn) {
+    case CURVE_IV:
+    case CURVE_IV_CY:
    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:{
+    case CURVE_VO:
+    case CURVE_RT:
+    case CURVE_VT:
+    case CURVE_IT:
+    case CURVE_CALI_ADCTEST:
+    case CURVE_CV:
+    case CURVE_LSV:
+    case CURVE_CA:{
        WORKLED();
        break;
    }
-    case CONSTANT_CURRENT:{
+    case CURVE_PULSE:{
+//        Elite_led_color(COLOR_YELLOW);
        WORKLED();
        break;
    }
-    case CALI_ADC_MODE:{
-        if(INSTRUCTION.AdcChannel == IIN_ADC){
+    case CURVE_CC:{
+        WORKLED();
+        break;
+    }
+    case CURVE_CALI_ADC:{
+        if(instru.AdcChannel == IIN_ADC){
            Elite_led_color(COLOR_RED);
-        }else if(INSTRUCTION.AdcChannel == VIN_ADC){
+        }else if(instru.AdcChannel == VIN_ADC){
            Elite_led_color(COLOR_ORANGE);
        }

@@ -1,97 +1,79 @@
 #ifndef ELITELSV
 #define ELITELSV

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

-static uint16_t LSVCurve(LSVMode *LSV){
-    static uint16_t DACOutCode;
-    static int32_t Vin;
-    static int32_t Vout;
-    static int32_t DeltaVout;
+static void lsv_volt_out(void)
+{
+    struct wm_lsv_ctx_t *lsv = (struct wm_lsv_ctx_t *)wm_get();
+    struct wm_meas_t *m = &lsv->measure;
+    uint16_t DACOutCode;
+    int32_t Vin;
+    int32_t Vout;
+    int32_t DeltaVout;

-    Vin = LSV->_measureVin * 200;//[5nV]
-    if(DACReset){
+    Vin = m->_measureVin * 200;//[5nV]
+    if (DACReset) {
        Vout = Vset + Vin;
-        DACReset = false;
-    }else{
+    } else {
        DeltaVout = Vset - (Vout - Vin);
        Vout = Vout + DeltaVout;
    }

-    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
+    instru.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
+    DACOutCode = Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.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);
+//    int32_t RealV;
+//    RealV = (int32_t)(Vout / 200);//[1uV]
+//    InputNotify(NOTIFY_IMPEDANCE, RealV);

    DAC_outputV(DACOutCode);
-//
-     return DACOutCode;
+
+    return;
 }

-static void LSV_Vscan(LSVMode *LSV){
+static void lsv_vscan(void)
+{
+    struct wm_lsv_ctx_t *lsv = (struct wm_lsv_ctx_t *)wm_get();

-    NotifyCycleNumber = (INSTRUCTION.cycleNumber - LSV->_cycleNumber + 1);
+    NotifyCycleNumber = (instru.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;
+    if (vscanReset) {
+        if (instru.directionInit == 1) {
+            lsv->_direction_up         = true;
+            lsv->_current_direction_up = true;
+        } else {
+            lsv->_direction_up         = false;
+            lsv->_current_direction_up = false;
        }

         //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if(INSTRUCTION.step <= 10){
-            LSV->_Vstep = INSTRUCTION.step *  INSTRUCTION.VsetRate / 5;
-        }else{
-            LSV->_Vstep = INSTRUCTION.step / 5 *  INSTRUCTION.VsetRate;
+        if (instru.step <= 10) {
+            lsv->_Vstep = instru.step *  instru.VsetRate / 5;
+        } else {
+            lsv->_Vstep = instru.step / 5 *  instru.VsetRate;
        }

-        Vset = LSV->_Vinit;
+        Vset = lsv->_Vinit;
    }

-    if(!vscanReset){
+    if (!vscanReset) {

-        if (LSV->_current_direction_up){
-            Vset = Vset + LSV->_Vstep * GPT.GptimerMultiple;
-        }else{
-            Vset = Vset - LSV->_Vstep * GPT.GptimerMultiple;
+        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
+        if (Vset >= lsv->_Vmax) {
+            PeriodicEvent = false;
+        } else if (Vset <= lsv->_Vmin) {
+            PeriodicEvent = false;
        }
    }
 }
@@ -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,7 +90,7 @@ 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];
@@ -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;
+
+    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);
 }
@@ -0,0 +1,115 @@
+#ifndef ELITEPULSE
+#define ELITEPULSE
+
+#define Vset instru.Vset
+
+static void pulse_vscan(void)
+{
+    struct wm_pulse_ctx_t *pulse = (struct wm_pulse_ctx_t *)wm_get();
+    static uint16_t lastVolt;
+
+    if (stiFirstTime) {
+        stiFirstTime = false;
+        lastVolt = 25000;
+        pulse->_sti_t_flag = 1;
+        pulse->_sti_v = pulse->_sti_v1;
+        pulse->_sti_t = pulse->_sti_t1;
+        if (pulse->_sti_t == 1) {
+            pulse->_sti_v = lastVolt;
+        }
+    } else if(!stiFirstTime) {
+        if (GPT.StiCounter >= pulse->_sti_t) {
+            GPT.StiCounter -= pulse->_sti_t; //to get right time
+
+            if (pulse->_sti_lp > 0) {
+                if (pulse->_sti_cy > 0) {
+                    if (pulse->_sti_t_flag == 1) {
+                        pulse->_sti_t_flag = 2;
+                        pulse->_sti_v = pulse->_sti_v2;
+                        pulse->_sti_t = pulse->_sti_t2;
+                        if (pulse->_sti_t == 1) {
+                            pulse->_sti_v = lastVolt;
+                        }
+                    } else if (pulse->_sti_t_flag == 2) {
+                        pulse->_sti_t_flag = 3;
+                        pulse->_sti_v = pulse->_sti_v3;
+                        pulse->_sti_t = pulse->_sti_t3;
+                        if (pulse->_sti_t == 1) {
+                            pulse->_sti_v = lastVolt;
+                        }
+                    } else if (pulse->_sti_t_flag == 3) {
+                        pulse->_sti_cy -- ;
+                        if (pulse->_sti_cy == 0) {
+                            pulse->_sti_t_flag = 4;
+                            pulse->_sti_v = pulse->_sti_v4;
+                            pulse->_sti_t = pulse->_sti_t4;
+                            if (pulse->_sti_t == 1) {
+                                pulse->_sti_v = lastVolt;
+                            }
+                        } else {
+                            pulse->_sti_t_flag = 2;
+                            pulse->_sti_v = pulse->_sti_v2;
+                            pulse->_sti_t = pulse->_sti_t2;
+                            if (pulse->_sti_t == 1) {
+                                pulse->_sti_v = lastVolt;
+                            }
+                        }
+                    }
+                } else if (pulse->_sti_cy <= 0){
+                    if (pulse->_sti_t_flag == 4) {
+                        pulse->_sti_lp -- ;
+                        if (pulse->_sti_lp > 0) {
+                            pulse->_sti_cy = instru.sti_cy;
+                            pulse->_sti_t_flag = 2;
+                            pulse->_sti_v = pulse->_sti_v2;
+                            pulse->_sti_t = pulse->_sti_t2;
+                            if (pulse->_sti_t == 1) {
+                                pulse->_sti_v = lastVolt;
+                            }
+                        } else {
+                            pulse->_sti_t_flag = 5;
+                            pulse->_sti_v = pulse->_sti_v5;
+                            pulse->_sti_t = pulse->_sti_t5;
+                            if (pulse->_sti_t == 1) {
+                                pulse->_sti_v = lastVolt;
+                            }
+                        }
+                    }
+                }
+            } else if (pulse->_sti_lp <= 0) {
+                if (pulse->_sti_t_flag == 5) {
+                    pulse->_sti_t_flag = 6;
+                    pulse->_sti_v = pulse->_sti_v6;
+                    pulse->_sti_t = pulse->_sti_t6;
+                    if (pulse->_sti_t == 1) {
+                        pulse->_sti_v = lastVolt;
+                    }
+                } else if (pulse->_sti_t_flag == 6) {
+                    pulse->_sti_t_flag = 7;
+                    pulse->_sti_v = pulse->_sti_v7;
+                    pulse->_sti_t = pulse->_sti_t7;
+                    if (pulse->_sti_t == 1) {
+                        pulse->_sti_v = lastVolt;
+                    }
+                } else if (pulse->_sti_t_flag == 7) {
+                    pulse->_sti_v = 25000;
+                    PeriodicEvent  = false;
+                    PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
+                    ModeLED(NO_EVENT);
+                }
+            }
+        }
+    }
+
+    if (lastVolt != pulse->_sti_v) {
+        lastVolt = pulse->_sti_v;
+        //if (pulse->_sti_v == 25000) {
+        //    PIN15_setOutputValue(HIGH_Z_MODE, 0);   // 1 => close high_z mode
+        //} else {
+        //    PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
+        //}
+        DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
+        DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
+    }
+}
+#endif
@@ -3,19 +3,25 @@
 #define ELITERESET

 static void reset() {
-    ModeLED(NO_EVENT);
-    InitEliteFlag();
-    InitFlag();
-    InitCT();
-    InitGPT();
-    InitLH();
+    mode_init = true;
+    megaStiEnable = false;
+    PeriodicEvent = false;     // is there an PeriodicEvent?
+    Free_Work_Mode = true;      // Free(WorkModeData)
+    InitPeriodicEvent = true;      // need to create a WorkModeData?

-//    VinADCGainControl(VIN_GAIN_AUTO);
-//    IinADCGainControl(I_GAIN_AUTO);
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+    InitGPT();
    initINSBuf();
    initDATBuf();

+    PIN15_setOutputValue(HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
+
+    VinADCGainControl(VIN_GAIN_AUTO);
+    IinADCGainControl(I_GAIN_AUTO);
+
+    instru.VoutGainLevel = VOUT_GAIN_15K;
+    VoutGainControl(instru.VoutGainLevel);
+    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
+
    for (int i = 0; i < SPI_LED_SIZE; i++) {
        spi_LEDtxbuf[i] = 0;
        spi_LEDrxbuf[i] = 0;
@@ -31,26 +37,27 @@ static void reset() {
        spi_ADC_rxbuf[i] = 0;
    }

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

 static void Eliteinterrupt() {
-    InitFlag();
-    ModeLED(NO_EVENT);
+    mode_init = true;
+    megaStiEnable = false;
+    PeriodicEvent = false;     // is there an PeriodicEvent?
+    Free_Work_Mode = true;      // Free(WorkModeData)
+    InitPeriodicEvent = true;      // need to create a WorkModeData?

-    InitEliteFlag();
-    InitCT();
    InitGPT();
-    InitLH();
-
-//    VinADCGainControl(VIN_GAIN_AUTO);
-//    IinADCGainControl(I_GAIN_AUTO);
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
    initINSBuf();
    initDATBuf();

+    PIN15_setOutputValue(HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
+
+    instru.VoutGainLevel = VOUT_GAIN_15K;
+    VoutGainControl(instru.VoutGainLevel);
+    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
+
    for (int i = 0; i < SPI_LED_SIZE; i++) {
        spi_LEDtxbuf[i] = 0;
        spi_LEDrxbuf[i] = 0;
@@ -66,7 +73,7 @@ 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 5
+#define SPI_DAC_SIZE 3
 #define SPI_ADC_SIZE 4

 static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
@@ -36,10 +36,13 @@ static SPI_Params      spiParams1;
 static SPI_Transaction LED_transaction;
 static SPI_Transaction ADC_DAC_transaction;

+static void ELITE15_SPI_HOLD();
+static void ELITE15_SPI_CLOSE();
+
 static void Elite_SPI_init(){
    SPI_init();
    SPI_Params_init(&spiParams0);
-    spiParams0.bitRate     = 2000;  // 2k
+    spiParams0.bitRate     = 2000;  // 12k
    spiParams0.mode        = SPI_MASTER;
    spiParams0.dataSize    = 16;
    spiParams0.frameFormat = SPI_POL0_PHA1;
@@ -49,8 +52,7 @@ static void Elite_SPI_init(){
    spiParams1.bitRate     = 1000000;  // 1M
    spiParams1.mode        = SPI_MASTER;
    spiParams1.dataSize    = 8;
-    spiParams1.frameFormat = SPI_POL0_PHA0;
-
+    spiParams1.frameFormat = SPI_POL0_PHA1;
    spiHandle1 = SPI_open(Board_SPI1, &spiParams1);  // ADC DAC SPI
 }

@@ -63,7 +65,9 @@ static void LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
 }

 static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-    PIN_setOutputValue(pin_handle, AD_CS, 0);      // CS_ADC
+//    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;
@@ -71,228 +75,63 @@ 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, AD_CS, 1);      // CS_ADC
+    PIN_setOutputValue(pin_handle, D6, 1); // ADC_CS HIGH
+    update_latch_status (ADC_CS, 1);
+//    PIN15_setOutputValue(ADC_CS, 1);  // ADC_CS HIGH
 }

 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 HIGH
+    update_latch_status (DAC_CS, 1);
+//    PIN15_setOutputValue(DAC_CS, 1);            // DAC_CS HIGH
+}
+
+static void ELITE15_SPI_HOLD() {
+    Elite_SPI_init();
+    #ifdef ELITE_PIN_1_5_RE
+    PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);   // ADC_CS
+    PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);   // DAC_CS
+    PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);   // update HIGH_Z_MODE
+    #endif
+
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, LOAD1, 0);
+    PIN_setOutputValue(pin_handle, LOAD2, 0);
+}
+static void ELITE15_SPI_CLOSE() {
+    PIN_setOutputValue(pin_handle, LOAD0, 0);
+    PIN_setOutputValue(pin_handle, LOAD1, 0);
+    PIN_setOutputValue(pin_handle, LOAD2, 0);
+
+    SPI_close(spiHandle0);
+    SPI_close(spiHandle1);
 }

 /* Elite1.5 Calibration SPI */
 static void CAL_ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+//    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, AD_CS, 1);      // CS_ADC
+    PIN_setOutputValue(pin_handle, D6, 1); // ADC_CS HOGH
+    update_latch_status (ADC_CS, 1);
+//    PIN15_setOutputValue(ADC_CS, 1);  // ADC_CS HIGH
 }

-static void CAL_LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
-    LED_transaction.count = length;
-    LED_transaction.txBuf = spi_txbuf;
-    LED_transaction.rxBuf = spi_rxbuf;
-
-    SPI_transfer(spiHandle0, &LED_transaction);
-}
-
-
-
-#ifdef ELITE_VERSION_EIS
-//define SPI command
-#define SPICMD_SETADDR  0x20
-#define SPICMD_WRITEREG 0x2D
-#define SPICMD_READREG  0x6D
-
-//define REG
-#define LPDACCON0       0x2128
-#define LPDACSW0        0x2124
-#define LPDACDAT0       0x2120
-#define LPREFBUFCON     0x2050
-#define SWMUX           0x235C
-#define LPTIASW0        0x20E4
-#define SWCON           0x200C
-#define HSDACCON        0x2010
-#define HSDACDAT        0x2048
-#define LPTIACON0       0x20EC
-#define HSTIACON        0x20FC
-#define AFECON          0x2000
-#define DSWFULLCON      0x2150
-#define NSWFULLCON      0x2154
-#define PSWFULLCON      0x2158
-#define TSWFULLCON      0x215C
-#define WGFCW           0x2030
-#define WGPHASE         0x2034
-#define WGOFFSET        0x2038
-#define WGAMPLITUDE     0x203C
-#define WGCON           0x2014
-#define DE0RESCON       0x20F8
-#define ADCCON          0x21A8
-#define DFTCON          0x20D0
-#define ADCFILTERCON    0x2044
-
-static void select_REG(uint16_t addr){
-    PIN_setOutputValue(pin_handle, AD_CS, 0);
-//    CPUdelay(16000);
-
-    spi_DACtxbuf[0] = SPICMD_SETADDR;
-    spi_DACtxbuf[1] = (uint8_t)((addr & 0xFF00) >> 8);
-    spi_DACtxbuf[2] = (uint8_t)(addr & 0x00FF);
-
-    ADC_DAC_transaction.count = 3;
-    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-//    CPUdelay(16000);
-    PIN_setOutputValue(pin_handle, AD_CS, 1);
-}
-
-static void w16_REG(uint16_t data){
-    PIN_setOutputValue(pin_handle, AD_CS, 0);
-    spi_DACtxbuf[0] = SPICMD_WRITEREG;
-    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF00) >> 8);
-    spi_DACtxbuf[2] = (uint8_t)(data & 0x00FF);
-
-    ADC_DAC_transaction.count = 3;
-    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);
-}
-
-static void r16_REG(){
-    PIN_setOutputValue(pin_handle, AD_CS, 0);
-    spi_DACtxbuf[0] = SPICMD_READREG;
-    spi_DACtxbuf[1] = 0x00;
-    spi_DACtxbuf[2] = 0x00;
-    spi_DACtxbuf[3] = 0x00;
-
-    ADC_DAC_transaction.count = 4;
-    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);
-}
-
-static void w32_REG(uint32_t data){
-    PIN_setOutputValue(pin_handle, AD_CS, 0);
-    spi_DACtxbuf[0] = SPICMD_WRITEREG;
-    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF000000) >> 24);
-    spi_DACtxbuf[2] = (uint8_t)((data & 0x00FF0000) >> 16);
-    spi_DACtxbuf[3] = (uint8_t)((data & 0x0000FF00) >> 8);
-    spi_DACtxbuf[4] = (uint8_t)(data & 0x000000FF);
-
-    ADC_DAC_transaction.count = 5;
-    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);
-}
-
-static void r32_REG(){
-    PIN_setOutputValue(pin_handle, AD_CS, 0);
-    spi_DACtxbuf[0] = SPICMD_READREG;
-    spi_DACtxbuf[1] = 0x00;
-    spi_DACtxbuf[2] = 0x00;
-    spi_DACtxbuf[3] = 0x00;
-    spi_DACtxbuf[4] = 0x00;
-    spi_DACtxbuf[5] = 0x00;
-
-    ADC_DAC_transaction.count = 6;
-    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, AD_CS, 1);
-}
-
-static void AD5940_init(){
-        PIN_setOutputValue(pin_handle, AD_reset, 0);
-        PIN_setOutputValue(pin_handle, AD_reset, 1);
-        select_REG(0x0908);//initiation
-        w16_REG(0x02C9);
-        select_REG(0x0C08);
-        w16_REG(0x206C);
-        select_REG(0x21F0);
-        w16_REG(0x0010);
-        select_REG(0x0410);
-        w16_REG(0x02C9);
-        select_REG(0x0A28);
-        w16_REG(0x0009);
-        select_REG(0x238C);
-        w16_REG(0x0104);
-        select_REG(0x0A04);
-        w16_REG(0x4859);
-        select_REG(0x0A04);
-        w16_REG(0xF27B);
-        select_REG(0x0A00);
-        w16_REG(0x8009);
-        select_REG(0x0A04);
-        w16_REG(0x4859);
-        select_REG(0x22F0);
-        w16_REG(0x0000);
-
-        select_REG(SWCON);  //200C
-        w32_REG(0x402B5);
-
-        select_REG(HSDACCON);  //2010  //ac gain
-        w32_REG(0x001E);
-
-        select_REG(WGFCW);  //2030
-        w32_REG(0x340000);
-        select_REG(WGCON);  //2014
-        w32_REG(0x4);   //AC on/off;  0x0:DC 0x4:AC 0x5:trapezoid
-
-        select_REG(LPDACCON0);  //2128 //DC on
-        w32_REG(0b0000001);
-        select_REG(LPDACSW0);  //2124  //operation
-        w32_REG(0b101011);
-        select_REG(LPDACDAT0);  //2120 //output Vout
-        w32_REG(0x00000);
-
-        // select_REG(HSTIACON);  //20FC //SE0's gain
-        // w32_REG(0x0);
-        select_REG(DE0RESCON);  //20F8 //DE0's gain
-        w32_REG(0x68);
-
-        select_REG(ADCCON);  //21A8
-        w32_REG(0x101);
-        select_REG(DFTCON);  //20D0
-        w32_REG(0x00C1);
-        select_REG(ADCFILTERCON);  //2044
-        w32_REG(0x00D0);
-
-        select_REG(AFECON);  //2000
-        w32_REG(0x30CFC0);
-//        w32_REG(0b1100011100111111000000);
-}
-
-static void EIS_LPDAC_SPI(){
-//    uint32_t con = 0b00001;//12 bit DAC
-//    uint32_t sw = 0b01010;//test mode
-//    uint32_t volt = 0;//2.4v
-//    uint32_t buf = 0;//LP reference
-//    uint32_t cm = 0;//common mode disabled
-//    select_REG(LPDACCON0);
-//    w32_REG(con);
-//    select_REG(LPDACSW0);
-//    w32_REG(sw);
-//    select_REG(LPDACDAT0);
-//    w32_REG(volt);
-//    select_REG(LPREFBUFCON);
-//    w32_REG(buf);
-//    select_REG(SWMUX);
-//    w32_REG(cm);
-}
-
-#endif
-
 #endif // ELITE_SPI
@@ -8,14 +8,16 @@
 // 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();
+static void rt_vscan(void)
+{
+    struct wm_rt_ctx_t *rt = (struct wm_rt_ctx_t *)wm_get();
+
+    if (vscanReset) {
+        Vset = rt->_Vinit;
    }

-    if(!vscanReset){
-
+    if(!vscanReset) {
+        Vset = rt->_Vinit;
    }
 }
 #endif
@@ -6,39 +6,108 @@
 #include <Board.h>
 #include <ti/drivers/PIN.h>

+#define ELITE_PIN_1_5
+
 /* SPI Board */
 #define Board_SPI0_MISO                 PIN_UNASSIGNED
-#define Board_SPI0_MOSI                 IOID_4
-#define Board_SPI0_CLK                  IOID_3
+#define Board_SPI0_MOSI                 D1
+#define Board_SPI0_CLK                  D0
 #define Board_SPI0_CS                   PIN_UNASSIGNED

 #define Board_SPI1_MISO                 IOID_1
-#define Board_SPI1_MOSI                 IOID_6
-#define Board_SPI1_CLK                  IOID_5
+#define Board_SPI1_MOSI                 D3
+#define Board_SPI1_CLK                  D2
 #define Board_SPI1_CS                   PIN_UNASSIGNED

-#define AD_CS                           IOID_10
+#define D0                              IOID_3
+#define D1                              IOID_4
+#define D2                              IOID_5
+#define D3                              IOID_6
+#define D4                              IOID_7
+#define D5                              IOID_8
+#define D6                              IOID_9
+#define D7                              IOID_10

-//#define SD_MISO                         IOID_11
-//#define SD_CS                           IOID_8
-//#define SD_CLK                          IOID_7
-//#define SD_MOSI                         IOID_13
+#define LOAD0                           IOID_13
+#define LOAD1                           IOID_12
+#define LOAD2                           IOID_11
+
+#define ADC_CS                          LOAD0, D6
+#define DAC_CS                          LOAD0, D7
+#define ADC_DAC_SPI_MOSI                LOAD0, D3
+#define ADC_DAC_SPI_CLK                 LOAD0, D2
+#define LED_MOSI                        LOAD0, D1
+#define LED_CLK                         LOAD0, D0
+#define MEM_CS                          LOAD0, D5
+
+#ifdef ELITE_PIN_1_5
+#define MEM_HOLD                        LOAD0, D4
+#define HIGH_Z_MODE                     LOAD2, D5
+#endif
+#ifdef ELITE_PIN_1_5_RE
+#define MEM_HOLD                        LOAD1, D0
+#define HIGH_Z_MODE                     LOAD0, D4
+#endif
+
+#define Turnon_I_MID                    LOAD2, D0
+#define Turnon_I_SMALL                  LOAD2, D4
+#define Turnon_I_LARGE                  LOAD2, D1
+#define Turnon_V_SMALL                  LOAD2, D2
+#define Turnon_V_MID                    LOAD2, D3
+#define Turon_VOUT_SMALL                LOAD2, D7
+#define shutdown_6994                   LOAD2, D6
+
+//#define Turnon10K                       Turnon_I_MID
+//#define Turnon200R                      Turnon_I_LARGE
+
+/* I2C */
+#ifdef ELITE_VERSION_1_4
+#define Board_I2C0_SCL0                 PIN_UNASSIGNED
+#define Board_I2C0_SDA0                 PIN_UNASSIGNED
+#endif

 #define switch_on                       IOID_14
-#define enable_5v                       IOID_9
-#define AD_reset                        IOID_13
+#define enable_10v                      LOAD1, D5
+#define enable_5v                       LOAD1, D6

 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,
+//    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+
+    LOAD0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    LOAD1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    LOAD2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+
+    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,                                    // to sense switch
+
    PIN_TERMINATE
 };

+static void add_elite_pin() {
+//    PIN_Status elite15_status;
+    PIN_add(pin_handle,
+    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+
+//    if(elite15_status != PIN_SUCCESS) {
+//        LED_color(DARKLED, 0x0F, 0x0F, 0x0F);
+//    }
+}
+
 static void remove_elite_pin() {
    PIN_close(pin_handle);
    pin_handle = PIN_open(&ZM_rst, BLE_IO);
@@ -159,6 +228,8 @@ const I2CCC26XX_HWAttrsV1 i2cCC26xxHWAttrs[CC2650_MA_I2CCOUNT] = {
        .intNum = INT_I2C_IRQ,
        .intPriority = ~0,
        .swiPriority = 0,
+        .sdaPin = Board_I2C0_SDA0,
+        .sclPin = Board_I2C0_SCL0,
    }
 };

@@ -42,7 +42,7 @@ static void headstage_battery_volt(){

 static void EliteADCBattery(){
    static uint8_t ADCSwitch = 0;
-    if(INSTRUCTION.eliteFxn == ADC_TEST){
+    if(instru.eliteFxn == CURVE_CALI_ADCTEST){
        ADCSwitch = 0;
    }else{
        if(ADCSwitch == 0){ /**read V**/
@@ -85,7 +85,7 @@ static void measureBat(){
    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);
+        PIN15_setOutputValue(enable_5v, 0);
    }
 }

@@ -20,35 +20,43 @@
 #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
+enum all_mode_e {
+    CURVE_IV                       =  0x01,                                    // 01
+    CURVE_IV_CY                    =  0x02, // cycling iv                      // 02
+    CURVE_VO                       =  0x03,                                    // 03
+    CURVE_RT                       =  0x04,                                    // 04
+    CURVE_VT                       =  0x05,                                    // 05
+    CURVE_IT                       =  0x06,                                    // 06
+    CURVE_CC                       =  0x07, // constant current                // 07
+    CURVE_CC_CY                    =  0x08, // doesn't exist                   // 08
+    CURVE_CV                       =  0x09, // cyclic voltammetry              // 09
+    CURVE_CV_HIGH_CY               =  0x0A, // cyclic voltammetry(high cycle)  // 0A
+    CURVE_LSV                      =  0x0B, // linear sweep voltammetry        // 0B
+    CURVE_CA                       =  0x0C, // chronoamperometric graph(CA)    // 0C
+    CURVE_PULSE                    =  0x0D,                                    // 0D
+    DIFFERENTIAL_PULSE_VOLTAMMETRY =  0x0E, // doesn't exist                   // 0E
+    SQUARE_WAVE_VOLTAMMETRY        =  0x0F, // doesn't exist                   // 0F
+
+    SHORT_INSTR                    =  0xE0,
+
+    CURVE_CALI_ADCTEST             =  0x91,                                    // F0
+    CURVE_CALI_DAC                 =  0x93,                                    // F1
+    CURVE_CALI_ADC                 =  0x92,                                    // F2
+    DEV_MODE                       =  0xFF
+
+};
+
+enum all_short_instr_e {
+    SET_NOTIFY_RATE2               =  0x01,                                    //01
+    SET_NOTIFY_RATE                =  0x70,                                    //01
+    SET_ADC_DAC_GAIN               =  0x80,                                    //02
+};

 // CIS (control instruction)
 #define CIS_VERSION                     0x40
 #define CIS_VOLT                        0x10
 #define CIS_LED_TEST                    0x70
-#define CTL_WRT                         0x20
-#define CTL_RD                          0x21
-#define CTL_RD_DFTR                     0x78
-#define CTL_RD_DFTI                     0x7C
-#define CTL_WRT_WGAMPL                  0x3C
+
 // mode parameter
 #define STEP_TO_VSETRATE(step)   step2VsetRate(step)
 #define VMAX(v1,v2)              ((v1 >= v2) ? v1 : v2)
@@ -59,6 +67,9 @@
 #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_END                  0x11

 //Elite LED
 #define COLOR_BLACK              0x00
@@ -72,6 +83,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)
@@ -84,5 +101,5 @@
 #define WORKING                  0x04
 #define POST_WORK                0x05

-
+#define VALUE_ZERO_TO_ONE(_v)    (_v == 0) ? 1 : _v
 #endif
@@ -1,100 +1,95 @@
 #ifndef ELITE_MODE_ADC_DAC
 #define ELITE_MODE_ADC_DAC

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

-static void readIin(WorkMode *WorkModeData);
-static int32_t readVinVout(WorkMode *WorkModeData);
-
-static uint16_t OneWayVoltScan() {
+static void volt_out() {
    static uint16_t DACOutCode;
    static int32_t Vout;
    static int32_t DeltaVout;

    if(DACReset){
        Vout = Vset;
-        DACReset = false;
    }else{
        DeltaVout = Vset - (Vout);
        Vout = Vout + DeltaVout;
    }

-    INSTRUCTION.VoltConstant = Vout / 40000 + 25000; //5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
+
+    if (Vout >= 1100000000) { //1100000000 = 5.5V
+        Vout = 1100000000;
+    } else if (Vout <= -1000000000) {  //-1000000000 = -5V
+        Vout = -1000000000;
+    }
+
+    instru.VoltConstant = Vout / 40000 + 25000; //5nV=>usercode
+    DACOutCode = Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.VoltConstant);
    DAC_outputV(DACOutCode);

-    if ((INSTRUCTION.eliteFxn == IV_CURVE)||(INSTRUCTION.eliteFxn == CV_CURVE)||(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)){
+    if ((instru.eliteFxn == CURVE_IV)||(instru.eliteFxn == CURVE_IV_CY)||(instru.eliteFxn == CURVE_CC)){
        int32_t RealV;
        RealV = (int32_t)(Vout / 200);//[1uV]
        InputNotify(NOTIFY_IMPEDANCE, RealV);
    }

-
-    return DACOutCode;
+    return;
 }

-static void CalcuResistance(RTMode *RT, int32_t VoltData){
+static void CalcuResistance()
+{
    /* Elite 100 = 100R
-       Elite 1000 = 1KR
-       Elite 10000 = 10KR
-       Elite 100000 = 100KR
-       Elite 1000000 = 1MR
-    */
-    static int32_t resister_32 = 0;
-    int32_t Vtemp;
-    Vtemp = (VoltData * 1000) - (RT->_measureCurrent * 10); //V = Vin - Iin * 10
-    resister_32 = Vtemp / RT->_measureCurrent; //R = V / Iin;
-    InputNotify(NOTIFY_IMPEDANCE, resister_32);
+        Elite 1000 = 1KR
+        Elite 10000 = 10KR
+        Elite 100000 = 100KR
+        Elite 1000000 = 1MR
+     */
+
+    struct wm_rt_ctx_t *rt = (struct wm_rt_ctx_t *)wm_get();
+    struct wm_meas_t *m = &rt->measure;
+    int32_t resist;
+    int32_t volt;
+
+    // volt = (m->_measureVin * 1000) - (m->_measureCurrent * 10); //V = Vin - Iin * 10
+    resist = (m->_measureVin * 1000) / m->_measureCurrent; //R = V / Iin;
+    InputNotify(NOTIFY_IMPEDANCE, resist);
 }

-static void DACenable(WorkMode *WorkModeData, int32_t VoltData ,uint8_t afterRead){
-    if(afterRead == AFTER_READ_I){
-        switch (INSTRUCTION.eliteFxn) {
-            case CONSTANT_CURRENT:{
-                CC_Vscan(WorkModeData->CC);
-                OneWayVoltScan();
+static void DACenable(uint8_t afterRead){
+    void *wm = wm_get();
+
+    if (afterRead == AFTER_READ_I) {
+        switch (instru.eliteFxn) {
+            case CURVE_CC:
+                cc_vscan();
+                volt_out();
                break;
-            }
-            case IV_CURVE:
-            case CV_CURVE:
-            case ZT_CURVE:
-            case IT_CURVE:
-            case VT_CURVE:
-            case CYCLIC_VOLTAMMETRY:
-            case LINEAR_SWEEP_VOLTAMMETRY:
-            case CONSTANT_VSCAN:{
+
+            default:
                break;
-            }
-            default:{
-                break;
-            }
        }
-    }else if(afterRead == AFTER_READ_V){
-        switch (INSTRUCTION.eliteFxn) {
-            case IV_CURVE:
-            case CV_CURVE:{
-                OneWayVoltScan();
+    } else if (afterRead == AFTER_READ_V) {
+        switch (instru.eliteFxn) {
+            case CURVE_IV_CY:
+            case CURVE_IV:
+            case CURVE_VO:
+                volt_out();
                break;
-            }
-            case ZT_CURVE:{
-                CalcuResistance(WorkModeData->RT, VoltData);
+
+            case CURVE_RT:
+                volt_out();
+                CalcuResistance();
            break;
-            }
-            case IT_CURVE:
-            case VT_CURVE:
-            case CONSTANT_CURRENT:{
+
+            case CURVE_CV:
+                cv_volt_out();
+                break;
+
+            case CURVE_LSV:{
+                lsv_volt_out();
                break;
            }
-            case CYCLIC_VOLTAMMETRY:{
-                CV3Curve(WorkModeData->CV3);
-                break;
-            }
-            case LINEAR_SWEEP_VOLTAMMETRY:{
-                LSVCurve(WorkModeData->LSV);
-                break;
-            }
-            case CONSTANT_VSCAN:{
-                CVSCANCurve(WorkModeData->CVSCAN);
+            case CURVE_CA:{
+                ca_volt_out();
                break;
            }
            default:{
@@ -104,488 +99,279 @@ static void DACenable(WorkMode *WorkModeData, int32_t VoltData ,uint8_t afterRea
    }
 }

-static void CC_Plot(WorkMode *WorkModeData){
-    switch (INSTRUCTION.eliteFxn) {
-        case IT_CURVE:{
-            #define CURRENT_MODE WorkModeData->IT
-            break;
-        }
-        case VT_CURVE:{
-            #define CURRENT_MODE WorkModeData->VT
-            break;
-        }
-        case ZT_CURVE:{
-            #define CURRENT_MODE WorkModeData->RT
-            break;
-        }
-        case IV_CURVE:{
-            #define CURRENT_MODE WorkModeData->IV
-            break;
-        }
-        case CV_CURVE:{
-            #define CURRENT_MODE WorkModeData->CV
-            break;
-        }
-        case CONSTANT_CURRENT:{
-            #define CURRENT_MODE WorkModeData->CC
-            break;
-        }
-        case CYCLIC_VOLTAMMETRY:{
-            #define CURRENT_MODE WorkModeData->CV3
-            break;
-        }
-        case LINEAR_SWEEP_VOLTAMMETRY:{
-            #define CURRENT_MODE WorkModeData->LSV
-            break;
-        }
-        case CONSTANT_VSCAN:{
-            #define CURRENT_MODE WorkModeData->CVSCAN
-            break;
-        }
-        default: {
-            break;
-        }
-    }
-
+static void CC_Plot(void)
+{
    static uint8_t ADCSwitch = 0;
    static uint8_t BatSwitch = 0;
    static int32_t VoltData  = 0;
+    void *wm = wm_get();

-    if(batteryCheck_flag){
-        if(BatSwitch == 0){
-            if(ADCSwitch == 0){ /**read Iin(buffer),read bat**/
-                readIin(WorkModeData);
-                if(record_flag == false){
+    if (batteryCheck_flag) {
+        if (BatSwitch == 0) {
+            if (ADCSwitch == 0) { /**read Iin(buffer),read bat**/
+                if (instru.AutoGainEnable) {
+                    MEAS_CURR(wm) = AutoGainReadIin(spi_ADC_rxbuf);
+                    AutoGainChangeIin(MEAS_CURR(wm));
+                } else {
+                    ReadADCIin(spi_ADC_rxbuf);
+                    MEAS_CURR(wm) = DecodeADCValue(instru.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                    if (lastIinADCGainLevel != instru.ADCGainLevel) {
+                        IinADCGainControl(instru.ADCGainLevel);
+                        record_flag = false;
+                    }
+                }
+                if (record_flag == false) {
                    static int recordCount = 0;
                    recordCount++;
-                    if(recordCount == 2){
+                    if (recordCount == 2) {
                        record_flag = true;
                        recordCount = 0;
                    }
-                }else{
-                    InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+                } else {
+                    InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
                }
-                DACenable(WorkModeData, VoltData, AFTER_READ_I);
+                DACenable(AFTER_READ_I);

                ReadADCBat(spi_ADC_rxbuf);
                BatSwitch++;
-            }else if(ADCSwitch == 1 || ADCSwitch == 3){ /**read Bat**/
+            } else if(ADCSwitch == 1 || ADCSwitch == 3) { /**read Bat**/
                ReadADCBat(spi_ADC_rxbuf);
                BatSwitch++;
-            }else if(ADCSwitch == 2){ /**read V(buffer),read bat**/
-                VoltData = readVinVout(WorkModeData);
-                if(INSTRUCTION.VoViSwitch == 0x02){
-                    int32_t Vscan = (Vset / 200 - CURRENT_MODE->_measureVin);
+            } else if(ADCSwitch == 2) { /**read V(buffer),read bat**/
+                if (VOLT_SW(wm) == 0x01 || VOLT_SW(wm) == 0x02) {
+                    if (instru.VinAutoGainEnable) {
+                        MEAS_VIN(wm) = AutoGainReadVin(spi_ADC_rxbuf);
+                        AutoGainChangeVin(MEAS_VIN(wm));
+                    } else {
+                        ReadADCVolt(VOLT_SW(wm));
+                        MEAS_VIN(wm) = DecodeADCValue(instru.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+                        if (lastVinADCGainLevel != instru.VinADCGainLevel) {
+                            VinADCGainControl(instru.VinADCGainLevel);
+                            record_flag = false;
+                        }
+                    }
+                    VoltData = MEAS_VIN(wm);
+                } else if (VOLT_SW(wm) == 0x00) {
+                    ReadADCVolt(VOLT_SW(wm));
+                    MEAS_VOUT(wm) = DecodeADCValue(instru.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
+                    VoltData = MEAS_VOUT(wm);
+                }
+
+                if (instru.VoViSwitch == 0x02) {
+                    int32_t Vscan = (Vset / 200 - MEAS_VIN(wm));
                    Vscan = (int32_t)(Vscan);//[1uV]
                    InputNotify(NOTIFY_VOLT, Vscan);
-                }else{
+                } else {
                    InputNotify(NOTIFY_VOLT, VoltData);
                }
-                DACenable(WorkModeData, VoltData, AFTER_READ_V);
+                DACenable(AFTER_READ_V);

                ReadADCBat(spi_ADC_rxbuf);
                BatSwitch++;
            }
-        }else if(BatSwitch == 1){
+        } else if(BatSwitch == 1) {
            ReadADCBat(spi_ADC_rxbuf);
            BatSwitch++;
-        }else if(BatSwitch == 2){
+        } else if(BatSwitch == 2) {
            headstage_battery_volt();
            ReadADCIin(spi_ADC_rxbuf);
            batteryCheck_flag = false;
            BatSwitch = 0;
            ADCSwitch = 3;
        }
-    }else{
+    } else {
        BatSwitch = 0;
-        if(ADCSwitch == 0){ /**read Iin(buffer),read V**/
-            readIin(WorkModeData);
-            if(record_flag == false){
+        if (ADCSwitch == 0) { /**read Iin(buffer),read V**/
+            if (instru.AutoGainEnable) {
+                MEAS_CURR(wm) = AutoGainReadIin(spi_ADC_rxbuf);
+                AutoGainChangeIin(MEAS_CURR(wm));
+            } else {
+                ReadADCIin(spi_ADC_rxbuf);
+                MEAS_CURR(wm) = DecodeADCValue(instru.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                if (lastIinADCGainLevel != instru.ADCGainLevel) {
+                    IinADCGainControl(instru.ADCGainLevel);
+                    record_flag = false;
+                }
+            }
+            if (record_flag == false) {
                static int recordCount = 0;
                recordCount++;
-                if(recordCount == 2){
+                if (recordCount == 2) {
                    record_flag = true;
                    recordCount = 0;
                }
-            }else{
-                InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+            } else {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
            }
-            DACenable(WorkModeData, VoltData, AFTER_READ_I);
+            DACenable(AFTER_READ_I);

-            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+            ReadADCVolt(VOLT_SW(wm));
            ADCSwitch++;
-        }
-        else if(ADCSwitch == 1){ /**read V**/
-            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        } else if(ADCSwitch == 1) { /**read V**/
+            ReadADCVolt(VOLT_SW(wm));
            ADCSwitch++;
-        }
-        else if(ADCSwitch == 2){ /**read V(buffer),read Iin**/
-            VoltData = readVinVout(WorkModeData);
-            if(INSTRUCTION.VoViSwitch == 0x02){
-                int32_t Vscan = (Vset / 200 - CURRENT_MODE->_measureVin);
+        } else if(ADCSwitch == 2) { /**read V(buffer),read Iin**/
+            if (VOLT_SW(wm) == 0x01 || VOLT_SW(wm) == 0x02) {
+                if (instru.VinAutoGainEnable) {
+                    MEAS_VIN(wm) = AutoGainReadVin(spi_ADC_rxbuf);
+                    AutoGainChangeVin(MEAS_VIN(wm));
+                } else {
+                    ReadADCVolt(VOLT_SW(wm));
+                    MEAS_VIN(wm) = DecodeADCValue(instru.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+                    if (lastVinADCGainLevel != instru.VinADCGainLevel) {
+                        VinADCGainControl(instru.VinADCGainLevel);
+                        record_flag = false;
+                    }
+                }
+                VoltData = MEAS_VIN(wm);
+            } else if (VOLT_SW(wm) == 0x00) {
+                ReadADCVolt(VOLT_SW(wm));
+                MEAS_VOUT(wm) = DecodeADCValue(instru.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
+                VoltData = MEAS_VOUT(wm);
+            }
+
+            if (instru.VoViSwitch == 0x02) {
+                int32_t Vscan = (Vset / 200 - MEAS_VIN(wm));
                Vscan = (int32_t)(Vscan);//[1uV]
                InputNotify(NOTIFY_VOLT, Vscan);
-            }else{
+            } else {
                InputNotify(NOTIFY_VOLT, VoltData);
            }
-            DACenable(WorkModeData, VoltData, AFTER_READ_V);
+            DACenable(AFTER_READ_V);

            ReadADCIin(spi_ADC_rxbuf);
            ADCSwitch++;
-        }
-        else if(ADCSwitch == 3){ /**read Iin**/
+        } else if (ADCSwitch == 3) { /**read Iin**/
            ReadADCIin(spi_ADC_rxbuf);
            ADCSwitch = 0;
        }
    }
-    #undef CURRENT_MODE
 }

-static void IT_Plot(WorkMode *WorkModeData) {
-    switch (INSTRUCTION.eliteFxn) {
-        case IT_CURVE:{
-            #define CURRENT_MODE WorkModeData->IT
-            break;
-        }
-        case VT_CURVE:{
-            #define CURRENT_MODE WorkModeData->VT
-            break;
-        }
-        case ZT_CURVE:{
-            #define CURRENT_MODE WorkModeData->RT
-            break;
-        }
-        case IV_CURVE:{
-            #define CURRENT_MODE WorkModeData->IV
-            break;
-        }
-        case CV_CURVE:{
-            #define CURRENT_MODE WorkModeData->CV
-            break;
-        }
-        case CONSTANT_CURRENT:{
-            #define CURRENT_MODE WorkModeData->CC
-            break;
-        }
-        case CYCLIC_VOLTAMMETRY:{
-            #define CURRENT_MODE WorkModeData->CV3
-            break;
-        }
-        case LINEAR_SWEEP_VOLTAMMETRY:{
-            #define CURRENT_MODE WorkModeData->LSV
-            break;
-        }
-        case CONSTANT_VSCAN:{
-            #define CURRENT_MODE WorkModeData->CVSCAN
-            break;
-        }
-        default: {
-            break;
-        }
-    }
-
+static void IT_Plot(void)
+{
    static uint8_t ADCSwitch = 0;
+    void *wm = wm_get();

-    if(batteryCheck_flag){
+    if (batteryCheck_flag) {
        EliteADCBattery();
-        if(!batteryCheck_flag){
+        if (!batteryCheck_flag) {
            ReadADCIin(spi_ADC_rxbuf);
            ADCSwitch = 2;
        }
-    }else{
-        if(ADCSwitch == 0){ /**read Iin(buffer)**/
-            readIin(WorkModeData);
-            if(record_flag == false){
+    } else {
+        if (ADCSwitch == 0) { /**read Iin(buffer)**/
+            if (instru.AutoGainEnable) {
+                MEAS_CURR(wm) = AutoGainReadIin(spi_ADC_rxbuf);
+                AutoGainChangeIin(MEAS_CURR(wm));
+            } else {
+                ReadADCIin(spi_ADC_rxbuf);
+                MEAS_CURR(wm) = DecodeADCValue(instru.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                if (lastIinADCGainLevel != instru.ADCGainLevel) {
+                    IinADCGainControl(instru.ADCGainLevel);
+                    record_flag = false;
+                }
+            }
+            if (record_flag == false) {
                static int recordCount = 0;
                recordCount++;
-                if(recordCount == 2){
+                if (recordCount == 2) {
                    record_flag = true;
                    recordCount = 0;
                }
-            }else{
-                InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+            } else {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
            }
            ADCSwitch++;
-        }
-        else if(ADCSwitch == 1){ /**read Iin**/
+        } else if (ADCSwitch == 1) { /**read Iin**/
            ReadADCIin(spi_ADC_rxbuf);
            ADCSwitch++;
-        }
-        else if(ADCSwitch == 2){ /**read Iin**/
+        } else if(ADCSwitch == 2) { /**read Iin**/
            ReadADCIin(spi_ADC_rxbuf);
            ADCSwitch = 0;
        }
    }
-    #undef CURRENT_MODE
 }

-static void VT_Plot(WorkMode *WorkModeData) {
-    switch (INSTRUCTION.eliteFxn) {
-        case IT_CURVE:{
-            #define CURRENT_MODE WorkModeData->IT
-            break;
-        }
-        case VT_CURVE:{
-            #define CURRENT_MODE WorkModeData->VT
-            break;
-        }
-        case ZT_CURVE:{
-            #define CURRENT_MODE WorkModeData->RT
-            break;
-        }
-        case IV_CURVE:{
-            #define CURRENT_MODE WorkModeData->IV
-            break;
-        }
-        case CV_CURVE:{
-            #define CURRENT_MODE WorkModeData->CV
-            break;
-        }
-        case CONSTANT_CURRENT:{
-            #define CURRENT_MODE WorkModeData->CC
-            break;
-        }
-        case CYCLIC_VOLTAMMETRY:{
-            #define CURRENT_MODE WorkModeData->CV3
-            break;
-        }
-        case LINEAR_SWEEP_VOLTAMMETRY:{
-            #define CURRENT_MODE WorkModeData->LSV
-            break;
-        }
-        case CONSTANT_VSCAN:{
-            #define CURRENT_MODE WorkModeData->CVSCAN
-            break;
-        }
-        default: {
-            break;
-        }
-    }
-
-    // ADC gain is don't care when measuring voltage
-//    INSTRUCTION.ADCGainLevel = I_GAIN_100R;
-//    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-
+static void VT_Plot(void)
+{
    static uint8_t ADCSwitch = 0;
    static int32_t VoltData;
+    void *wm = wm_get();

-    if(batteryCheck_flag){
+    if (batteryCheck_flag) {
        EliteADCBattery();
-        if(!batteryCheck_flag){
-            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        if (!batteryCheck_flag) {
+            ReadADCVolt(VOLT_SW(wm));
            ADCSwitch = 2;
        }
-    }else{
-        if(ADCSwitch == 0){ /**read V(buffer)**/
-            VoltData = readVinVout(WorkModeData);
-            if(record_flag == false){
+    } else {
+        if (ADCSwitch == 0) { /**read V(buffer)**/
+            if (VOLT_SW(wm) == 0x01 || VOLT_SW(wm) == 0x02) {
+                if (instru.VinAutoGainEnable) {
+                    MEAS_VIN(wm) = AutoGainReadVin(spi_ADC_rxbuf);
+                    AutoGainChangeVin(MEAS_VIN(wm));
+                } else {
+                    ReadADCVolt(VOLT_SW(wm));
+                    MEAS_VIN(wm) = DecodeADCValue(instru.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+
+                    if (lastVinADCGainLevel != instru.VinADCGainLevel) {
+                        VinADCGainControl(instru.VinADCGainLevel);
+                        record_flag = false;
+                    }
+                }
+                VoltData = MEAS_VIN(wm);
+            } else if (VOLT_SW(wm) == 0x00) {
+                ReadADCVolt(VOLT_SW(wm));
+                MEAS_VOUT(wm) = DecodeADCValue(instru.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
+                VoltData = MEAS_VOUT(wm);
+            }
+
+            if (record_flag == false) {
                static int recordCount = 0;
                recordCount++;
-                if(recordCount == 2){
+                if (recordCount == 2) {
                    record_flag = true;
                    recordCount = 0;
                }
-            }else{
+            } else {
                InputNotify(NOTIFY_VOLT, VoltData);
            }
            ADCSwitch++;
-        }
-        else if(ADCSwitch == 1){ /**read V**/
-            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        } else if (ADCSwitch == 1) { /**read V**/
+            ReadADCVolt(VOLT_SW(wm));
            ADCSwitch++;
-        }
-        else if(ADCSwitch == 2){ /**read V**/
-            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        } else if (ADCSwitch == 2) { /**read V**/
+            ReadADCVolt(VOLT_SW(wm));
            ADCSwitch = 0;
        }
    }
-    #undef CURRENT_MODE
 }

-static void readIin(WorkMode *WorkModeData){
-    switch (INSTRUCTION.eliteFxn) {
-        case IT_CURVE:{
-            #define TEMP_MODE WorkModeData->IT
-            break;
-        }
-        case VT_CURVE:{
-            #define TEMP_MODE WorkModeData->VT
-            break;
-        }
-        case ZT_CURVE:{
-            #define TEMP_MODE WorkModeData->RT
-            break;
-        }
-        case IV_CURVE:{
-            #define TEMP_MODE WorkModeData->IV
-            break;
-        }
-        case CV_CURVE:{
-            #define TEMP_MODE WorkModeData->CV
-            break;
-        }
-        case CONSTANT_CURRENT:{
-            #define TEMP_MODE WorkModeData->CC
-            break;
-        }
-        case CYCLIC_VOLTAMMETRY:{
-            #define TEMP_MODE WorkModeData->CV3
-            break;
-        }
-        case LINEAR_SWEEP_VOLTAMMETRY:{
-            #define TEMP_MODE WorkModeData->LSV
-            break;
-        }
-        case CONSTANT_VSCAN:{
-            #define TEMP_MODE WorkModeData->CVSCAN
-            break;
-        }
-        default: {
-            break;
-        }
-    }
-
-    if(INSTRUCTION.AutoGainEnable){
-        TEMP_MODE->_measureCurrent = AutoGainReadIin(spi_ADC_rxbuf);
-//        AutoGainChangeIin(TEMP_MODE->_measureCurrent);
-    }else{
-        ReadADCIin(spi_ADC_rxbuf);
-        TEMP_MODE->_measureCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-        if(lastIinADCGainLevel != INSTRUCTION.ADCGainLevel){
-//            IinADCGainControl(INSTRUCTION.ADCGainLevel);
-            record_flag = false;
-        }
-    }
-    #undef TEMP_MODE
-}
-
-static int32_t readVinVout(WorkMode *WorkModeData){
-    switch (INSTRUCTION.eliteFxn) {
-        case IT_CURVE:{
-            #define TEMP_MODE WorkModeData->IT
-            break;
-        }
-        case VT_CURVE:{
-            #define TEMP_MODE WorkModeData->VT
-            break;
-        }
-        case ZT_CURVE:{
-            #define TEMP_MODE WorkModeData->RT
-            break;
-        }
-        case IV_CURVE:{
-            #define TEMP_MODE WorkModeData->IV
-            break;
-        }
-        case CV_CURVE:{
-            #define TEMP_MODE WorkModeData->CV
-            break;
-        }
-        case CONSTANT_CURRENT:{
-            #define TEMP_MODE WorkModeData->CC
-            break;
-        }
-        case CYCLIC_VOLTAMMETRY:{
-            #define TEMP_MODE WorkModeData->CV3
-            break;
-        }
-        case LINEAR_SWEEP_VOLTAMMETRY:{
-            #define TEMP_MODE WorkModeData->LSV
-            break;
-        }
-        case CONSTANT_VSCAN:{
-            #define TEMP_MODE WorkModeData->CVSCAN
-            break;
-        }
-        default: {
-            break;
-        }
-    }
-
-    static int32_t VoltData;
-
-    if(TEMP_MODE->_VoViSwitch == 0x01 || TEMP_MODE->_VoViSwitch == 0x02){
-        if(INSTRUCTION.VinAutoGainEnable){
-            TEMP_MODE->_measureVin = AutoGainReadVin(spi_ADC_rxbuf);
-//            AutoGainChangeVin(TEMP_MODE->_measureVin);
-        }else{
-            ReadADCVolt(TEMP_MODE->_VoViSwitch);
-            TEMP_MODE->_measureVin = DecodeADCValue(INSTRUCTION.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
-            if(lastVinADCGainLevel != INSTRUCTION.VinADCGainLevel){
-//                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-                record_flag = false;
-            }
-
-        }
-        VoltData = TEMP_MODE->_measureVin;
-    }else if(TEMP_MODE->_VoViSwitch == 0x00){
-        ReadADCVolt(TEMP_MODE->_VoViSwitch);
-        TEMP_MODE->_measureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
-        VoltData = TEMP_MODE->_measureVout;
-    }
-    #undef TEMP_MODE
-    return VoltData;
-}
-
-static void cali_IT_plot(WorkMode *WorkModeData) {
-    switch (INSTRUCTION.eliteFxn) {
-        case IT_CURVE:{
-            #define CURRENT_MODE WorkModeData->IT
-            break;
-        }
-        case VT_CURVE:{
-            #define CURRENT_MODE WorkModeData->VT
-            break;
-        }
-        case ZT_CURVE:{
-            #define CURRENT_MODE WorkModeData->RT
-            break;
-        }
-        case IV_CURVE:{
-            #define CURRENT_MODE WorkModeData->IV
-            break;
-        }
-        case CV_CURVE:{
-            #define CURRENT_MODE WorkModeData->CV
-            break;
-        }
-        case CONSTANT_CURRENT:{
-            #define CURRENT_MODE WorkModeData->CC
-            break;
-        }
-        case CYCLIC_VOLTAMMETRY:{
-            #define CURRENT_MODE WorkModeData->CV3
-            break;
-        }
-        case LINEAR_SWEEP_VOLTAMMETRY:{
-            #define CURRENT_MODE WorkModeData->LSV
-            break;
-        }
-        case CONSTANT_VSCAN:{
-            #define CURRENT_MODE WorkModeData->CVSCAN
-            break;
-        }
-        default: {
-            #define CURRENT_MODE WorkModeData->VT
-            break;
-        }
-    }
+static void cali_IT_plot(void) {
+    void *wm = wm_get();

    static uint8_t ADCSwitch = 0;
    static int32_t ADCValueSUM     = 0;
    int32_t ADCValueAVG            = 0;
+    static uint16_t cali_count_max = 1000;

    if(ADCSwitch == 0){ /**read Iin(buffer)**/
-        if(INSTRUCTION.AutoGainEnable){
-            CURRENT_MODE->_measureCurrent = 0xFFFF;
+        if(instru.AutoGainEnable){
+            MEAS_CURR(wm) = 0xFFFF;
        }else{
            ReadADCIin(spi_ADC_rxbuf);
-            CURRENT_MODE->_measureCurrent = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
-            if(lastIinADCGainLevel != INSTRUCTION.ADCGainLevel){
-//                IinADCGainControl(INSTRUCTION.ADCGainLevel);
+            MEAS_CURR(wm) = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+            if(lastIinADCGainLevel != instru.ADCGainLevel){
+                IinADCGainControl(instru.ADCGainLevel);
                record_flag = false;
            }
        }
+        if(instru.ADCGainLevel == 0) {
+            cali_count_max = 5000;
+        } else {
+            cali_count_max = 1000;
+        }

        if(record_flag == false){
            static int recordCount = 0;
@@ -596,18 +382,18 @@ static void cali_IT_plot(WorkMode *WorkModeData) {
            }
        }else{
            static uint16_t cali_count = 0;
-            if(cali_count >= 1000){
+            if(cali_count >= cali_count_max){
                ADCValueAVG = ADCValueSUM / cali_count;

                InputNotify(NOTIFY_CURRENT, ADCValueAVG);
                SendNotify();

                uint8_t CIS_buf[9]   = {0};
-                CIS_buf[0] = INSTRUCTION.chip_id;
+                CIS_buf[0] = instru.chip_id;
                CIS_buf[1] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
                CIS_buf[2] = (uint8_t) (ADCValueAVG & 0x00FF);
                CIS_buf[3] = 0x00;
-                CIS_buf[4] = INSTRUCTION.ADCGainLevel;
+                CIS_buf[4] = instru.ADCGainLevel;
                SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
                ADCValueSUM = 0;
                cali_count = 0;
@@ -616,8 +402,8 @@ static void cali_IT_plot(WorkMode *WorkModeData) {
                ModeLED(NO_EVENT);
            }else{
                cali_count++;
-                ADCValueSUM = ADCValueSUM + CURRENT_MODE->_measureCurrent;
-                InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+                ADCValueSUM = ADCValueSUM + MEAS_CURR(wm);
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
                InputNotify(NOTIFY_VOLT, ADCValueSUM);
                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
            }
@@ -633,79 +419,38 @@ static void cali_IT_plot(WorkMode *WorkModeData) {
        ReadADCIin(spi_ADC_rxbuf);
        ADCSwitch = 0;
    }
-
-    #undef CURRENT_MODE
 }

-static void cali_VT_plot(WorkMode *WorkModeData) {
-    switch (INSTRUCTION.eliteFxn) {
-        case IT_CURVE:{
-            #define CURRENT_MODE WorkModeData->IT
-            break;
-        }
-        case VT_CURVE:{
-            #define CURRENT_MODE WorkModeData->VT
-            break;
-        }
-        case ZT_CURVE:{
-            #define CURRENT_MODE WorkModeData->RT
-            break;
-        }
-        case IV_CURVE:{
-            #define CURRENT_MODE WorkModeData->IV
-            break;
-        }
-        case CV_CURVE:{
-            #define CURRENT_MODE WorkModeData->CV
-            break;
-        }
-        case CONSTANT_CURRENT:{
-            #define CURRENT_MODE WorkModeData->CC
-            break;
-        }
-        case CYCLIC_VOLTAMMETRY:{
-            #define CURRENT_MODE WorkModeData->CV3
-            break;
-        }
-        case LINEAR_SWEEP_VOLTAMMETRY:{
-            #define CURRENT_MODE WorkModeData->LSV
-            break;
-        }
-        case CONSTANT_VSCAN:{
-            #define CURRENT_MODE WorkModeData->CVSCAN
-            break;
-        }
-        default: {
-            #define CURRENT_MODE WorkModeData->VT
-            break;
-        }
-    }
+static void cali_VT_plot(void) {
+    void *wm = wm_get();

    static uint8_t ADCSwitch = 0;
-    static int32_t VoltData;
+    static int32_t VoltData = 0;
    static int32_t ADCValueSUM     = 0;
    int32_t ADCValueAVG            = 0;
+    static uint16_t cali_count_max = 1000;

    if(ADCSwitch == 0){ /**read Iin(buffer)**/
-        if(CURRENT_MODE->_VoViSwitch == 0x01 || CURRENT_MODE->_VoViSwitch == 0x02){
-            if(INSTRUCTION.VinAutoGainEnable){
-                CURRENT_MODE->_measureVin = 0xFFFF;
+        if(VOLT_SW(wm) == 0x01 || VOLT_SW(wm) == 0x02){
+            if(instru.VinAutoGainEnable){
+                MEAS_VIN(wm) = 0xFFFF;
            }else{
-                ReadADCVolt(CURRENT_MODE->_VoViSwitch);
-                CURRENT_MODE->_measureVin = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
-                if(lastVinADCGainLevel != INSTRUCTION.VinADCGainLevel){
-//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                ReadADCVolt(VOLT_SW(wm));
+                MEAS_VIN(wm) = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+                if(lastVinADCGainLevel != instru.VinADCGainLevel){
+                    VinADCGainControl(instru.VinADCGainLevel);
                    record_flag = false;
                }

            }
-            VoltData = CURRENT_MODE->_measureVin;
+            VoltData = MEAS_VIN(wm);
+        }
+
+        if(instru.VinADCGainLevel == 0) {
+            cali_count_max = 5000;
+        } else {
+            cali_count_max = 1000;
        }
-//        else if(CURRENT_MODE->_VoViSwitch == 0x00){
-//            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
-//            CURRENT_MODE->_measureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
-//            VoltData = CURRENT_MODE->_measureVout;
-//        }

        if(record_flag == false){
            static int recordCount = 0;
@@ -716,18 +461,18 @@ static void cali_VT_plot(WorkMode *WorkModeData) {
            }
        }else{
            static uint16_t cali_count = 0;
-            if(cali_count >= 1000){
+            if(cali_count >= cali_count_max){
                ADCValueAVG = ADCValueSUM / cali_count;

                InputNotify(NOTIFY_VOLT, ADCValueAVG);
                SendNotify();

                uint8_t CIS_buf[9]   = {0};
-                CIS_buf[0] = INSTRUCTION.chip_id;
+                CIS_buf[0] = instru.chip_id;
                CIS_buf[1] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
                CIS_buf[2] = (uint8_t) (ADCValueAVG & 0x00FF);
                CIS_buf[3] = 0x00;
-                CIS_buf[4] = INSTRUCTION.VinADCGainLevel;
+                CIS_buf[4] = instru.VinADCGainLevel;
                SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
                ADCValueSUM = 0;
                cali_count = 0;
@@ -736,25 +481,22 @@ static void cali_VT_plot(WorkMode *WorkModeData) {
                ModeLED(NO_EVENT);
            }else{
                cali_count++;
-                ADCValueSUM = ADCValueSUM + CURRENT_MODE->_measureVin;
-                InputNotify(NOTIFY_VOLT, CURRENT_MODE->_measureVin);
+                ADCValueSUM = ADCValueSUM + MEAS_VIN(wm);
+                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
                InputNotify(NOTIFY_CURRENT, ADCValueSUM);
                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
            }
-
        }
        ADCSwitch++;
    }
    else if(ADCSwitch == 1){ /**read v**/
-        ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        ReadADCVolt(VOLT_SW(wm));
        ADCSwitch++;
    }
    else if(ADCSwitch == 2){ /**read v**/
-        ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        ReadADCVolt(VOLT_SW(wm));
        ADCSwitch = 0;
    }
-
-    #undef CURRENT_MODE
 }

 #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     4
+#define VERSION_DATE_DAY       9
+#define VERSION_DATE_HOUR      16
+#define VERSION_DATE_MINUTE    23

 // this is NOT the version hash !!
 // it's the last version hash
@@ -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.
@@ -46,12 +46,29 @@ static void ZM_init() {

    // initialize
    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+    Init_Elite15_PIN();
+    ELITE15_SPI_HOLD();

-    PIN_setOutputValue(pin_handle, AD_CS, 1);            // AD_CS HIGH
+    PIN15_setOutputValue(shutdown_6994, 1);     // OFF = 1 => turn off 6994
+    PIN15_setOutputValue(enable_10v, 0);        // enable 10V
+    PIN15_setOutputValue(HIGH_Z_MODE, 0);       // HIGH Z MODE // 1: close; 0: open;

    InitEliteInstruction();

+    // 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);
 }

 static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins) {}
@@ -59,7 +76,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);
@@ -68,23 +85,24 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 }

 #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)               \
+(instru.eliteFxn == CURVE_IV)                 || \
+(instru.eliteFxn == CURVE_IV_CY)              || \
+(instru.eliteFxn == CURVE_IT)                 || \
+(instru.eliteFxn == CURVE_VT)                 || \
+(instru.eliteFxn == CURVE_RT)                 || \
+(instru.eliteFxn == CURVE_CC)                 || \
+(instru.eliteFxn == CURVE_CV)                 || \
+(instru.eliteFxn == CURVE_LSV)                || \
+(instru.eliteFxn == CURVE_CA)                 || \
+(instru.eliteFxn == CURVE_VO)                 || \
+(instru.eliteFxn == CURVE_CALI_ADC)              \
 )

 #define Ve1MatchVe2Mode() (                           \
-(INSTRUCTION.eliteFxn == IV_CURVE)                 || \
-(INSTRUCTION.eliteFxn == CV_CURVE)                 || \
-(INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)       || \
-(INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY)    \
+(instru.eliteFxn == CURVE_IV)                 || \
+(instru.eliteFxn == CURVE_IV_CY)              || \
+(instru.eliteFxn == CURVE_CV)                 || \
+(instru.eliteFxn == CURVE_LSV)                   \
 )

 /*********************************************************************
@@ -96,38 +114,61 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 *
 * @return  None.
 */
-static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
-    if ( IsPeriodicMode() ){
+static void SimpleBLEPeripheral_performPeriodicTask(void) {
+    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 bool first_highz_flag = false;

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

-        if(EliteWorkReset){
-            InitEliteGPtimer();
-            EliteWorkReset  = false;
+        if (mode_init) {
+            GPT.SampleRateCounter = instru.sampleRate - 10;
+            GPT.VscanRateCounter  = instru.VsetRate - 1;
+            mode_init  = false;
            batteryADC_flag = false;
            record_flag     = true;
-//            VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-//            IinADCGainControl(INSTRUCTION.ADCGainLevel);
-            if( Ve1MatchVe2Mode() ){
-                if (INSTRUCTION.Ve1 == INSTRUCTION.Ve2) {
-                    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1));
+            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;
+
+            VinADCGainControl(instru.VinADCGainLevel);
+            IinADCGainControl(instru.ADCGainLevel);
+            VoutGainControl(instru.VoutGainLevel);
+            if (Ve1MatchVe2Mode()) {
+                if (instru.Ve1 == instru.Ve2) {
+                    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.Ve1));
                    PeriodicEvent = false;
+                    PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
                    ModeLED(NO_EVENT);
                }
            }
        }

-
        GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-        if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
+        if (leadTimeReset && GPT.LeadTimeCounter <= 2000) {
            vscanReset = true;
-        }else{
-            if(notifyFirst_flag){
-                GPT.NotifyCounter = INSTRUCTION.notifyRate - 20;
+            if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
+                PIN15_setOutputValue(HIGH_Z_MODE, 1); // HIGH Z MODE // 1: close; 0: open;
+                first_highz_flag = false;
+            }
+        } else {
+            if (notifyFirst_flag) {
+                GPT.NotifyCounter = instru.notifyRate - 20;
                notifyFirst_flag = false;
            }
            vscanReset = false;
@@ -136,16 +177,16 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {

        //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{
+        if (GPT.VscanRateCounter >= instru.VsetRate) {
+            if (GPT.VscanRateCounter >= instru.VsetRate * 2) {
+                GPT.GptimerMultiple = GPT.VscanRateCounter / instru.VsetRate;
+            } else {
                GPT.GptimerMultiple = 1;
            }
-            GPT.VscanRateCounter -= INSTRUCTION.VsetRate * GPT.GptimerMultiple; //To get right time
+            GPT.VscanRateCounter -= instru.VsetRate * GPT.GptimerMultiple; //To get right time
            vscan_flag = true;
-            if(vscan_flag){
-                EliteVscanControl(WorkModeData);
+            if (vscan_flag) {
+                vscan_ctrl();
                vscan_flag = false;
            }
        }
@@ -160,16 +201,16 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {

        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);
+//            PIN15_setOutputValue(enable_5v, 0);
        }

        //ADC counter
        GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-        if(GPT.SampleRateCounter >= INSTRUCTION.sampleRate){
+        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(WorkModeData);
+                EliteADCControl();
                ADC_flag = false;
            }
        }
@@ -177,8 +218,8 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
        //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
+        if(GPT.NotifyCounter >= instru.notifyRate){
+            GPT.NotifyCounter -= instru.notifyRate; //To get right time
            notify_flag = true;
            if(vscanReset){
                notify_flag = false;
@@ -189,114 +230,214 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
            }
        }

-//        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;
+        mode_done();
    }
-    else{
-        InitFlag();
-    }
-}
+    else if (instru.eliteFxn == CURVE_PULSE) {
+         /** Periodic Event **/
+         // Default working flow is vscan -> ADC read -> send notify
+         // We will need a flag to control vscan, ADC and notify

-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);
+         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;
+             firstTimeReset  = true;
+             notifyFirst_flag = true;
+             //pulsemode variable
+             stiFirstTime  = true;
+             VinADCGainControl(instru.VinADCGainLevel);
+             IinADCGainControl(instru.ADCGainLevel);
+             VoutGainControl(instru.VoutGainLevel);
+             if (Ve1MatchVe2Mode()) {
+                 if (instru.Ve1 == instru.Ve2) {
+                     DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.Ve1));
+                     PeriodicEvent = false;
+                     PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
+                     ModeLED(NO_EVENT);
+                 }
+             } else if (instru.eliteFxn == CURVE_PULSE) {
+                 if(!megaStiEnable){
+                      PeriodicEvent = false;
+                      PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
+                      ModeLED(NO_EVENT);
+                 }
+             }
+         }
+
+
+         GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
+         if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
+             vscanReset = true;
+         }else{
+             if(notifyFirst_flag){
+                 GPT.NotifyCounter = instru.notifyRate - 20;
+                 notifyFirst_flag = false;
+             }
+             vscanReset = false;
+             leadTimeReset = false;
+         }
+
+        //vscan counter
+        GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
+        //pulse mode counter
+        GPT.StiCounter = GPT.StiCounter + GPT.DeltaGptimerCounter;
+        if (vscanReset) {
+            DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
+            DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
+            //vscanReset = false;
+        }else{
+            if (megaStiEnable) {
+                pulse_vscan();
            }
+        }
+
+//         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();
+//                 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 >= instru.sampleRate){
+             GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
+             ADC_flag = true;
+             if(ADC_flag){
+                 EliteADCControl();
+                 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();
+                 notify_flag = false;
+             }
+         }
+
+         mode_done();
+     }
+    else if (instru.eliteFxn == CURVE_CALI_DAC) {
+        DAC_outputV(instru.VoltConstant); //UserCode -> DAC code -> DAC out
+        wm_deinit();
+        PeriodicEvent = false;
+    } else {

-            break;
-        }
-        default:{
-            break;
-        }
    }
 }

-static void EliteDone() {
-    if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)) {
+static void EliteADCControl(void)
+{
+    switch (instru.eliteFxn) {
+        case CURVE_IV:
+        case CURVE_RT:
+        case CURVE_CC:
+        case CURVE_CV:
+        case CURVE_CA:
+        case CURVE_VO:
+        case CURVE_LSV:
+        case CURVE_IV_CY:
+        case CURVE_PULSE:
+            CC_Plot();
+            break;
+
+        case CURVE_IT:
+            IT_Plot();
+            break;
+
+        case CURVE_VT:
+            VT_Plot();
+            break;
+
+        case CURVE_CALI_ADC:
+            if (instru.AdcChannel == IIN_ADC) cali_IT_plot();
+            else if (instru.AdcChannel == VIN_ADC) cali_VT_plot();
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void mode_done(void)
+{
+    if ((instru.eliteFxn == CURVE_IV)  ||
+        (instru.eliteFxn == CURVE_CV)  ||
+        (instru.eliteFxn == CURVE_LSV) ||
+        (instru.eliteFxn == CURVE_IV_CY)) {
        if (!PeriodicEvent) {
+            finishMode = 1;
            SendNotify();
            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_IV:
+            iv_vscan();
            break;
-        }
-        case CV_CURVE:{
-            CV_Vscan(WorkModeData->CV);
+
+        case CURVE_IV_CY:
+            iv_cy_vscan();
            break;
-        }
-        case ZT_CURVE:{
-            ZT_Vscan(WorkModeData->RT);
+
+        case CURVE_VO:
+            vo_vscan();
            break;
-        }
-        case CYCLIC_VOLTAMMETRY:{
-            CV3_Vscan(WorkModeData->CV3);
+
+        case CURVE_RT:
+            rt_vscan();
            break;
-        }
-        case CONSTANT_CURRENT:{
-            CC_Vscan(WorkModeData->CC);
+
+        case CURVE_CV:
+            cv_vscan();
            break;
-        }
-        case LINEAR_SWEEP_VOLTAMMETRY:{
-            LSV_Vscan(WorkModeData->LSV);
+
+        case CURVE_LSV:
+            lsv_vscan();
            break;
-        }
-        case CONSTANT_VSCAN:{
-            CVSCAN_Vscan(WorkModeData->CVSCAN);
+
+        case CURVE_CA:
+            ca_vscan();
            break;
-        }
+
        default:{
            break;
        }
@@ -331,38 +472,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,25 +543,19 @@ static void SimpleBLEPeripheral_init(void) {
 // static void detectKey_clockHandler(UArg arg);

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

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

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

    for (;;) {
@@ -611,44 +605,45 @@ 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) {
+                    } else if (counter6994 == CLOCK_ONE_SECOND*5) {
+                        PIN15_setOutputValue(shutdown_6994, 0);  // OFF = 1 => turn off 6994
                        counter6994++;
+                    } else if (counter6994 > CLOCK_ONE_SECOND*5) {
+                        counter6994 = 0;
                    }
                    EliteKeyPress(key);

-//                    if(key != 0){  //detect Elite battery power when no periodic event
-//                        measureBat();
-//                    }
-//                    if(Free_Work_Mode){
-//                        FreeWorkMode(WorkModeData);
-//                        InitEliteInstruction();
-////                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
-//                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
-//
-//                        Free_Work_Mode = false;
-//                    }
+                    if(key != 0){  //detect Elite battery power when no periodic event
+                        measureBat();
+                    }
+                    if(Free_Work_Mode){
+                        wm_deinit();
+                        InitEliteInstruction();
+                        Free_Work_Mode = false;
+                    }
                } else {
                    EliteOn = TurnOnElite(key);
                }
            }
-//            else {                               // if there is periodic event
-//                if(InitPeriodicEvent){
-//                    InitWorkMode(WorkModeData);
-//                    InitPeriodicEvent = false;
-//                }
-//
-//                // Perform periodic application task
-//                SimpleBLEPeripheral_performPeriodicTask(WorkModeData);
-//                key = PIN_getInputValue(switch_on);
-//                EliteKeyPress(key);  // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
-//            }
+            else {                               // if there is periodic event
+                if(InitPeriodicEvent){
+                    wm_init();
+                    InitPeriodicEvent = false;
+                }
+
+                // Perform periodic application task
+                SimpleBLEPeripheral_performPeriodicTask();
+                key = PIN_getInputValue(switch_on);
+                EliteKeyPress(key);  // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
+            }
        }

 #ifdef FEATURE_OAD
@@ -924,16 +919,16 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)

        numActive = linkDB_NumActive();

-//        uint16_t cxnHandle;
-//
-//        // requestedPDUSize = LL payload = L2CAP_header + ATT header + BLE_NOT_BUFF_SIZE = 7 + BLE_NOT_BUFF_SIZE //roy
-//        uint16_t requestedPDUSize = 251; //251 roy
-//        uint16_t requestTxTime    = 2120; // (LL payload + 14) * 8   //2120 roy
-//        GAPRole_GetParameter(GAPROLE_CONNHANDLE, &cxnHandle);
-//
-//        if (SUCCESS == HCI_LE_SetDataLenCmd(cxnHandle, requestedPDUSize, requestTxTime)) {
-////            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
-//        }
+        uint16_t cxnHandle;
+
+        // requestedPDUSize = LL payload = L2CAP_header + ATT header + BLE_NOT_BUFF_SIZE = 7 + BLE_NOT_BUFF_SIZE //roy
+        uint16_t requestedPDUSize = 251; //251 roy
+        uint16_t requestTxTime    = 2120; // (LL payload + 14) * 8   //2120 roy
+        GAPRole_GetParameter(GAPROLE_CONNHANDLE, &cxnHandle);
+
+        if (SUCCESS == HCI_LE_SetDataLenCmd(cxnHandle, requestedPDUSize, requestTxTime)) {
+//            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
+        }

        // Use numActive to determine the connection handle of the last
        // connection
@@ -974,6 +969,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.
@@ -85,7 +85,7 @@ extern "C"

 // Length of Characteristic 5 in bytes
 #define SIMPLEPROFILE_CHAR5_LEN           5
-#define SIMPLEPROFILE_CHAR4_LEN           20
+#define SIMPLEPROFILE_CHAR4_LEN           60
 #define SIMPLEPROFILE_CHAR3_LEN           20
 #define SIMPLEPROFILE_CHAR2_LEN           20
Author	SHA1	Message	Date
Roy	6c91a72c1b	test sps	2021-04-09 18:16:32 +08:00
Roy	7c6d7c68de	CC MODE deltaV = 10mV	2021-04-09 16:23:10 +08:00
Roy	eff1e4a43e	new 1.5re pin (use define)	2021-04-09 10:48:25 +08:00
Roy	9678266e59	fix RT (no 10 ohm)	2021-04-08 14:10:31 +08:00
Roy	6f74dc2c05	datalength extension:60bytes	2021-04-08 11:07:44 +08:00
Roy	910576ac6d	datalength extension 200 bytes	2021-03-31 10:19:35 +08:00
Roy	9377dc517f	battery < 3V when running mode, don't close elite	2021-03-16 14:25:21 +08:00
Roy	e44d3d8e60	adjusted cc value	2021-03-16 11:24:45 +08:00
Roy	f5416d5e1f	measure battery when run mode	2021-03-15 15:44:47 +08:00
Roy	0d60074697	send mode finish flag	2021-03-12 12:12:24 +08:00
Roy	3c74358634	update notify rate	2021-03-10 17:25:12 +08:00
Roy	398f9977b8	add debug battery func	2021-03-08 10:05:53 +08:00
Roy	89db7e4575	don't measure battery when run mode	2021-03-08 10:01:46 +08:00
Roy	2b99b96f0f	don't measure battery when run mode	2021-03-05 12:15:47 +08:00
Roy	1b67c809a9	open highz when finish experiment	2021-03-05 11:55:07 +08:00
Roy	59aac611f6	open highz when finish experiment	2021-03-05 11:31:14 +08:00
Roy	6f5baf38ce	open highz when finish experiment	2021-03-05 10:29:20 +08:00
Roy	05f8eb4c51	change vin level when open elite, battery value is right	2021-03-04 11:48:12 +08:00
Roy	9bd536bb68	[update] don't meas battery when no reriodicEvent	2021-01-28 11:06:08 +08:00
Roy	81d9aaab1f	[update] organize code	2021-01-28 10:41:45 +08:00
Roy	341c5939ac	[update] organize code	2021-01-27 17:45:43 +08:00
Roy	c50c0b4dec	[update] close highz & set DAC value in pre-treated (100ms)	2021-01-27 15:03:39 +08:00
Roy	1639eddc6d	[update] free malloc when change mode	2021-01-26 18:08:27 +08:00
Roy	cc50bbc0a4	[update] pulse module	2021-01-26 16:08:24 +08:00
Roy	913d269a32	[update] ca module	2021-01-26 15:44:26 +08:00
Roy	5938d6645f	[update] lsv module	2021-01-26 15:33:02 +08:00
Roy	3fda9fff6c	[update] cv module	2021-01-26 15:16:30 +08:00
Roy	6f6346ac45	Merge branch 'Elite1.5_dev_module_0125_4' into Elite1.5_dev_module_0125_5	2021-01-26 13:42:36 +08:00
Roy	4ca15b1ec9	[update] open highz when elite int() & reset()	2021-01-26 13:40:38 +08:00
Roy	4c0cdcbfe9	[update] cc module	2021-01-26 12:30:46 +08:00
Roy	ccb6939b34	[update] iv_cy module	2021-01-26 11:59:48 +08:00
Roy	27baa87562	[update] iv module	2021-01-26 11:12:00 +08:00
Roy	ea862012b8	Merge branch 'Elite1.5_dev_module_0125_3' into Elite1.5_dev_module_0125_4	2021-01-26 10:53:44 +08:00
Roy	d8c0d5e420	[update] open highz when elite turn on	2021-01-26 10:45:41 +08:00
Roy	43c606577a	[update] rt module	2021-01-26 10:40:05 +08:00
Roy	72a64479d4	[update] vo module	2021-01-25 18:29:35 +08:00
Roy	c6b45ecca4	[update] it module	2021-01-25 17:56:09 +08:00
Roy	11d828bfc7	[update] vt module	2021-01-25 17:12:09 +08:00
Roy	79bca317c2	[update] vt module	2021-01-25 17:02:32 +08:00
Roy	ea254423d6	[cali] add BOARD_C5CD calibration data.	2021-01-25 10:47:06 +08:00
Roy	f151d5a74d	[update] fix CC mode	2021-01-25 10:18:40 +08:00
Roy	5cc2d878be	[update] fix Vout mode	2021-01-22 18:31:31 +08:00
Roy	18eeeec7cc	[update] update cycle 8bit to 16bit	2021-01-22 18:20:08 +08:00
Roy	81d753b5f0	[update] fix RT mode	2021-01-17 17:40:30 +08:00
Roy	0841d08972	[update] fix Vout mode (ok)	2021-01-11 23:35:43 +08:00
Roy	de5bb460fc	[update] fix WM (not ok)	2021-01-11 00:47:35 +08:00
Roy	eb45ca6d81	[update] test struct ok	2021-01-08 18:05:27 +08:00
Roy	b0d2697c92	[update] test struct fail	2021-01-08 12:27:28 +08:00
Roy	0dc0b66234	[update] test struct fail	2021-01-08 10:39:49 +08:00
Roy	11da60ab8f	test struct	2021-01-08 00:42:28 +08:00
Roy	41c7db8776	[update] test TT-CURVE	2021-01-07 18:22:26 +08:00
Roy	916a8f5dc7	[update] fix Cycle I-V cycle	2021-01-05 11:08:06 +08:00
Roy	25cc8b16fa	[update] fix CV3 cycle	2021-01-05 10:31:08 +08:00
Roy	67bf8b67dd	[cali] add BOARD_C797 & BOARD_C639 calibration data.	2020-12-31 09:40:38 +08:00
Roy	13dfdbd502	[update] fix problem for change level	2020-12-30 16:36:16 +08:00
Roy	e0ae30d40d	[update] add dark led fun()	2020-12-29 11:45:09 +08:00
Roy	2c3a0a7ee8	[cali] add BOARD_C615 & BOARD_C78B calibration data.	2020-12-29 10:43:51 +08:00
Benny Liu	f1086df363	turn on 6994 shutdown	2020-12-17 12:40:07 +08:00
Roy	6345ee875a	[cali] add BOARD_C60C calibration data.	2020-12-16 09:59:21 +08:00
Roy	69061f9afd	[cali] add BOARD_C903 calibration data.	2020-12-15 10:00:58 +08:00
Roy	3aecb50b47	[cali] add BOARD_C69F calibration data.	2020-12-14 18:37:01 +08:00
Roy	e030578fd8	[update] update headstage version on elite1.5 (0,2,1,6)	2020-12-10 17:16:37 +08:00
Roy	c05fefe71c	Merge branch 'Elite1.5_developement_testmode1210' into Elite1.5_developement	2020-12-10 17:04:31 +08:00
Roy	177b56e8f9	[update] update pulsemode on elite1.5	2020-12-10 17:03:08 +08:00
Benny Liu	aeb7a8afaf	cali_count_max = 5000 for smallest Vin and Iin gain	2020-12-10 15:53:35 +08:00
Roy	0edaa77857	[update] match 1.5 ui (cali code)	2020-12-04 11:28:33 +08:00
Roy	c656eebcbc	[update] align notify (match megafly ui)	2020-11-26 22:48:53 +08:00
Roy	e17e78bc18	[update] add Vout boundary (usc)	2020-11-26 16:14:31 +08:00
Benny Liu	c3235e985f	Change 1.5 Iin measurement range.	2020-11-26 15:48:01 +08:00
Roy	656e0fb485	[cali] update BOARD_C7A1 calibration data.	2020-11-23 12:12:09 +08:00
Roy	d3dd5270dd	[update] tag controller version	2020-11-23 10:18:46 +08:00
Roy	e588b30c8b	[update] monitor bat	2020-11-20 14:45:21 +08:00
Roy	d3f9aec31c	add BOARD_C604 calibration data.	2020-11-20 11:50:17 +08:00
Roy	ed617c88c9	[update] remove megafly pin	2020-11-20 11:14:01 +08:00
Roy	0b8f4c2414	Merge branch 'Elite1.5_developement_magafly_1119_1' into Elite1.5_developement	2020-11-20 11:08:51 +08:00
Roy	b5449b7404	[update]update pulsefly INSTRUCTION.notifyRate	2020-11-20 11:06:12 +08:00
Roy	a3c1241f38	Merge branch 'Elite1.5_calibration' into Elite1.5_developement	2020-11-20 11:01:45 +08:00
Roy	bbf60ebfed	test periodicEvent	2020-11-19 16:00:51 +08:00
Roy	0e9f40bdd5	Megafly trigger yes yes.	2020-11-19 15:47:07 +08:00
Roy	e32897f6b5	[update] Megafly notify check. & Megafly trigger.	2020-11-19 15:40:12 +08:00
Roy	6ee4b47d90	[update]update pulsefly INSTRUCTION.notifyRate	2020-11-18 11:57:53 +08:00
YiChin	dac19f62b2	test ok,but T2~T3=0 can't handle	2020-11-16 14:43:50 +08:00
YiChin	8e6d112729	test ok,but T2~T3=0 can't handle	2020-11-16 14:30:27 +08:00
YiChin	9e1dc1e3f4	test ok,but T1~T5=0 can't handle	2020-11-13 18:28:48 +08:00
YiChin	49fb3afc01	test ok,but T1~T5=0 can't handle	2020-11-13 13:30:47 +08:00
YiChin	f3b402fce9	test ok	2020-11-12 18:01:32 +08:00
YiChin	ef9a38d7fc	test not ok(RT not ok)	2020-11-12 17:24:04 +08:00
YiChin	67275a7921	test not ok(RT not ok)	2020-11-12 16:17:15 +08:00
YiChin	0ddaa02414	test not ok	2020-11-12 15:39:44 +08:00
YiChin	96d5735164	test not ok	2020-11-12 14:55:28 +08:00
YiChin	ac32fb9c73	test not ok	2020-11-12 12:23:14 +08:00
Benny Liu	9acc242ff6	Add Megafly pin.	2020-11-12 10:22:31 +08:00
YiChin	d8a403c410	add BOARD_C771 calibration data.	2020-11-12 10:18:12 +08:00
YiChin	f1d0acef23	update pulse mode	2020-11-12 10:16:40 +08:00
YiChin	9811572f47	add pulse mode	2020-11-11 16:44:49 +08:00
YiChin	8753e2ddc6	dont send battery information	2020-10-22 10:38:09 +08:00
YiChin	f6167c25ca	update SPI hold & take away AutoGainChangeVout()	2020-10-20 18:41:00 +08:00
YiChin	cb3894712e	take away AutoGainChangeVout()	2020-10-20 18:23:13 +08:00
YiChin	995a47e200	update SPI hold	2020-10-20 17:11:36 +08:00
YiChin	cde9096018	update SPI hold	2020-10-20 12:18:29 +08:00
YiChin	6c1bd24b92	update SPI hold	2020-10-19 18:40:35 +08:00
YiChin	0c129bc99b	take away bat()	2020-09-25 09:43:39 +08:00