test

(add ReadVout)

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src/makefile.libs

@@ -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")

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src/sysbios/makefile

@@ -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,:)

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/.ccsproject

@@ -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>

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

@@ -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>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/.launches/simple_peripheral_cc2650em_stack.launch

@@ -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>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/targetConfigs/CC2650F128.ccxml

@@ -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">

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

@@ -62,24 +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, 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);
     }
 }
 
@@ -121,4 +126,115 @@ static void ADCChannelSelect(uint8_t ADCChannel){
     }
 }
 
+static void ReadVolt(uint8_t *buf){
+    // Read data twice since the first data we get is previous data
+    ADCChannelSelect(ADC_CH_VOLT);
+    CPUdelay(10);
+    ADC_read(buf);
+
+    ADCChannelSelect(ADC_CH_VOLT);
+    CPUdelay(10);
+    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);
+    ADCChannelSelect(ADC_CH_CURRENT);
+    CPUdelay(10);
+    ADC_read(buf);
+
+    ADCChannelSelect(ADC_CH_CURRENT);
+    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
+
+
+static int32_t AutoGainReadCurrent(uint8_t *buf){
+    int32_t Real_Current = 0;
+
+    if(INSTRUCTION.ADCGainLevel == GAIN_AUTO){
+        INSTRUCTION.ADCGainLevel = GAIN_200R;
+    }
+
+    if(INSTRUCTION.ADCGainLevel == GAIN_200R){
+        ReadCurrent(spi_ADC_rxbuf);
+        Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+
+        // switch to mid range current
+        if(Real_Current < GAIN_LARGE_BOUNDARY && Real_Current > -1*GAIN_LARGE_BOUNDARY){
+            INSTRUCTION.ADCGainLevel = GAIN_10K;
+            ReadCurrent(spi_ADC_rxbuf);
+            Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+//            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);
+
+        // switch to large range current
+        if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
+            INSTRUCTION.ADCGainLevel = GAIN_200R;
+            ReadCurrent(spi_ADC_rxbuf);
+            Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+        }
+
+        // switch to small range current
+        else 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);
+        }
+    }
+    else if(INSTRUCTION.ADCGainLevel == GAIN_200K){
+        ReadCurrent(spi_ADC_rxbuf);
+        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){
+            INSTRUCTION.ADCGainLevel = GAIN_10K;
+            ReadCurrent(spi_ADC_rxbuf);
+            Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+           // switch to large range current
+//           if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
+//               INSTRUCTION.ADCGainLevel = GAIN_200R;
+//               ReadCurrent(spi_ADC_rxbuf);
+//               Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+//           }
+       }
+    }
+    return Real_Current;
+}
+
 #endif

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

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

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

@@ -2,259 +2,131 @@
 #ifndef ELITECCMODE
 #define ELITECCMODE
 
-#define CURRENT_LV_FOUR     4
-#define CURRENT_LV_THREE    3
-#define CURRENT_LV_TWO      2
-#define CURRENT_LV_ONE      1
-#define CURRENT_LV_ZERO     0
+static void CCModeDACControl(CCMode *CC, int32_t IUC_Measure_Difference);
 
-/*********************************************************************
- * @struct  Constant Current Code
- *
- * @brief   A struct to handle CC mode command
- */
-typedef struct _CURRENT_USER_CODE {
-    /** current level range: 0-4 **/
-    // current level = 0 => 0-499 nA     => ADCGainLevel = 200K
-    // current level = 1 => 500-999 nA   => ADCGainLevel = 10K
-    // current level = 2 => 0-499 uA     => ADCGainLevel = 10K
-    // current level = 3 => 500-999 uA   => ADCGainLevel = 200R
-    // current level = 4 => 0-499 mA     => ADCGainLevel = 200R
-    uint8_t lv;
+static int32_t CCModeReadCurrent(CCMode *CC){
 
-    /** current value **/
-    // current value divide current level into 50000 pieces
-    uint16_t value;
+    static uint8_t VoltCurrentSwitch = 0;
 
-    /** transform a current user code (IUC) to real current in pA **/
-    // handle current lv 0~2
-    int32_t (*Transform2RealpA)(struct _CURRENT_USER_CODE *self);
-
-    /** transform an IUC to real current in nA **/
-    // handle current lv 3~4
-    int32_t (*Transform2RealnA)(struct _CURRENT_USER_CODE *self);
-
-    /** larger than a given int32 ? **/
-    uint8_t (*Compare)(struct _CURRENT_USER_CODE *self, uint8_t, int32_t);
-}CURRENT_USER_CODE;
-
-static CURRENT_USER_CODE CurrentUserCode;
-
-static int32_t CCModeReadCurrent(CURRENT_USER_CODE *CurrentUserCode){
-    int32_t Real_Current = 0;
-    CCModeReset = 0;    // This flag will control DAC working
-
-    CCCurrent2IUC(CurrentUserCode);
-    // read ADC current
-    SetCCModeGain(CurrentUserCode);
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
-    ADCChannelSelect(ADC_CH_CURRENT);
-    CPUdelay(10);
-    ADC_read(spi_ADC_rxbuf);
-
-    // check if ADC over/under flow
-    // let the output saturate if over/under flow
-    ADC_overflow(INSTRUCTION.ADCGainLevel, spi_ADC_rxbuf);
+    CCModeDACEnable = 1;    // This flag will control DAC working
 
     // decode ADC value and put it into notify buffer
-    Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-    return 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);
+
+        // 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 CCModeOutputDAC(){
-    if(CCModeReset){
+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);
 
+    CCModeDACControl(CC, IUCCurrent - CC->_MeasureData);
 
+    CCModeDACEnable = 0;
+    return CC->_MeasureData;
 }
 
-static void SetCCModeGain(CURRENT_USER_CODE CurrentUserCode){
-    switch(CurrentUserCode.lv){
-        case CURRENT_LV_FOUR:{
-            INSTRUCTION.ADCGainLevel = GAIN_200K;
-            break;
-        }
+static void CCModeDACControl(CCMode *CC, int32_t IUC_Measure_Difference){
+    int32_t step;
 
-        case CURRENT_LV_THREE:{
-            INSTRUCTION.ADCGainLevel = GAIN_10K;
-            break;
-        }
-        case CURRENT_LV_TWO:{
-            INSTRUCTION.ADCGainLevel = GAIN_10K;
-            break;
-        }
-        case CURRENT_LV_ONE:{
-            INSTRUCTION.ADCGainLevel = GAIN_200R;
-            break;
-        }
-        case CURRENT_LV_ZERO:{
-            INSTRUCTION.ADCGainLevel = GAIN_200R;
-            break;
-        }
-        default :{
-            INSTRUCTION.ADCGainLevel = GAIN_200R;
-            break;
-        }
+    if(IUC_Measure_Difference < 300 && IUC_Measure_Difference > -300){
+        step = 0;
     }
-}
-
-static void CCCurrent2IUC(){
-
-    CurrentUserCode.value = INSTRUCTION.ConstantCurrent;
-    if (INSTRUCTION.CurrentLV == CURRENT_LV_MA){
-        // largest current ( 0~500 mA)
-        if (INSTRUCTION.ConstantCurrentRange == CURRENT_RANGE_HIGH){
-            CurrentUserCode.lv = CURRENT_LV_FOUR;
+    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( (!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;
         }
-
-        // mid range current ( 500 uA ~ 999 uA)
+        // after ignore few second, active VMin condition
         else{
-            CurrentUserCode.lv = CURRENT_LV_THREE;
-        }
-    }
-    else if (INSTRUCTION.CurrentLV == CURRENT_LV_UA){
-        // mid range current ( 0 uA ~ 499 uA)
-        if (INSTRUCTION.ConstantCurrentRange == CURRENT_RANGE_HIGH){
-            CurrentUserCode.lv = CURRENT_LV_TWO;
+            CC->value = 0;
+            step = (IUC_Measure_Difference > 0) ? 1:-1;
         }
 
-        // current range ( 500 nA ~ 999 nA)
-        else{
-            CurrentUserCode.lv = CURRENT_LV_ONE;
-        }
     }
-
-    // low current ( < 500 nA)
     else{
-        CurrentUserCode.lv = CURRENT_LV_ZERO;
+        step = (IUC_Measure_Difference > 0) ? 1:-1;
     }
-}
-
-//static int32_t IUC2RealnA(){
-//
-//}
-//
-//static int32_t IUC2RealpA{
-//
-//}
-/*********************************************************************
- * @fn      Transform2RealpA
- *
- * @brief   transform an IUC into real current value in pA.
- *
- * @param   self, which is an IUC
- *
- * @return  an int32_t current value in pA
- */
-static int32_t Transform2RealpA(CURRENT_USER_CODE *self){
-    int32_t IUCReal;
-
-    // Saturate if current > 500 uA
-    if (self->lv > 2){
-        return 0xFFFFFFFF;
-    }
-
-    // 0-499 nA
-    if (self->lv == 0){
-        IUCReal = (int32_t) (self->value) * 10;
-    }
-
-    // 500-999 nA
-    else if (self->lv == 1){
-        IUCReal = ((int32_t) (self->value) * 10);
-        IUCReal = IUCReal + 500e3;
-    }
-
-    // 0-499 uA
-    else if (self->lv == 2){
-        IUCReal = (int32_t) (self->value) * 10e3;
-    }
-    return IUCReal;
-}
-
-/*********************************************************************
- * @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;
-
-    // Saturate if current < 500 uA
-    if (self->lv < 3){
-        return 0;
-    }
-
-    // 500-999 uA
-    if (self->lv == 3){
-        IUCReal = (int32_t) (self->value) * 10;
-        IUCReal = IUCReal + 500e3;
-    }
-
-    // 0-499 mA
-    else if (self->lv == 4){
-        IUCReal = (int32_t) (self->value) * 10e3;
-    }
-    return IUCReal;
-}
-
-/*********************************************************************
- * @fn      CompareCurrent
- *
- * @brief   compare an int32 current with CURRENT_USER_CODE (IUC) type current.
- *
- * @param   unit is current unit (0 = pA, 1 = nA)
- *          value is current value
- *
- * @return  0 if equal
- *          1 if IUC is larger
- *          2 if int32 current is larger.
- */
-static uint8_t CompareCurrent(CURRENT_USER_CODE *self, uint8_t unit, int32_t value){
-    int32_t ErrorRangeIUCReal;
-
-    // unit = pA
-    if (unit == 0){
-        if (self->Transform2RealpA(self) > value){
-            return 1;
-        }
-        else if (self->Transform2RealpA(self) < value){
-            return 2;
+    // 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{
-            return 0;
+            INSTRUCTION.VoltConstant = (INSTRUCTION.VoltConstant + MIN_DAC_UC)/2;
         }
     }
-
-    // unit = nA
-    else if (unit == 1){
-        if (self->Transform2RealnA(self) > value){
-            return 1;
-        }
-        else if (self->Transform2RealnA(self) < value){
-            return 2;
-        }
-        else{
-            return 0;
-        }
+    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);
 }
 
-static void InitCurrentUserCode(){
-//    CURRENT_USER_CODE *CurrentUserCode = malloc(sizeof(CURRENT_USER_CODE));
-    CurrentUserCode.lv = 0;
-    CurrentUserCode.value = 0;
-    CurrentUserCode.Transform2RealnA = &Transform2RealnA;
-    CurrentUserCode.Transform2RealpA = &Transform2RealpA;
-    CurrentUserCode.Compare = &CompareCurrent;
-//    return CurrentUserCode;
-}
+/* Transform setting CC into IUC
+*
+* User code in CC mode : 0 ~ 3000000
+* Real current value : -15.00000 ~ 15.00000 mA
+*  => user code = 1500000 mapping to 0.00000 mA
+*/
+static void CCCurrent2IUC(CCMode *CC){
+    int32_t CurrentValue = 0;
 
+    CC->value = INSTRUCTION.ConstantCurrent;
+    CurrentValue = CC->value - CC_ZERO_POINT;
+}
 
 #endif

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

@@ -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,68 +132,292 @@ static uint16_t DPVCurve() {
     }
 }
 
-static uint16_t CVCurve() {
-    static uint8_t  ramp0;
-    static uint8_t  ramp1;
-    static uint16_t outputV;
-    static bool     direction_up;
-    static bool     current_direction_up;
+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
 
     // reset origin volt at the begin
     if (DACReset) {
-        outputV = INSTRUCTION.VoltOrigin;
-        if (INSTRUCTION.VoltFinal > INSTRUCTION.VoltOrigin) {
+        DACUserCode = CV->_VOrigin;
+        if (CV->_VStop > CV->_VOrigin) {
             direction_up         = true;
             current_direction_up = true;
         } else {
             direction_up         = false;
             current_direction_up = false;
         }
-        ramp0    = (uint8_t)(INSTRUCTION.VoltOrigin & 0x00FF);         // right byte
-        ramp1    = (uint8_t)((INSTRUCTION.VoltOrigin >> 8) & 0x00FF);  // left byte
-        DACReset = false;
+
+        DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
+        DAC_outputV(DACOutCode);    // output VOLT_ORIGIN
+        DACReset   = false;
+
+        return DACOutCode;
     }
 
-    // output a certain volt
-    DAC_outputV(outputV);
-
-    if (direction_up) {
-        if (outputV >= INSTRUCTION.VoltFinal) {
-            current_direction_up = false;  // problem occurs when origin == 0000 final == ffff!!!!!!
-        } else if (outputV <= INSTRUCTION.VoltOrigin) {
-            current_direction_up = true;
-            if (INSTRUCTION.CycleNumber == 0) {
-                PeriodicEvent = false;  // periodic event end
-                DACReset      = true;
+    if (CT.StepTimeCounter == CV->_StepTime) {
+        // Decide next direction
+        if (CV->_VoVi_Switch == 0x00){   //user see Vout
+            if (direction_up) {
+                if (DACUserCode >= CV->_VStop) {
+                    current_direction_up = false;  // problem occurs when origin == 0000 final == ffff!!!!!!
+                } else if (DACUserCode <= CV->_VOrigin) {
+                    current_direction_up = true;
+                    if (CV->_CycleNumber == 0) {
+                        PeriodicEvent = false;  // periodic event end
+                        DACReset      = true;
+                    }
+                    CV->_CycleNumber--;
+                }
+            } else {
+                if (DACUserCode <= CV->_VStop) {
+                    current_direction_up = true;  // problem occurs when origin == 0000 final == ffff!!!!!!
+                } else if (DACUserCode >= CV->_VOrigin) {
+                    current_direction_up = false;
+                    if (CV->_CycleNumber == 0) {
+                        PeriodicEvent = false;  // periodic event end
+                        DACReset      = true;
+                    }
+                    CV->_CycleNumber--;
+                }
             }
-            INSTRUCTION.CycleNumber--;
         }
-    } else {
-        if (outputV <= INSTRUCTION.VoltFinal) {
-            current_direction_up = true;  // problem occurs when origin == 0000 final == ffff!!!!!!
-        } else if (outputV >= INSTRUCTION.VoltOrigin) {
-            current_direction_up = false;
-            if (INSTRUCTION.CycleNumber == 0) {
-                PeriodicEvent = false;  // periodic event end
-                DACReset      = true;
+        else if (CV->_VoVi_Switch == 0x01){     //user see Vin
+            if (direction_up) {
+                if (CV->MeasureVolt >= ((int32_t)(CV->_VStop) - DAC_ZERO)/5) {
+                    current_direction_up = false;  // problem occurs when origin == 0000 final == ffff!!!!!!
+                } else if (CV->MeasureVolt <= ((int32_t)(CV->_VOrigin) - DAC_ZERO)/5) {
+                    current_direction_up = true;
+                    if (CV->_CycleNumber == 0) {
+                        PeriodicEvent = false;  // periodic event end
+                        DACReset      = true;
+                    }
+                    CV->_CycleNumber--;
+                }
+            } else {
+                if (CV->MeasureVolt <= ((int32_t)(CV->_VStop) - DAC_ZERO)/5) {
+                    current_direction_up = true;  // problem occurs when origin == 0000 final == ffff!!!!!!
+                } else if (CV->MeasureVolt >= ((int32_t)(CV->_VOrigin) - DAC_ZERO)/5){
+                    current_direction_up = false;
+                    if (CV->_CycleNumber == 0) {
+                        PeriodicEvent = false;  // periodic event end
+                        DACReset      = true;
+                    }
+                    CV->_CycleNumber--;
+                }
             }
-            INSTRUCTION.CycleNumber--;
         }
-    }
+//        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 (CV->_VoVi_Switch == 0x00){
+            if (direction_up) {
+                if (current_direction_up) {
+                    // DACUserCode overflow ?
+                    if (DACUserCode + CV->_Step < DACUserCode) {
+                        DACUserCode = CV->_VStop;
+                    }
+                    // reach Vfinal ?
+                    else if (DACUserCode + CV->_Step > CV->_VStop) {
+                        DACUserCode =CV->_VStop;
+                    }
+                    else {
+                        DACUserCode = DACUserCode + CV->_Step;
+                    }
+                }
+                else {
+                    // DACUserCode underflow ?
+                    if (DACUserCode - CV->_Step > DACUserCode) {
+                        DACUserCode = CV->_VOrigin;
+                    }
 
-    if (current_direction_up) {
-        if (outputV + INSTRUCTION.Step < outputV)
-            outputV = 0xffff;
-        else
-            outputV = outputV + INSTRUCTION.Step;
-    } else {
-        if (outputV - INSTRUCTION.Step > outputV)
-            outputV = 0x0000;
-        else
-            outputV = outputV - INSTRUCTION.Step;
-    }
+                    // reach Vorigin ?
+                    else if (DACUserCode - CV->_Step <  CV->_VOrigin) {
+                        DACUserCode = CV->_VOrigin;
+                    }
+                    else {
+                        DACUserCode = DACUserCode - CV->_Step;
+                    }
+                }
+            }
+            else {
+                if (current_direction_up) {
+                    if (DACUserCode + CV->_Step < DACUserCode) {
+                        DACUserCode = CV->_VOrigin;
+                    }
+                    else if (DACUserCode + CV->_Step >  CV->_VOrigin) {
+                        DACUserCode = CV->_VOrigin;
+                    }
+                    else {
+                        DACUserCode = DACUserCode + CV->_Step;
+                    }
+                }
+                else {
+                    if (DACUserCode - CV->_Step > DACUserCode) {
+                        DACUserCode = CV->_VStop ;
+                    }
+                    else if (DACUserCode - CV->_Step < CV->_VStop) {
+                        DACUserCode = CV->_VStop;
+                    }
+                    else {
+                        DACUserCode = DACUserCode - CV->_Step;
+                    }
+                }
+            }
+        }
+        else if (CV->_VoVi_Switch == 0x01){
+            if (direction_up) {
+                if (current_direction_up) {
+                    // DACUserCode overflow ?
+                    if (DACUserCode + CV->_Step < DACUserCode) {
+                        DACUserCode = CV->_VStop;
+                    }
+                    // reach Vfinal ?
+                    else if (CV->MeasureVolt + ((int32_t)(CV->_Step) - DAC_ZERO)/5 > ((int32_t)(CV->_VStop) - DAC_ZERO)/5) {
+                        DACUserCode =CV->_VStop;
+                    }
+                    else {
+                        DACUserCode = DACUserCode + CV->_Step;
+                    }
+                }
+                else {
+                    // DACUserCode underflow ?
+                    if (DACUserCode - CV->_Step > DACUserCode) {
+                        DACUserCode = CV->_VOrigin;
+                    }
 
-    return outputV;
+                    // reach Vorigin ?
+                    else if (CV->MeasureVolt - ((int32_t)(CV->_Step) - DAC_ZERO)/5 < ((int32_t)(CV->_VOrigin) - DAC_ZERO)/5) {
+                        DACUserCode = CV->_VOrigin;
+                    }
+                    else {
+                        DACUserCode = DACUserCode - CV->_Step;
+                    }
+                }
+            }
+            else {
+                if (current_direction_up) {
+                    if (DACUserCode + CV->_Step < DACUserCode) {
+                        DACUserCode = CV->_VOrigin;
+                    }
+                    else if (CV->MeasureVolt + ((int32_t)(CV->_Step) - DAC_ZERO)/5 > ((int32_t)(CV->_VOrigin) - DAC_ZERO)/5) {
+                        DACUserCode = CV->_VOrigin;
+                    }
+                    else {
+                        DACUserCode = DACUserCode + CV->_Step;
+                    }
+                }
+                else {
+                    if (DACUserCode - CV->_Step > DACUserCode) {
+                        DACUserCode = CV->_VStop ;
+                    }
+                    else if (CV->MeasureVolt - ((int32_t)(CV->_Step) - DAC_ZERO)/5 < ((int32_t)(CV->_VStop) - DAC_ZERO)/5) {
+                        DACUserCode = CV->_VStop;
+                    }
+                    else {
+                        DACUserCode = DACUserCode - CV->_Step;
+                    }
+                }
+            }
+        }
+        
+        DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
+        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 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 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);
+        }else if(CV->_VoVi_Switch == 0x00){
+           /** read vout voltage **/
+            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{
+        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);
+    }
+}
+
+
 #endif

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

@@ -57,4 +57,9 @@ static uint16_t DAC_outputV(uint16_t voltLV) {
 
 #endif
 
+static int32_t User2Real(uint16_t UserCode){
+    /* transfer usercode to real voltage value (mV) */
+    return (int32_t) ((UserCode - 25000)*2)/10;
+}
+
 #endif

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

@@ -29,7 +29,7 @@
 */
 
 
-#define BOARD_CLASS_LEADER
+#define BOARD_KUMA
 
 typedef struct _formula{
 
@@ -66,8 +66,8 @@ struct _correction{
 .DAC2RealV.coeff = (-18959656),
 .DAC2RealV.offset = 565743281498,
 
-.Usercode2DAC.coeff = (-10548714),
-.Usercode2DAC.offset = 562100522714,
+.Usercode2DAC.coeff = (-10517325),
+.Usercode2DAC.offset = 561574831511,
 
 .Gain0Boundary[0] = 0x5F75,
 .Gain0Boundary[1] = 0x5FB2,
@@ -82,11 +82,11 @@ struct _correction{
 .ADC_volt.coeff = (-6259045),
 .ADC_volt.offset = 150606390230,
 
-.ADC_current[0].coeff = 27661202,
-.ADC_current[0].offset = (-664225386769),
+.ADC_current[0].coeff = 30675739,
+.ADC_current[0].offset = (-736666253953),
 
-.ADC_current[1].coeff = 663176124,
-.ADC_current[1].offset = (-15925056526152),
+.ADC_current[1].coeff = 749057318,
+.ADC_current[1].offset = (-17984432358007),
 
 .ADC_current[2].coeff = 31242587,
 .ADC_current[2].offset = (-750184492407),
@@ -135,17 +135,17 @@ struct _correction{
 
 #ifdef BOARD_TWENTY_ONE
 {
-.ADC_volt.coeff = (-6258074),
-.ADC_volt.offset = 152210580945,
+.ADC_volt.coeff = (-6256213),
+.ADC_volt.offset = 102974768458,
 
-.ADC_current[0].coeff = 30022512,
-.ADC_current[0].offset = -729552647201,
+.ADC_current[0].coeff = 31033951,
+.ADC_current[0].offset = -510391262009,
 
-.ADC_current[1].coeff = 658398533,
-.ADC_current[1].offset = -16001498741131,
+.ADC_current[1].coeff = 656911527,
+.ADC_current[1].offset = -10810626335997,
 
-.ADC_current[2].coeff = 30908351,
-.ADC_current[2].offset = -746548614824,
+.ADC_current[2].coeff = 31234223317,
+.ADC_current[2].offset = -513653236006248,
 
 .DAC2RealV.coeff = (-19007867),
 .DAC2RealV.offset = 646316924837,
@@ -172,8 +172,8 @@ struct _correction{
 .ADC_current[1].coeff = 652738209,
 .ADC_current[1].offset = -15767733896990,
 
-.ADC_current[2].coeff = 30959456,
-.ADC_current[2].offset = -748026885843,
+.ADC_current[2].coeff = 30959456000,
+.ADC_current[2].offset = -748026885843000,
 
 .DAC2RealV.coeff = (-18880478),
 .DAC2RealV.offset = 629012735316,
@@ -199,25 +199,25 @@ struct _correction{
 #endif
 
 
-#ifdef BOARD_BAY_BAY
+#ifdef BOARD_GENIUS
 {
-.ADC_volt.coeff = (-6219797),
-.ADC_volt.offset = 148596702982,
+.ADC_volt.coeff = (-6236652),
+.ADC_volt.offset = 101533279052,
 
-.ADC_current[0].coeff = 309083900,
-.ADC_current[0].offset = (-7414775955140),
+.ADC_current[0].coeff = 31094976,
+.ADC_current[0].offset = (-507114075439),
 
-.ADC_current[1].coeff = 661271310,
-.ADC_current[1].offset = (-15864495597969),
+.ADC_current[1].coeff = 31218018,
+.ADC_current[1].offset = (-508593562044),
 
-.ADC_current[2].coeff = 31183513,
-.ADC_current[2].offset = (-748178468530),
+.ADC_current[2].coeff = 557826631,
+.ADC_current[2].offset = (-9088752534070),
 
-.DAC2RealV.coeff = (-18988046),
-.DAC2RealV.offset = 642080522322,
+.DAC2RealV.coeff = (-18990774),
+.DAC2RealV.offset = 570886531263,
 
-.Usercode2DAC.coeff = (-10532941),
-.Usercode2DAC.offset = 601473393000,
+.Usercode2DAC.coeff = (-10605006),
+.Usercode2DAC.offset = 566878948150,
 
 .Gain0Boundary[0] = 0x5D96,
 .Gain0Boundary[1] = 0x5DD9,
@@ -266,8 +266,8 @@ struct _correction{
 .ADC_current[1].coeff = 657619858,
 .ADC_current[1].offset = (-15835988865283),
 
-.ADC_current[2].coeff = 31116362,
-.ADC_current[2].offset = (-749402214847),
+.ADC_current[2].coeff = 31116362000,
+.ADC_current[2].offset = (-749402214847000),
 
 .DAC2RealV.coeff = (-18935149),
 .DAC2RealV.offset = 643063752893,
@@ -283,6 +283,538 @@ struct _correction{
 };
 #endif
 
+#ifdef BOARD_LITTLE_STAR
+{
+.ADC_volt.coeff = (-6224192),
+.ADC_volt.offset = 101472884698,
+
+.ADC_current[0].coeff = 31293602,
+.ADC_current[0].offset = (-510187416959),
+
+.ADC_current[1].coeff = 655130048,
+.ADC_current[1].offset = (-10680093830418),
+
+.ADC_current[2].coeff = 31450484,
+.ADC_current[2].offset = (-512697942950),
+
+.DAC2RealV.coeff = (-18690126),
+.DAC2RealV.offset = 564319610294 ,
+
+.Usercode2DAC.coeff = (-10524846),
+.Usercode2DAC.offset = 561713962333,
+
+.Gain0Boundary[0] = 0x5E2F,
+.Gain0Boundary[1] = 0x5E96,
+
+.Gain1Boundary[0] = 0x5878,
+.Gain1Boundary[1] = 0x645A
+};
+#endif
+
+#ifdef BOARD_517
+{
+.ADC_volt.coeff = (-6244769),
+.ADC_volt.offset = 101714685687,
+
+.ADC_current[0].coeff = 30919726,
+.ADC_current[0].offset = (-503489101786),
+
+.ADC_current[1].coeff = 654824495,
+.ADC_current[1].offset = (-10660542778914),
+
+.ADC_current[2].coeff = 31376265,
+.ADC_current[2].offset = (-510797752348),
+
+.DAC2RealV.coeff = (-18690126),
+.DAC2RealV.offset = 564319610294 ,
+
+.Usercode2DAC.coeff = (-10500774),
+.Usercode2DAC.offset = 560779455904,
+
+.Gain0Boundary[0] = 0x5E2F,
+.Gain0Boundary[1] = 0x5E96,
+
+.Gain1Boundary[0] = 0x5878,
+.Gain1Boundary[1] = 0x645A
+};
+#endif
+
+#ifdef BOARD_FISH_VET
+{
+.ADC_volt.coeff = (-6243954),
+.ADC_volt.offset = 101956814341,
+
+.ADC_current[0].coeff = 6208753,
+.ADC_current[0].offset = (-101076436901),
+
+.ADC_current[1].coeff = 68760643,
+.ADC_current[1].offset = (-1123221851971),
+
+.ADC_current[2].coeff = 61882330000,
+.ADC_current[2].offset = (-1010385966159000),
+
+.DAC2RealV.coeff = (-18690126),
+.DAC2RealV.offset = 564319610294,
+
+.Usercode2DAC.coeff = (-10517326),
+.Usercode2DAC.offset = 561574831512,
+
+.Gain0Boundary[0] = 0x5E2F,
+.Gain0Boundary[1] = 0x5E96,
+
+.Gain1Boundary[0] = 0x5878,
+.Gain1Boundary[1] = 0x645A
+};
+#endif
+
+#ifdef BOARD_KELLY
+{
+.ADC_volt.coeff = (-6238112),
+.ADC_volt.offset = 101628014509,
+
+.ADC_current[0].coeff = 61842883,
+.ADC_current[0].offset = (-1006424716609),
+
+.ADC_current[1].coeff = 68602677,
+.ADC_current[1].offset = (-1117469013718),
+
+.ADC_current[2].coeff = 12521267000,
+.ADC_current[2].offset = (-204009192742000),
+
+.DAC2RealV.coeff = (-18690126),
+.DAC2RealV.offset = 564319610294,
+
+.Usercode2DAC.coeff = (-10528309),
+.Usercode2DAC.offset = 561035476688,
+
+.Gain0Boundary[0] = 0x5E2F,
+.Gain0Boundary[1] = 0x5E96,
+
+.Gain1Boundary[0] = 0x5878,
+.Gain1Boundary[1] = 0x645A
+};
+#endif
+
+#ifdef BOARD_BAY_BAY
+{
+.ADC_volt.coeff = (-6223734),
+.ADC_volt.offset = 101647006833,
+
+.ADC_current[0].coeff = 31039179,
+.ADC_current[0].offset = (-506383432096),
+
+.ADC_current[1].coeff = 647940355,
+.ADC_current[1].offset = (-10611041889224),
+
+.ADC_current[2].coeff = 31094976,
+.ADC_current[2].offset = (-507114075439),
+
+.DAC2RealV.coeff = (-18690126),
+.DAC2RealV.offset = 564319610294,
+
+.Usercode2DAC.coeff = (-10541677),
+.Usercode2DAC.offset = 562208801371,
+
+.Gain0Boundary[0] = 0x5E2F,
+.Gain0Boundary[1] = 0x5E96,
+
+.Gain1Boundary[0] = 0x5878,
+.Gain1Boundary[1] = 0x645A
+};
+#endif
+
+#ifdef BOARD_MEOWMI
+{
+.ADC_volt.coeff = (-6265015),
+.ADC_volt.offset = 101843650153,
+
+.ADC_current[0].coeff = 62522034,
+.ADC_current[0].offset = (-1016702373525),
+
+.ADC_current[1].coeff = 31613132,
+.ADC_current[1].offset = (-514033175600),
+
+.ADC_current[2].coeff = 565897139,
+.ADC_current[2].offset = (-9201204539440),
+
+.DAC2RealV.coeff = (-18990774),
+.DAC2RealV.offset = 570886531263,
+
+.Usercode2DAC.coeff = (-10541427),
+.Usercode2DAC.offset = 562159124753,
+
+.Gain0Boundary[0] = 0x5D96,
+.Gain0Boundary[1] = 0x5DD9,
+
+.Gain1Boundary[0] = 0x57CD,
+.Gain1Boundary[1] = 0x639F
+};
+#endif
+
+#ifdef BOARD_EUROPEAN
+{
+.ADC_volt.coeff = (-6264190),
+.ADC_volt.offset = 101683809669,
+
+.ADC_current[0].coeff = 31301451,
+.ADC_current[0].offset = (-508301866021),
+
+.ADC_current[1].coeff = 656423459,
+.ADC_current[1].offset = (-10660544072862),
+
+.ADC_current[2].coeff = 31414514000,
+.ADC_current[2].offset = (-510185549182000),
+
+.DAC2RealV.coeff = (-18990774),
+.DAC2RealV.offset = 570886531263,
+
+.Usercode2DAC.coeff = (-10513774),
+.Usercode2DAC.offset = 559795292677,
+
+.Gain0Boundary[0] = 0x5D96,
+.Gain0Boundary[1] = 0x5DD9,
+
+.Gain1Boundary[0] = 0x57CD,
+.Gain1Boundary[1] = 0x639F
+};
+#endif
+
+#ifdef BOARD_EARTH
+{
+.ADC_volt.coeff = (-6256660),
+.ADC_volt.offset = 101658275678,
+
+.ADC_current[0].coeff = 31271240,
+.ADC_current[0].offset = (-508496329863),
+
+.ADC_current[1].coeff = 659931818,
+.ADC_current[1].offset = (-10729666444387),
+
+.ADC_current[2].coeff = 31485559000,
+.ADC_current[2].offset = (-511907957163000),
+
+.DAC2RealV.coeff = (-19047143),
+.DAC2RealV.offset = 565935714286,
+
+.Usercode2DAC.coeff = (-10500262),
+.Usercode2DAC.offset = 559630236100,
+
+.Gain0Boundary[0] = 0x5D96,
+.Gain0Boundary[1] = 0x5DD9,
+
+.Gain1Boundary[0] = 0x57CD,
+.Gain1Boundary[1] = 0x639F
+};
+#endif
+
+#ifdef BOARD_MARS
+{
+.ADC_volt.coeff = (-6270623),
+.ADC_volt.offset = 102383421553,
+
+.ADC_current[0].coeff = 31187022,
+.ADC_current[0].offset = (-509159321195),
+
+.ADC_current[1].coeff = 655981611,
+.ADC_current[1].offset = (-10709717111320),
+
+.ADC_current[2].coeff = 31256968000,
+.ADC_current[2].offset = (-510275213115000),
+
+.DAC2RealV.coeff = (-18937347),
+.DAC2RealV.offset = 568558163265,
+
+.Usercode2DAC.coeff = (-10561141),
+.Usercode2DAC.offset = 564249134291,
+
+.Gain0Boundary[0] = 0x5D96,
+.Gain0Boundary[1] = 0x5DD9,
+
+.Gain1Boundary[0] = 0x57CD,
+.Gain1Boundary[1] = 0x639F
+};
+#endif
+
+#ifdef BOARD_VENUS
+{
+.ADC_volt.coeff = (-6268996),
+.ADC_volt.offset = 102204055818,
+
+.ADC_current[0].coeff = 31131930,
+.ADC_current[0].offset = (-507382432547),
+
+.ADC_current[1].coeff = 654620883,
+.ADC_current[1].offset = (-10668953588943),
+
+.ADC_current[2].coeff = 31245260000,
+.ADC_current[2].offset = (-509181085054000),
+
+.DAC2RealV.coeff = (-19009388),
+.DAC2RealV.offset = 567032653061,
+
+.Usercode2DAC.coeff = (-10521117),
+.Usercode2DAC.offset = 561308254899,
+
+.Gain0Boundary[0] = 0x5D96,
+.Gain0Boundary[1] = 0x5DD9,
+
+.Gain1Boundary[0] = 0x57CD,
+.Gain1Boundary[1] = 0x639F
+};
+#endif
+
+#ifdef BOARD_MERCURY
+{
+.ADC_volt.coeff = (-6259808),
+.ADC_volt.offset = 102009860128,
+
+.ADC_current[0].coeff = 31335917,
+.ADC_current[0].offset = (-511426612252),
+
+.ADC_current[1].coeff = 658172815,
+.ADC_current[1].offset = (-10738251896209),
+
+.ADC_current[2].coeff = 31482687000,
+.ADC_current[2].offset = (-513650531545000),
+
+.DAC2RealV.coeff = (-19009388),
+.DAC2RealV.offset = 567032653061,
+
+.Usercode2DAC.coeff = (-10548297),
+.Usercode2DAC.offset = 562611756757,
+
+.Gain0Boundary[0] = 0x5D96,
+.Gain0Boundary[1] = 0x5DD9,
+
+.Gain1Boundary[0] = 0x57CD,
+.Gain1Boundary[1] = 0x639F
+};
+#endif
+
+#ifdef BOARD_JUPITER
+{
+.ADC_volt.coeff = (-6269485),
+.ADC_volt.offset = 102238333056,
+
+.ADC_current[0].coeff = 31318015,
+.ADC_current[0].offset = (-510539199854),
+
+.ADC_current[1].coeff = 657254297,
+.ADC_current[1].offset = (-10714778629799),
+
+.ADC_current[2].coeff = 31423827318,
+.ADC_current[2].offset = (-512292182160264),
+
+.DAC2RealV.coeff = (-19009388),
+.DAC2RealV.offset = 567032653061,
+
+.Usercode2DAC.coeff = (-10474987),
+.Usercode2DAC.offset = 560580057382,
+
+.Gain0Boundary[0] = 0x5D96,
+.Gain0Boundary[1] = 0x5DD9,
+
+.Gain1Boundary[0] = 0x57CD,
+.Gain1Boundary[1] = 0x639F
+};
+#endif
+
+#ifdef BOARD_SATURN
+{
+.ADC_volt.coeff = (-6262993),
+.ADC_volt.offset = 101996256499,
+
+.ADC_current[0].coeff = 31482854,
+.ADC_current[0].offset = (-513080696050),
+
+.ADC_current[1].coeff = 660069824,
+.ADC_current[1].offset = (-10757047907091),
+
+.ADC_current[2].coeff = 31599480301,
+.ADC_current[2].offset = (-514997796786064),
+
+.DAC2RealV.coeff = (-19009388),
+.DAC2RealV.offset = 567032653061,
+
+.Usercode2DAC.coeff = (-10482326),
+.Usercode2DAC.offset = 558931155711,
+
+.Gain0Boundary[0] = 0x5D96,
+.Gain0Boundary[1] = 0x5DD9,
+
+.Gain1Boundary[0] = 0x57CD,
+.Gain1Boundary[1] = 0x639F
+};
+#endif
+
+#ifdef BOARD_PLUTO
+{
+.ADC_volt.coeff = (-6234602),
+.ADC_volt.offset = 101125467977,
+
+.ADC_current[0].coeff = 31257110,
+.ADC_current[0].offset = -507158331398,
+
+.ADC_current[1].coeff = 658056279,
+.ADC_current[1].offset = -10678937298845,
+
+.ADC_current[2].coeff = 31453705244,
+.ADC_current[2].offset = -510451697841977,
+
+.DAC2RealV.coeff = (-19007867),
+.DAC2RealV.offset = 646316924837,
+
+.Usercode2DAC.coeff = (-10511469),
+.Usercode2DAC.offset = 560144103380,
+
+.Gain0Boundary[0] = 0x5ECD,
+.Gain0Boundary[1] = 0x5F0D,
+
+.Gain1Boundary[0] = 0x5900,
+.Gain1Boundary[1] = 0x64DD
+};
+#endif
+
+#ifdef BOARD_URANUS
+{
+.ADC_volt.coeff = (-6288406),
+.ADC_volt.offset = 102590185538,
+
+.ADC_current[0].coeff = 31126241,
+.ADC_current[0].offset = -507996638504,
+
+.ADC_current[1].coeff = 657161839,
+.ADC_current[1].offset = -10726524110539,
+
+.ADC_current[2].coeff = 31389113015,
+.ADC_current[2].offset = -512374954780066,
+
+.DAC2RealV.coeff = (-19007867),
+.DAC2RealV.offset = 646316924837,
+
+.Usercode2DAC.coeff = (-10522699),
+.Usercode2DAC.offset = 562027015384,
+
+.Gain0Boundary[0] = 0x5ECD,
+.Gain0Boundary[1] = 0x5F0D,
+
+.Gain1Boundary[0] = 0x5900,
+.Gain1Boundary[1] = 0x64DD
+};
+#endif
+
+#ifdef BOARD_NEPTUNE
+{
+.ADC_volt.coeff = (-6238267),
+.ADC_volt.offset = 101851442363,
+
+.ADC_current[0].coeff = 31273546,
+.ADC_current[0].offset = -510209128923,
+
+.ADC_current[1].coeff = 655098575,
+.ADC_current[1].offset = -10688260793525,
+
+.ADC_current[2].coeff = 31427718507,
+.ADC_current[2].offset = -512764179259867,
+
+.DAC2RealV.coeff = (-19007867),
+.DAC2RealV.offset = 646316924837,
+
+.Usercode2DAC.coeff = (-10523806),
+.Usercode2DAC.offset = 561060090900,
+
+.Gain0Boundary[0] = 0x5ECD,
+.Gain0Boundary[1] = 0x5F0D,
+
+.Gain1Boundary[0] = 0x5900,
+.Gain1Boundary[1] = 0x64DD
+};
+#endif
+
+#ifdef BOARD_BIGBROTHER
+{
+.ADC_volt.coeff = (-6249254),
+.ADC_volt.offset = 101825967151,
+
+.ADC_current[0].coeff = 31064047,
+.ADC_current[0].offset = -506320666330,
+
+.ADC_current[1].coeff = 656820055,
+.ADC_current[1].offset = -10700912340162,
+
+.ADC_current[2].coeff = 31424358846,
+.ADC_current[2].offset = -511986603889918,
+
+.DAC2RealV.coeff = (-19007867),
+.DAC2RealV.offset = 646316924837,
+
+.Usercode2DAC.coeff = (-10484132),
+.Usercode2DAC.offset = 559642619397,
+
+.Gain0Boundary[0] = 0x5ECD,
+.Gain0Boundary[1] = 0x5F0D,
+
+.Gain1Boundary[0] = 0x5900,
+.Gain1Boundary[1] = 0x64DD
+};
+#endif
+
+#ifdef BOARD_KUMA
+{
+.ADC_volt.coeff = (-6284116),
+.ADC_volt.offset = 102151354839,
+
+.ADC_current[0].coeff = 31222344,
+.ADC_current[0].offset = -507425541248,
+
+.ADC_current[1].coeff = 657422161,
+.ADC_current[1].offset = -10654143756362,
+
+.ADC_current[2].coeff = 31221776879,
+.ADC_current[2].offset = -506123984398184,
+
+.DAC2RealV.coeff = (-19007867),
+.DAC2RealV.offset = 646316924837,
+
+.Usercode2DAC.coeff = (-10541828),
+.Usercode2DAC.offset = 559483550210,
+
+.Gain0Boundary[0] = 0x5ECD,
+.Gain0Boundary[1] = 0x5F0D,
+
+.Gain1Boundary[0] = 0x5900,
+.Gain1Boundary[1] = 0x64DD
+};
+#endif
+
+#ifdef BOARD_MINO
+{
+.ADC_volt.coeff = (-6242774),
+.ADC_volt.offset = 101201319007,
+
+.ADC_current[0].coeff = 31322380,
+.ADC_current[0].offset = -507484324313,
+
+.ADC_current[1].coeff = 659514123,
+.ADC_current[1].offset = -10687831492393,
+
+.ADC_current[2].coeff = 31535570993,
+.ADC_current[2].offset = -511116189463173,
+
+.DAC2RealV.coeff = (-19007867),
+.DAC2RealV.offset = 646316924837,
+
+.Usercode2DAC.coeff = (-10529707),
+.Usercode2DAC.offset = 560289198229,
+
+.Gain0Boundary[0] = 0x5ECD,
+.Gain0Boundary[1] = 0x5F0D,
+
+.Gain1Boundary[0] = 0x5900,
+.Gain1Boundary[1] = 0x64DD
+};
+#endif
+
 
 // this function turn ADC measure value (0xXXXX) into real voltage
 // unit should be mV
@@ -295,6 +827,16 @@ static int32_t DecodeADCVolt(uint16_t ADC_measure){
     return (int32_t) (ADCRealVolt);
 }
 
+// this function turn ADC measure value (0xXXXX) into Vout voltage
+// unit should be mV
+static int32_t DecodeADCVoutVolt(uint16_t ADC_measure){
+    long long ADCVoutVolt = 0;
+
+    ADCVoutVolt = ((-62658782380) * ADC_measure + 1020118014900000);
+    ADCVoutVolt = ADCVoutVolt / 1e11;
+    return (int32_t) (ADCVoutVolt);
+}
+
 // this function turn ADC measure value (0xXXXX) into real current
 // unit should be pA
 static int32_t DecodeADCCurrent(uint8_t ADCGain, uint16_t ADC_measure){
@@ -308,39 +850,41 @@ static int32_t DecodeADCCurrent(uint8_t ADCGain, uint16_t ADC_measure){
 }
 
 static int32_t DecodeResister(uint8_t ADCGainLevel, uint16_t CurrentMeasure, uint16_t VoltMeasure){
-    long long ADCRealResister = 0, ADCRealCurrent=0, ADCRealVolt=0;
-    int32_t current_32, volt_32, resister_32;
+    long long ADCRealCurrent=0, ADCRealVolt=0;
+    int32_t resister_32;
 
     // get measure current
     ADCRealCurrent = (Correction.ADC_current[ADCGainLevel].coeff * CurrentMeasure + Correction.ADC_current[ADCGainLevel].offset)/1e7;
-    current_32 = (int32_t) (ADCRealCurrent);
 
     // get measure volt
     // This step is necessary, if the measure resister !>> 10 ohm
     ADCRealVolt = (Correction.ADC_volt.coeff * VoltMeasure + Correction.ADC_volt.offset);
     ADCRealVolt = ADCRealVolt / 1e4;
-    volt_32 = (int32_t) (ADCRealVolt);
 
-    if (INSTRUCTION.ADCGainLevel == GAIN_200R){
-        resister_32 = (int32_t) ((ADCRealVolt) / (ADCRealCurrent/1e3)); // nV / uA = mV
-    }
-    else{
-        resister_32 = (int32_t) ((ADCRealVolt) / (ADCRealCurrent/1e6)); // nV / uA = mV
-    }
-//    NotifyVolt[0] = (uint8_t) (volt_32 >> 24);
-//    NotifyVolt[1] = (uint8_t) ((volt_32 & 0x00FF0000) >> 16);
-//    NotifyVolt[2] = (uint8_t) ((volt_32 & 0x0000FF00) >> 8);
-//    NotifyVolt[3] = (uint8_t) (volt_32 & 0x000000FF);
-//
-//    NotifyCurrent[0] = (uint8_t) (current_32 >> 24);
-//    NotifyCurrent[1] = (uint8_t) ((current_32 & 0x00FF0000) >> 16);
-//    NotifyCurrent[2] = (uint8_t) ((current_32 & 0x0000FF00) >> 8);
-//    NotifyCurrent[3] = (uint8_t) (current_32 & 0x000000FF);
+//    if (INSTRUCTION.ADCGainLevel == GAIN_200R){
+    resister_32 = (int32_t) ((ADCRealVolt) / (ADCRealCurrent/1e3)); // nV / uA = mV
+//    }
+//    else{
+//        resister_32 = (int32_t) ((ADCRealVolt) / (ADCRealCurrent/1e6)); // nV / uA = mV
+//    }
+    int32_t volt_32 = (int32_t) (ADCRealVolt);
+    int32_t current_32 = (int32_t) (ADCRealCurrent);
+
+    NotifyVolt[0] = (uint8_t) (volt_32 >> 24);
+    NotifyVolt[1] = (uint8_t) ((volt_32 & 0x00FF0000) >> 16);
+    NotifyVolt[2] = (uint8_t) ((volt_32 & 0x0000FF00) >> 8);
+    NotifyVolt[3] = (uint8_t) (volt_32 & 0x000000FF);
+
+    NotifyCurrent[0] = (uint8_t) (current_32 >> 24);
+    NotifyCurrent[1] = (uint8_t) ((current_32 & 0x00FF0000) >> 16);
+    NotifyCurrent[2] = (uint8_t) ((current_32 & 0x0000FF00) >> 8);
+    NotifyCurrent[3] = (uint8_t) (current_32 & 0x000000FF);
 
     NotifyImpedance[0] = (uint8_t) (resister_32 >> 24);
     NotifyImpedance[1] = (uint8_t) ((resister_32 & 0x00FF0000) >> 16);
     NotifyImpedance[2] = (uint8_t) ((resister_32 & 0x0000FF00) >> 8);
     NotifyImpedance[3] = (uint8_t) (resister_32 & 0x000000FF);
+//    NotifyReady = true;
 
     return resister_32;
 }
@@ -349,47 +893,77 @@ static int32_t DecodeResister(uint8_t ADCGainLevel, uint16_t CurrentMeasure, uin
 static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_raw){
 
     uint16_t ADC_measure = (uint16_t) (ADC_raw[0] << 8) | (uint16_t) (ADC_raw[1]);
-    int32_t ADCRealVolt = 0, ret = 0, ADCRealCurrent = 0, ADCRealResister = 0;
+    int32_t ADCRealVolt = 0, ret = 0, ADCRealCurrent = 0, ADCVoutVolt = 0;;
+
 
     // return real volt to controller
     if(ADCChannel == ADC_CH_VOLT){
         ADCRealVolt = DecodeADCVolt(ADC_measure);
-        NotifyVolt[0] = (uint8_t) (ADCRealVolt >> 24);
-        NotifyVolt[1] = (uint8_t) ((ADCRealVolt & 0x00FF0000) >> 16);
-        NotifyVolt[2] = (uint8_t) ((ADCRealVolt & 0x0000FF00) >> 8);
-        NotifyVolt[3] = (uint8_t) (ADCRealVolt & 0x000000FF);
         ret = ADCRealVolt;
     }
 
     // return real current to controller
     else if(ADCChannel == ADC_CH_CURRENT){
-
-        if (INSTRUCTION.eliteFxn == IV_CURVE) {
-
-            ADCRealCurrent_long += DecodeADCCurrent(ADCGain, ADC_measure);
-            avg_number++;
-
-            if (StepTimeCounter == INSTRUCTION.StepTime) {
-                ADCRealCurrent_long = ADCRealCurrent_long / avg_number;
-                NotifyCurrent[0] = (uint8_t) (ADCRealCurrent_long >> 24);
-                NotifyCurrent[1] = (uint8_t) ((ADCRealCurrent_long & 0x00FF0000) >> 16);
-                NotifyCurrent[2] = (uint8_t) ((ADCRealCurrent_long & 0x0000FF00) >> 8);
-                NotifyCurrent[3] = (uint8_t) (ADCRealCurrent_long & 0x000000FF);
-                avg_number = 0;
-                ADCRealCurrent_long = 0;
-            }
-        }
-        else {
-            ADCRealCurrent = DecodeADCCurrent(ADCGain, ADC_measure);
-            NotifyCurrent[0] = (uint8_t) (ADCRealCurrent >> 24);
-            NotifyCurrent[1] = (uint8_t) ((ADCRealCurrent & 0x00FF0000) >> 16);
-            NotifyCurrent[2] = (uint8_t) ((ADCRealCurrent & 0x0000FF00) >> 8);
-            NotifyCurrent[3] = (uint8_t) (ADCRealCurrent & 0x000000FF);
-            ret = ADCRealCurrent;
-        }
-
+        ADCRealCurrent = DecodeADCCurrent(ADCGain, ADC_measure);
+        NotifyCurrent[0] = (uint8_t) (ADCRealCurrent >> 24);
+        NotifyCurrent[1] = (uint8_t) ((ADCRealCurrent & 0x00FF0000) >> 16);
+        NotifyCurrent[2] = (uint8_t) ((ADCRealCurrent & 0x0000FF00) >> 8);
+        NotifyCurrent[3] = (uint8_t) (ADCRealCurrent & 0x000000FF);
+        ret = ADCRealCurrent;
     }
 
+    // return real TestVolt to controller
+    else if(ADCChannel == ADC_CH_DAC){
+        ADCVoutVolt = DecodeADCVoutVolt(ADC_measure);
+        ret = ADCVoutVolt;
+    }
+
+
+//        if ( (INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE)) {
+//        if ( (INSTRUCTION.eliteFxn == CV_CURVE)) {
+//            // wait 0.1 sec until circuit stable => discard first data means wait 0.1 sec
+//            if(DiscardIVFirstData){
+//                DiscardIVFirstData ++;
+//                DecodeADCCurrent(ADCGain, ADC_measure);
+//                ret = DecodeADCCurrent(ADCGain, ADC_measure);
+//
+//                // DiscardIVFirstData :1,2; discard two data
+//                // DiscardIVFirstData = 0; recording data
+//                if(DiscardIVFirstData == 3){
+//                    DiscardIVFirstData = 0;
+//                }
+//                return ret;
+//            }
+//
+//            // return a real time current (used for deciding auto gain)
+//            ret = DecodeADCCurrent(ADCGain, ADC_measure);
+//            ADCRealCurrent_long = ADCRealCurrent_long + ret;
+//            avg_number ++;
+//
+//            if (CT.StepTimeCounter == INSTRUCTION.StepTime - 1) {
+//                DiscardIVFirstData = 1;
+//                ADCRealCurrent_long = ADCRealCurrent_long / avg_number;
+//                NotifyCurrent[0] = (uint8_t) (ADCRealCurrent_long >> 24);
+//                NotifyCurrent[1] = (uint8_t) ((ADCRealCurrent_long & 0x00FF0000) >> 16);
+//                NotifyCurrent[2] = (uint8_t) ((ADCRealCurrent_long & 0x0000FF00) >> 8);
+//                NotifyCurrent[3] = (uint8_t) (ADCRealCurrent_long & 0x000000FF);
+//                avg_number = 0;
+//                ADCRealCurrent_long = 0;
+////                NotifyReady = true;
+//            }
+//        }
+
+        // IT curve
+//        else {
+//            ADCRealCurrent = DecodeADCCurrent(ADCGain, ADC_measure);
+//            NotifyCurrent[0] = (uint8_t) (ADCRealCurrent >> 24);
+//            NotifyCurrent[1] = (uint8_t) ((ADCRealCurrent & 0x00FF0000) >> 16);
+//            NotifyCurrent[2] = (uint8_t) ((ADCRealCurrent & 0x0000FF00) >> 8);
+//            NotifyCurrent[3] = (uint8_t) (ADCRealCurrent & 0x000000FF);
+//            ret = ADCRealCurrent;
+//        }
+//    }
+
     else{
         // not support AIN2 / AIN3 yet
     }
@@ -452,7 +1026,6 @@ static int32_t DAC_to_realV(uint16_t DACcode)
 
     usercode_32 = ((DACcode * 1e7) - Correction.Usercode2DAC.offset) / Correction.Usercode2DAC.coeff;
 
-//    RealV = (int32_t) ((Correction.DAC2RealV.coeff * DACcode + Correction.DAC2RealV.offset)/1e8);  //(mV)
     RealV = (int32_t) (usercode_32 / 5) - 5000;
 
     // return mV

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

@@ -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

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

@@ -2,22 +2,83 @@
 #ifndef ELITEIT
 #define ELITEIT
 
-static int32_t IT_Plot() {
+#define absolute(a) ((a<0)? -a:a)
+
+//static int32_t IT_Plot() {
+//    // read ADC current
+//    int32_t Real_Current = 0;
+//    ADCGainControl(INSTRUCTION.ADCGainLevel);
+//    ADCChannelSelect(ADC_CH_CURRENT);
+//    CPUdelay(10);
+//    ADC_read(spi_ADC_rxbuf);
+//
+//    // check if ADC over/under flow
+//    // let the output saturate if over/under flow
+////    ADC_overflow(INSTRUCTION.ADCGainLevel, spi_ADC_rxbuf);
+//
+//    // decode ADC value and put it into notify buffer
+//    Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+//
+//    return Real_Current;
+//}
+
+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;
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
-    ADCChannelSelect(ADC_CH_CURRENT);
-    CPUdelay(10);
-    ADC_read(spi_ADC_rxbuf);
+    int32_t RealCurrent = 0, RealVolt = 0;
+    static uint8_t PreviousGain = GAIN_200R;
 
-    // check if ADC over/under flow
-    // let the output saturate if over/under flow
-//    ADC_overflow(INSTRUCTION.ADCGainLevel, spi_ADC_rxbuf);
+    if(INSTRUCTION.AutoGainEnable){
+        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);
+        RealCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+    }
 
-    // decode ADC value and put it into notify buffer
-    Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+    CURRENT_MODE->_MeasureData = RealCurrent;
 
-    return Real_Current;
+
+//    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

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

@@ -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,31 @@ 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();
-    } else if (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY) {
-        Voltage = CVCurve();
+        Voltage = DPVCurve(WorkModeData);
+    } else if (INSTRUCTION.eliteFxn == CV_CURVE) {
+        Voltage = CVCurve(WorkModeData->CV);
+    } else if (INSTRUCTION.eliteFxn == SQUARE_CURR) {
+        Voltage = SCCurve(WorkModeData->SC);
     }
 
     // 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,32 +42,167 @@ 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) {
             // 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.VosltConstant > 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){        //user see Vout
+            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);
+            
+    }
+
+    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 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 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);
+        }else if(IV->_VoVi_Switch == 0x00){
+            /** read vout voltage **/
+            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{
+        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);
+
+        if (IV->_VOrigin < IV->_VStop) {
+            if(IV->MeasureVolt >= ((int32_t) (IV->_VStop) - DAC_ZERO)/5){
                 PeriodicEvent = false;
                 DACReset      = true;
             }
-        } else {
-            // output the next output volt
-            DACUserCode = DACUserCode - INSTRUCTION.Step;
-            DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
-            DAC_outputV(DACOutCode);
-
-            // end IV task if we reach INSTRUCTION.VoltFinal
-            if (DACUserCode <= INSTRUCTION.VoltFinal) {
+        }
+        else{
+            if(IV->MeasureVolt <= ((int32_t) (IV->_VStop) - DAC_ZERO)/5){
                 PeriodicEvent = false;
                 DACReset      = true;
             }
         }
     }
-    return DACOutCode;
 }
 
+
 #endif

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

@@ -19,9 +19,17 @@
 #define CURRENT_LV_NA 0x00
 #define CURRENT_LV_UA 0x01
 #define CURRENT_LV_MA 0x02
-// ConstantCurrentRange
-#define CURRENT_RANGE_LOW   0x00
-#define CURRENT_RANGE_HIGH  0x01
+
+/* DAC reset parameter */
+#define DAC_ZERO 25000
+#define DAC_ONEV 30000
+#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 ====
@@ -33,24 +41,32 @@ struct HEADSTAGE_INSTRUCTION {
     /** Sample rate **/
      // SampleRate = SampleRateTable[SampleRateIndex]
     uint8_t SampleRateIndex;
-    uint16_t SampleRate;
+    uint32_t SampleRate;
 
     /** DAC parameter **/
      // volt san parameter
     uint16_t VoltOrigin;
     uint16_t VoltFinal;
     uint16_t Step;
-    uint8_t  StepTime;
+    uint16_t StepTime;
+
      // constant volt
+     // which is used in CC mode as VMax and VMin
     uint16_t VoltConstant;
 
     /** ADC parameter **/
     uint8_t ADCGainLevel;
 
+    uint8_t AutoGainEnable;
+
+    /** Notify parameter **/
+    uint16_t NotifyRate;
+
     /** Constant Current Parameter **/
-    uint8_t CurrentLV;  // nA? uA? mA?
-    uint8_t ConstantCurrentRange;   // 0~499 or 500~999?
-    uint16_t ConstantCurrent;
+    // Charge is a bool; true => current > 0, vice versa
+    uint8_t Charge;
+    int32_t ConstantCurrent;
+    uint16_t VoltLimit;
 
     /** Resister Measure **/
     uint8_t ResisterMeter;
@@ -60,6 +76,12 @@ struct HEADSTAGE_INSTRUCTION {
 
     uint8_t CycleNumber;
 
+    uint8_t VoVi_Switch;
+
+    // Square current curve
+    uint16_t Pulse_Period;
+    uint16_t Pulse_Length;
+
 } INSTRUCTION = {0};
 
 /*********************************************************************
@@ -74,18 +96,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 = 24999;  // is about 0V
-    INSTRUCTION.ADCGainLevel = GAIN_200K;
-    INSTRUCTION.ResisterMeter = RESISTER_METER_SMALL;
-    INSTRUCTION.CurrentLV = 0x00;
-    INSTRUCTION.ConstantCurrent = 0x0000;
+    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
 }
 
 /*********************************************************************
@@ -101,18 +127,18 @@ static void GetInstructionParameter(uint8 *ins){
     // CurrentLV=0 => unit is nA
     // CurrentLV=1 => unit is uA
     // CurrentLV=2 => unit is mA
-    INSTRUCTION.CurrentLV = (*ins) & 0xF0;
+//    INSTRUCTION.CurrentLV = (*ins);
 
     // ConstantCurrentRange=0 => current value is 0~499
     // ConstantCurrentRange=1 => current value is 500~999
-    INSTRUCTION.ConstantCurrentRange = (*ins) & 0x0F;
+//    INSTRUCTION.ConstantCurrentRange = (*ins) & 0x0F;
 
     // ConstantCurrent divide ConstantCurrentRange into 50000 count (thus each count is 0.01)
         // e.g. 485.7 uA can be represent by
         // CurrentLV = 1 (unit is uA)
         // ConstantCurrentRange = 0 (current range is 0~499)
         // ConstantCurrent = 48570
-    INSTRUCTION.ConstantCurrent = (uint16_t) (*(ins+1))<<8 | (uint16_t) (*(ins+2));
+    INSTRUCTION.ConstantCurrent = (uint32_t) (*(ins+1))<<24 | (uint32_t) (*(ins+2))<<16 | (uint32_t) (*(ins+3))<<8 | (uint32_t) (*(ins+4));
 }
 
 #endif

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

@@ -32,6 +32,7 @@ static void EliteKeyPress(uint8_t key) {
     if (key == 0) {
         // key = 0 if press
         // press key => bight LED
+
         if (ShutDownCounter == CLOCK_ONE_SECOND) {
             KeyWorkModeLED();
         }

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

@@ -29,7 +29,7 @@ static void WorkModeLED() {
         WORKLED();
         break;
     }
-    case CYCLIC_VOLTAMMETRY: {
+    case CV_CURVE: {
         WORKLED();
         break;
     }
@@ -50,14 +50,17 @@ static void WorkModeLED() {
         break;
     }
     case VT_CURVE: {
-//        WORKLED();
+        WORKLED();
         break;
     }
     case IT_CURVE: {
         WORKLED();
         break;
     }
-
+    case CONSTANT_CURRENT:{
+        WORKLED();
+        break;
+    }
     case VIS_RST: {
         LEDPowerON();
         break;
@@ -66,6 +69,10 @@ static void WorkModeLED() {
         WORKLED();
         break;
     }
+    case READ_VOUT_VALUE: {
+        WORKLED();
+        break;
+    }
 
     default: {
         LEDPowerON();
@@ -82,7 +89,7 @@ static void KeyWorkModeLED() {
             LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
             break;
         }
-        case CYCLIC_VOLTAMMETRY:{
+        case CV_CURVE:{
             LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
             break;
         }

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

@@ -109,4 +109,27 @@ static void SendNotify() {
     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;
+
+    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
+}
+
 #endif

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

@@ -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

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

@@ -3,14 +3,17 @@
 #define ELITERESET
 
 static void reset() {
-    PeriodicEvent       = false;
-    DACReset = true;
-    CCModeReset = 1;
-    InitEliteInstruction();
-    SampleRate_counter  = 1;
-    StepTimeCounter     = 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));
+
     if (INSTRUCTION.eliteFxn == CONSTANT_CURRENT){
         INSTRUCTION.eliteFxn = 0;
 
@@ -46,14 +49,15 @@ static void reset() {
 }
 
 static void Eliteinterrupt() {
-    PeriodicEvent       = false;
-    DACReset = true;
-    CCModeReset = 1;
-    InitEliteInstruction();
-    StepTimeCounter     = 1;
-    SampleRate_counter  = 1;
+    InitFlag();
+    InitCT();
+
+    // IV/CV mode reset
+    DiscardIVFirstData = 0;
     avg_number          = 0;
     ADCRealCurrent_long = 0;
+    ADCGainControl(GAIN_AUTO);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
 
     LEDPowerON();
     for (int i = 0; i < BLE_INS_BUFF_SIZE; i++) {
@@ -85,12 +89,10 @@ static void Eliteinterrupt() {
 }
 
 static void CleanBuffer() {
-    PeriodicEvent       = false;
-    DACReset = true;
-    CCModeReset = 1;
-//    InitEliteInstruction();
-    SampleRate_counter  = 1;
-    StepTimeCounter     = 1;
+    InitFlag();
+    InitEliteInstruction();
+    InitCT();
+    DiscardIVFirstData = 0;
     avg_number          = 0;
     ADCRealCurrent_long = 0;
 

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

@@ -0,0 +1,167 @@
+
+#ifndef ELITESC
+#define ELITESC
+
+static uint16_t SCCurve(SCMode *SC) {
+    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
+
+    // reset origin volt at the begin
+    if (DACReset) {
+        DACUserCode = SC->_VOrigin;
+
+        DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
+        DAC_outputV(DACOutCode);    // output VOLT_ORIGIN
+        DACReset   = false;
+
+        return DACOutCode;
+    }
+
+    if (CT.StepTimeCounter == SC->_StepTime) {
+//        if (CT.PulseLength_counter < SC->_pulsePeriod) {
+//            if (SC->_MeasureData < (1e8 - SC->_Step)){ //  SC->_MeasureData == 1e8 => 0.1mA
+//                SC->_VStop += SC->_Step;
+//            }
+//            else if (SC->_MeasureData > (1e8 + SC->_Step)){
+//                SC->_VStop -= SC->_Step;
+//            }
+//
+//            DACUserCode = SC->_VStop;
+//        }
+//        else if (CT.PulseLength_counter < SC->_pulseLength) {
+//            if (SC->_MeasureData < (0 - SC->_Step)){ //  SC->_MeasureData == 0 => 0mA
+//                SC->_VOrigin += SC->_Step;
+//            }
+//            else if (SC->_MeasureData > (0 + SC->_Step)){
+//                SC->_VOrigin -= SC->_Step;
+//            }
+//
+//            DACUserCode = SC->_VOrigin;
+//        }
+//
+//
+//        SC->_CycleNumber--;
+//        if (SC->_CycleNumber == 0){
+//            PeriodicEvent = false;  // periodic event end
+//            DACReset      = true;
+//        }
+
+        if (CT.PulseLength_counter < SC->_pulsePeriod) {
+            //if (SC->_MeasureData > 1e10){
+                //LED_color(DARKLED, 255, 0, 0); // red when _MeasureData is larger than 10mA
+            //}
+
+            DACUserCode = SC->_VOrigin;
+        }
+        else if (CT.PulseLength_counter < SC->_pulseLength) {
+            //if (SC->_MeasureData > 1e10){
+                //LED_color(DARKLED, 0, 0, 255);  // blue when _MeasureData is larger than 10mA
+            //}
+
+            DACUserCode = SC->_VStop;
+        }
+
+        if (CT.PulseLength_counter == 1 ) SC->_CycleNumber--;
+
+        if (SC->_CycleNumber == 0){
+
+            PeriodicEvent = false;  // periodic event end
+            DACReset      = true;
+        }
+
+        DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
+        DAC_outputV(DACOutCode);
+    }
+    return DACOutCode;
+}
+
+static void SC_Plot(SCMode *SC){
+    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){
+            SC->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+            if(PreviousGain != INSTRUCTION.ADCGainLevel){
+                PreviousGain = INSTRUCTION.ADCGainLevel;
+                SC->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+                SC->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+            }
+            if(PreviousGain != INSTRUCTION.ADCGainLevel){
+                PreviousGain = INSTRUCTION.ADCGainLevel;
+                SC->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+                SC->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
+            }
+        }
+        else{
+            ReadCurrent(spi_ADC_rxbuf);
+            SC->_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]);
+//        //SC->MeasureVolt = 20000;
+//        SC->MeasureVolt = DecodeADSColt(ADC_measure);
+//        VoltCurrentSwitch++;
+//    }
+    else if(VoltCurrentSwitch < 9){
+        if(SC->_VoVi_Switch == 0x01){
+            // read volt
+            ReadVolt(spi_ADC_rxbuf);
+        }else if(SC->_VoVi_Switch == 0x00){
+             // read vout volt
+             ReadVoutVolt(spi_ADC_rxbuf);
+         }
+        VoltCurrentSwitch++;
+    }
+    else if(VoltCurrentSwitch == 9){
+        if(SC->_VoVi_Switch == 0x01){
+            /** read battery voltage **/
+            ReadVolt(spi_ADC_rxbuf);
+            ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
+            //SC->MeasureVolt = 20000;
+            SC->MeasureVolt = DecodeADCVolt(ADC_measure);
+        }else if(SC->_VoVi_Switch == 0x00){
+           /** read vout voltage **/
+            ReadVoutVolt(spi_ADC_rxbuf);
+            ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
+            SC->MeasureVolt = DecodeADCVoutVolt(ADC_measure);
+        }
+        VoltCurrentSwitch++;
+    }
+    else{
+        VoltCurrentSwitch = 0;
+    }
+
+    NotifyCurrent[0] = (uint8_t) (SC->_MeasureData >> 24);
+    NotifyCurrent[1] = (uint8_t) ((SC->_MeasureData & 0x00FF0000) >> 16);
+    NotifyCurrent[2] = (uint8_t) ((SC->_MeasureData & 0x0000FF00) >> 8);
+    NotifyCurrent[3] = (uint8_t) (SC->_MeasureData & 0x000000FF);
+
+    if ((SC->_VoVi_Switch == 0x01) || (SC->_VoVi_Switch == 0x00)){        //user see Vin || user see Vout
+        NotifyVolt[0] = (uint8_t) (SC->MeasureVolt >> 24);
+        NotifyVolt[1] = (uint8_t) ((SC->MeasureVolt & 0x00FF0000) >> 16);
+        NotifyVolt[2] = (uint8_t) ((SC->MeasureVolt & 0x0000FF00) >> 8);
+        NotifyVolt[3] = (uint8_t) (SC->MeasureVolt & 0x000000FF);
+    }
+}
+
+
+#endif

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

@@ -2,17 +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
-    ADCChannelSelect(ADC_CH_VOLT);
-    CPUdelay(10);
-    ADC_read(spi_ADC_rxbuf);
+    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

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

@@ -0,0 +1,721 @@
+/**
+*
+* 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 0b11110001
+#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
+#define SQUARE_CURR 0b00010000
+
+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 * InitTVMode(){
+    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;
+}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->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;
+}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->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*/
+
+/* SC Mode Data */ // SC mode => Square Current Mode
+typedef struct _SCMode{
+    MEASURE;
+    int32_t MeasureVolt;
+    VOUT_PARA;
+    LIMIT;
+    uint16_t _pulseLength;
+    uint16_t _pulsePeriod;
+}SCMode;
+
+SCMode *InitSCMode(){
+    SCMode *ret = malloc(sizeof(SCMode));
+    ret->_MeasureData = 0;
+    ret->MeasureVolt = (INSTRUCTION.VoltOrigin - DAC_ZERO)/5;
+
+//    ret->_VoltOut = DAC_ZERO;
+//    ret->_VOrigin = DAC_ZERO;
+//    ret->_VStop = DAC_ONEV;;
+//    ret->_Step  = 500; // approximately 10mV
+//    ret->_CycleNumber = 10;
+//    // ret->_StepTime = INSTRUCTION.StepTime;
+//    // ret->_pulseLength = INSTRUCTION.Pulse_Length; // this is pulse length, should be STEPTIME_ONE_SEC/10 or STEPTIME_ONE_SEC
+//    // ret->_pulsePeriod = INSTRUCTION.Pulse_Period; // this is pulse period, should be STEPTIME_ONE_SEC/100 or STEPTIME_ONE_SEC/10
+//
+//    ret->_pulseLength = STEPTIME_ONE_SEC / 10; // this is pulse length, should be STEPTIME_ONE_SEC/10 or STEPTIME_ONE_SEC
+//    ret->_pulsePeriod = STEPTIME_ONE_SEC / 100; // this is pulse period, should be STEPTIME_ONE_SEC/100 or STEPTIME_ONE_SEC/10
+//    ret->_StepTime = STEPTIME_ONE_SEC / 1000;
+//
+
+
+    ret->_VOrigin = INSTRUCTION.VoltOrigin;
+    ret->_VStop = INSTRUCTION.VoltFinal;;
+    ret->_Step  = INSTRUCTION.Step; // approximately 10mV
+    ret->_CycleNumber = 100;
+    ret->_StepTime = INSTRUCTION.StepTime;
+    ret->_pulsePeriod = INSTRUCTION.Pulse_Period; // this is pulse period, should be STEPTIME_ONE_SEC/100 or STEPTIME_ONE_SEC/10
+    ret->_pulseLength = INSTRUCTION.Pulse_Length; // this is pulse length, should be STEPTIME_ONE_SEC/10 or STEPTIME_ONE_SEC
+    
+
+
+//    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 SC Mode Data */
+
+/* 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;
+    SCMode *SC;
+//    CCCMode *CCC;
+    PSMode *PS;
+
+    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 = InitTVMode();
+            break;
+        case SQUARE_CURR:
+            WM->SC = InitSCMode();
+            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 SQUARE_CURR:
+            if(WM->SC != NULL){
+                free(WM->SC);
+                WM->SC = 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

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

@@ -9,62 +9,99 @@ 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() {
-    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 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;
+
+    int32_t volt_32 = 0;
+    int32_t current_32 = 0;
+    int32_t resister_32 = 0;
+
+    if(INSTRUCTION.AutoGainEnable){
+        current_32 = AutoGainReadCurrent(spi_ADC_rxbuf);
+    }
+    else{
+        ReadCurrent(spi_ADC_rxbuf);
+        current_32 = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+    }
+
+
+    volt_32 = User2Real(INSTRUCTION.VoltConstant)*1e4;
+//    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 / 1e4;
+
+    NotifyVolt[0] = (uint8_t) (volt_32 >> 24);
+    NotifyVolt[1] = (uint8_t) ((volt_32 & 0x00FF0000) >> 16);
+    NotifyVolt[2] = (uint8_t) ((volt_32 & 0x0000FF00) >> 8);
+    NotifyVolt[3] = (uint8_t) (volt_32 & 0x000000FF);
+
+    NotifyCurrent[0] = (uint8_t) (current_32 >> 24);
+    NotifyCurrent[1] = (uint8_t) ((current_32 & 0x00FF0000) >> 16);
+    NotifyCurrent[2] = (uint8_t) ((current_32 & 0x0000FF00) >> 8);
+    NotifyCurrent[3] = (uint8_t) (current_32 & 0x000000FF);
+
+    NotifyImpedance[0] = (uint8_t) (resister_32 >> 24);
+    NotifyImpedance[1] = (uint8_t) ((resister_32 & 0x00FF0000) >> 16);
+    NotifyImpedance[2] = (uint8_t) ((resister_32 & 0x0000FF00) >> 8);
+    NotifyImpedance[3] = (uint8_t) (resister_32 & 0x000000FF);
 
     // set ADC GAIN
-    if(INSTRUCTION.ResisterMeter == RESISTER_METER_SMALL){
-        INSTRUCTION.ADCGainLevel = GAIN_200R;
-    }
-    else if(INSTRUCTION.ResisterMeter == RESISTER_METER_MIDDLE1){
-        INSTRUCTION.ADCGainLevel = GAIN_200R;
-    }
-    else if(INSTRUCTION.ResisterMeter == RESISTER_METER_MIDDLE2){
-        INSTRUCTION.ADCGainLevel = GAIN_10K;
-    }
-    else{
-        INSTRUCTION.ADCGainLevel = GAIN_200K;
-    }
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
+//    if(INSTRUCTION.ResisterMeter == RESISTER_METER_LARGE){
+//        INSTRUCTION.ADCGainLevel = GAIN_200R;
+//    }
+//    else if(INSTRUCTION.ResisterMeter == RESISTER_METER_MIDDLE2){
+//        INSTRUCTION.ADCGainLevel = GAIN_200R;
+//    }
+//    else if(INSTRUCTION.ResisterMeter == RESISTER_METER_MIDDLE1){
+//        INSTRUCTION.ADCGainLevel = GAIN_10K;
+//    }
+//    else{
+//        INSTRUCTION.ADCGainLevel = GAIN_200K;
+//    }
+//    ADCGainControl(INSTRUCTION.ADCGainLevel);
 
-    if(VoltCurrentSwitch < 9){
-        ADCChannelSelect(ADC_CH_CURRENT);
-        CPUdelay(10);
-        ADC_read(SPICurrent);
-        VoltCurrentSwitch ++;
-    }
-    else if(VoltCurrentSwitch == 9){
-        // read current
-        ADCChannelSelect(ADC_CH_CURRENT);
-        CPUdelay(10);
-        ADC_read(SPICurrent);
-        CurrentMeasure = (uint16_t) (SPICurrent[0] << 8) | (uint16_t) (SPICurrent[1]);
-        VoltCurrentSwitch ++;
-    }
-    else if(VoltCurrentSwitch <18){
-        // read volt
-        ADCChannelSelect(ADC_CH_VOLT);
-        CPUdelay(10);
-        ADC_read(SPIVolt);
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 18){
-        // read volt
-        ADCChannelSelect(ADC_CH_VOLT);
-        CPUdelay(10);
-        ADC_read(SPIVolt);
-        VoltMeasure = (uint16_t) (SPIVolt[0] << 8) | (uint16_t) (SPIVolt[1]);
-        VoltCurrentSwitch++;
-    }
-    else{
-        VoltCurrentSwitch = 0;
-    }
+    // Use 9-th measure value as real-measure value
+    // because some value in the begin are garbage
+//    if(VoltCurrentSwitch < 9){
+//        ADCChannelSelect(ADC_CH_CURRENT);
+//        CPUdelay(10);
+//        ADC_read(SPICurrent);
+//        VoltCurrentSwitch ++;
+//    }
+//    else if(VoltCurrentSwitch == 9){
+//        // read current
+//        ADCChannelSelect(ADC_CH_CURRENT);
+//        CPUdelay(10);
+//        ADC_read(SPICurrent);
+//        CurrentMeasure = (uint16_t) (SPICurrent[0] << 8) | (uint16_t) (SPICurrent[1]);
+//        VoltCurrentSwitch ++;
+//    }
+//    else if(VoltCurrentSwitch <18){
+//        // read volt
+//        ADCChannelSelect(ADC_CH_VOLT);
+//        CPUdelay(10);
+//        ADC_read(SPIVolt);
+//        VoltCurrentSwitch++;
+//    }
+//    else if(VoltCurrentSwitch == 18){
+//        // read volt
+//        ADCChannelSelect(ADC_CH_VOLT);
+//        CPUdelay(10);
+//        ADC_read(SPIVolt);
+//        VoltMeasure = (uint16_t) (SPIVolt[0] << 8) | (uint16_t) (SPIVolt[1]);
+//        VoltCurrentSwitch++;
+//    }
+//    else{
+//        VoltCurrentSwitch = 0;
+//    }
 
     // decode ADC value and put it into notify buffer
-    DecodeResister(INSTRUCTION.ADCGainLevel, CurrentMeasure, VoltMeasure);
+//    DecodeResister(INSTRUCTION.ADCGainLevel, CurrentMeasure, VoltMeasure);
 //    Real_Resister = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
 }
 

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

@@ -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,
 

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

@@ -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
 
 
 =========================
@@ -190,14 +190,14 @@ MUX
 PGA
     programmable gain amplifier configuration
         (Full Scale Range = FSR)
-        000 = FSR is ��6.144 V
-        001 = FSR is ��4.096 V
-        010 = FSR is ��2.048 V (default)
-        011 = FSR is ��1.024 V
-        100 = FSR is ��0.512 V
-        101 = FSR is ��0.256 V
-        110 = FSR is ��0.256 V
-        111 = FSR is ��0.256 V
+        000 = FSR is  6.144 V
+        001 = FSR is  4.096 V
+        010 = FSR is  2.048 V (default)
+        011 = FSR is  1.024 V
+        100 = FSR is  0.512 V
+        101 = FSR is  0.256 V
+        110 = FSR is  0.256 V
+        111 = FSR is  0.256 V
 
 M
     ADC operating mode
@@ -431,6 +431,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;
 
@@ -535,6 +536,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,11 +577,11 @@ 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
 
 // real instruction
-#define IV_CURVE 0b00010000
-#define CYCLIC_VOLTAMMETRY 0b00100000
+#define IV_CURVE 0b11110001
+#define CV_CURVE 0b00100000
 #define VOLT_OUTPUT 0b00110000
 #define ZT_CURVE 0b01000000
 #define VT_CURVE 0b01010000
@@ -590,7 +592,10 @@ 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
+#define SQUARE_CURR 0b00010000
+
 
 // CIS instruction
 
@@ -601,32 +606,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] = {10, 100, 1000, 5000, 10000, 100000};  // 1 =>100 Hz, 10000=>0.01 Hz
-static uint16_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 int16_t   avg_number          = 0;
+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 CCModeReset = 1;
+static uint8_t CCModeDACEnable = 0;
 static int32_t CCModeReadCurrent();
-static int32_t CCModeOutputDAC();
-static void SetCCModeGain();
+static int32_t CCModeVoltOut();
 static void CCCurrent2IUC();
-static int32_t IUC2RealnA();
-static int32_t IUC2RealpA();
 
 // for DPVCurve SWVCurve
 static uint16_t Amplitude;
@@ -635,17 +628,29 @@ static uint16_t PulseWidth_16;
 static uint8_t  PulsePeriod;
 static uint16_t PulsePeriod_16;
 
-static uint16_t StepTime_16     = 0;
-static uint8_t  StepTimeCounter = 1;
+// counter
+struct _CT{
+    uint32_t SampleRate_counter;
+    uint16_t StepTimeCounter;
+    uint16_t NotifyCounter;
+    uint32_t StandByCounter;
+    uint32_t PulseLength_counter;
+}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 +660,12 @@ 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 SCCurve(SCMode *SC);
+static uint16_t SWVCurve(WorkMode *WorkModeData);
 
 static void reset();
 static void Eliteinterrupt();
@@ -670,6 +676,7 @@ static void SendNotify();
 static bool If10Von = false;
 static void TurnOn10V();
 
+
 #include "EliteInstruction.h"
 #include "EliteADC.h"
 #include "EliteDAC.h"
@@ -682,16 +689,20 @@ static void TurnOn10V();
 
 #include "EliteDeviceCorrection.h"
 #include "EliteNotify.h"
+#include "EliteFlagCTInit.h"
 #include "EliteReset.h"
 #include "EliteLED.h"
 #include "EliteKeyDetect.h"
 #include "EliteCCMode.h"
 #include "EliteIVCurve.h"
 #include "EliteCVCurve.h"
+#include "EliteSCCurve.h"
 #include "EliteITCurve.h"
 #include "EliteVTCurve.h"
 #include "EliteZTCurve.h"
+#include "EliteCCCMode.h"
 #include "impedance_meter.h"
+#include "EliteReadVout.h"
 
 // update instruction for Z meter
 static void update_ZM_instruction(uint8 *ins) {
@@ -700,7 +711,7 @@ static void update_ZM_instruction(uint8 *ins) {
     INSTRUCTION.chip_id = chip_ID;
 
     uint8_t oper        = ins[1] & 0xF0;  // this is don't care in RIS
-    uint8_t data_length = ins[1] & 0x0F;
+//    uint8_t data_length = ins[1] & 0x0F;
 
     if (!If10Von) {
         // TurnOn10V();
@@ -711,33 +722,37 @@ static void update_ZM_instruction(uint8 *ins) {
     case INS_TYPE_RIS: {
         switch (ins[2]) {
         case IV_CURVE: {
-            CleanBuffer();
+//            CleanBuffer();
             INSTRUCTION.eliteFxn = IV_CURVE;
             DACReset = true;
-            INSTRUCTION.SampleRate = 10;
+            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.VoVi_Switch = ins[10];
+                INSTRUCTION.VoVi_Switch = 0x00;
+//            }
             break;
         }
 
         case DIFFERENTIAL_PULSE_VOLTAMMETRY: {
-            CleanBuffer();
+//            CleanBuffer();
             INSTRUCTION.eliteFxn = DIFFERENTIAL_PULSE_VOLTAMMETRY;
             DACReset             = true;
 
@@ -768,11 +783,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,56 +817,101 @@ static void update_ZM_instruction(uint8 *ins) {
             if (ins[12]) {
                 PulseWidth = ins[12];
             }
+            if ( ins[13]) {
+                INSTRUCTION.VoVi_Switch = ins[13];
+            }
             break;
         }
 
-        case CYCLIC_VOLTAMMETRY: {
-            CleanBuffer();
-            INSTRUCTION.eliteFxn = CYCLIC_VOLTAMMETRY;
+        case CV_CURVE: {
+//            CleanBuffer();
+            INSTRUCTION.eliteFxn = CV_CURVE;
             DACReset             = true;
+            INSTRUCTION.SampleRate = 500;
 
-            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]) {
+    //                INSTRUCTION.VoltOrigin = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
+//            }
+//            if (ins[5] | ins[6]) {
                 INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
-                INSTRUCTION.VoltFinal = Usercode_Correction_to_DAC(INSTRUCTION.VoltFinal);
-            }
+    //                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 = 0x00;
+//            }
 
             break;
         }
+        case SQUARE_CURR: {
+//            CleanBuffer();
+            INSTRUCTION.eliteFxn    = SQUARE_CURR;
+            DACReset                = true;
+            INSTRUCTION.SampleRate = 100;
+
+ //            if (ins[3] | ins[4]) {
+                 INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]); // don't care, set to DAC_ZERO as default
+ //                INSTRUCTION.VoltOrigin = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
+ //            }
+ //            if (ins[5] | ins[6]) {
+                 INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]); // don't care, set to DAC_ONEV as default
+ //                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]) {
+                 INSTRUCTION.StepTime = ins[9];
+                 INSTRUCTION.StepTime = OldStep2NewStepTime(INSTRUCTION.StepTime);
+ //            }
+                 INSTRUCTION.Pulse_Period = ins[9] * 2; // Pulse Period
+                 INSTRUCTION.Pulse_Period = OldStep2NewStepTime(INSTRUCTION.Pulse_Period);
+
+                 INSTRUCTION.Pulse_Length = ins[9] * 4; // Pulse Length
+                 INSTRUCTION.Pulse_Length = OldStep2NewStepTime(INSTRUCTION.Pulse_Length);
+                
+                // set for testing
+//                INSTRUCTION.VoltOrigin = DAC_ZERO;
+//                INSTRUCTION.VoltFinal = DAC_ONEV;
+//                INSTRUCTION.Step = 500;
+//                INSTRUCTION.StepTime = STEPTIME_ONE_SEC / 1000;
+//                INSTRUCTION.Pulse_Period = STEPTIME_ONE_SEC / 100;
+//                INSTRUCTION.Pulse_Length = STEPTIME_ONE_SEC / 10;
+                
+            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;
         }
 
         // impedance test
         case ZT_CURVE: {
-            CleanBuffer();
+//            CleanBuffer();
             INSTRUCTION.eliteFxn = ZT_CURVE;
 //            INSTRUCTION.VoltConstant = ( ((uint16_t)(ins[3])) << 8) | (uint16_t)(ins[4]);
             break;
         }
 
         case VT_CURVE: {
-            CleanBuffer();
+//            CleanBuffer();
             INSTRUCTION.eliteFxn = VT_CURVE;
             //                    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
             //                    VT_Plot(); // enable 10v = 0
@@ -856,7 +919,7 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case IT_CURVE: {
-            CleanBuffer();
+//            CleanBuffer();
             INSTRUCTION.eliteFxn = IT_CURVE;
             //            IT_Plot(); // enable 10v = 1
             break;
@@ -864,7 +927,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: {
@@ -881,19 +944,52 @@ static void update_ZM_instruction(uint8 *ins) {
 
         case CONSTANT_CURRENT:{
             INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
-//            CURRENT_USER_CODE *CurrentUserCode = InitCurrentUserCode();
-            GetInstructionParameter(ins+2);
-            CCCurrent2IUC();
+            INSTRUCTION.SampleRate = 2;
+            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){
+                INSTRUCTION.AutoGainEnable = 0;
+            }
+            else{
+                INSTRUCTION.AutoGainEnable = 1;
+            }
+//            if(INSTRUCTION.ADCGainLevel == GAIN_200R){
+//                LED_color(DARKLED, 0x0F, 0x00, 0x00);
+//            }
+//            else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
+//                LED_color(DARKLED, 0x0F, 0x00, 0x0F);
+//            }
+//            else if(INSTRUCTION.ADCGainLevel == GAIN_200K){
+//                LED_color(DARKLED, 0x0F, 0x02, 0xFF);
+//            }
             break;
         }
 
-        case 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;
         }
 
@@ -902,15 +998,27 @@ static void update_ZM_instruction(uint8 *ins) {
             int32_t ADCRealValue = 0;
             uint8_t CIS_buf[9]   = {0};
 
-            ADCGainControl(ins[3]);
-            ADCChannelSelect(ins[4]);
-            CPUdelay(1600);
-            ADC_read(spi_ADC_rxbuf);
+//            for(int i=0 ; i<10 ; i++){
+                ADCGainControl(ins[3]);
+                ADCChannelSelect(ins[4]);
+                CPUdelay(10);
+                ADC_read(spi_ADC_rxbuf);
+//                CPUdelay(10);
+//
+//                ADCValueTemp = ( uint16_t) (spi_ADC_rxbuf[0]) << 8 | (uint16_t) (spi_ADC_rxbuf[1]);
+//                ADCValueAVG = ADCValueAVG + ADCValueTemp;
+//            }
+//            ADCValueAVG = ADCValueAVG / 10;
+//            ADCValueTemp = (uint16_t) (ADCValueAVG);
 
             CIS_buf[0] = chip_ID;
-            for (int i = 0; i < 4; i++) {
-                CIS_buf[i + 1] = spi_ADC_rxbuf[i];
+            for(int i=0; i<4 ; i++){
+                CIS_buf[i+1] = spi_ADC_rxbuf[i];
             }
+//            CIS_buf[1] = (uint8_t) ((ADCValueTemp & 0xFF00) >> 8);
+//            CIS_buf[2] = (uint8_t) (ADCValueTemp & 0x00FF);
+//            CIS_buf[3] = spi_ADC_rxbuf[2];
+//            CIS_buf[4] = spi_ADC_rxbuf[3];
 
             // decode ADC measure value
             ADCRealValue = DecodeADCValue(ins[3], ins[4], spi_ADC_rxbuf);
@@ -971,6 +1079,9 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case VIS_STI: {
+            for(int i=0 ; i<12 ; i++){
+                FlushNotify();
+            }
             PeriodicEvent = true;
             break;
         }
@@ -982,26 +1093,29 @@ 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;
         }

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

@@ -1,7 +1,7 @@
 /*
  * impedance_meter.h
  *
- *  Created on: 2019�~1��15��
+ *  Created on: 2019/01/15
  *      Author: benny
  */
 #ifndef HEADSTAGE_H
@@ -19,8 +19,9 @@
 // header
 #include <ti/drivers/PIN.h>
 #include "board.h"
+#include "EliteWorkData.h"
 
-static void SimpleBLEPeripheral_performPeriodicTask();
+static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData);
 
 static void SimpleBLEPeripheral_clockHandler(UArg arg) {
     // Store the event.
@@ -51,7 +52,7 @@ static void ZM_init() {
     PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
 
     InitEliteInstruction();
-    InitCurrentUserCode();
+    ADCGainControl(GAIN_AUTO);
     elite_gptimer_open();
 
     //    PIN_registerIntCb(pin_handle, switch_on_callback);
@@ -73,10 +74,13 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 
 #define IsPeriodicMode() (  \
 (INSTRUCTION.eliteFxn == IV_CURVE) || \
+(INSTRUCTION.eliteFxn == CV_CURVE) || \
 (INSTRUCTION.eliteFxn == IT_CURVE) || \
 (INSTRUCTION.eliteFxn == VT_CURVE) || \
 (INSTRUCTION.eliteFxn == ZT_CURVE) || \
-(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)  \
+(INSTRUCTION.eliteFxn == SQUARE_CURR) || \
+(INSTRUCTION.eliteFxn == CONSTANT_CURRENT) || \
+(INSTRUCTION.eliteFxn == READ_VOUT_VALUE)  \
 )
 
 /*********************************************************************
@@ -88,60 +92,121 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
  *
  * @return  None.
  */
-static void SimpleBLEPeripheral_performPeriodicTask() {
+static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
     if ( IsPeriodicMode() ){
 
-        // XXX Using nwe clock => StepTime/SampleRate should change
-        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 ++;
+        }
+
+        // Pulse Length counter (Square Current Curve)
+        if (CT.PulseLength_counter == INSTRUCTION.Pulse_Length){
+            CT.PulseLength_counter = 1;
+        }
+        else{
+            CT.PulseLength_counter ++;
         }
 
         /** 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();
+        EliteDACControl(WorkModeData);
 
         // Control ADC to sample rate
-        EliteADCControl();
+        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() {
+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 == SQUARE_CURR){
+            VoltScan(WorkModeData);
     }
     else if (INSTRUCTION.eliteFxn == ZT_CURVE){
         if(INSTRUCTION.ResisterMeter == RESISTER_METER_SMALL){
-            // output 5mV
-            INSTRUCTION.VoltConstant = 24999 + 50;
-            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+            // output 1V
+            if (DACReset) {
+                INSTRUCTION.VoltConstant = 25000 + 5000;
+                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+                DACReset = false;
+            }
         }
         else{
-            // output 100mV
-            INSTRUCTION.VoltConstant = 24999 + 500;
-            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+            // output 1V
+            if (DACReset) {
+                INSTRUCTION.VoltConstant = 25000 + 5000;
+                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+                DACReset = false;
+            }
         }
     }
-    else if(INSTRUCTION.ResisterMeter == CONSTANT_CURRENT){
-        DAC_outputV(Usercode_Correction_to_DAC(CurrentUserCode.value));
+    else if(INSTRUCTION.eliteFxn == CONSTANT_CURRENT){
+        if (DACReset) {
+            DAC_outputV(Usercode_Correction_to_DAC(25000));
+            DACReset = false;
+        }
+        CCModeVoltOut(WorkModeData->CC);
     }
 
     else{
@@ -150,31 +215,56 @@ static void EliteDACControl() {
     }
 }
 
-static void EliteADCControl() {
-    if (SampleRate_counter == INSTRUCTION.SampleRate) {
+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:{
+                CV_Plot(WorkModeData->CV);
+                break;
+            }
+            case SQUARE_CURR:{
+                SC_Plot(WorkModeData->SC);
                 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();
+                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;
             }
         }
@@ -182,17 +272,21 @@ static void EliteADCControl() {
 }
 
 static void EliteNotifyControl() {
-    if ((INSTRUCTION.eliteFxn == IV_CURVE)) {
+    if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == SQUARE_CURR)) {
         // output the last notify, and reset Elite
         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();
     }
 }
@@ -208,7 +302,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

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

@@ -529,7 +529,7 @@ static void SimpleBLEPeripheral_init(void) {
 }
 
 
-
+#include "EliteWorkData.h"
 /*********************************************************************
  * @fn      SimpleBLEPeripheral_taskFxn
  *
@@ -551,13 +551,14 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
 
     ZM_init();
     Elite_SPI_init();
+    WorkMode *WorkModeData = CreateWorkMode();
 
     uint8_t key         = 0;
     uint16_t counter6994 = 0;
     bool    EliteOn     = 0;
 
     // init DAC, set output ~= 0 V
-    DAC_outputV(Usercode_Correction_to_DAC(24999));
+    DAC_outputV(Usercode_Correction_to_DAC(25000));
     elite_gptimer_start();
 
     // Application main loops
@@ -626,14 +627,26 @@ 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();
+                SimpleBLEPeripheral_performPeriodicTask(WorkModeData);
 
                 key = PIN_getInputValue(switch_on);
                 EliteKeyPress(key);  // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650