Change BOARD_517 feedback R to 200k, 6.2k, 200R.

Update calibration code.
Change BOARD_517 feedback R to 200k, 6.2k, 510R.
2020-05-25 18:03:44 +08:00 · 2020-05-25 16:19:13 +08:00 · 2020-02-25 18:32:13 +08:00 · 2020-02-25 10:38:03 +08:00 · 2020-02-25 10:08:58 +08:00 · 2020-02-21 17:57:26 +08:00
40 changed files with 3206 additions and 678 deletions
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<configurations XML_version="1.2" id="configurations_0">
+    <configuration XML_version="1.2" id="configuration_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe">
+            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="2" id="The Converter Usage">
+                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
+                        <choice Name="Overclock with user specified value" value="unused">
+                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
+                        </choice>
+                    </property>
+                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+                </choice>
+            </property>
+            <platform XML_version="1.2" id="platform_0">
+                <instance XML_version="1.2" desc="CC2640F128" href="devices/cc2640f128.xml" id="CC2640F128" xml="cc2640f128.xml" xmlpath="devices"/>
+            </platform>
+        </connection>
+    </configuration>
+</configurations>
@@ -0,0 +1,9 @@
+The 'targetConfigs' folder contains target-configuration (.ccxml) files, automatically generated based
+on the device and connection settings specified in your project on the Properties > General page.
+
+Please note that in automatic target-configuration management, changes to the project's device and/or
+connection settings will either modify an existing or generate a new target-configuration file. Thus,
+if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
+you may create your own target-configuration file for this project and manage it manually. You can
+always switch back to automatic target-configuration management by checking the "Manage the project's
+target-configuration automatically" checkbox on the project's Properties > General page.
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<configurations XML_version="1.2" id="configurations_0">
+    <configuration XML_version="1.2" id="configuration_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe">
+            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="2" id="The Converter Usage">
+                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
+                        <choice Name="Overclock with user specified value" value="unused">
+                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
+                        </choice>
+                    </property>
+                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+                </choice>
+            </property>
+            <platform XML_version="1.2" id="platform_0">
+                <instance XML_version="1.2" desc="CC2640F128" href="devices/cc2640f128.xml" id="CC2640F128" xml="cc2640f128.xml" xmlpath="devices"/>
+            </platform>
+        </connection>
+    </configuration>
+</configurations>
@@ -0,0 +1,9 @@
+The 'targetConfigs' folder contains target-configuration (.ccxml) files, automatically generated based
+on the device and connection settings specified in your project on the Properties > General page.
+
+Please note that in automatic target-configuration management, changes to the project's device and/or
+connection settings will either modify an existing or generate a new target-configuration file. Thus,
+if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
+you may create your own target-configuration file for this project and manage it manually. You can
+always switch back to automatic target-configuration management by checking the "Manage the project's
+target-configuration automatically" checkbox on the project's Properties > General page.
@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>
@@ -18,8 +18,8 @@
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o      ${ProjName}.hex ${ProjName}.out" prebuildStep="">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.1369151231" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.223507680">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.732777020" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.687113732" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1175214904">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1766090240" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
@@ -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.579299287" 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.2112816025" 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.1418617668" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1368914557" 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.872349905" 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.1023813954" 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.1674413144" 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.184317276" 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.1068578615" 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.1943600764" 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.644525479" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1440160666" 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.1899549400" 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.1290729302" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.721499569" 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.748175460" 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.626419827" 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.647015929" 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.289941614" 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.1253275540" 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.728465942" 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.1083748399" 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.1330623088" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1126030229" 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,71 +86,71 @@
 									<listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
 									<listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.1308360247" 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.504235202" 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.105967788" 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.698913237" 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.1162837514" 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.2135753083" 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.710476155" 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.1054015944" 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.1399241416" 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.323133680" 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.867926379" 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.980626282" 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.374992114" 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.1890491357" 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.827786109" 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.1167890580" 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.2012181802" 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.1145821475" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
 									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
 								</option>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.263445006" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1235873701" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.207268648" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1068957263" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.984631123" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1536412064" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.955203011" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.534126004" 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.223507680" 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.698430423" 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.402182782" 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.1628689699" 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.2141951901" 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.679112687" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1175214904" 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.195741240" 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.600159013" 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.1574331605" 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.664332972" 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.25625621" 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.650613345" 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.5851816" 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.782343525" 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.972853444" 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.1555270082" 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.16105060" 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.1713299511" 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.68776981" 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.1860389255" 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.152379533" 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.158095632" 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.978853236" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.749876507" 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.1386058179" 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.699248925" 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.1864268761" 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.1562698794" 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.1077744726" 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.198307799" 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.1247173115" 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.2015106526" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1270425102" 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.16813235" 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.318851558" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.2020593432" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.855423016" 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.793625032" 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.395278084" 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.927640565" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1908494509" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
+							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.311958009" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.825400340" 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.1746187707" 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.884959194" 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.943624305" 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.1521167272" 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.1901654533" 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.138005453" 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.602562416" 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.596219144" 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.341519465" 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.1369908851" 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.1800641556" 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.2138808751" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="1" id="Power Selection">
-                <choice Name="Probe supplied power" value="1">
-                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
-                </choice>
-            </property>
-            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
-            <property Type="choicelist" Value="4" id="SWD Mode Settings">
-                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="2" id="The Converter Usage">
+                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
+                        <choice Name="Overclock with user specified value" value="unused">
+                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
+                        </choice>
+                    </property>
+                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
                </choice>
            </property>
            <platform XML_version="1.2" id="platform_0">
@@ -16,7 +16,7 @@
 # sources were generated) is:
 #    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src
+GEN_SRC_DIR ?= ../../config/src

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

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

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

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

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

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

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

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

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

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

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

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

 static void ADCGainControl(uint8_t ADCLevel){
    if(ADCLevel == 0){
-        // ADC gain level = 0, using 200R resister
+        // ADC gain level = 0, using 200K resister
        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon100R, 0);
+        PIN_setOutputValue(pin_handle, Turnon200R, 0);
    }
    else if(ADCLevel == 1){
        // ADC gain level = 1, using 10K resister
        PIN_setOutputValue(pin_handle, Turnon10K, 1);
-        PIN_setOutputValue(pin_handle, Turnon100R, 0);
+        PIN_setOutputValue(pin_handle, Turnon200R, 0);
    }
    else if(ADCLevel == 2){
-        // ADC gain level = 2, using 100R resister
+        // ADC gain level = 2, using 200R resister
        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon100R, 1);
+        PIN_setOutputValue(pin_handle, Turnon200R, 1);
    }
    else if(ADCLevel == 3){
        // ADC gain level = 0, auto gain (using 200R resister)
        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon100R, 0);
+        PIN_setOutputValue(pin_handle, Turnon200R, 1);
    }
    else{
        // default using 200R resister
        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon100R, 0);
+        PIN_setOutputValue(pin_handle, Turnon200R, 1);
    }
 }

@@ -137,6 +137,17 @@ static void ReadVolt(uint8_t *buf){
    ADC_read(buf);
 }

+static void ReadVoutVolt(uint8_t *buf){
+    // Read data twice since the first data we get is previous data
+    ADCChannelSelect(ADC_CH_DAC);
+    CPUdelay(10);
+    ADC_read(buf);
+
+    ADCChannelSelect(ADC_CH_DAC);
+    CPUdelay(10);
+    ADC_read(buf);
+}
+
 static void ReadCurrent(uint8_t *buf){
    // Read data twice since the first data we get is previous data
    ADCGainControl(INSTRUCTION.ADCGainLevel);
@@ -149,11 +160,34 @@ static void ReadCurrent(uint8_t *buf){
    ADC_read(buf);
 }

+static void ReadBatVolt(uint8_t *buf){
+    // Read data twice since the first data we get is previous data
+    ADCChannelSelect(ADC_CH_BAT);
+    CPUdelay(10);
+    ADC_read(buf);
+
+    ADCChannelSelect(ADC_CH_BAT);
+    CPUdelay(10);
+    ADC_read(buf);
+}
+
 // theoretical boundary <20, 10~500, >100 (uA)
+//#define GAIN_SMALL_BOUNDARY 40000  // 40 uA = 40,000,000 pA
+//#define GAIN_MID_BOUNDARY1  20000  // 20 uA = 20,000,000 pA
+//#define GAIN_MID_BOUNDARY2  400000 // 400 uA = 400,000,000 pA
+//#define GAIN_LARGE_BOUNDARY 200000 // 200 uA = 200,000 nA
+
+//#define GAIN_SMALL_BOUNDARY 8000  // 8 uA = 8,000,000 pA
+//#define GAIN_MID_BOUNDARY1  3000  // 3 uA = 3,000,000 pA
+//#define GAIN_MID_BOUNDARY2  90000 // 90 uA = 90,000,000 pA
+//#define GAIN_LARGE_BOUNDARY 70000 // 70 uA = 70,000 nA
+
+/* for Elite1.4-re which 6.3kohm replaced by 10kohm */
+// theoretical boundary <40, 30~1350, >1000 (uA)
 #define GAIN_SMALL_BOUNDARY 40000  // 40 uA = 40,000,000 pA
-#define GAIN_MID_BOUNDARY1  20000  // 20 uA = 20,000,000 pA
-#define GAIN_MID_BOUNDARY2  400000 // 400 uA = 400,000,000 pA
-#define GAIN_LARGE_BOUNDARY 200000 // 200 uA = 200,000 nA
+#define GAIN_MID_BOUNDARY1  30000  // 30 uA = 30,000,000 pA
+#define GAIN_MID_BOUNDARY2  1350000 // 1350 uA = 1350,000,000 pA
+#define GAIN_LARGE_BOUNDARY 1000000 // 1000 uA = 1000,000 nA

 static int32_t AutoGainReadCurrent(uint8_t *buf){
    int32_t Real_Current = 0;
@@ -163,59 +197,144 @@ static int32_t AutoGainReadCurrent(uint8_t *buf){
    }

    if(INSTRUCTION.ADCGainLevel == GAIN_200R){
-        ReadCurrent(spi_ADC_rxbuf);
-        Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+        uint8_t CurrentCount1 = 0;
+        while(CurrentCount1 < 5){
+            ReadCurrent(spi_ADC_rxbuf);
+            CurrentCount1++;
+            if(CurrentCount1 == 5){
+                ReadCurrent(spi_ADC_rxbuf);
+                Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                break;
+            }
+        }

        // switch to mid range current
        if(Real_Current < GAIN_LARGE_BOUNDARY && Real_Current > -1*GAIN_LARGE_BOUNDARY){
-//            LED_color(DARKLED, 0x00, 0x0F, 0xFF);
-            INSTRUCTION.ADCGainLevel = GAIN_10K;
-            ReadCurrent(spi_ADC_rxbuf);
-            Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-
+            uint8_t CurrentCount = 0;
            // switch to small range current
            if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
-//                LED_color(DARKLED, 0x00, 0x00, 0xFF);
                INSTRUCTION.ADCGainLevel = GAIN_200K;
-                ReadCurrent(spi_ADC_rxbuf);
-                Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                while(CurrentCount < 5){
+                    ReadCurrent(spi_ADC_rxbuf);
+                    CurrentCount++;
+                    if(CurrentCount == 5){
+                        ReadCurrent(spi_ADC_rxbuf);
+                        Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                        break;
+                    }
+                }
+            }else{
+                CurrentCount = 0;
+                INSTRUCTION.ADCGainLevel = GAIN_10K;
+                while(CurrentCount < 5){
+                    ReadCurrent(spi_ADC_rxbuf);
+                    CurrentCount++;
+                    if(CurrentCount == 5){
+                        ReadCurrent(spi_ADC_rxbuf);
+                        Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                        break;
+                    }
+                }
            }
+
+//            LED_color(DARKLED, 0x00, 0xFF, 0x00);
+
+//            // switch to small range current
+//            if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
+//                INSTRUCTION.ADCGainLevel = GAIN_200K;
+//                ReadCurrent(spi_ADC_rxbuf);
+//                Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+//                LED_color(DARKLED, 0xFF, 0x00, 0x00);
+//            }
        }
    }
    else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
-        ReadCurrent(spi_ADC_rxbuf);
-        Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+        uint8_t CurrentCount1 = 0;
+        while(CurrentCount1 < 3){
+            ReadCurrent(spi_ADC_rxbuf);
+            CurrentCount1++;
+            if(CurrentCount1 == 3){
+                ReadCurrent(spi_ADC_rxbuf);
+                Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                break;
+            }
+        }

        // switch to large range current
        if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
-//            LED_color(DARKLED, 0xFF, 0x0F, 0x0F);
+            uint8_t CurrentCount = 0;
            INSTRUCTION.ADCGainLevel = GAIN_200R;
-            ReadCurrent(spi_ADC_rxbuf);
-            Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+            while(CurrentCount < 3){
+                ReadCurrent(spi_ADC_rxbuf);
+                CurrentCount++;
+                if(CurrentCount == 3){
+                    ReadCurrent(spi_ADC_rxbuf);
+                    Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                    break;
+                }
+            }
        }

        // switch to small range current
        else if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
-//            LED_color(DARKLED, 0x00, 0x00, 0xFF);
+            uint8_t CurrentCount = 0;
            INSTRUCTION.ADCGainLevel = GAIN_200K;
-            ReadCurrent(spi_ADC_rxbuf);
-            Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+            while(CurrentCount < 3){
+                ReadCurrent(spi_ADC_rxbuf);
+                CurrentCount++;
+                if(CurrentCount == 3){
+                    ReadCurrent(spi_ADC_rxbuf);
+                    Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                    break;
+                }
+            }
        }
    }
    else if(INSTRUCTION.ADCGainLevel == GAIN_200K){
-        ReadCurrent(spi_ADC_rxbuf);
-        Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+        uint8_t CurrentCount1 = 0;
+        while(CurrentCount1 < 5){
+            ReadCurrent(spi_ADC_rxbuf);
+            CurrentCount1++;
+            if(CurrentCount1 == 5){
+                ReadCurrent(spi_ADC_rxbuf);
+                Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                break;
+            }
+        }
+        //Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);

        // switch to mid range current
        if(Real_Current > GAIN_SMALL_BOUNDARY || Real_Current < -1*GAIN_SMALL_BOUNDARY){
-//           LED_color(DARKLED, 0x00, 0x0F, 0xFF);
-           INSTRUCTION.ADCGainLevel = GAIN_10K;
-           ReadCurrent(spi_ADC_rxbuf);
-           Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+            uint8_t CurrentCount = 0;
+            // switch to large range current
+            if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
+                INSTRUCTION.ADCGainLevel = GAIN_200R;
+                while(CurrentCount < 5){
+                    ReadCurrent(spi_ADC_rxbuf);
+                    CurrentCount++;
+                    if(CurrentCount == 5){
+                        ReadCurrent(spi_ADC_rxbuf);
+                        Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                        break;
+                    }
+                }
+            }else{
+                CurrentCount = 0;
+                INSTRUCTION.ADCGainLevel = GAIN_10K;
+                while(CurrentCount < 5){
+                    ReadCurrent(spi_ADC_rxbuf);
+                    CurrentCount++;
+                    if(CurrentCount == 5){
+                        ReadCurrent(spi_ADC_rxbuf);
+                        Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+                        break;
+                    }
+                }
+            }
+

           // switch to large range current
 //           if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
-//               LED_color(DARKLED, 0xFF, 0x0F, 0x0F);
 //               INSTRUCTION.ADCGainLevel = GAIN_200R;
 //               ReadCurrent(spi_ADC_rxbuf);
 //               Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
@@ -0,0 +1,32 @@
+
+#ifndef ELITECCC
+#define ELITECCC
+
+#include "EliteCCMode.h"
+
+
+// XXX : should we reset DAC output after STOP?
+static void CCModeReverseCurrent(CCCMode *CCC){
+    if(CCC->StandBy){
+        if(CT.StandByCounter == CCC->StandByTime){
+            CCC->StandBy = false;
+            CT.StandByCounter = 0;
+        }
+        else{
+            CT.StandByCounter ++;
+        }
+    }
+    else{
+        // reverse charge/discharge
+        if(CCC->BatteryV == CCC->VMax){
+            CCC->StandBy = true;
+            CCC->value = CCC->DischargeCurrent;
+        }
+        else if(CCC->BatteryV == CCC->VMin){
+            CCC->StandBy = true;
+            CCC->value = CCC->ChargeCurrent;
+        }
+    }
+}
+
+#endif
@@ -2,129 +2,118 @@
 #ifndef ELITECCMODE
 #define ELITECCMODE

-#define CC_ZERO_POINT     1500000
-#define MAX_DAC_UC    50000
-#define MIN_DAC_UC      0
-#define CURRENT_LV_ONE      1
-#define CURRENT_LV_ZERO     0
+static void CCModeDACControl(CCMode *CC, int32_t IUC_Measure_Difference);

-static void CCModeDACControl(int32_t IUC_Measure_Difference);
+static int32_t CCModeReadCurrent(CCMode *CC){

-
-/*********************************************************************
- * @struct  Constant Current Code
- *
- * @brief   A struct to handle CC mode command
- */
-typedef struct _CURRENT_USER_CODE {
-
-    /** current value **/
-    // current value divide current level into 3,000,001 pieces
-    // 1,500,000 is zero point
-    int32_t value;
-
-    /** ADC level range: 0-2 **/
-    // constant current value will decide ADC gain level
-    // if |1500000 - value| > 10000 (+-100 uA)     => lv = GAIN_200R
-    // else if |1500000 - valule| > 1000 (+-10 uA) => lv = GAIN_10K
-    // else lv = GAIN_200K
-    uint8_t lv;
-
-    /* Vmax and Vmin */
-    // Vmax protect battery charge
-    // Vmin protect battery discharge
-    // uint = mV
-    uint16_t Vmax;
-    uint16_t Vmin;
-
-    /** transform a current user code (IUC) to real current in nA **/
-    int32_t (*_Transform2RealnA)(struct _CURRENT_USER_CODE *);
-
-    /** Measure Current **/
-    int32_t _MeasureCurrent;
-
-    /** MeasureCurrent operation **/
-    void (*SetMeasureCurrent)(struct _CURRENT_USER_CODE *, int32_t);
-
-    int32_t (*GetMeasureCurrent)(struct _CURRENT_USER_CODE *);
-}CURRENT_USER_CODE;
-
-//static CURRENT_USER_CODE CurrentUserCode;
-
-static int32_t CCModeReadCurrent(void *WorkModeData){
-
-    int32_t Real_Current = 0;
-    CURRENT_USER_CODE *CurrentUserCode = WorkModeData;
-//    CurrentUserCode = WorkModeData;
+    static uint8_t VoltCurrentSwitch = 0;

    CCModeDACEnable = 1;    // This flag will control DAC working

-    // set current value and ADC gain level
-    CCCurrent2IUC(CurrentUserCode);
-
-    // set ADC gain according to constant current value
-    INSTRUCTION.ADCGainLevel = CurrentUserCode->lv;
-
-    // read ADC current
-    ReadCurrent(spi_ADC_rxbuf);
-
    // decode ADC value and put it into notify buffer
-    Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-    CurrentUserCode->SetMeasureCurrent(CurrentUserCode, Real_Current);
+    // Use 5-th measure value as real-measure value
+    // because some value in the begin are garbage
+    if(VoltCurrentSwitch < 5){
+        ReadCurrent(spi_ADC_rxbuf);
+        VoltCurrentSwitch ++;
+    }
+    else if(VoltCurrentSwitch == 5){
+        // read current
+        if(INSTRUCTION.AutoGainEnable){
+            CC->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+        }
+        else{
+            ReadCurrent(spi_ADC_rxbuf);
+            CC->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+        }
+        VoltCurrentSwitch ++;
+    }
+    else if(VoltCurrentSwitch <10){
+        // read volt
+        ReadVolt(spi_ADC_rxbuf);
+        VoltCurrentSwitch++;
+    }
+    else if(VoltCurrentSwitch == 10){
+        /** read battery voltage **/
+        ReadVolt(spi_ADC_rxbuf);
+        CC->BatteryV = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);

-    return Real_Current;
+        // if Iin have a offset if current !=0
+        CC->BatteryV = CC->BatteryV - (CC->value - CC_ZERO_POINT)*10/1e5;   // I_set * 10R = V_Iin2GND (mA * ohm)
+        VoltCurrentSwitch++;
+//        NotifyReady = true;
+    }
+    else{
+        VoltCurrentSwitch = 0;
+    }
+    NotifyVolt[0] = (uint8_t) (CC->BatteryV >> 24);
+    NotifyVolt[1] = (uint8_t) ((CC->BatteryV & 0x00FF0000) >> 16);
+    NotifyVolt[2] = (uint8_t) ((CC->BatteryV & 0x0000FF00) >> 8);
+    NotifyVolt[3] = (uint8_t) (CC->BatteryV & 0x000000FF);
+    return CC->_MeasureData;
 }

-static int32_t CCModeVoltOut(void *WorkModeData){
-    int32_t MeasureCurrent = 0, IUCCurrent = 0;
-    CURRENT_USER_CODE *CurrentUserCode = WorkModeData;
+static int32_t CCModeVoltOut(CCMode *CC){
+    int32_t IUCCurrent = 0;

    if(!CCModeDACEnable){
        // DAC should not work now
        return 0;
    }
+    IUCCurrent = CC->_Transform2RealnA( (struct CCModePara *) CC);

-    IUCCurrent = CurrentUserCode->_Transform2RealnA(CurrentUserCode);
-    if(CurrentUserCode->lv == GAIN_200K || CurrentUserCode->lv == GAIN_10K ){
-        MeasureCurrent = CurrentUserCode->GetMeasureCurrent(CurrentUserCode);
-        CCModeDACControl(IUCCurrent - MeasureCurrent);
-    }
-    else{
-        MeasureCurrent = CurrentUserCode->GetMeasureCurrent(CurrentUserCode);
-        CCModeDACControl(IUCCurrent - MeasureCurrent);
-    }
-//    NotifyCurrent[0] = (uint8_t) (IUCCurrent >> 24);
-//    NotifyCurrent[1] = (uint8_t) ((IUCCurrent & 0x00FF0000) >> 16);
-//    NotifyCurrent[2] = (uint8_t) ((IUCCurrent & 0x0000FF00) >> 8);
-//    NotifyCurrent[3] = (uint8_t) (IUCCurrent & 0x000000FF);
-//
-//    NotifyVolt[0] = (uint8_t) (MeasureCurrent >> 24);
-//    NotifyVolt[1] = (uint8_t) ((MeasureCurrent & 0x00FF0000) >> 16);
-//    NotifyVolt[2] = (uint8_t) ((MeasureCurrent & 0x0000FF00) >> 8);
-//    NotifyVolt[3] = (uint8_t) (MeasureCurrent & 0x000000FF);
+    CCModeDACControl(CC, IUCCurrent - CC->_MeasureData);

-    DACCode2Real2Notify(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
    CCModeDACEnable = 0;
-    return MeasureCurrent;
+    return CC->_MeasureData;
 }

-static void CCModeDACControl(int32_t IUC_Measure_Difference){
-    if(IUC_Measure_Difference > 100000 || IUC_Measure_Difference < -100000){
-        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + IUC_Measure_Difference/1e4;
-        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+static void CCModeDACControl(CCMode *CC, int32_t IUC_Measure_Difference){
+    int32_t step;
+
+    if(IUC_Measure_Difference < 300 && IUC_Measure_Difference > -300){
+        step = 0;
    }
-    else if(IUC_Measure_Difference > 1000 || IUC_Measure_Difference < -1000){
-        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + IUC_Measure_Difference/1e3;
-        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+    else if( CC->Charge && CC->BatteryV >= ( (int32_t) (CC->VMax - DAC_ZERO)/5 ) ){
+        CC->value = 0;
+        step = (IUC_Measure_Difference > 0) ? 1:-1;
    }
-    else if(IUC_Measure_Difference > 0){
-        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + 1;
-        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+    else if( (!CC->Charge) && CC->BatteryV <= ( (int32_t) (CC->VMin - DAC_ZERO)/5 ) ){
+        // Ignore VMin condition
+        if(CC->Done < 25000){
+            CC->Done ++;
+            step = (IUC_Measure_Difference > 0) ? 2:-2;
+        }
+        // after ignore few second, active VMin condition
+        else{
+            CC->value = 0;
+            step = (IUC_Measure_Difference > 0) ? 1:-1;
+        }
+
    }
-    else if(IUC_Measure_Difference < 0){
-       INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant - 1;
-       DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+    else{
+        step = (IUC_Measure_Difference > 0) ? 1:-1;
    }
+    // over/under flow
+    if( (INSTRUCTION.VoltConstant + step) > MAX_DAC_UC || (INSTRUCTION.VoltConstant + step) < MIN_DAC_UC ){
+        if(step > 0){
+            INSTRUCTION.VoltConstant = (INSTRUCTION.VoltConstant + MAX_DAC_UC)/2;
+        }
+        else{
+            INSTRUCTION.VoltConstant = (INSTRUCTION.VoltConstant + MIN_DAC_UC)/2;
+        }
+    }
+    else{
+        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + step;
+    }
+
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+
+//    step = CC->Done;
+//    NotifyImpedance[0] = (uint8_t) (step >> 24);
+//    NotifyImpedance[1] = (uint8_t) ((step & 0x00FF0000) >> 16);
+//    NotifyImpedance[2] = (uint8_t) ((step & 0x0000FF00) >> 8);
+//    NotifyImpedance[3] = (uint8_t) (step & 0x000000FF);
 }

 /* Transform setting CC into IUC
@@ -133,63 +122,11 @@ static void CCModeDACControl(int32_t IUC_Measure_Difference){
 * Real current value : -15.00000 ~ 15.00000 mA
 *  => user code = 1500000 mapping to 0.00000 mA
 */
-static void CCCurrent2IUC(CURRENT_USER_CODE *CurrentUserCode){
+static void CCCurrent2IUC(CCMode *CC){
    int32_t CurrentValue = 0;

-    CurrentUserCode->value = INSTRUCTION.ConstantCurrent;
-    CurrentValue = CurrentUserCode->value - CC_ZERO_POINT;
-
-    /* set ADC level */
-    // largest current
-    if (CurrentValue > 10000 || CurrentValue < -10000){
-        CurrentUserCode->lv = GAIN_200R;
-    }
-    // mid range current
-    else if (CurrentValue > 1000 || CurrentValue < -1000){
-        CurrentUserCode->lv = GAIN_10K;
-    }
-    // least range current
-    else{
-        CurrentUserCode->lv = GAIN_200K;
-    }
-}
-
-/*********************************************************************
- * @fn      Transform2RealnA
- *
- * @brief   transform an IUC into real current value in nA.
- *
- * @param   self, which is an IUC
- *
- * @return  an int32_t current value in nA
- */
-static int32_t _Transform2RealnA(CURRENT_USER_CODE *self){
-    int32_t IUCReal;
-
-    // self->value : 0 ~ 3000000 (which is -1500000 ~ 1500000 (10nA) )
-    IUCReal = (self->value - CC_ZERO_POINT) * 10;
-    return IUCReal;
-}
-
-static void SetMeasureCurrent(CURRENT_USER_CODE *self, int32_t current){
-    self->_MeasureCurrent = current;
-}
-
-static int32_t GetMeasureCurrent(CURRENT_USER_CODE *self){
-    return self->_MeasureCurrent;
-}
-
-static CURRENT_USER_CODE *InitCurrentUserCode(){
-    CURRENT_USER_CODE *CurrentUserCode = malloc(sizeof(CURRENT_USER_CODE));
-    CurrentUserCode->value = CC_ZERO_POINT;
-    CurrentUserCode->lv = GAIN_AUTO;
-    CurrentUserCode->Vmax = MAX_DAC_UC;  // max DAC UserCode
-    CurrentUserCode->Vmin = MIN_DAC_UC;  // min DAC UserCode
-    CurrentUserCode-> _MeasureCurrent = 0;
-    CurrentUserCode->_Transform2RealnA = &_Transform2RealnA;
-    CurrentUserCode->SetMeasureCurrent = &SetMeasureCurrent;
-    CurrentUserCode->GetMeasureCurrent = &GetMeasureCurrent;
-    return CurrentUserCode;
+    CC->value = INSTRUCTION.ConstantCurrent;
+    CurrentValue = CC->value - CC_ZERO_POINT;
 }

 #endif
@@ -2,7 +2,7 @@
 #ifndef ELITECV
 #define ELITECV

-static uint16_t SWVCurve() {
+static uint16_t SWVCurve(WorkMode *WorkModeData) {
    static uint8_t  counter;
    static uint16_t outputV;
    static uint16_t Volt;
@@ -57,7 +57,7 @@ static uint16_t SWVCurve() {
    return outputV;
 }

-static uint16_t DPVCurve() {
+static uint16_t DPVCurve(WorkMode *WorkModeData) {
    static uint8_t  counter;
    static uint16_t Volt1;
    static uint16_t Volt2;
@@ -132,15 +132,15 @@ static uint16_t DPVCurve() {
    }
 }

-static uint16_t CVCurve() {
+static uint16_t CVCurve(CVMode *CV) {
    static uint16_t DACOutCode;
    static bool direction_up;           // direction_up = true, if Vfinal > Vorigin
    static bool current_direction_up;   // current_direction_up = true, Vstep => positive. vice versa
-
+    static bool firstADCData;           //firstADCdata=true,when min<x<max,cyclenumber--
    // reset origin volt at the begin
    if (DACReset) {
-        DACUserCode = INSTRUCTION.VoltOrigin;
-        if (INSTRUCTION.VoltFinal > INSTRUCTION.VoltOrigin) {
+        INSTRUCTION.VoltConstant = CV->_VOrigin;
+        if (CV->_VStop > CV->_VOrigin) {
            direction_up         = true;
            current_direction_up = true;
        } else {
@@ -148,98 +148,451 @@ static uint16_t CVCurve() {
            current_direction_up = false;
        }

-        DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
+        DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
        DAC_outputV(DACOutCode);    // output VOLT_ORIGIN
        DACReset   = false;
-
+        firstADCData = true;
        return DACOutCode;
    }

-    if (StepTimeCounter == INSTRUCTION.StepTime) {
-
+    if (CT.StepTimeCounter == CV->_StepTime) {
        // Decide next direction
-        if (direction_up) {
-            if (DACUserCode >= INSTRUCTION.VoltFinal) {
-                current_direction_up = false;  // problem occurs when origin == 0000 final == ffff!!!!!!
-            } else if (DACUserCode <= INSTRUCTION.VoltOrigin) {
-                current_direction_up = true;
-                if (INSTRUCTION.CycleNumber == 0) {
-                    PeriodicEvent = false;  // periodic event end
-                    DACReset      = true;
+        if (CV->_VoVi_Switch == 0x00){   //user see Vout
+            if (direction_up) {
+                if (INSTRUCTION.VoltConstant >= CV->_VStop) {
+                    current_direction_up = false;  // problem occurs when origin == 0000 final == ffff!!!!!!
+                    firstADCData = false;
                }
-                INSTRUCTION.CycleNumber--;
-            }
-        } else {
-            if (DACUserCode <= INSTRUCTION.VoltFinal) {
-                current_direction_up = true;  // problem occurs when origin == 0000 final == ffff!!!!!!
-            } else if (DACUserCode >= INSTRUCTION.VoltOrigin) {
-                current_direction_up = false;
-                if (INSTRUCTION.CycleNumber == 0) {
-                    PeriodicEvent = false;  // periodic event end
-                    DACReset      = true;
+                else if (INSTRUCTION.VoltConstant <= CV->_VOrigin) {
+                    current_direction_up = true;
+                    firstADCData = false;
+                    if (CV->_CycleNumber == 0) {
+                        PeriodicEvent = false;  // periodic event end
+                        DACReset      = true;
+                    }
+                    CV->_CycleNumber--;
+                }
+
+
+                else if(current_direction_up){
+                    if(INSTRUCTION.VoltConstant + CV->_Step > CV->_VStop){
+                        current_direction_up = false;
+                    }
+                }
+                else if(!current_direction_up){
+                    if(INSTRUCTION.VoltConstant - CV->_Step < CV->_VOrigin){
+                        current_direction_up = true;
+                        if (CV->_CycleNumber == 0) {
+                            PeriodicEvent = false;  // periodic event end
+                            DACReset      = true;
+                        }
+                        CV->_CycleNumber--;
+                    }
+                }
+                if (firstADCData){
+                    CV->_CycleNumber--;
+                    firstADCData = false;
+                }
+
+            } else {
+                if (INSTRUCTION.VoltConstant < CV->_VStop) {
+                    current_direction_up = true;  // problem occurs when origin == 0000 final == ffff!!!!!!
+                    firstADCData = false;
+                }
+                else if (INSTRUCTION.VoltConstant > CV->_VOrigin) {
+                    current_direction_up = false;
+                    firstADCData = false;
+                    if (CV->_CycleNumber == 0) {
+                        PeriodicEvent = false;  // periodic event end
+                        DACReset      = true;
+                    }
+                    CV->_CycleNumber--;
+                }
+                else if(current_direction_up){
+                    if(INSTRUCTION.VoltConstant + CV->_Step > CV->_VOrigin){
+                        current_direction_up = false;
+                        if (CV->_CycleNumber == 0) {
+                            PeriodicEvent = false;  // periodic event end
+                            DACReset      = true;
+                        }
+                        CV->_CycleNumber--;
+                    }
+                }
+                else if(!current_direction_up){
+                    if(INSTRUCTION.VoltConstant - CV->_Step < CV->_VStop){
+                        current_direction_up = true;
+                    }
+                }
+                if (firstADCData){//first data =2899mv,CV->_CycleNumber--;
+                    CV->_CycleNumber--;
+                    firstADCData = false;
                }
-                INSTRUCTION.CycleNumber--;
            }
        }
+        else if (CV->_VoVi_Switch == 0x01){     //user see Vin
+            if (direction_up) {
+                if (INSTRUCTION.VoltConstant >= CV->_VStop) {
+                    current_direction_up = false;  // problem occurs when origin == 0000 final == ffff!!!!!!
+                    firstADCData = false;
+                }
+                else if (INSTRUCTION.VoltConstant <= CV->_VOrigin) {
+                    current_direction_up = true;
+                    firstADCData = false;
+                    if (CV->_CycleNumber == 0) {
+                        PeriodicEvent = false;  // periodic event end
+                        DACReset      = true;
+                    }
+                    CV->_CycleNumber--;
+                }

+
+                else if(current_direction_up){
+                    if(INSTRUCTION.VoltConstant + CV->_Step > CV->_VStop){
+                        current_direction_up = false;
+                    }
+                }
+                else if(!current_direction_up){
+                    if(INSTRUCTION.VoltConstant - CV->_Step < CV->_VOrigin){
+                        current_direction_up = true;
+                        if (CV->_CycleNumber == 0) {
+                            PeriodicEvent = false;  // periodic event end
+                            DACReset      = true;
+                        }
+                        CV->_CycleNumber--;
+                    }
+                }
+                if (firstADCData){
+                    CV->_CycleNumber--;
+                    firstADCData = false;
+                }
+
+            } else {
+                if (INSTRUCTION.VoltConstant < CV->_VStop) {
+                    current_direction_up = true;  // problem occurs when origin == 0000 final == ffff!!!!!!
+                    firstADCData = false;
+                }
+                else if (INSTRUCTION.VoltConstant > CV->_VOrigin){
+                    current_direction_up = false;
+                    firstADCData = false;
+                    if (CV->_CycleNumber == 0) {
+                        PeriodicEvent = false;  // periodic event end
+                        DACReset      = true;
+                    }
+                    CV->_CycleNumber--;
+                }
+                else if(current_direction_up){
+                    if(INSTRUCTION.VoltConstant + CV->_Step > CV->_VOrigin){
+                        current_direction_up = false;
+                        if (CV->_CycleNumber == 0) {
+                            PeriodicEvent = false;  // periodic event end
+                            DACReset      = true;
+                        }
+                        CV->_CycleNumber--;
+                    }
+                }
+                else if(!current_direction_up){
+                    if(INSTRUCTION.VoltConstant - CV->_Step < CV->_VStop){
+                        current_direction_up = true;
+                    }
+                }
+                if (firstADCData){//first data =2899mv,CV->_CycleNumber--;
+                    CV->_CycleNumber--;
+                    firstADCData = false;
+                }
+            }
+        }
+//        if (current_direction_up == true){
+//            LED_color(DARKLED, 255, 0, 0);
+//        }
+//        else if (current_direction_up == false){
+//            LED_color(DARKLED, 255, 0, 255);
+//        }
+        
        // Next output voltage
-        if (direction_up) {
-            if (current_direction_up) {
-                // DACUserCode overflow ?
-                if (DACUserCode + INSTRUCTION.Step < DACUserCode) {
-                    DACUserCode = INSTRUCTION.VoltFinal;
-                }
-                else if (DACUserCode + INSTRUCTION.Step > INSTRUCTION.VoltFinal) {
-                    DACUserCode = INSTRUCTION.VoltFinal;
+        if (CV->_VoVi_Switch == 0x00){
+            if (direction_up) {
+                if (current_direction_up) {
+                    // DACUserCode overflow ?
+                    if (INSTRUCTION.VoltConstant + CV->_Step < INSTRUCTION.VoltConstant) {
+                        INSTRUCTION.VoltConstant = CV->_VStop;
+                    }
+                    // reach Vfinal ?
+                    else if (INSTRUCTION.VoltConstant + CV->_Step > CV->_VStop) {
+                        INSTRUCTION.VoltConstant =CV->_VStop;
+                    }
+                    else if (INSTRUCTION.VoltConstant >= CV->_VStop){
+                        INSTRUCTION.VoltConstant =CV->_VStop;
+                    }
+                    else {
+                        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + CV->_Step;
+                    }
                }
                else {
-                    DACUserCode = DACUserCode + INSTRUCTION.Step;
+                    // DACUserCode underflow ?
+                    if (INSTRUCTION.VoltConstant - CV->_Step > INSTRUCTION.VoltConstant) {
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+                    // reach Vorigin ?
+                    else if (INSTRUCTION.VoltConstant - CV->_Step <  CV->_VOrigin) {
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+                    else if (INSTRUCTION.VoltConstant <= CV->_VOrigin){
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+                    else {
+                        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant - CV->_Step;
+                        if(INSTRUCTION.VoltConstant > 60000){
+                            INSTRUCTION.VoltConstant = 0;
+                            current_direction_up = true;
+                            if (CV->_CycleNumber == 0) {
+                                PeriodicEvent = false;  // periodic event end
+                                DACReset      = true;
+                            }
+                            CV->_CycleNumber--;
+                        }
+                    }
                }
            }
            else {
-                // DACUserCode underflow ?
-                if (DACUserCode - INSTRUCTION.Step > DACUserCode || DACUserCode > 60000) {
-                    DACUserCode = INSTRUCTION.VoltOrigin;
-                }
+                if (current_direction_up) {

-                // reach Vorigin ?
-                else if (DACUserCode - INSTRUCTION.Step <  INSTRUCTION.VoltOrigin) {
-                    DACUserCode = INSTRUCTION.VoltOrigin;
+                    if (INSTRUCTION.VoltConstant + CV->_Step < INSTRUCTION.VoltConstant) {
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+
+                    else if (INSTRUCTION.VoltConstant + CV->_Step >  CV->_VOrigin) {
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+                    else if (INSTRUCTION.VoltConstant >= CV->_VOrigin){
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+                    else {
+                        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + CV->_Step;
+                    }
                }
                else {
-                    DACUserCode = DACUserCode - INSTRUCTION.Step;
+                    if (INSTRUCTION.VoltConstant - CV->_Step > INSTRUCTION.VoltConstant) {
+                        INSTRUCTION.VoltConstant = CV->_VStop ;
+                    }
+                    else if (INSTRUCTION.VoltConstant - CV->_Step < CV->_VStop) {
+                        INSTRUCTION.VoltConstant = CV->_VStop;
+                    }
+                    else if(INSTRUCTION.VoltConstant <= CV->_VStop){
+                        INSTRUCTION.VoltConstant = CV->_VStop;
+                    }
+                    else {
+                        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant - CV->_Step;
+
+                        if(INSTRUCTION.VoltConstant > 60000){
+                            INSTRUCTION.VoltConstant = 0;
+                            current_direction_up = true;
+                        }
+                    }
                }
            }
        }
-        else {
-            if (current_direction_up) {
-                if (DACUserCode + INSTRUCTION.Step < DACUserCode) {
-                     DACUserCode = INSTRUCTION.VoltOrigin;
-                }
-                else if (DACUserCode + INSTRUCTION.Step >  INSTRUCTION.VoltOrigin) {
-                    DACUserCode = INSTRUCTION.VoltOrigin;
+        else if (CV->_VoVi_Switch == 0x01){
+            if (direction_up) {
+                if (current_direction_up) {
+                    // DACUserCode overflow ?
+                    if (INSTRUCTION.VoltConstant + CV->_Step < INSTRUCTION.VoltConstant) {
+                        INSTRUCTION.VoltConstant = CV->_VStop;
+                    }
+                    // reach Vfinal ?
+                    else if (INSTRUCTION.VoltConstant + CV->_Step > CV->_VStop) {
+                        INSTRUCTION.VoltConstant =CV->_VStop;
+                    }
+                    else if (INSTRUCTION.VoltConstant >= CV->_VStop){
+                        INSTRUCTION.VoltConstant =CV->_VStop;
+                    }
+                    else {
+                        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + CV->_Step;
+                    }
                }
                else {
-                     DACUserCode = DACUserCode + INSTRUCTION.Step;
+                    // DACUserCode underflow ?
+                    if (INSTRUCTION.VoltConstant - CV->_Step > INSTRUCTION.VoltConstant) {
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+                    // reach Vorigin ?
+                    else if (INSTRUCTION.VoltConstant - CV->_Step < CV->_VOrigin) {
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+                    else if (INSTRUCTION.VoltConstant <= CV->_VOrigin){
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+                    else {
+                        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant - CV->_Step;
+                        if(INSTRUCTION.VoltConstant > 60000){
+                            INSTRUCTION.VoltConstant = 0;
+                            current_direction_up = true;
+                            if (CV->_CycleNumber == 0) {
+                                PeriodicEvent = false;  // periodic event end
+                                DACReset      = true;
+                            }
+                            CV->_CycleNumber--;
+                        }
+                    }
                }
            }
            else {
-                if (DACUserCode - INSTRUCTION.Step > DACUserCode || DACUserCode > 60000) {
-                     DACUserCode = INSTRUCTION.VoltFinal;
-                }
-                else if (DACUserCode - INSTRUCTION.Step < INSTRUCTION.VoltFinal) {
-                    DACUserCode = INSTRUCTION.VoltFinal;
+                if (current_direction_up) {
+                    // DACUserCode overflow ?
+                    if (INSTRUCTION.VoltConstant + CV->_Step < INSTRUCTION.VoltConstant) {
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+                    // ex:command 3->1V ,when 1 to 3V, 2.99+0.1 > 3V
+                    else if (INSTRUCTION.VoltConstant + CV->_Step > CV->_VOrigin) {
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+                    else if (INSTRUCTION.VoltConstant >= CV->_VOrigin){
+                        INSTRUCTION.VoltConstant = CV->_VOrigin;
+                    }
+                    else {
+                        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + CV->_Step;
+                    }
                }
                else {
-                     DACUserCode = DACUserCode - INSTRUCTION.Step;
+                    if (INSTRUCTION.VoltConstant - CV->_Step > INSTRUCTION.VoltConstant) {
+                        INSTRUCTION.VoltConstant = CV->_VStop ;
+                    }
+                    else if (INSTRUCTION.VoltConstant - CV->_Step < CV->_VStop) {
+                        INSTRUCTION.VoltConstant = CV->_VStop;
+                    }
+                    else if(INSTRUCTION.VoltConstant <= CV->_VStop){
+                        INSTRUCTION.VoltConstant = CV->_VStop;
+                    }
+                    else {
+                        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant - CV->_Step;
+
+                        if(INSTRUCTION.VoltConstant > 60000){
+                            INSTRUCTION.VoltConstant = 0;
+                            current_direction_up = true;
+                        }
+                    }
                }
            }
        }
-        DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
+
+//        NotifyImpedance[0] = 0x00;
+//        NotifyImpedance[1] = 0x00;
+//        NotifyImpedance[2] = (uint8_t)((DACOutCode & 0xFF00) >> 8);
+//        NotifyImpedance[3] = (uint8_t)(DACOutCode & 0x00FF);
+
+
+        DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
        DAC_outputV(DACOutCode);
    }
    return DACOutCode;
 }

+static void CV_Plot(CVMode *CV){
+    static uint8_t PreviousGain = GAIN_200R;
+
+    static uint8_t VoltCurrentSwitch = 0;
+    uint16_t ADC_measure = 0;
+
+    if(VoltCurrentSwitch < 5){
+        ReadCurrent(spi_ADC_rxbuf);
+        VoltCurrentSwitch ++;
+    }
+    else if(VoltCurrentSwitch == 5){
+        // read current
+
+        if(INSTRUCTION.AutoGainEnable){
+            CV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+            if(PreviousGain != INSTRUCTION.ADCGainLevel){
+                PreviousGain = INSTRUCTION.ADCGainLevel;
+                CV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+                CV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+            }
+            if(PreviousGain != INSTRUCTION.ADCGainLevel){
+                PreviousGain = INSTRUCTION.ADCGainLevel;
+                CV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+                CV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+            }
+        }
+        else{
+            ReadCurrent(spi_ADC_rxbuf);
+            CV->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+        }
+        VoltCurrentSwitch ++;
+    }
+//    else if(VoltCurrentSwitch < 9){
+//        // read volt
+//        ReadVolt(spi_ADC_rxbuf);
+//        VoltCurrentSwitch++;
+//    }
+//    else if(VoltCurrentSwitch == 9){
+//        /** read battery voltage **/
+//        ReadVolt(spi_ADC_rxbuf);
+//        ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
+//        //CV->MeasureVolt = 20000;
+//        CV->MeasureVolt = DecodeADCVolt(ADC_measure);
+//        VoltCurrentSwitch++;
+//    }
+    else if(VoltCurrentSwitch < 9){
+        if(CV->_VoVi_Switch == 0x01){
+            // read vin volt
+            ReadVolt(spi_ADC_rxbuf);
+        }else if(CV->_VoVi_Switch == 0x00){
+             // read vout volt
+             ReadVoutVolt(spi_ADC_rxbuf);
+         }
+        VoltCurrentSwitch++;
+    }
+    else if(VoltCurrentSwitch == 9){
+        if(CV->_VoVi_Switch == 0x01){
+            // read vin volt
+            ReadVolt(spi_ADC_rxbuf);
+            ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
+            //CV->MeasureVolt = 20000;
+            CV->MeasureVolt = DecodeADCVolt(ADC_measure);
+        }else if(CV->_VoVi_Switch == 0x00){
+           // read vout volt
+            ReadVoutVolt(spi_ADC_rxbuf);
+            ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
+            CV->MeasureVolt = DecodeADCVoutVolt(ADC_measure);
+        }
+        VoltCurrentSwitch++;
+    }
+//    else if (VoltCurrentSwitch < 13){
+//             ReadBatVolt(spi_ADC_rxbuf);
+//             VoltCurrentSwitch ++;
+//    }
+//    else if (VoltCurrentSwitch == 13){
+//         // read battery volt
+//         ReadBatVolt(spi_ADC_rxbuf);
+//         ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
+//         CV->_MeasureBatvolt = DecodeADCBatVolt(ADC_measure);
+//         CV->_MeasureBatvolt = CV->_MeasureBatvolt/10 - 250; // (5.00V) 5000->250 usercode
+//         VoltCurrentSwitch ++;
+//    }
+    else{
+        VoltCurrentSwitch = 0;
+    }
+
+    NotifyCurrent[0] = (uint8_t) (CV->_MeasureData >> 24);
+    NotifyCurrent[1] = (uint8_t) ((CV->_MeasureData & 0x00FF0000) >> 16);
+    NotifyCurrent[2] = (uint8_t) ((CV->_MeasureData & 0x0000FF00) >> 8);
+    NotifyCurrent[3] = (uint8_t) (CV->_MeasureData & 0x000000FF);
+
+    if ((CV->_VoVi_Switch == 0x01) || (CV->_VoVi_Switch == 0x00)){        //user see Vin || user see Vout
+//        NotifyVolt[0] = (uint8_t) (CV->MeasureVolt >> 24);
+//        NotifyVolt[1] = (uint8_t) ((CV->MeasureVolt & 0x00FF0000) >> 16);
+//        NotifyVolt[2] = (uint8_t) ((CV->MeasureVolt & 0x0000FF00) >> 8);
+//        NotifyVolt[3] = (uint8_t) (CV->MeasureVolt & 0x000000FF);
+
+        int32_t RealV;
+        RealV = (int32_t)(INSTRUCTION.VoltConstant - 25000)*1000/5;
+        NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
+        NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
+        NotifyVolt[2] = (uint8_t)((RealV & 0x0000FF00) >> 8);
+        NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
+    }
+
+//    NotifyBatVolt = (uint8_t) (CV->_MeasureBatvolt & 0x000000FF);
+}
+

 #endif
@@ -0,0 +1,22 @@
+
+#ifndef ELITE_FLAG_CT_INIT
+#define ELITE_FLAG_CT_INIT
+
+static void InitCT(){
+    CT.SampleRate_counter = 1;
+    CT.StepTimeCounter = 1;
+    CT.NotifyCounter = 1;
+    CT.StandByCounter = 0;
+}
+
+static void InitFlag(){
+    PeriodicEvent = false;      // is there an PeriodicEvent?
+    InitPeriodicEvent = true;   // need to create a WorkModeData?
+    DACReset = true;
+    CCModeDACEnable = 0;        // to make sure DAC work after ADC
+    Free_Work_Mode = true;      // Free(WorkModeData)
+//    NotifyReady = false;
+//    DiscardIVFirstData = 0;
+}
+
+#endif
@@ -2,6 +2,8 @@
 #ifndef ELITEIT
 #define ELITEIT

+#define absolute(a) ((a<0)? -a:a)
+
 //static int32_t IT_Plot() {
 //    // read ADC current
 //    int32_t Real_Current = 0;
@@ -20,19 +22,63 @@
 //    return Real_Current;
 //}

-static int32_t  IT_Plot() {
+static int32_t IT_Plot(WorkMode *WorkModeData) {
+
+    switch (INSTRUCTION.eliteFxn) {
+            case IV_CURVE:{
+                #define CURRENT_MODE WorkModeData->IV
+                break;
+            }
+            case CV_CURVE:{
+                #define CURRENT_MODE WorkModeData->CV
+                break;
+            }
+            case IT_CURVE:{
+                #define CURRENT_MODE WorkModeData->IT
+                break;
+            }
+            default: {
+                #define CURRENT_MODE WorkModeData->IT
+                break;
+            }
+    }
+   
    // read ADC current
-    int32_t Real_Current = 0;
+    int32_t RealCurrent = 0, RealVolt = 0;
+    static uint8_t PreviousGain = GAIN_200R;

    if(INSTRUCTION.AutoGainEnable){
-        Real_Current = AutoGainReadCurrent(spi_ADC_rxbuf);
+        RealCurrent = AutoGainReadCurrent(spi_ADC_rxbuf);
+        if(PreviousGain != INSTRUCTION.ADCGainLevel){
+            PreviousGain = INSTRUCTION.ADCGainLevel;
+            CURRENT_MODE->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+            CURRENT_MODE->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+        }
+        if(PreviousGain != INSTRUCTION.ADCGainLevel){
+            PreviousGain = INSTRUCTION.ADCGainLevel;
+            CURRENT_MODE->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+            CURRENT_MODE->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+        }
    }
    else{
        ReadCurrent(spi_ADC_rxbuf);
-        Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+        RealCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
    }

-    return Real_Current;
+    CURRENT_MODE->_MeasureData = RealCurrent;
+
+
+//    if(INSTRUCTION.eliteFxn == IV_CURVE){
+//        // RealVo = Vo - RealCurrent * 100R
+//        RealVolt = (INSTRUCTION.VoltConstant - DAC_ZERO)/5 - 200*(RealCurrent/1e6);
+//
+//        NotifyVolt[0] = (uint8_t) (RealVolt >> 24);
+//        NotifyVolt[1] = (uint8_t) ((RealVolt & 0x00FF0000) >> 16);
+//        NotifyVolt[2] = (uint8_t) ((RealVolt & 0x0000FF00) >> 8);
+//        NotifyVolt[3] = (uint8_t) (RealVolt & 0x000000FF);
+//    }
+    return RealCurrent;
 }

+
 #endif
@@ -2,7 +2,7 @@
 #ifndef ELITEIV
 #define ELITEIV

-static uint16_t VoltScan() {
+static uint16_t VoltScan(WorkMode *WorkModeData) {
    uint16_t Voltage;
    if (INSTRUCTION.VoltOrigin == INSTRUCTION.VoltFinal) {
        Voltage = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
@@ -10,28 +10,29 @@ static uint16_t VoltScan() {
        PeriodicEvent = false;
        return Voltage;
    } else if (INSTRUCTION.eliteFxn == SQUARE_WAVE_VOLTAMMETRY) {
-        Voltage = SWVCurve();
+        Voltage = SWVCurve(WorkModeData);
    } else if (INSTRUCTION.eliteFxn == DIFFERENTIAL_PULSE_VOLTAMMETRY) {
-        Voltage = DPVCurve();
+        Voltage = DPVCurve(WorkModeData);
    } else if (INSTRUCTION.eliteFxn == CV_CURVE) {
-        Voltage = CVCurve();
+        Voltage = CVCurve(WorkModeData->CV);
    }

    // IV plot mode
    else {
-        Voltage = OneWayVoltScan();
+        Voltage = OneWayVoltScan(WorkModeData->IV);
    }

    return Voltage;
 }

-static uint16_t OneWayVoltScan() {
-    static uint16_t DACOutCode;
+static uint16_t OneWayVoltScan(IVMode *IV) {
+    uint16_t DACOutCode;

    // reset origin volt at the begin
    if (DACReset) {
-        DACUserCode = INSTRUCTION.VoltOrigin;
-        DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
+//        DACUserCode = IV->GetVOrigin((struct VoltOutPara *) IV);
+        INSTRUCTION.VoltConstant = IV->_VOrigin;
+        DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
        DACReset   = false;

        // output VOLT_ORIGIN
@@ -39,46 +40,224 @@ static uint16_t OneWayVoltScan() {
        return DACOutCode;
    }

-    if (StepTimeCounter == INSTRUCTION.StepTime) {
-        if (INSTRUCTION.VoltOrigin < INSTRUCTION.VoltFinal) {
+    if (CT.StepTimeCounter == IV->_StepTime){
+        if (IV->_VOrigin < IV->_VStop) {//4~5V
            // output the next output volt
-            DACUserCode = DACUserCode + INSTRUCTION.Step;
-            DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
+            INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + IV->_Step;
+            // Only used in two-wire IV
+//            if(INSTRUCTION.VoltConstant > IV->_VStop){
+//                INSTRUCTION.VoltConstant = IV->_VStop;
+//            }
+
+            DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
            DAC_outputV(DACOutCode);

            // end IV task if we reach INSTRUCTION.VoltFinal
-            if (DACUserCode >= INSTRUCTION.VoltFinal) {
+//            if (INSTRUCTION.VoltConstant >= IV->_VStop) {
+//                PeriodicEvent = false;
+//                DACReset      = true;
+//            }
+        } else {
+            INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant - IV->_Step;
+
+            // check if DACUserCode underflow
+            if(INSTRUCTION.VoltConstant >= 60000){
+                INSTRUCTION.VoltConstant = IV->_VStop;
+            }
+
+            // output the next output volt
+            DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
+            DAC_outputV(DACOutCode);
+
+            // end IV task if we reach INSTRUCTION.VoltFinal
+//            if (INSTRUCTION.VoltConstant <= IV->_VStop){
+//                PeriodicEvent = false;
+//                DACReset      = true;
+////                reset();
+//            }
+        }
+
+//        if (IV->_VoVi_Switch == 0x00 || IV->_VoVi_Switch == 0x01){        //user see Vout/user see Vin
+//            if (IV->_VOrigin < IV->_VStop) {
+//                if(INSTRUCTION.VoltConstant >= IV->_VStop){
+//                    PeriodicEvent = false;
+//                    DACReset      = true;
+//                }
+//            }
+//            else{
+//                if(INSTRUCTION.VoltConstant <= IV->_VStop){
+//                    PeriodicEvent = false;
+//                    DACReset      = true;
+//                }
+//            }
+//        }
+
+//        int32_t RealV;
+//        RealV = DAC_to_realV(DACOutCode);
+//        NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
+//        NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
+//        NotifyVolt[2] = (uint8_t)((RealV & 0x0000FF00) >> 8);
+//        NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
+
+//          int32_t RealV;
+//          RealV = (int32_t)(INSTRUCTION.VoltConstant - 25000)/5*1000;
+//          NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
+//          NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
+//          NotifyVolt[2] = (uint8_t)((RealV & 0x0000FF00) >> 8);
+//          NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
+
+
+//        NotifyImpedance[0] = 0x00;
+//        NotifyImpedance[1] = 0x00;
+//        NotifyImpedance[2] = (uint8_t)((INSTRUCTION.VoltConstant & 0xFF00) >> 8);
+//        NotifyImpedance[3] = (uint8_t)(INSTRUCTION.VoltConstant & 0x00FF);
+
+            
+    }
+
+    return DACOutCode;
+}
+
+static void IV_Plot(IVMode *IV) {
+    static uint8_t VoltCurrentSwitch = 0;
+    static uint8_t PreviousGain = GAIN_200R;
+    uint16_t ADC_measure = 0;
+
+    if(VoltCurrentSwitch < 5){
+        ReadCurrent(spi_ADC_rxbuf);
+        VoltCurrentSwitch ++;
+    }
+    else if(VoltCurrentSwitch == 5){
+        // read current
+
+        if(INSTRUCTION.AutoGainEnable){
+            IV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+            if(PreviousGain != INSTRUCTION.ADCGainLevel){
+                PreviousGain = INSTRUCTION.ADCGainLevel;
+                IV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+                IV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+            }
+            if(PreviousGain != INSTRUCTION.ADCGainLevel){
+                PreviousGain = INSTRUCTION.ADCGainLevel;
+                IV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+                IV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+            }
+        }
+        else{
+            ReadCurrent(spi_ADC_rxbuf);
+            IV->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+        }
+        VoltCurrentSwitch ++;
+    }
+//    else if(VoltCurrentSwitch < 9){
+//        // read volt
+//        ReadVolt(spi_ADC_rxbuf);
+//        VoltCurrentSwitch++;
+//    }
+//    else if(VoltCurrentSwitch == 9){
+//        /** read battery voltage **/
+//        ReadVolt(spi_ADC_rxbuf);
+//        ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
+//        IV->MeasureVolt = DecodeADCVolt(ADC_measure);
+//        VoltCurrentSwitch++;
+//    }
+    else if(VoltCurrentSwitch < 9){
+        if(IV->_VoVi_Switch == 0x01){
+            // read vin volt
+            ReadVolt(spi_ADC_rxbuf);
+        }else if(IV->_VoVi_Switch == 0x00){
+            // read vout volt
+            ReadVoutVolt(spi_ADC_rxbuf);
+        }
+        VoltCurrentSwitch++;
+    }
+    else if(VoltCurrentSwitch == 9){
+        if(IV->_VoVi_Switch == 0x01){
+            // read vin volt
+            ReadVolt(spi_ADC_rxbuf);
+            ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
+            IV->MeasureVolt = DecodeADCVolt(ADC_measure);
+        }else if(IV->_VoVi_Switch == 0x00){
+            // read vout volt
+            ReadVoutVolt(spi_ADC_rxbuf);
+            ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
+            IV->MeasureVolt = DecodeADCVoutVolt(ADC_measure);
+        }
+        VoltCurrentSwitch++;
+    }
+//    else if (VoltCurrentSwitch < 13){
+//        ReadBatVolt(spi_ADC_rxbuf);
+//        VoltCurrentSwitch ++;
+//    }
+//    else if (VoltCurrentSwitch == 13){
+//        // read battery volt
+//        ReadBatVolt(spi_ADC_rxbuf);
+//        ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
+//        IV->_MeasureBatvolt = DecodeADCBatVolt(ADC_measure);
+//        IV->_MeasureBatvolt = IV->_MeasureBatvolt/10 - 250; // (5.00V) 5000->250 usercode
+//        VoltCurrentSwitch ++;
+//    }
+    else{
+        VoltCurrentSwitch = 0;
+    }
+
+
+
+    NotifyCurrent[0] = (uint8_t) (IV->_MeasureData >> 24);
+    NotifyCurrent[1] = (uint8_t) ((IV->_MeasureData & 0x00FF0000) >> 16);
+    NotifyCurrent[2] = (uint8_t) ((IV->_MeasureData & 0x0000FF00) >> 8);
+    NotifyCurrent[3] = (uint8_t) (IV->_MeasureData & 0x000000FF);
+
+//    if((IV->_VoVi_Switch == 0x01) || (IV->_VoVi_Switch == 0x00)){        //user see Vin || user see Vout
+////        NotifyVolt[0] = (uint8_t) (IV->MeasureVolt >> 24);
+////        NotifyVolt[1] = (uint8_t) ((IV->MeasureVolt & 0x00FF0000) >> 16);
+////        NotifyVolt[2] = (uint8_t) ((IV->MeasureVolt & 0x0000FF00) >> 8);
+////        NotifyVolt[3] = (uint8_t) (IV->MeasureVolt & 0x000000FF);
+//          int32_t RealV;
+//          RealV = (int32_t)(INSTRUCTION.VoltConstant - 25000)/5*1000;
+//          NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
+//          NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
+//          NotifyVolt[2] = (uint8_t)((RealV & 0x0000FF00) >> 8);
+//          NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
+//
+//        if (IV->_VOrigin < IV->_VStop) {
+//            if((IV->MeasureVolt/1000) >= ((int32_t) (IV->_VStop) - DAC_ZERO)/5){
+//                PeriodicEvent = false;
+//                DACReset      = true;
+//            }
+//        }
+//        else{
+//            if((IV->MeasureVolt/1000) <= ((int32_t) (IV->_VStop) - DAC_ZERO)/5){
+//                PeriodicEvent = false;
+//                DACReset      = true;
+//            }
+//        }
+//    }
+
+    if (IV->_VoVi_Switch == 0x00 || IV->_VoVi_Switch == 0x01){        //user see Vout/user see Vin
+          int32_t RealV;
+          RealV = (int32_t)(INSTRUCTION.VoltConstant - 25000)*1000/5;
+          NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
+          NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
+          NotifyVolt[2] = (uint8_t)((RealV & 0x0000FF00) >> 8);
+          NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
+
+        if (IV->_VOrigin < IV->_VStop) {
+            if(INSTRUCTION.VoltConstant >= IV->_VStop){
                PeriodicEvent = false;
                DACReset      = true;
            }
-        } else {
-
-            DACUserCode = DACUserCode - INSTRUCTION.Step;
-
-            // check if DACUserCode underflow
-            if(DACUserCode >= 60000){
-//                LED_color(DARKLED, 0xFF, 0x00, 0x00);
-                DACUserCode = INSTRUCTION.VoltFinal;
-            }
-
-//            int32_t DACUC = DACUserCode;
-//            NotifyImpedance[0] = (uint8_t) (DACUC >> 24);
-//            NotifyImpedance[1] = (uint8_t) ((DACUC & 0x00FF0000) >> 16);
-//            NotifyImpedance[2] = (uint8_t) ((DACUC & 0x0000FF00) >> 8);
-//            NotifyImpedance[3] = (uint8_t) (DACUC & 0x000000FF);
-
-            // output the next output volt
-            DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
-            DAC_outputV(DACOutCode);
-
-            // end IV task if we reach INSTRUCTION.VoltFinal
-            if (DACUserCode <= INSTRUCTION.VoltFinal) {
+        }
+        else{
+            if(INSTRUCTION.VoltConstant <= IV->_VStop){
                PeriodicEvent = false;
                DACReset      = true;
            }
        }
    }
-    return DACOutCode;
+
+//    NotifyBatVolt = (uint8_t) (IV->_MeasureBatvolt & 0x000000FF);
 }

+
 #endif
@@ -20,6 +20,16 @@
 #define CURRENT_LV_UA 0x01
 #define CURRENT_LV_MA 0x02

+/* DAC reset parameter */
+#define DAC_ZERO 25000
+#define DAC_POS_MAX 0x0000
+#define DAC_NEG_MAX 0xFFFF
+
+// Step time macro
+#define STEPTIME_HALF_SEC 5000
+#define STEPTIME_ONE_SEC 10000
+#define STEPTIME_TWO_SEC 20000
+
 /*==============================
 ==== headstage instruction ====
 =============================*/
@@ -37,8 +47,10 @@ struct HEADSTAGE_INSTRUCTION {
    uint16_t VoltOrigin;
    uint16_t VoltFinal;
    uint16_t Step;
-    uint16_t  StepTime;
+    uint16_t StepTime;
+
     // constant volt
+     // which is used in CC mode as VMax and VMin
    uint16_t VoltConstant;

    /** ADC parameter **/
@@ -46,8 +58,14 @@ struct HEADSTAGE_INSTRUCTION {

    uint8_t AutoGainEnable;

+    /** Notify parameter **/
+    uint16_t NotifyRate;
+
    /** Constant Current Parameter **/
+    // Charge is a bool; true => current > 0, vice versa
+    uint8_t Charge;
    int32_t ConstantCurrent;
+    uint16_t VoltLimit;

    /** Resister Measure **/
    uint8_t ResisterMeter;
@@ -57,6 +75,8 @@ struct HEADSTAGE_INSTRUCTION {

    uint8_t CycleNumber;

+    uint8_t VoVi_Switch;
+
 } INSTRUCTION = {0};

 /*********************************************************************
@@ -71,18 +91,22 @@ struct HEADSTAGE_INSTRUCTION {
 static void InitEliteInstruction(){
    INSTRUCTION.chip_id = 0;
    INSTRUCTION.SampleRateIndex = 1;
-    INSTRUCTION.SampleRate = 10;
+    INSTRUCTION.SampleRate = 100;
    INSTRUCTION.VoltOrigin = DAC_ZERO;
-    INSTRUCTION.VoltFinal = DAC_POS_MAX;
+    INSTRUCTION.VoltFinal = DAC_ZERO;
    INSTRUCTION.Step = 0x0005; // 0x0005 = 1mV
-    INSTRUCTION.StepTime = STEPTIME_HALF_SEC;    // about 0.5 sec
-    INSTRUCTION.VoltConstant = 25000;  // is about 0V
+    INSTRUCTION.StepTime = STEPTIME_ONE_SEC;    // about 0.5 sec
+    INSTRUCTION.VoltConstant = DAC_ZERO;  // is about 0V
    INSTRUCTION.ADCGainLevel = GAIN_AUTO;
    INSTRUCTION.AutoGainEnable = 1;
+    INSTRUCTION.NotifyRate = STEPTIME_ONE_SEC/10;
    INSTRUCTION.ResisterMeter = RESISTER_METER_LARGE;
+    INSTRUCTION.Charge = 1;
    INSTRUCTION.ConstantCurrent = 0x00000000;
+    INSTRUCTION.VoltLimit = 0x0000;
    INSTRUCTION.eliteFxn = 0; // default is a null event
    INSTRUCTION.CycleNumber = 0;
+    INSTRUCTION.VoVi_Switch = 0x01;    //VoVi_Switch == 0 => user see Vo / VoVi_Switch == 1 => user see Vi
 }

 /*********************************************************************
@@ -69,6 +69,10 @@ static void WorkModeLED() {
        WORKLED();
        break;
    }
+    case READ_VOUT_VALUE: {
+        WORKLED();
+        break;
+    }

    default: {
        LEDPowerON();
@@ -24,6 +24,7 @@ static uint32_t not_time_stamp;
 static uint8_t NotifyCurrent[4] = {0};
 static uint8_t NotifyVolt[4] = {0};
 static uint8_t NotifyImpedance[4] = {0};
+static uint8_t NotifyBatVolt = 0;

 /**
 * counter of notify send.
@@ -106,6 +107,35 @@ static void SendNotify() {
    // cyclic voltametry cycle number
    not_buf[17] = INSTRUCTION.CycleNumber;

+    //battery volt
+    not_buf[18] = NotifyBatVolt;
+
+    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
+}
+
+static void FlushNotify(){
+    not_buf[0] = INSTRUCTION.chip_id;
+
+    for (int i = 0; i < 4; i++) {
+        not_buf[i + 1] = 0;
+        not_buf[i + 5] = 0;
+        not_buf[i + 9] = 0;
+    }
+
+    // 1 Timestamp = 32 usec;  31 Timestamp ~= 1 msec
+    not_time_stamp = 0;  // msec
+
+    not_buf[13] = not_time_stamp & 0xff;
+    not_buf[14] = (not_time_stamp >> 8) & 0xff;
+    not_buf[15] = (not_time_stamp >> 16) & 0xff;
+    not_buf[16] = (not_time_stamp >> 24) & 0xff;
+
+    // cyclic voltametry cycle number
+    not_buf[17] = 0x00;
+
+    //battery volt
+    not_buf[18] = 0x00;
+
    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
 }

@@ -0,0 +1,22 @@
+
+#ifndef ELITERVout
+#define ELITERVout
+
+static void RVout_Plot(RVoutMode *RVout) {
+    // ADC gain is don't care when measuring voltage
+    INSTRUCTION.ADCGainLevel = GAIN_200R;
+    ADCGainControl(INSTRUCTION.ADCGainLevel);
+
+    // read ADC VoutVolt
+    ReadVoutVolt(spi_ADC_rxbuf);
+
+    // decode ADC value and put it into notify buffer
+    RVout->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
+
+    NotifyVolt[0] = (uint8_t) (RVout->_MeasureData >> 24);
+    NotifyVolt[1] = (uint8_t) ((RVout->_MeasureData & 0x00FF0000) >> 16);
+    NotifyVolt[2] = (uint8_t) ((RVout->_MeasureData & 0x0000FF00) >> 8);
+    NotifyVolt[3] = (uint8_t) (RVout->_MeasureData & 0x000000FF);
+}
+
+#endif
@@ -3,15 +3,14 @@
 #define ELITERESET

 static void reset() {
-    PeriodicEvent       = false;
-    DACReset = true;
-    CCModeDACEnable = 0;
-    InitEliteInstruction();
-    SampleRate_counter  = 1;
-    StepTimeCounter     = 1;
-    DiscardIVFirstData = 1;
+    InitFlag();
+    InitCT();
+
+    // IV/CV mode reset
+    DiscardIVFirstData = 0;
    avg_number          = 0;
    ADCRealCurrent_long = 0;
+
    ADCGainControl(INSTRUCTION.ADCGainLevel);
    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));

@@ -50,16 +49,14 @@ static void reset() {
 }

 static void Eliteinterrupt() {
-    PeriodicEvent       = false;
-    DACReset = true;
-    CCModeDACEnable = 0;
-    InitEliteInstruction();
-    StepTimeCounter     = 1;
-    SampleRate_counter  = 1;
-    DiscardIVFirstData = 1;
+    InitFlag();
+    InitCT();
+
+    // IV/CV mode reset
+    DiscardIVFirstData = 0;
    avg_number          = 0;
    ADCRealCurrent_long = 0;
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
+    ADCGainControl(GAIN_AUTO);
    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));

    LEDPowerON();
@@ -92,13 +89,10 @@ static void Eliteinterrupt() {
 }

 static void CleanBuffer() {
-    PeriodicEvent       = false;
-    DACReset = true;
-    CCModeDACEnable = 0;
-//    InitEliteInstruction();
-    SampleRate_counter  = 1;
-    StepTimeCounter     = 1;
-    DiscardIVFirstData = 1;
+    InitFlag();
+    InitEliteInstruction();
+    InitCT();
+    DiscardIVFirstData = 0;
    avg_number          = 0;
    ADCRealCurrent_long = 0;

@@ -2,15 +2,21 @@
 #ifndef ELITEVT
 #define ELITEVT

-static void VT_Plot() {
+static void VT_Plot(VTMode *VT) {
    // ADC gain is don't care when measuring voltage
-    uint8_t ADCGain = 0;
+    INSTRUCTION.ADCGainLevel = GAIN_200R;
+    ADCGainControl(INSTRUCTION.ADCGainLevel);

    // read ADC volt
    ReadVolt(spi_ADC_rxbuf);

    // decode ADC value and put it into notify buffer
-    DecodeADCValue(ADCGain, ADC_CH_VOLT, spi_ADC_rxbuf);
+    VT->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+
+    NotifyVolt[0] = (uint8_t) (VT->_MeasureData >> 24);
+    NotifyVolt[1] = (uint8_t) ((VT->_MeasureData & 0x00FF0000) >> 16);
+    NotifyVolt[2] = (uint8_t) ((VT->_MeasureData & 0x0000FF00) >> 8);
+    NotifyVolt[3] = (uint8_t) (VT->_MeasureData & 0x000000FF);
 }

 #endif
@@ -0,0 +1,655 @@
+/**
+*
+* struct WorkMode{
+*   // Measure Only
+*   ITMode;
+*   VTMode;
+*
+*   // Measure + VoltOut
+*   RTMode;
+*   IVMode;
+*   CVMode;
+*
+*   // Volt out only
+*   VOutMode
+* }
+*
+* -------------------------------
+* // Measure Only
+* struct ITMode{
+*   MeasureData
+*   SetMeasureData()
+*   GetMeasureData()
+* }
+*
+* -------------------------------
+* // VoltOut parameter
+* stuct VOutMode{
+*   Vout_UC
+*   VoltOrigin
+*   Vstop;
+*   Step;
+*   StepTime;
+*   CycleNumber;
+* }
+*
+*/
+
+#ifndef ELITE_WORK_DATA
+#define ELITE_WORK_DATA
+
+#include "EliteInstruction.h"
+#define IV_CURVE 0b00010000
+#define CV_CURVE 0b00100000
+#define VOLT_OUTPUT 0b00110000
+#define ZT_CURVE 0b01000000
+#define VT_CURVE 0b01010000
+#define IT_CURVE 0b01100000
+#define SET_SAMPLE_RATE 0b01110000
+#define SET_ADC_GAIN 0b10000000
+#define DIFFERENTIAL_PULSE_VOLTAMMETRY 0b10100000
+#define SQUARE_WAVE_VOLTAMMETRY 0b10110000
+#define POTENTIAL_STATE 0b11000000
+#define CONSTANT_CURRENT 0b11010000
+#define READ_VOUT_VALUE 0b11100000
+
+static bool Free_Work_Mode = false;
+typedef void (*InitWorkData) ();
+
+/***** Template of Measure and VoltOut parameter *****/
+#define MEASURE \
+    int32_t _MeasureData; \
+    uint16_t _VoVi_Switch
+//    void (*SetMeasureData) (struct Measure *, int32_t);  \
+//    int32_t (*GetMeasureData) (struct Measure *)
+
+/* VoltOut is an UserCode */
+/* VOrigin, VStop, Step are all UserCode */
+#define VOUT_PARA \
+    uint16_t _VoltOut;  \
+    uint16_t _VOrigin;  \
+    uint16_t _VStop;    \
+    uint16_t _Step;     \
+    uint16_t _StepTime;  \
+    uint16_t _CycleNumber
+//    void (*SetVoltOut) (struct VoltOutPara *, uint16_t);  \
+//    uint16_t (*GetVoltOut) (struct VoltOutPara *);  \
+//    void (*SetVOrigin) (struct VoltOutPara *, uint16_t);  \
+//    uint16_t (*GetVOrigin) (struct VoltOutPara *);  \
+//    void (*SetVStop) (struct VoltOutPara *, uint16_t);  \
+//    uint16_t (*GetVStop) (struct VoltOutPara *);  \
+//    void (*SetStep) (struct VoltOutPara *, uint16_t);  \
+//    uint16_t (*GetStep) (struct VoltOutPara *);  \
+//    void (*SetStepTime) (struct VoltOutPara *, uint16_t);  \
+//    uint16_t (*GetStepTime) (struct VoltOutPara *);  \
+//    void (*SetCycleNumber) (struct VoltOutPara *, uint16_t);  \
+//    uint16_t (*GetCycleNumber) (struct VoltOutPara *)
+
+
+/*  CC Mode parameter
+*   @ Measure : measure current value (nA)
+*   @ Charge : Charge or Discharge
+*   @ BatteryV : Vin measure battery voltage (mV)
+*   @ value : constant current setting.
+*             Current value divide current level into 3,000,001 pieces
+*             1,500,000 is zero point; 3,000,000 is 15mA
+*             Current = (value - 1,500,000)/100,000 mA
+*   @ Done : Done = false => Ignore Vmin condition;
+*            Done will be true, if BatteryV <= Vmin last for about 12sec in discharge mode
+*   @ VMax : voltage upper bound in charge mode
+*            CC->value will set to zero if BatteryV >= VMax in charge mode
+*   @ VMin : voltage lower bound in charge mode
+*            CC->value will set to zero if BatteryV <=> VMin in charge mode
+*            Note that VMax and VMin are always larger or equal to zero
+*   @_Transform2RealnA : transform a current user code (IUC) to real current in nA
+*/
+#define CC_PARA \
+    MEASURE;    \
+    uint8_t Charge; \
+    int32_t BatteryV;   \
+    int32_t value;  \
+    uint16_t Done;   \
+    uint16_t VMax;  \
+    uint16_t VMin;  \
+    int32_t (*_Transform2RealnA)(struct CCModePara *)
+
+
+#define LIMIT \
+    uint32_t _LimitValue; \
+    void (*SetLimitValue) (struct Limit *, uint32_t); \
+    uint32_t (*GetLimitValue) (struct Limit*)
+
+struct Measure{
+    MEASURE;
+};
+
+struct VoltOutPara{
+    VOUT_PARA;
+};
+
+struct Limit{
+    LIMIT;
+};
+
+struct CCModePara{
+    CC_PARA;
+};
+/***** End of Measure and VoltOut parameter *****/
+
+
+/***** Measure Only Mode *****/
+//void _SetMeasureData(struct Measure *self, int32_t Data){
+//    self->_MeasureData = Data;
+//}
+//
+//int32_t _GetMeasureData(struct Measure *self){
+//    return self->_MeasureData;
+//}
+
+
+/**** Limit Mode ****/
+//LimitValue
+void _SetLimitValue(struct Limit *self, uint32_t LimitValue){
+    self->_LimitValue = LimitValue;
+}
+uint32_t _GetLimitValue(struct Limit *self){
+    return self->_LimitValue;
+}
+
+/* IT Mode Data */
+typedef struct _ITMode{
+    MEASURE;
+    LIMIT;
+}ITMode;
+
+ITMode * InitITMode(){
+    ITMode *ret = malloc(sizeof(ITMode));
+    ret->_MeasureData = 0;
+//    ret->SetMeasureData = &_SetMeasureData;
+//    ret->GetMeasureData = &_GetMeasureData;
+
+    ret->_LimitValue = 0;
+    
+    ret->SetLimitValue = &_SetLimitValue;
+    ret->GetLimitValue = &_GetLimitValue;
+    return ret;
+}
+/* End of IT Mode Data */
+
+/* VT Mode Data */
+typedef struct _VTMode{
+    MEASURE;
+}VTMode;
+
+VTMode * InitVTMode(){
+    VTMode *ret = malloc(sizeof(VTMode));
+    ret->_MeasureData = 0;
+//    ret->SetMeasureData = &_SetMeasureData;
+//    ret->GetMeasureData = &_GetMeasureData;
+    return ret;
+}
+/* End of VT Mode Data */
+
+/* ReadVOut Mode Data */
+typedef struct _RVoutMode{
+    MEASURE;
+}RVoutMode;
+
+RVoutMode * InitRVoutMode(){
+    RVoutMode *ret = malloc(sizeof(RVoutMode));
+    ret->_MeasureData = 0;
+//    ret->SetMeasureData = &_SetMeasureData;
+//    ret->GetMeasureData = &_GetMeasureData;
+    return ret;
+}
+/* End of ReadVOut Mode Data */
+/***** End of Measure Only Mode *****/
+
+
+/**** VoltOut Only Mode ****/
+//// VoltOut
+//void _SetVoltOut(struct VoltOutPara *self, uint16_t VoltOut){
+//    self->_VoltOut = VoltOut;
+//}
+//uint16_t _GetVoltOut(struct VoltOutPara *self){
+//    return self->_VoltOut;
+//}
+//
+//// VOrigin
+//void _SetVOrigin(struct VoltOutPara *self, uint16_t VOrigin){
+//    self->_VOrigin = VOrigin;
+//}
+//uint16_t _GetVOrigin(struct VoltOutPara *self){
+//    return self->_VOrigin;
+//}
+//
+//// VStop
+//void _SetVStop(struct VoltOutPara *self, uint16_t VStop){
+//    self->_VStop = VStop;
+//}
+//uint16_t _GetVStop(struct VoltOutPara *self){
+//    return self->_VStop;
+//}
+//
+//// Step
+//void _SetStep(struct VoltOutPara *self, uint16_t Step){
+//    self->_Step = Step;
+//}
+//uint16_t _GetStep(struct VoltOutPara *self){
+//    return self->_Step;
+//}
+//
+//// StepTime
+//void _SetStepTime(struct VoltOutPara *self, uint16_t StepTime){
+//    self->_StepTime = StepTime;
+//}
+//uint16_t _GetStepTime(struct VoltOutPara *self){
+//    return self->_StepTime;
+//}
+//
+//// CycleNumber
+//void _SetCycleNumber(struct VoltOutPara *self, uint16_t CycleNumber){
+//    self->_CycleNumber = CycleNumber;
+//}
+//uint16_t _GetCycleNumber(struct VoltOutPara *self){
+//    return self->_CycleNumber;
+//}
+
+
+/* VoltOut Mode Data */
+typedef struct _VoltOutMode{
+    VOUT_PARA;
+}VoltOutMode;
+
+VoltOutMode *InitVoltOutMode(){
+    VoltOutMode *ret = malloc(sizeof(VoltOutMode));
+    ret->_VoltOut = INSTRUCTION.VoltConstant;  // 25000 is DAC_ZERO
+    ret->_VOrigin = DAC_ZERO;
+    ret->_VStop = DAC_ZERO;
+    ret->_Step  =   0;
+    ret->_StepTime = 10000; // STEPTIME_ONE_SEC
+    ret->_CycleNumber = 1;
+
+//    ret->SetVoltOut = &_SetVoltOut;
+//    ret->GetVoltOut = &_GetVoltOut;
+//    ret->SetVOrigin = &_SetVOrigin;
+//    ret->GetVOrigin = &_GetVOrigin;
+//    ret->SetVStop = &_SetVStop;
+//    ret->GetVStop = &_GetVStop;
+//    ret->SetStep = &_SetStep;
+//    ret->GetStep = &_GetStep;
+//    ret->SetStepTime = &_SetStepTime;
+//    ret->GetStepTime = &_GetStepTime;
+//    ret->SetCycleNumber = &_SetCycleNumber;
+//    ret->GetCycleNumber = &_GetCycleNumber;
+    return ret;
+}
+/* End of VoltOut Mode Data */
+/**** End of VoltOut Only Mode ****/
+
+
+/**** Measure + VoltOut Mode ****/
+/* IV Mode Data */
+typedef struct _IVMode{
+    MEASURE;
+    int32_t MeasureVolt;
+    VOUT_PARA;
+    LIMIT;
+    int32_t _MeasureBatvolt;
+}IVMode;
+
+IVMode *InitIVMode(){
+    IVMode *ret = malloc(sizeof(IVMode));
+    ret->_MeasureData = 0;
+    ret->MeasureVolt = (INSTRUCTION.VoltOrigin - DAC_ZERO)/5;
+    ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
+
+    ret->_VoltOut = DAC_ZERO;
+    ret->_VOrigin = INSTRUCTION.VoltOrigin;
+    ret->_VStop = INSTRUCTION.VoltFinal;
+    ret->_Step  = INSTRUCTION.Step;
+    ret->_StepTime = INSTRUCTION.StepTime;
+    ret->_CycleNumber = 1;
+    ret->_MeasureBatvolt = 0;
+
+
+//    ret->SetVoltOut = &_SetVoltOut;
+//    ret->GetVoltOut = &_GetVoltOut;
+//    ret->SetVOrigin = &_SetVOrigin;
+//    ret->GetVOrigin = &_GetVOrigin;
+//    ret->SetVStop = &_SetVStop;
+//    ret->GetVStop = &_GetVStop;
+//    ret->SetStep = &_SetStep;
+//    ret->GetStep = &_GetStep;
+//    ret->SetStepTime = &_SetStepTime;
+//    ret->GetStepTime = &_GetStepTime;
+//    ret->SetCycleNumber = &_SetCycleNumber;
+//    ret->GetCycleNumber = &_GetCycleNumber;
+
+    ret->_LimitValue = 1e5;
+    
+    ret->SetLimitValue = &_SetLimitValue;
+    ret->GetLimitValue = &_GetLimitValue;
+    return ret;
+}
+/* End of IV Mode Data */
+
+/* RT Mode Data */
+typedef struct _RTMode{
+    MEASURE;
+    VOUT_PARA;
+}RTMode;
+
+RTMode * InitRTMode(){
+    RTMode *ret = malloc(sizeof(RTMode));
+    ret->_MeasureData = 0;
+//    ret->SetMeasureData = &_SetMeasureData;
+//    ret->GetMeasureData = &_GetMeasureData;
+
+    ret->_VoltOut = DAC_ZERO;  // 25000 is DAC_ZERO
+    ret->_VOrigin = DAC_ZERO;
+    ret->_VStop = DAC_ZERO;
+    ret->_Step  =   0;
+    ret->_StepTime = 10000; // STEPTIME_ONE_SEC
+    ret->_CycleNumber = 1;
+
+//    ret->SetVoltOut = &_SetVoltOut;
+//    ret->GetVoltOut = &_GetVoltOut;
+//    ret->SetVOrigin = &_SetVOrigin;
+//    ret->GetVOrigin = &_GetVOrigin;
+//    ret->SetVStop = &_SetVStop;
+//    ret->GetVStop = &_GetVStop;
+//    ret->SetStep = &_SetStep;
+//    ret->GetStep = &_GetStep;
+//    ret->SetStepTime = &_SetStepTime;
+//    ret->GetStepTime = &_GetStepTime;
+//    ret->SetCycleNumber = &_SetCycleNumber;
+//    ret->GetCycleNumber = &_GetCycleNumber;
+    return ret;
+}
+/* End of RT Mode Data */
+
+/* CV Mode*/
+typedef struct _CVMode{
+    MEASURE;
+    int32_t MeasureVolt;
+    VOUT_PARA;
+    int32_t _MeasureBatvolt;
+}CVMode;
+
+CVMode * InitCVMode(){
+    CVMode *ret = malloc(sizeof(CVMode));
+    ret->_MeasureData = (INSTRUCTION.VoltOrigin- DAC_ZERO)/5;
+//    ret->SetMeasureData = &_SetMeasureData;
+//    ret->GetMeasureData = &_GetMeasureData;
+    ret->MeasureVolt = 20000;
+
+    ret->_VoltOut = DAC_ZERO;  // 25000 is DAC_ZERO
+    ret->_VOrigin = INSTRUCTION.VoltOrigin;
+    ret->_VStop = INSTRUCTION.VoltFinal;
+    ret->_Step  = INSTRUCTION.Step;
+    ret->_StepTime = INSTRUCTION.StepTime; // STEPTIME_ONE_SEC
+    ret->_CycleNumber = INSTRUCTION.CycleNumber;
+    ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
+    ret->_MeasureBatvolt = 0;
+//    ret->SetVoltOut = &_SetVoltOut;
+//    ret->GetVoltOut = &_GetVoltOut;
+//    ret->SetVOrigin = &_SetVOrigin;
+//    ret->GetVOrigin = &_GetVOrigin;
+//    ret->SetVStop = &_SetVStop;
+//    ret->GetVStop = &_GetVStop;
+//    ret->SetStep = &_SetStep;
+//    ret->GetStep = &_GetStep;
+//    ret->SetStepTime = &_SetStepTime;
+//    ret->GetStepTime = &_GetStepTime;
+//    ret->SetCycleNumber = &_SetCycleNumber;
+//    ret->GetCycleNumber = &_GetCycleNumber;
+    return ret;
+}
+/*End of CV Mode*/
+
+/* Const Current Mode */
+#define CC_ZERO_POINT     0
+#define MAX_DAC_UC    50000
+#define MIN_DAC_UC      0
+
+/*********************************************************************
+ * @struct  Constant Current Code
+ *
+ * @brief   A struct to handle CC mode command
+ */
+typedef struct _CCMode{
+    CC_PARA;
+}CCMode;
+
+/*********************************************************************
+ * @fn      Transform2RealnA
+ *
+ * @brief   transform an IUC into real current value in nA.
+ *
+ * @param   self, which is an IUC
+ *
+ * @return  an int32_t current value in nA
+ */
+int32_t _Transform2RealnA(struct CCModePara *self){
+    int32_t IUCReal;
+
+    // self->value : 0 ~ 1500000 (which is 0 ~ 1500000 (10nA) )
+    if(self->Charge){
+        IUCReal = (self->value - CC_ZERO_POINT) * 10;
+    }
+    else{
+        IUCReal = -1 * (self->value - CC_ZERO_POINT) * 10;
+    }
+    return IUCReal;
+}
+
+CCMode * InitCCMode(){
+    CCMode *ret = malloc(sizeof(CCMode));
+    ret->_MeasureData = 0;
+    ret->Charge = INSTRUCTION.Charge;
+    ret->BatteryV = 0;
+    ret->Done = 0;
+
+    ret->value = INSTRUCTION.ConstantCurrent;
+    ret->VMax = INSTRUCTION.VoltLimit + DAC_ZERO;
+    ret->VMin = INSTRUCTION.VoltLimit + DAC_ZERO;
+    ret->_Transform2RealnA = &_Transform2RealnA;
+    return ret;
+}
+/*End of Const Current Mode Mode*/
+
+/* Cycle CC Mode */
+typedef struct _CCCMode{
+    CC_PARA;
+
+    /* Vmax and Vmin */
+    // Vmax protect battery charge
+    // Vmin protect battery discharge, uint = mV
+
+    /* Charge/Discharge Current */
+    int32_t ChargeCurrent;
+    int32_t DischargeCurrent;
+    uint8_t CycleNumber;
+
+    bool StandBy;
+    uint32_t StandByTime;
+}CCCMode;
+
+CCCMode * InitCCCMode(){
+    CCCMode *ret = malloc(sizeof(CCCMode));
+    ret->_MeasureData = 0;
+    ret->Charge = 1;
+    ret->BatteryV = 0;
+
+    ret->value = CC_ZERO_POINT;
+    ret->VMax = MAX_DAC_UC;  // max DAC UserCode
+    ret->VMin = MIN_DAC_UC;  // min DAC UserCode
+    ret->ChargeCurrent = 0;
+    ret->DischargeCurrent = 0;
+    ret->CycleNumber = 0;
+    ret->StandBy = false;
+    ret->StandByTime = 0;
+    ret->_Transform2RealnA = &_Transform2RealnA;
+    return ret;
+}
+
+/* End of Cycle CC Mode */
+
+/** Potential State Mode **/
+typedef struct _PS{
+    // measure
+    MEASURE; // circuit current
+    int32_t ReferenceVolt;
+    int32_t _MeasureVolt;
+    VOUT_PARA;
+}PSMode;
+
+PSMode *InitPSMode(){
+    PSMode *ret = malloc(sizeof(PSMode));
+    ret->_MeasureData = 0;
+//    ret->SetMeasureData = &_SetMeasureData;
+//    ret->GetMeasureData = &_GetMeasureData;
+    ret->ReferenceVolt = 0;
+    ret->_MeasureVolt = INSTRUCTION.VoltOrigin;
+
+    ret->_VoltOut = DAC_ZERO;  // 25000 is DAC_ZERO
+    ret->_VOrigin = INSTRUCTION.VoltOrigin;
+    ret->_VStop = INSTRUCTION.VoltFinal;
+    ret->_Step  = INSTRUCTION.Step;
+    ret->_StepTime = INSTRUCTION.StepTime; // STEPTIME_ONE_SEC
+    ret->_CycleNumber = INSTRUCTION.CycleNumber;
+    return ret;
+}
+
+/** End of Potential State Mode **/
+
+typedef union _WorkMode{
+    // Measure only
+    ITMode *IT;
+    VTMode *VT;
+
+    // Output Only
+    VoltOutMode *VO;
+
+    // Measure + Output
+    IVMode *IV;
+    CVMode *CV;
+    RTMode *RT;
+    CCMode *CC;
+//    CCCMode *CCC;
+    PSMode *PS;
+
+    //test mode
+    RVoutMode *RVout;
+}WorkMode;
+
+WorkMode *CreateWorkMode(){
+    WorkMode *ret = malloc(sizeof(WorkMode));
+    return ret;
+}
+
+void InitWorkMode(WorkMode *WM){
+    switch(INSTRUCTION.eliteFxn){
+        case IV_CURVE:
+            WM->IV = InitIVMode();
+            break;
+        case CV_CURVE:
+            WM->CV = InitCVMode();
+            break;
+        case VOLT_OUTPUT:
+            WM->VO = InitVoltOutMode();
+            break;
+        case ZT_CURVE:
+            WM->RT = InitRTMode();
+            break;
+        case VT_CURVE:
+            WM->VT = InitVTMode();
+            break;
+        case IT_CURVE:
+            WM->IT = InitITMode();
+            break;
+        case CONSTANT_CURRENT:
+            WM->CC = InitCCMode();
+            break;
+//        case CYCLE_CONSTANT_CURRENT:
+//            WM->CCC = InitCCCMode();
+//            break;
+        case READ_VOUT_VALUE:
+            WM->RVout = InitRVoutMode();
+            break;
+        default:
+            WM->VT = InitVTMode();
+            break;
+    }
+}
+
+void FreeWorkMode(WorkMode *WM){
+    switch(INSTRUCTION.eliteFxn){
+        case IV_CURVE:
+            if(WM->IV != NULL){
+                free(WM->IV);
+                WM->IV = NULL;
+            }
+            break;
+        case CV_CURVE:
+            if(WM->CV != NULL){
+                free(WM->CV);
+                WM->CV = NULL;
+            }
+            break;
+        case VOLT_OUTPUT:
+            if(WM->VO != NULL){
+                free(WM->VO);
+                WM->VO = NULL;
+            }
+            break;
+        case ZT_CURVE:
+            if(WM->RT != NULL){
+                free(WM->RT);
+                WM->RT = NULL;
+            }
+            break;
+        case VT_CURVE:
+            if(WM->VT != NULL){
+                free(WM->VT);
+                WM->VT = NULL;
+            }
+            break;
+        case IT_CURVE:
+            if(WM->IT != NULL){
+                free(WM->IT);
+                WM->IT = NULL;
+            }
+            break;
+        case CONSTANT_CURRENT:
+            if(WM->CC != NULL){
+                free(WM->CC);
+                WM->CC = NULL;
+            }
+            break;
+        case READ_VOUT_VALUE:
+            if(WM->RVout != NULL){
+                free(WM->RVout);
+                WM->RVout = NULL;
+            }
+            break;
+
+
+//        case CYCLE_CONSTANT_CURRENT:
+//            if(WM->CCC != NULL){
+//                free(WM->CCC);
+//                WM->CCC = NULL;
+//            }
+//            break;
+        default:
+            if(WM->IV != NULL){
+                free(WM->IV);
+                WM->IV = NULL;
+            }
+            break;
+    }
+//    free(WM);
+}
+
+#endif
@@ -9,18 +9,18 @@ static void ZT_notify(int32_t impedance);
 // => calculate the resister
 // change the output voltage step
 // => get a R-T curve (with resolution = 1 sample/volt step )
-static void ZT_Plot() {
+static void ZT_Plot(RTMode *RT) {
 //    int32_t Real_Resister = 0;
-    static uint16_t CurrentMeasure=0, VoltMeasure=0;
-    uint8_t SPICurrent[SPI_ADC_SIZE]={0}, SPIVolt[SPI_ADC_SIZE]={0};
-    static uint8_t VoltCurrentSwitch = 0;
+//    static uint16_t CurrentMeasure=0, VoltMeasure=0;
+//    uint8_t SPICurrent[SPI_ADC_SIZE]={0}, SPIVolt[SPI_ADC_SIZE]={0};
+//    static uint8_t VoltCurrentSwitch = 0;

    int32_t volt_32 = 0;
    int32_t current_32 = 0;
    int32_t resister_32 = 0;

    if(INSTRUCTION.AutoGainEnable){
-        current_32 = AutoGainReadCurrent(SPICurrent);
+        current_32 = AutoGainReadCurrent(spi_ADC_rxbuf);
    }
    else{
        ReadCurrent(spi_ADC_rxbuf);
@@ -28,11 +28,12 @@ static void ZT_Plot() {
    }


-    volt_32 = User2Real(INSTRUCTION.VoltConstant)*1e4;
+    volt_32 = User2Real(INSTRUCTION.VoltConstant)*1e5;
 //    ReadVolt(SPIVolt);
 //    VoltMeasure = (uint16_t) (SPIVolt[0] << 8) | (uint16_t) (SPIVolt[1]);
 //    volt_32 = DecodeADCVolt(VoltMeasure)*1e4;
    resister_32 = volt_32 / current_32;
+    volt_32 = volt_32 / 1e2; //uV

    NotifyVolt[0] = (uint8_t) (volt_32 >> 24);
    NotifyVolt[1] = (uint8_t) ((volt_32 & 0x00FF0000) >> 16);
@@ -20,7 +20,7 @@
 #define ADC_CS                          IOID_8
 #define DAC_CS                          IOID_9

-#define Turnon100R                      IOID_5
+#define Turnon200R                      IOID_5
 #define Turnon10K                       IOID_6

 /* I2C */
@@ -45,7 +45,7 @@ const PIN_Config BLE_IO[] = {
    enable_10v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,     // 10V_enable
    enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,      // 5V_enable
    shutdown_6994 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // turn off power
-    Turnon100R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    Turnon200R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
    Turnon10K | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,

@@ -59,7 +59,7 @@ VIS_FUH         = 0b1001_0000       # 9x flush
 VIS_INT         = 0b0110_0000       # 6x interrupt
 VIS_SHIFT_200K  = 0b1010_0000       # Ax shift gear to 200K
 VIS_SHIFT_10K   = 0b1110_0000       # Ex shift gear to 10K
-VIS_SHIFT_100R  = 0b1000_0000       # 8x shift gear to 100R
+VIS_SHIFT_200R  = 0b1000_0000       # 8x shift gear to 100R


 =========================
@@ -375,10 +375,11 @@ characteristic change event

 // product information
 #define DEVICE_NAME "Elite-ZM-v1.4-re"
-#define MAJOR_PRODUCT_NUMBER 0
-#define MINOR_PRODUCT_NUMBER 2
-#define MAJOR_VERSION_NUMBER 1
-#define MINOR_VERSION_NUMBER 2
+#define MAJOR_PRODUCT_NUMBER 0 //0:Elite ,1:Neulive
+#define MINOR_PRODUCT_NUMBER 2 //1:Elite_legacy(Ori_Neulive)  2:Elite_zm  3:Elite_bat
+#define MAJOR_VERSION_NUMBER 1 //1
+#define MINOR_VERSION_NUMBER 2 //2 (1.2:support 1.2~1.4-re)
+//0310 //bat1.0

 #define ELITE_VERSION_1_4
 //#define ELITE_VERSION_1_3
@@ -431,6 +432,7 @@ static Clock_Struct periodicClock;
 #include "simple_gatt_profile.h"

 static bool            PeriodicEvent = false;
+static bool InitPeriodicEvent = true;
 static ICall_Semaphore semaphore;
 static uint16_t        events;

@@ -491,6 +493,7 @@ static uint8 channel_table[CHANNEL_COUNT] = {0};
 */
 static int8    channel_pointer            = -1;
 static uint8_t not_buf[BLE_DAT_BUFF_SIZE] = {0};
+static uint8_t cis_buf[BLE_CIS_BUFF_SIZE] = {0};

 /*=====================================
 ==== headstage function prototype ====
@@ -535,6 +538,7 @@ static void ADC_test_read(uint8_t *ADCdata);  // for auto shifting
 static void    ADCGainControl(uint8_t ADCLevel);
 static void    ADCChannelSelect(uint8_t ADCChannel);
 static int32_t DecodeADCVolt(uint16_t ADC_measure);
+static int32_t DecodeADCVoutVolt(uint16_t ADC_measure);
 static int32_t DecodeADCCurrent(uint8_t ADCGain, uint16_t ADC_measure);
 static void Impedance_Calculate(uint16_t Voltage, int32_t Current);
 static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_raw);
@@ -575,7 +579,9 @@ static void set_update_instruction_callback(update_instruction_callback_type cal
 #define VIS_INT 0b01100000
 #define VIS_SHIFT_200K 0b10100000
 #define VIS_SHIFT_10K 0b11100000
-#define VIS_SHIFT_100R 0b10000000
+#define VIS_SHIFT_200R 0b10000000
+#define VIS_DEVICE_SHINY 0b00010000
+#define VIS_SHINY_DIS 0b00100000

 // real instruction
 #define IV_CURVE 0b00010000
@@ -590,9 +596,11 @@ static void set_update_instruction_callback(update_instruction_callback_type cal
 #define SQUARE_WAVE_VOLTAMMETRY 0b10110000
 #define POTENTIAL_STATE 0b11000000
 #define CONSTANT_CURRENT 0b11010000
-#define SET_RESISTER_LEVEL 0b11100000
+#define READ_VOUT_VALUE 0b11100000
+#define CYCLE_CONSTANT_CURRENT 0b11110000

 // CIS instruction
+#define CIS_VERSION 0x40

 // test instruction
 #define ADC_TEST 0b10010000
@@ -601,33 +609,20 @@ static void set_update_instruction_callback(update_instruction_callback_type cal
 static uint16_t DAC_outputV(uint16_t voltLV);
 static int32_t DAC_to_realV(uint16_t DACcode);

-/* DAC reset parameter */
-#define DAC_ZERO 0x85B2
-#define DAC_POS_MAX 0x0000
-#define DAC_NEG_MAX 0xFFFF
 static uint16_t DACUserCode = 0x0000;

-static uint32_t SampleRateTable[6] = {100, 1000, 10000, 50000, 100000, 1000000};  // 1 =>100 Hz, 10000=>0.01 Hz
-static uint32_t SampleRate_counter = 1;
+static uint32_t SampleRateTable[6] = {100, 1000, 10000, 50000, 100000, 1000000};  // 100 =>100 Hz, 1000000=>0.01 Hz

 // record value for IV curve to calculate average current
 static uint8_t DiscardIVFirstData = 1;
 static uint16_t   avg_number          = 0;
 static long long ADCRealCurrent_long = 0;

-// Step time macro
-#define STEPTIME_HALF_SEC 5000
-#define STEPTIME_ONE_SEC 10000
-#define STEPTIME_TWO_SEC 20000
-
 // Constant Current Mode function
 static uint8_t CCModeDACEnable = 0;
 static int32_t CCModeReadCurrent();
 static int32_t CCModeVoltOut();
-static void SetCCModeGain();
 static void CCCurrent2IUC();
-static int32_t IUC2RealnA();
-static int32_t IUC2RealpA();

 // for DPVCurve SWVCurve
 static uint16_t Amplitude;
@@ -636,16 +631,28 @@ static uint16_t PulseWidth_16;
 static uint8_t  PulsePeriod;
 static uint16_t PulsePeriod_16;

-static uint16_t StepTimeCounter = 1;
+// counter
+struct _CT{
+    uint32_t SampleRate_counter;
+    uint16_t StepTimeCounter;
+    uint16_t NotifyCounter;
+    uint32_t StandByCounter;
+}CT = {0};

+//static bool NotifyReady = false;
+static void InitFlag();
+static void InitCT();
+
+#include "EliteWorkData.h"
 // real instruction fxn
-static uint16_t VoltScan();                   // used in I-V and cyclic
+static uint16_t VoltScan(WorkMode *WorkModeData);       // used in I-V and cyclic
 static void     DACCode2Real2Notify(uint16_t DACcode);  // send notify voltage after VoltScan()

 //static void    VOLT_OUTPUT();
-static void    ZT_Plot();
-static void    VT_Plot();
-static int32_t IT_Plot();
+static void    ZT_Plot(RTMode *RT);
+static void    VT_Plot(VTMode *VT);
+static int32_t IT_PlotIT_Plot(WorkMode *WorkModeData);
+static void    RVout_Plot(RVoutMode *RVout);

 // the following fxn do the same thing
 // IVCurve_T is called if Vorigin > Vfinal, vice versa
@@ -655,11 +662,11 @@ static uint8_t  OldStep2NewStep(uint8_t OldStep);
 static uint16_t OldStep2NewStepTime(uint8_t StepTime);
 static uint8_t  IVdone = 0;

-static uint16_t OneWayVoltScan();
+static uint16_t OneWayVoltScan(IVMode *IV);
 static void     ramp_test();
-static uint16_t DPVCurve();
-static uint16_t CVCurve();
-static uint16_t SWVCurve();
+static uint16_t DPVCurve(WorkMode *WorkModeData);
+static uint16_t CVCurve(CVMode *CV);
+static uint16_t SWVCurve(WorkMode *WorkModeData);

 static void reset();
 static void Eliteinterrupt();
@@ -670,6 +677,7 @@ static void SendNotify();
 static bool If10Von = false;
 static void TurnOn10V();

+
 #include "EliteInstruction.h"
 #include "EliteADC.h"
 #include "EliteDAC.h"
@@ -682,6 +690,7 @@ static void TurnOn10V();

 #include "EliteDeviceCorrection.h"
 #include "EliteNotify.h"
+#include "EliteFlagCTInit.h"
 #include "EliteReset.h"
 #include "EliteLED.h"
 #include "EliteKeyDetect.h"
@@ -691,7 +700,10 @@ static void TurnOn10V();
 #include "EliteITCurve.h"
 #include "EliteVTCurve.h"
 #include "EliteZTCurve.h"
+#include "EliteCCCMode.h"
 #include "impedance_meter.h"
+#include "EliteReadVout.h"
+#include "headstage_version.h"

 // update instruction for Z meter
 static void update_ZM_instruction(uint8 *ins) {
@@ -714,30 +726,36 @@ static void update_ZM_instruction(uint8 *ins) {
 //            CleanBuffer();
            INSTRUCTION.eliteFxn = IV_CURVE;
            DACReset = true;
-            INSTRUCTION.SampleRate = 1000;
+            INSTRUCTION.SampleRate = 100;

-            if (ins[3] | ins[4]) {
+//            if (ins[3] | ins[4]) {
                INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
 //                INSTRUCTION.VoltOrigin = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
-            }
-            if (ins[5] | ins[6]) {
+//            }
+//            if (ins[5] | ins[6]) {
                INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
 //                INSTRUCTION.VoltFinal = Usercode_Correction_to_DAC(INSTRUCTION.VoltFinal);
-            }
+//            }

            if (ins[7] | ins[8]) {
                INSTRUCTION.Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
+//                NotifyImpedance[2] = (uint8_t)((INSTRUCTION.Step & 0xFF00)>>8);
+//                NotifyImpedance[3] = (uint8_t)(INSTRUCTION.Step & 0x00FF);
                INSTRUCTION.Step = StepCode2DACcode(INSTRUCTION.Step);
            }
-            if (ins[9]) {
+//            if (ins[9]) {
                INSTRUCTION.StepTime = ins[9];
                INSTRUCTION.StepTime = OldStep2NewStepTime(INSTRUCTION.StepTime);
-            }
+//            }
+//            if(ins[10]) {
+                //INSTRUCTION.VoVi_Switch = ins[10];
+                INSTRUCTION.VoVi_Switch = 0x01;
+//            }
            break;
        }

        case DIFFERENTIAL_PULSE_VOLTAMMETRY: {
-            CleanBuffer();
+//            CleanBuffer();
            INSTRUCTION.eliteFxn = DIFFERENTIAL_PULSE_VOLTAMMETRY;
            DACReset             = true;

@@ -768,11 +786,14 @@ static void update_ZM_instruction(uint8 *ins) {
            if (ins[13]) {
                PulseWidth = ins[13];
            }
+            if(ins[14]) {
+                INSTRUCTION.VoVi_Switch = ins[14];
+            }            
            break;
        }

        case SQUARE_WAVE_VOLTAMMETRY: {
-            CleanBuffer();
+//            CleanBuffer();
            INSTRUCTION.eliteFxn = SQUARE_WAVE_VOLTAMMETRY;
            DACReset             = true;

@@ -799,6 +820,9 @@ static void update_ZM_instruction(uint8 *ins) {
            if (ins[12]) {
                PulseWidth = ins[12];
            }
+            if ( ins[13]) {
+                INSTRUCTION.VoVi_Switch = ins[13];
+            }
            break;
        }

@@ -806,38 +830,39 @@ static void update_ZM_instruction(uint8 *ins) {
 //            CleanBuffer();
            INSTRUCTION.eliteFxn = CV_CURVE;
            DACReset             = true;
-            INSTRUCTION.SampleRate = 1000;
+            INSTRUCTION.SampleRate = 100;

-            if (ins[3] | ins[4]) {
+//            if (ins[3] | ins[4]) {
                INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
    //                INSTRUCTION.VoltOrigin = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
-            }
-            if (ins[5] | ins[6]) {
+//            }
+//            if (ins[5] | ins[6]) {
                INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
    //                INSTRUCTION.VoltFinal = Usercode_Correction_to_DAC(INSTRUCTION.VoltFinal);
-            }
+//            }

            if (ins[7] | ins[8]) {
                INSTRUCTION.Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
                INSTRUCTION.Step = StepCode2DACcode(INSTRUCTION.Step);
            }
-            if (ins[9]) {
+//            if (ins[9]) {
                INSTRUCTION.StepTime = ins[9];
                INSTRUCTION.StepTime = OldStep2NewStepTime(INSTRUCTION.StepTime);
-            }
+//            }
            if (ins[10]) {
                INSTRUCTION.CycleNumber = ins[10];
            }
+//            if(ins[11]) {
+                //INSTRUCTION.VoVi_Switch = ins[11];
+                INSTRUCTION.VoVi_Switch = 0x01;
+//            }

            break;
        }

-
        case VOLT_OUTPUT: {
            INSTRUCTION.eliteFxn = VOLT_OUTPUT;
            INSTRUCTION.VoltConstant = ( ((uint16_t)(ins[3])) << 8) | (uint16_t)(ins[4]);
-            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-//            DAC_outputV(INSTRUCTION.VoltConstant);
            break;
        }

@@ -866,7 +891,7 @@ static void update_ZM_instruction(uint8 *ins) {
        case SET_SAMPLE_RATE: {
            INSTRUCTION.SampleRateIndex = ins[3];
            INSTRUCTION.SampleRate = SampleRateTable[INSTRUCTION.SampleRateIndex];
-            SampleRate_counter = 1;
+            CT.SampleRate_counter = 1;
            break;
        }
        case POTENTIAL_STATE: {
@@ -884,12 +909,23 @@ static void update_ZM_instruction(uint8 *ins) {
        case CONSTANT_CURRENT:{
            INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
            INSTRUCTION.SampleRate = 2;
-            INSTRUCTION.ConstantCurrent = ( (uint32_t) (ins[3])<<24 | (uint32_t) (ins[4])<<16 | (uint32_t) (ins[5])<<8 | (uint32_t) (ins[6]) );
+            INSTRUCTION.Charge = ins[3];
+            INSTRUCTION.VoltLimit = ((uint16_t) ins[4] << 8) | ((uint16_t) ins[5]);
+            INSTRUCTION.ConstantCurrent = ( (uint32_t) (ins[6])<<24 | (uint32_t) (ins[7])<<16 | (uint32_t) (ins[8])<<8 | (uint32_t) (ins[9]) );
+            INSTRUCTION.NotifyRate = 1000;
+
+//            if(!INSTRUCTION.Charge){
+//                INSTRUCTION.VoltConstant = 50000;
+//            }
 //            GetInstructionParameter(ins+2);
 //            CCCurrent2IUC();
            break;
        }

+        case CYCLE_CONSTANT_CURRENT:{
+
+            break;
+        }
        case SET_ADC_GAIN: {
            INSTRUCTION.ADCGainLevel = ins[3];
            if(INSTRUCTION.ADCGainLevel != GAIN_AUTO){
@@ -910,8 +946,14 @@ static void update_ZM_instruction(uint8 *ins) {
            break;
        }

-        case SET_RESISTER_LEVEL:{
-            INSTRUCTION.ResisterMeter = ins[3];
+        case READ_VOUT_VALUE:{
+//            INSTRUCTION.ResisterMeter = ins[3];
+            INSTRUCTION.eliteFxn = READ_VOUT_VALUE;
+            /*uint8_t ReadVoutBuf[2] = {0};
+
+            ADC_write(0xA4);
+            ADC_read(ReadVoutBuf);
+            SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, 2, ReadVoutBuf);*/
            break;
        }

@@ -1001,6 +1043,9 @@ static void update_ZM_instruction(uint8 *ins) {
        }

        case VIS_STI: {
+            for(int i=0 ; i<12 ; i++){
+                FlushNotify();
+            }
            PeriodicEvent = true;
            break;
        }
@@ -1012,30 +1057,58 @@ static void update_ZM_instruction(uint8 *ins) {

        case VIS_INT: {
            Eliteinterrupt();
+            for(int i=0 ; i<12 ; i++){
+                FlushNotify();
+            }
            break;
        }

        case VIS_SHIFT_200K: {
            PIN_setOutputValue(pin_handle, Turnon10K, 0);
-            PIN_setOutputValue(pin_handle, Turnon100R, 0);
+            PIN_setOutputValue(pin_handle, Turnon200R, 0);
            LED_color(DARKLED, 0xFF, 0xB4, 0x00);
            break;
        }

        case VIS_SHIFT_10K: {
            PIN_setOutputValue(pin_handle, Turnon10K, 1);
-            PIN_setOutputValue(pin_handle, Turnon100R, 0);
+            PIN_setOutputValue(pin_handle, Turnon200R, 0);
            LED_color(DARKLED, 0x14, 0xC8, 0xFF);
            break;
        }

-        case VIS_SHIFT_100R: {
+        case VIS_SHIFT_200R: {
            PIN_setOutputValue(pin_handle, Turnon10K, 0);
-            PIN_setOutputValue(pin_handle, Turnon100R, 1);
+            PIN_setOutputValue(pin_handle, Turnon200R, 1);
            LED_color(DARKLED, 0xFF, 0xFF, 0xFF);
            break;
        }

+        case VIS_DEVICE_SHINY:{
+            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
+//            uint8_t deviceShinySwitch = (ins[2] & 0b11110000) >> 4;//1:open 0:close
+//            if(deviceShinySwitch == 1){
+//                 LED_color(DARKLED, 0xFF, 0x00, 0xFF);
+//            }else if(deviceShinySwitch == 0){
+//                 if(PeriodicEvent){
+//                      WORKLED();
+//                 }else if(!PeriodicEvent){
+//                     LEDPowerON();
+//                 }
+//            }
+            break;
+        }
+
+        case VIS_SHINY_DIS:{
+             if(PeriodicEvent){
+                  WORKLED();
+             }else if(!PeriodicEvent){
+                 LEDPowerON();
+             }
+
+            break;
+        }
+
        default: {
            break;
        }
@@ -1049,6 +1122,19 @@ static void update_ZM_instruction(uint8 *ins) {
            I2CWrite(0x01, 0xAB);
            break;
        }
+
+        case CIS_VERSION:{
+            cis_buf[0] = VERSION_DATE_YEAR;
+            cis_buf[1] = VERSION_DATE_MONTH;
+            cis_buf[2] = VERSION_DATE_DAY;
+            cis_buf[3] = VERSION_DATE_HOUR;
+            cis_buf[4] = VERSION_DATE_MINUTE;
+
+            SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
+            break;
+        }
+
+
        }
        break;
    }
@@ -0,0 +1,11 @@
+
+#ifndef VERSION_DATE
+#define VERSION_DATE
+
+#define VERSION_DATE_YEAR       20
+#define VERSION_DATE_MONTH      2
+#define VERSION_DATE_DAY        25
+#define VERSION_DATE_HOUR       18
+#define VERSION_DATE_MINUTE     32
+
+#endif
@@ -19,8 +19,9 @@
 // header
 #include <ti/drivers/PIN.h>
 #include "board.h"
+#include "EliteWorkData.h"

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

 static void SimpleBLEPeripheral_clockHandler(UArg arg) {
    // Store the event.
@@ -77,7 +78,8 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 (INSTRUCTION.eliteFxn == IT_CURVE) || \
 (INSTRUCTION.eliteFxn == VT_CURVE) || \
 (INSTRUCTION.eliteFxn == ZT_CURVE) || \
-(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)  \
+(INSTRUCTION.eliteFxn == CONSTANT_CURRENT) || \
+(INSTRUCTION.eliteFxn == READ_VOUT_VALUE)  \
 )

 /*********************************************************************
@@ -89,44 +91,85 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 *
 * @return  None.
 */
-static void SimpleBLEPeripheral_performPeriodicTask(void *WorkModeData) {
+static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
    if ( IsPeriodicMode() ){

-        if (StepTimeCounter == INSTRUCTION.StepTime){
-            StepTimeCounter = 1;
+        // DAC counter
+        if (CT.StepTimeCounter == INSTRUCTION.StepTime){
+            CT.StepTimeCounter = 1;
        }
        else{
-            StepTimeCounter++;
+            CT.StepTimeCounter++;
        }

-        if (SampleRate_counter == INSTRUCTION.SampleRate){
-            SampleRate_counter = 1;
+        // ADC counter
+        if (CT.SampleRate_counter == INSTRUCTION.SampleRate){
+            CT.SampleRate_counter = 1;
        }
        else{
-            SampleRate_counter++;
+            CT.SampleRate_counter++;
+        }
+
+        // notify counter
+        if (CT.NotifyCounter == INSTRUCTION.NotifyRate){
+            CT.NotifyCounter = 1;
+        }
+        else{
+            CT.NotifyCounter ++;
        }

        /** Periodic Event **/
-        // Default working mode is DAC out -> ADC read -> send notify
+        // Default working flow is DAC out -> ADC read -> send notify
        // We will need a flag to control DAC, if we want to exchange to ADC -> DAC -> notify
-        // This flag can be named by FxnNameReset
+        // This flag can be named by FxnNameDACReset

        // In IV, CV, and func-gen mode, DAC will output voltage
        // else DAC do nothing.
-        EliteDACControl(*WorkModeData);
+        EliteDACControl(WorkModeData);

        // Control ADC to sample rate
-        EliteADCControl(*WorkModeData);
+        EliteADCControl(WorkModeData);

        // Notify control, check if we need to send notify
        EliteNotifyControl();
+
+    }
+
+    else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
+        // assign WorkModeData->VO  = INSTRUCTION.VoltConstant
+        WorkModeData->VO->_VoltOut = INSTRUCTION.VoltConstant;
+        // UserCode -> DAC code -> DAC out
+        DAC_outputV(Usercode_Correction_to_DAC(WorkModeData->VO->_VoltOut));
+//        DAC_outputV(WorkModeData->VO->_VoltOut);      // for voltage output calibration
+        FreeWorkMode(WorkModeData);
+        PeriodicEvent = false;
+        InitPeriodicEvent = true;
+    }
+    else{
+        PeriodicEvent = false;
    }
 }

-static void EliteDACControl(void *WorkModeData) {
-    if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE)) {
+static void EliteDACControl(WorkMode *WorkModeData) {
+    if (INSTRUCTION.eliteFxn == IV_CURVE) {
        // output a certain voltage and put it into NotifyVolt
-        DACCode2Real2Notify(VoltScan());
+        if(WorkModeData->IV->_VoVi_Switch == 0x00){       //user see Vout
+            //DACCode2Real2Notify(VoltScan(WorkModeData));
+            uint16_t DACcode;
+            DACcode = VoltScan(WorkModeData);
+            
+        }
+        else if (WorkModeData->IV->_VoVi_Switch == 0x01){ //user see Vin
+            VoltScan(WorkModeData);
+        }
+    }
+    else if(INSTRUCTION.eliteFxn == CV_CURVE){
+        if (WorkModeData->CV->_VoVi_Switch == 0x00){
+            DACCode2Real2Notify(VoltScan(WorkModeData));
+        }
+        else if (WorkModeData->CV->_VoVi_Switch == 0x01){
+            VoltScan(WorkModeData);
+        }
    }
    else if (INSTRUCTION.eliteFxn == ZT_CURVE){
        if(INSTRUCTION.ResisterMeter == RESISTER_METER_SMALL){
@@ -151,7 +194,7 @@ static void EliteDACControl(void *WorkModeData) {
            DAC_outputV(Usercode_Correction_to_DAC(25000));
            DACReset = false;
        }
-        CCModeVoltOut(WorkModeData);
+        CCModeVoltOut(WorkModeData->CC);
    }

    else{
@@ -160,35 +203,52 @@ static void EliteDACControl(void *WorkModeData) {
    }
 }

-static void EliteADCControl(uint32_t **WorkModeData) {
-    if (SampleRate_counter == INSTRUCTION.SampleRate-1) {
+static void EliteADCControl(WorkMode *WorkModeData) {
+    if (CT.SampleRate_counter == INSTRUCTION.SampleRate - 1) {
        switch (INSTRUCTION.eliteFxn) {
            case IV_CURVE:{
-                IT_Plot();
+                IV_Plot(WorkModeData->IV);
+//                IT_Plot(WorkModeData);
                break;
            }
            case CV_CURVE:{
-                IT_Plot();
+                CV_Plot(WorkModeData->CV);
                break;
            }
            case IT_CURVE:{
-                IT_Plot();
+                IT_Plot(WorkModeData);
+//                NotifyReady = true;
                break;
            }
            case VT_CURVE:{
                // read volt through ADC and put it into notify buffer
-                VT_Plot();
+                VT_Plot(WorkModeData->VT);
+//                NotifyReady = true;
                break;
            }
            case ZT_CURVE:{
-                ZT_Plot();
+                ZT_Plot(WorkModeData->RT);
+//                NotifyReady = true;
                break;
            }
            case CONSTANT_CURRENT:{
-                CCModeReadCurrent(WorkModeData);
+                CCModeReadCurrent(WorkModeData->CC);
+//                CCModeReverseCurrent(WorkModeData->CC);
+                break;
+            }
+            case READ_VOUT_VALUE:{
+                RVout_Plot(WorkModeData->RVout);
+
+                /*uint8_t ReadVoutBuf[2] = {0};
+
+                ADC_write(0xA4);
+                ADC_read(ReadVoutBuf);
+                SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, 2, ReadVoutBuf);*/
                break;
            }
            default:{
+                IT_Plot(WorkModeData);
+//                NotifyReady = true;
                break;
            }
        }
@@ -201,19 +261,23 @@ static void EliteNotifyControl() {
        if (!PeriodicEvent) {
            SendNotify();
            reset();
-        } else if (StepTimeCounter == INSTRUCTION.StepTime - 1) {
+        } else if (CT.StepTimeCounter == INSTRUCTION.StepTime/2) {
            SendNotify();
        }
    }
-
-    else if (SampleRate_counter == INSTRUCTION.SampleRate) {
+    else if(INSTRUCTION.eliteFxn == CONSTANT_CURRENT){
+        if(CT.NotifyCounter == INSTRUCTION.NotifyRate){
+            SendNotify();
+        }
+    }
+    else if (CT.SampleRate_counter == INSTRUCTION.SampleRate) {
        SendNotify();
    }
 }


 static uint16_t StepCode2DACcode(uint16_t StepCode){
-    return (StepCode * 0x0005);
+    return (StepCode * 0x0005 / 10);
 }

 static uint16_t OldStep2NewStepTime(uint8_t StepTime) {
@@ -222,7 +286,6 @@ static uint16_t OldStep2NewStepTime(uint8_t StepTime) {

    switch (StepTimeLevel) {
    case 0: {  //0.5 sec
-        LED_color(LIGHTLED, 0xFF, 0xFF, 0xFF);
        return STEPTIME_HALF_SEC;
    }
    case 1: {  //1 sec
@@ -529,7 +529,7 @@ static void SimpleBLEPeripheral_init(void) {
 }


-
+#include "EliteWorkData.h"
 /*********************************************************************
 * @fn      SimpleBLEPeripheral_taskFxn
 *
@@ -551,9 +551,7 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {

    ZM_init();
    Elite_SPI_init();
-    void *WorkModeData = malloc(sizeof(uint32_t));
-    CURRENT_USER_CODE *CurrentUserCode = InitCurrentUserCode();
-    WorkModeData = &CurrentUserCode;
+    WorkMode *WorkModeData = CreateWorkMode();

    uint8_t key         = 0;
    uint16_t counter6994 = 0;
@@ -629,17 +627,34 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
                        counter6994++;
                    }
                    EliteKeyPress(key);
+                    if(Free_Work_Mode){
+                        FreeWorkMode(WorkModeData);
+                        InitEliteInstruction();
+                        ADCGainControl(INSTRUCTION.ADCGainLevel);
+                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+
+                        Free_Work_Mode = false;
+                    }
                } else {
                    EliteOn = TurnOnElite(key);
                }
            }
            // if there is periodic event
            else {
+                if(InitPeriodicEvent){
+                    InitWorkMode(WorkModeData);
+                    InitPeriodicEvent = false;
+                }
+
                // Perform periodic application task
-                SimpleBLEPeripheral_performPeriodicTask(WorkModeData );
+                SimpleBLEPeripheral_performPeriodicTask(WorkModeData);
+
+                // Turn off Elite if battery  voltage < 3V
+//                ReadBatVolt(spi_ADC_rxbuf);

                key = PIN_getInputValue(switch_on);
                EliteKeyPress(key);  // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
+
            }
        }