Compare commits
196 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Benny Liu
|
17c866c5c6 | ||
|
Benny Liu
|
eb1b4ddf30 | ||
|
Benny Liu
|
52139ec1b1 | ||
|
Benny Liu
|
142c8c38e1 | ||
|
Benny Liu
|
e1acbf5681 | ||
|
Benny Liu
|
3e8bbbeaf8 | ||
|
Benny Liu
|
b0ced97ffb | ||
|
Benny Liu
|
67a82d0cb1 | ||
|
YiChin
|
cf876bfaf9 | ||
|
YiChin
|
2fe991a23b | ||
|
YiChin
|
b9f8938c0e | ||
|
Benny Liu
|
14129b8b3c | ||
|
YiChin
|
502daf7204 | ||
|
YiChin
|
3013e88dca | ||
|
YiChin
|
d37cf0f694 | ||
|
YiChin
|
4cf062fb06 | ||
|
YiChin
|
4a8e090ff1 | ||
|
YiChin
|
576df09f24 | ||
|
YiChin
|
3a01d5cc2c | ||
|
YiChin
|
165c89e6aa | ||
|
YiChin
|
9eaedfc0e5 | ||
|
YiChin
|
5eba9eff3a | ||
|
Benny Liu
|
b985a09863 | ||
|
YiChin
|
68aa82bbd8 | ||
|
Benny Liu
|
6b1c0ca9aa | ||
|
YiChin
|
d176628edb | ||
|
YiChin
|
8548712049 | ||
|
YiChin
|
bc819082cc | ||
|
YiChin
|
64fb0fc78a | ||
|
YiChin
|
0a4303dff0 | ||
|
YiChin
|
caa0bfaf8d | ||
|
Benny Liu
|
c6e300bfff | ||
|
YiChin
|
cf1d92d9ec | ||
|
YiChin
|
25796a879d | ||
|
Benny Liu
|
f6e8385a8f | ||
|
Benny Liu
|
b52ea2fe1e | ||
|
YiChin
|
2a6920a3d3 | ||
|
YiChin
|
fac1427eb6 | ||
|
Benny Liu
|
ed13172c92 | ||
|
YiChin
|
07ebae4f64 | ||
|
Benny Liu
|
1391ebd695 | ||
|
YiChin
|
6cf988a54c | ||
|
YiChin
|
76b74b53f9 | ||
|
YiChin
|
786991d971 | ||
|
YiChin
|
c33b46521e | ||
|
YiChin
|
fc41b62329 | ||
|
YiChin
|
ab2eeb7f96 | ||
|
YiChin
|
bc3106fc26 | ||
|
YiChin
|
f2d404ed60 | ||
|
YiChin
|
53038c0c84 | ||
|
YiChin
|
b835a0136b | ||
|
YiChin
|
e12102a8a7 | ||
|
YiChin
|
728b9ae8bf | ||
|
YiChin
|
9f5a6a09de | ||
|
YiChin
|
d26da674f5 | ||
|
YiChin
|
b781023863 | ||
|
YiChin
|
a42f6441fa | ||
|
YiChin
|
2c4122bb77 | ||
|
YiChin
|
a05b81a7b4 | ||
|
YiChin
|
2c8cc334e2 | ||
|
YiChin
|
59786e995f | ||
|
YiChin
|
ebc1d29195 | ||
|
YiChin
|
2d8d706141 | ||
|
YiChin
|
eb25a2e674 | ||
|
YiChin
|
241ff38555 | ||
|
YiChin
|
059bc76536 | ||
|
YiChin
|
4678e304ee | ||
|
YiChin
|
db7d1e1141 | ||
|
YiChin
|
218997b6b3 | ||
|
YiChin
|
f05c37d53e | ||
|
YiChin
|
90767f36e5 | ||
|
YiChin
|
81b1ff935a | ||
|
YiChin
|
0f5f228707 | ||
|
YiChin
|
f0ea8bfcf5 | ||
|
YiChin
|
a2f0d62819 | ||
|
YiChin
|
e238d117a9 | ||
|
YiChin
|
82dbe82bd1 | ||
|
Benny Liu
|
8ba6180c8c | ||
|
Benny Liu
|
e2d5470b47 | ||
|
YiChin
|
2532e703ae | ||
|
Benny Liu
|
10497683c8 | ||
|
YiChin
|
53932d4cb3 | ||
|
YiChin
|
7b0f5ce687 | ||
|
YiChin
|
653c2059e2 | ||
|
YiChin
|
5c949be67c | ||
|
YiChin
|
c73ab1bbd4 | ||
|
YiChin
|
083cbb0611 | ||
|
YiChin
|
f998c01010 | ||
|
YiChin
|
faf57cba6a | ||
|
YiChin
|
83b70de310 | ||
|
YiChin
|
b4fb63f1e8 | ||
|
YiChin
|
832fe1695f | ||
|
YiChin
|
d6b6b65e5f | ||
|
YiChin
|
1698f0b544 | ||
|
YiChin
|
d10a6d16a8 | ||
|
YiChin
|
f864acfa26 | ||
|
YiChin
|
ba7703a772 | ||
|
YiChin
|
b7739ab42d | ||
|
YiChin
|
a6208f00d0 | ||
|
YiChin
|
c53a2d8872 | ||
|
YiChin
|
9c69e16046 | ||
|
YiChin
|
cc57bc47a6 | ||
|
YiChin
|
b2b07ae05f | ||
|
YiChin
|
fec9ddcdf8 | ||
|
YiChin
|
3eb17d14e6 | ||
|
YiChin
|
8ca4eb3812 | ||
|
YiChin
|
8341560686 | ||
|
YiChin
|
39f39773b8 | ||
|
YiChin
|
a01c9b9dc0 | ||
|
YiChin
|
124ca6ea84 | ||
|
YiChin
|
befb4f80e2 | ||
|
Roy
|
5a7980dca5 | ||
|
YiChin
|
889a3d4147 | ||
|
YiChin
|
0245adae4a | ||
|
YiChin
|
8b94eaa6dd | ||
|
YiChin
|
323dc2cf77 | ||
|
YiChin
|
e89cd406e4 | ||
|
YiChin
|
8de29a213c | ||
|
YiChin
|
571edc35aa | ||
|
YiChin
|
ee04ca568e | ||
|
YiChin
|
67ef9adad1 | ||
|
YiChin
|
4ec0bb12f7 | ||
|
YiChin
|
5f5921e411 | ||
|
YiChin
|
da6a3f90f9 | ||
|
YiChin
|
21135acf32 | ||
|
YiChin
|
b8e052de0d | ||
|
YiChin
|
cf33bcba2a | ||
|
YiChin
|
45e7e2d5b7 | ||
|
YiChin
|
04286e891d | ||
|
YiChin
|
2e4720c607 | ||
|
YiChin
|
5333cd9c98 | ||
|
YiChin
|
a116cbfa3e | ||
|
YiChin
|
bae6a4bce3 | ||
|
YiChin
|
bc10083c25 | ||
|
YiChin
|
6f7cea2590 | ||
|
YiChin
|
f3c010ebf8 | ||
|
YiChin
|
ffbdd27df0 | ||
|
YiChin
|
4f9fb2b8fb | ||
|
Benny Liu
|
f7d2b168d4 | ||
|
YiChin
|
5a9a3754e7 | ||
|
YiChin
|
97040855af | ||
|
YiChin
|
77ee73a878 | ||
|
YiChin
|
cbd8f96f60 | ||
|
YiChin
|
631396c50e | ||
|
YiChin
|
d25103373e | ||
|
YiChin
|
8ddb66393d | ||
|
YiChin
|
f8d37fcf20 | ||
|
YiChin
|
a22253e384 | ||
|
YiChin
|
116d4cfb76 | ||
|
YiChin
|
bd070a4ce8 | ||
|
YiChin
|
5beb62613f | ||
|
YiChin
|
e27204bd50 | ||
|
YiChin
|
34e9c644c5 | ||
|
YiChin
|
74d2024731 | ||
|
YiChin
|
7615f141ef | ||
|
YiChin
|
38a45cdb1d | ||
|
YiChin
|
9623751337 | ||
|
YiChin
|
dbf25c5712 | ||
|
yichin
|
7b2a51ee24 | ||
|
yichin
|
bf57c10785 | ||
|
yichin
|
854e82a198 | ||
|
yichin
|
3107807268 | ||
|
YiChin
|
dff6c0a9e2 | ||
|
royluo
|
8480f60266 | ||
|
YiChin
|
8808490caa | ||
|
YiChin
|
59a4d9dafe | ||
|
yichin
|
1d8d987d22 | ||
|
yichin
|
5538e13e69 | ||
|
YiChin
|
1b75ccb056 | ||
|
YiChin
|
131051e227 | ||
|
YiChin
|
e0e116b1d1 | ||
|
YiChin
|
9a9cf40c74 | ||
|
YiChin
|
246052bf9c | ||
|
yichin
|
66229c2821 | ||
|
YiChin
|
347259fe7e | ||
|
YiChin
|
d1b3aa9506 | ||
|
yichin
|
6cdecd9e87 | ||
|
YiChin
|
56937a0780 | ||
|
YiChin
|
cb1ca49985 | ||
|
YiChin
|
7e9dfbc4c2 | ||
|
YiChin
|
d86b008bb1 | ||
|
Roy
|
ceac955327 | ||
|
yichin
|
64effd5a02 | ||
|
YiChin
|
c7d531f0a5 | ||
|
YiChin
|
37caa92565 | ||
|
YiChin
|
4c04c57728 | ||
|
YiChin
|
9bc16f7687 | ||
|
YiChin
|
e11eae5302 | ||
|
YiChin
|
2269a2b4d7 | ||
|
YiChin
|
3ffa567f1b | ||
|
YiChin
|
de4d766ed5 | ||
|
YiChin
|
7b5d46edff | ||
|
YiChin
|
7399ddce01 | ||
|
YiChin
|
7e16a54533 | ||
|
YiChin
|
778495a07a | ||
|
YiChin
|
527a90f732 |
-19
File diff suppressed because one or more lines are too long
-32
@@ -1,32 +0,0 @@
|
||||
eclipse.preferences.version=1
|
||||
encoding//FlashROM/Application/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/Application/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/Display/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/Display/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/ECC/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/ECC/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/PIN/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/PIN/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/RF/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/RF/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/SPI/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/SPI/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/TRNG/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/TRNG/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/UART/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/UART/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/UDMA/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/Drivers/UDMA/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/ICall/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/ICall/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/ICallBLE/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/ICallBLE/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/PROFILES/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/PROFILES/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/Startup/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/Startup/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/TOOLS/subdir_rules.mk=UTF-8
|
||||
encoding//FlashROM/TOOLS/subdir_vars.mk=UTF-8
|
||||
encoding//FlashROM/makefile=UTF-8
|
||||
encoding//FlashROM/objects.mk=UTF-8
|
||||
encoding//FlashROM/sources.mk=UTF-8
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<configurations XML_version="1.2" id="configurations_0">
|
||||
<configuration XML_version="1.2" id="configuration_0">
|
||||
<instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
|
||||
<connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe">
|
||||
<instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
|
||||
<instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
|
||||
<instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
|
||||
<property Type="choicelist" Value="2" id="The Converter Usage">
|
||||
<choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
|
||||
<property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
|
||||
<choice Name="Overclock with user specified value" value="unused">
|
||||
<property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
|
||||
</choice>
|
||||
</property>
|
||||
<property Type="choicelist" Value="5" id="The Target Scan Format"/>
|
||||
</choice>
|
||||
</property>
|
||||
<platform XML_version="1.2" id="platform_0">
|
||||
<instance XML_version="1.2" desc="CC2640F128" href="devices/cc2640f128.xml" id="CC2640F128" xml="cc2640f128.xml" xmlpath="devices"/>
|
||||
</platform>
|
||||
</connection>
|
||||
</configuration>
|
||||
</configurations>
|
||||
-25
@@ -1,25 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<configurations XML_version="1.2" id="configurations_0">
|
||||
<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
|
||||
<instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
|
||||
<connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
|
||||
<instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
|
||||
<instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
|
||||
<instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
|
||||
<property Type="choicelist" Value="1" id="Power Selection">
|
||||
<choice Name="Probe supplied power" value="1">
|
||||
<property Type="stringfield" Value="3.3" id="Voltage Level"/>
|
||||
</choice>
|
||||
</property>
|
||||
<property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
|
||||
<property Type="choicelist" Value="4" id="SWD Mode Settings">
|
||||
<choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
|
||||
<property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
|
||||
</choice>
|
||||
</property>
|
||||
<platform XML_version="1.2" id="platform_0">
|
||||
<instance XML_version="1.2" desc="CC2650F128_0" href="devices/cc2650f128.xml" id="CC2650F128_0" xml="cc2650f128.xml" xmlpath="devices"/>
|
||||
</platform>
|
||||
</connection>
|
||||
</configuration>
|
||||
</configurations>
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
The 'targetConfigs' folder contains target-configuration (.ccxml) files, automatically generated based
|
||||
on the device and connection settings specified in your project on the Properties > General page.
|
||||
|
||||
Please note that in automatic target-configuration management, changes to the project's device and/or
|
||||
connection settings will either modify an existing or generate a new target-configuration file. Thus,
|
||||
if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
|
||||
you may create your own target-configuration file for this project and manage it manually. You can
|
||||
always switch back to automatic target-configuration management by checking the "Manage the project's
|
||||
target-configuration automatically" checkbox on the project's Properties > General page.
|
||||
@@ -1 +0,0 @@
|
||||
This file exists to prevent Eclipse/CDT from adding the C sources contained in this directory (or below) to any enclosing project.
|
||||
-62
@@ -1,62 +0,0 @@
|
||||
#
|
||||
# This file was generated based on the configuration script:
|
||||
# C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_central\ccs\config\app_ble.cfg
|
||||
#
|
||||
# This makefile may be included in other makefiles that need to build
|
||||
# the libraries containing the compiled source files generated as
|
||||
# part of the configuration step.
|
||||
|
||||
#
|
||||
# ======== GEN_SRC_DIR =========
|
||||
# The path to the sources generated during configuration
|
||||
#
|
||||
# This path must be either absolute or relative to the build directory.
|
||||
#
|
||||
# The absolute path to the generated source directory (at the time the
|
||||
# sources were generated) is:
|
||||
# C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_central\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")
|
||||
endif
|
||||
|
||||
#
|
||||
# ======== .force ========
|
||||
# The .force goal is used to force the build of any goal that names it as
|
||||
# a prerequisite
|
||||
#
|
||||
.PHONY: .force
|
||||
|
||||
#
|
||||
# ======== library macros ========
|
||||
#
|
||||
sysbios_SRC = $(GEN_SRC_DIR)/sysbios
|
||||
sysbios_LIB = $(GEN_SRC_DIR)/sysbios/rom_sysbios.aem3
|
||||
|
||||
#
|
||||
# ======== dependencies ========
|
||||
#
|
||||
all: $(sysbios_LIB)
|
||||
clean: .sysbios_clean
|
||||
|
||||
|
||||
# ======== convenient build goals ========
|
||||
.PHONY: sysbios
|
||||
sysbios: $(GEN_SRC_DIR)/sysbios/rom_sysbios.aem3
|
||||
|
||||
# CDT managed make executables depend on $(OBJS)
|
||||
OBJS += $(sysbios_LIB)
|
||||
|
||||
#
|
||||
# ======== rules ========
|
||||
#
|
||||
$(sysbios_LIB): .force
|
||||
@echo making $@ ...
|
||||
@$(MAKE) -C $(sysbios_SRC)
|
||||
|
||||
.sysbios_clean:
|
||||
@echo cleaning $(sysbios_SRC) ...
|
||||
-@$(MAKE) --no-print-directory -C $(sysbios_SRC) clean
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
-107
@@ -1,107 +0,0 @@
|
||||
|
||||
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
|
||||
|
||||
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/
|
||||
|
||||
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/
|
||||
|
||||
BIOS_ROOT = C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
|
||||
|
||||
BIOS_DEFS = -Dti_sysbios_BIOS_swiEnabled__D=TRUE -Dti_sysbios_BIOS_taskEnabled__D=TRUE -Dti_sysbios_BIOS_clockEnabled__D=TRUE -Dti_sysbios_BIOS_runtimeCreatesEnabled__D=TRUE -Dti_sysbios_knl_Task_moduleStateCheckFlag__D=FALSE -Dti_sysbios_knl_Task_objectCheckFlag__D=FALSE -Dti_sysbios_hal_Hwi_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Swi_DISABLE_ALL_HOOKS -Dti_sysbios_BIOS_smpEnabled__D=FALSE -Dti_sysbios_Build_useHwiMacros -Dti_sysbios_knl_Swi_numPriorities__D=6 -Dti_sysbios_knl_Task_deleteTerminatedTasks__D=FALSE -Dti_sysbios_knl_Task_numPriorities__D=6 -Dti_sysbios_knl_Task_checkStackFlag__D=FALSE -Dti_sysbios_knl_Task_initStackFlag__D=TRUE -Dti_sysbios_knl_Task_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Clock_TICK_SOURCE=ti_sysbios_knl_Clock_TickSource_TIMER -Dti_sysbios_knl_Clock_TICK_MODE=ti_sysbios_knl_Clock_TickMode_DYNAMIC -Dti_sysbios_hal_Core_delegate_getId=ti_sysbios_hal_CoreNull_getId__E -Dti_sysbios_hal_Core_delegate_interruptCore=ti_sysbios_hal_CoreNull_interruptCore__E -Dti_sysbios_hal_Core_delegate_lock=ti_sysbios_hal_CoreNull_lock__E -Dti_sysbios_hal_Core_delegate_unlock=ti_sysbios_hal_CoreNull_unlock__E -Dti_sysbios_hal_Core_numCores__D=1 -Dti_sysbios_hal_CoreNull_numCores__D=1 -Dti_sysbios_utils_Load_taskEnabled__D=TRUE -Dti_sysbios_utils_Load_swiEnabled__D=FALSE -Dti_sysbios_utils_Load_hwiEnabled__D=FALSE -Dti_sysbios_family_arm_m3_Hwi_dispatcherSwiSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherTaskSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherAutoNestingSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherIrpTrackingSupport__D=TRUE -Dti_sysbios_knl_Semaphore_supportsEvents__D=FALSE -Dti_sysbios_knl_Semaphore_supportsPriority__D=FALSE -Dxdc_runtime_Assert_DISABLE_ALL -Dxdc_runtime_Log_DISABLE_ALL
|
||||
|
||||
BIOS_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
|
||||
|
||||
TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
|
||||
|
||||
INCS = $(BIOS_INC) $(TARGET_INC) --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_central/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/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272" -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/
|
||||
|
||||
CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
|
||||
ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
|
||||
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
|
||||
|
||||
define RM
|
||||
$(if $(wildcard $1),$(DEL) $1,:)
|
||||
endef
|
||||
|
||||
define ASSEMBLE
|
||||
@echo asmem3 $< ...
|
||||
@$(ASM) $(BIOS_DEFS) $(XOPTS) $(INCS) $<
|
||||
endef
|
||||
|
||||
all: rom_sysbios.aem3
|
||||
|
||||
m3_Hwi_asm.obj: family/arm/m3/Hwi_asm.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_Hwi_asm.obj
|
||||
|
||||
m3_Hwi_asm_switch.obj: family/arm/m3/Hwi_asm_switch.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_Hwi_asm_switch.obj
|
||||
|
||||
m3_IntrinsicsSupport_asm.obj: family/arm/m3/IntrinsicsSupport_asm.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_IntrinsicsSupport_asm.obj
|
||||
|
||||
m3_TaskSupport_asm.obj: family/arm/m3/TaskSupport_asm.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_TaskSupport_asm.obj
|
||||
|
||||
|
||||
rom_sysbios.obj: BIOS.c knl/Clock.c knl/Idle.c knl/Intrinsics.c knl/Event.c knl/Mailbox.c knl/Queue.c knl/Semaphore.c knl/Swi.c knl/Swi_andn.c knl/Task.c family/arm/m3/Hwi.c family/arm/m3/TaskSupport.c family/arm/cc26xx/Boot.c family/arm/cc26xx/Timer.c family/arm/cc26xx/TimestampProvider.c hal/Hwi.c hal/Hwi_stack.c hal/Hwi_startup.c gates/GateHwi.c gates/GateMutex.c heaps/HeapMem.c xdc/runtime/xdc_noinit.c xdc/runtime/Assert.c xdc/runtime/Core-mem.c xdc/runtime/Core-smem.c xdc/runtime/Core-label.c xdc/runtime/Core-params.c xdc/runtime/Diags.c xdc/runtime/Error.c xdc/runtime/Gate.c xdc/runtime/Log.c xdc/runtime/Memory.c xdc/runtime/Registry.c xdc/runtime/Startup.c xdc/runtime/System.c xdc/runtime/SysCallback.c xdc/runtime/Text.c xdc/runtime/Timestamp.c makefile
|
||||
@-$(call RM, $@)
|
||||
@echo clem3 $< ...
|
||||
@$(CC) $(BIOS_DEFS) $(XOPTS) $(INCS) --output_file=rom_sysbios.obj \
|
||||
$(BIOS_ROOT)BIOS.c \
|
||||
$(BIOS_ROOT)knl/Clock.c \
|
||||
$(BIOS_ROOT)knl/Idle.c \
|
||||
$(BIOS_ROOT)knl/Intrinsics.c \
|
||||
$(BIOS_ROOT)knl/Event.c \
|
||||
$(BIOS_ROOT)knl/Mailbox.c \
|
||||
$(BIOS_ROOT)knl/Queue.c \
|
||||
$(BIOS_ROOT)knl/Semaphore.c \
|
||||
$(BIOS_ROOT)knl/Swi.c \
|
||||
$(BIOS_ROOT)knl/Swi_andn.c \
|
||||
$(BIOS_ROOT)knl/Task.c \
|
||||
$(BIOS_ROOT)family/arm/m3/Hwi.c \
|
||||
$(BIOS_ROOT)family/arm/m3/TaskSupport.c \
|
||||
$(BIOS_ROOT)family/arm/cc26xx/Boot.c \
|
||||
$(BIOS_ROOT)family/arm/cc26xx/Timer.c \
|
||||
$(BIOS_ROOT)family/arm/cc26xx/TimestampProvider.c \
|
||||
$(BIOS_ROOT)hal/Hwi.c \
|
||||
$(BIOS_ROOT)hal/Hwi_stack.c \
|
||||
$(BIOS_ROOT)hal/Hwi_startup.c \
|
||||
$(BIOS_ROOT)gates/GateHwi.c \
|
||||
$(BIOS_ROOT)gates/GateMutex.c \
|
||||
$(BIOS_ROOT)heaps/HeapMem.c \
|
||||
$(XDC_ROOT)xdc/runtime/xdc_noinit.c \
|
||||
$(XDC_ROOT)xdc/runtime/Assert.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-mem.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-smem.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-label.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-params.c \
|
||||
$(XDC_ROOT)xdc/runtime/Diags.c \
|
||||
$(XDC_ROOT)xdc/runtime/Error.c \
|
||||
$(XDC_ROOT)xdc/runtime/Gate.c \
|
||||
$(XDC_ROOT)xdc/runtime/Log.c \
|
||||
$(XDC_ROOT)xdc/runtime/Memory.c \
|
||||
$(XDC_ROOT)xdc/runtime/Registry.c \
|
||||
$(XDC_ROOT)xdc/runtime/Startup.c \
|
||||
$(XDC_ROOT)xdc/runtime/System.c \
|
||||
$(XDC_ROOT)xdc/runtime/SysCallback.c \
|
||||
$(XDC_ROOT)xdc/runtime/Text.c \
|
||||
$(XDC_ROOT)xdc/runtime/Timestamp.c \
|
||||
|
||||
rom_sysbios.aem3: rom_sysbios.obj m3_Hwi_asm.obj m3_Hwi_asm_switch.obj m3_IntrinsicsSupport_asm.obj m3_TaskSupport_asm.obj
|
||||
@-$(call RM, $@)
|
||||
@echo arem3 $^ ...
|
||||
@$(AR) $@ $^ C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/rom/cortexm/cc26xx/golden/CC26xx/rom_sysbios_config.obj
|
||||
|
||||
clean:
|
||||
@$(DEL) ..\makefile.libs
|
||||
@-$(call RM, *)
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
+24
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<configurations XML_version="1.2" id="configurations_0">
|
||||
<configuration XML_version="1.2" id="configuration_0">
|
||||
<instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
|
||||
<connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe">
|
||||
<instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
|
||||
<instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
|
||||
<instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
|
||||
<property Type="choicelist" Value="2" id="The Converter Usage">
|
||||
<choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
|
||||
<property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
|
||||
<choice Name="Overclock with user specified value" value="unused">
|
||||
<property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
|
||||
</choice>
|
||||
</property>
|
||||
<property Type="choicelist" Value="5" id="The Target Scan Format"/>
|
||||
</choice>
|
||||
</property>
|
||||
<platform XML_version="1.2" id="platform_0">
|
||||
<instance XML_version="1.2" desc="CC2640F128" href="devices/cc2640f128.xml" id="CC2640F128" xml="cc2640f128.xml" xmlpath="devices"/>
|
||||
</platform>
|
||||
</connection>
|
||||
</configuration>
|
||||
</configurations>
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
The 'targetConfigs' folder contains target-configuration (.ccxml) files, automatically generated based
|
||||
on the device and connection settings specified in your project on the Properties > General page.
|
||||
|
||||
Please note that in automatic target-configuration management, changes to the project's device and/or
|
||||
connection settings will either modify an existing or generate a new target-configuration file. Thus,
|
||||
if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
|
||||
you may create your own target-configuration file for this project and manage it manually. You can
|
||||
always switch back to automatic target-configuration management by checking the "Manage the project's
|
||||
target-configuration automatically" checkbox on the project's Properties > General page.
|
||||
+1
-1
@@ -9,6 +9,6 @@
|
||||
<linkerCommandFile value="cc26x0f128.cmd"/>
|
||||
<rts value="libc.a"/>
|
||||
<createSlaveProjects value=""/>
|
||||
<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
|
||||
<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
|
||||
<isTargetManual value="false"/>
|
||||
</projectOptions>
|
||||
|
||||
+55
-55
@@ -18,8 +18,8 @@
|
||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||
<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out" prebuildStep="">
|
||||
<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137." name="/" resourcePath="">
|
||||
<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.1345831464" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.910616164">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.2045697190" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
|
||||
<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.410623502" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1351821865">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1751124300" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
|
||||
<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
|
||||
<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
|
||||
<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
|
||||
@@ -34,17 +34,17 @@
|
||||
<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
|
||||
<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
|
||||
</option>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.283826897" 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.125763109" 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.1419681234" 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.1291803638" 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.2050886614" 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.1108409502" 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.334261891" 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.1886558187" 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.325362832" 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.1194031570" 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.443206607" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.277675815" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
|
||||
<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1593934674" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
|
||||
<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.632414212" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
|
||||
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.154623462" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.974280107" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1783826131" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1536570599" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1895413316" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.322983319" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.1305400753" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1468985930" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
|
||||
<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
|
||||
<listOptionValue builtIn="false" value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\simple_peripheral\cc26xx\app\headstage"/>
|
||||
<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/cc26xx/app"/>
|
||||
@@ -70,7 +70,7 @@
|
||||
<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
|
||||
<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
|
||||
</option>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1547880768" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1897088" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
|
||||
<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
|
||||
<listOptionValue builtIn="false" value="POWER_SAVING"/>
|
||||
<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
|
||||
@@ -86,71 +86,71 @@
|
||||
<listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
|
||||
<listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
|
||||
</option>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.928393719" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1740295419" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1102035795" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1736078204" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.871011287" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.863089168" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1454248503" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1965115059" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
|
||||
<listOptionValue builtIn="false" value="48"/>
|
||||
</option>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1575880763" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1638011093" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
|
||||
<listOptionValue builtIn="false" value="225"/>
|
||||
</option>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.726507594" 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.1058654511" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.972819601" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.944616200" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1920170652" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.2038786257" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.811478344" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1229809338" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
|
||||
<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
|
||||
<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
|
||||
<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
|
||||
</option>
|
||||
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1336528024" 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.310070475" 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.1323022718" 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.773203741" 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.1540775079" 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.319000695" 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.270651019" 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.463094612" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
|
||||
</tool>
|
||||
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.910616164" 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.1947116251" 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.354964589" 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.1878826793" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value=""${ProjName}.map"" valueType="string"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1081885439" 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.311400946" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
|
||||
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1351821865" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.174129193" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.567300083" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1800982811" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value=""${ProjName}.map"" valueType="string"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1091211742" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1479599481" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
|
||||
<listOptionValue builtIn="false" value="libc.a"/>
|
||||
<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
|
||||
<listOptionValue builtIn="false" value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
|
||||
</option>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.2054742586" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.672837228" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
|
||||
<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
|
||||
<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
|
||||
</option>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.833241141" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.544523272" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
|
||||
<listOptionValue builtIn="false" value="10247-D"/>
|
||||
<listOptionValue builtIn="false" value="16002-D"/>
|
||||
</option>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1522953205" 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.166010556" 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.2046832453" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value=""${ProjName}_linkInfo.xml"" valueType="string"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.208128926" 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.1609127336" 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.2139872640" 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.1444790082" 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.2050319754" 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.1281207998" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.468817864" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1679096029" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value=""${ProjName}_linkInfo.xml"" valueType="string"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.254835397" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1848192295" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
|
||||
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1999849945" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
|
||||
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.25027104" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
|
||||
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.888093741" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
|
||||
</tool>
|
||||
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1833311544" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.908921763" 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.841633372" 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.1321597545" 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.19288898" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.11734737" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.466140455" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.824070691" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
|
||||
</tool>
|
||||
<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.849185486" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1218482091" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
|
||||
<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1392704063" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.225737408" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
|
||||
<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_REPOS}"/>
|
||||
<listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
|
||||
</option>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.267298049" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.208966345" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1031058644" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.914575284" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.155421236" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.694278174" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value=""${COMPILER_FLAGS}"" valueType="string"/>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.571281110" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.205178830" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1097777495" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.744121344" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.165807018" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
|
||||
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.391961861" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value=""${COMPILER_FLAGS}"" valueType="string"/>
|
||||
</tool>
|
||||
</toolChain>
|
||||
</folderInfo>
|
||||
|
||||
+15
-14
@@ -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">
|
||||
|
||||
+45
-45
@@ -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=""${TOOLS_BLE}/lib_search/lib_search.exe" ${ORG_PROJ_DIR}/build_config.opt "${TOOLS_BLE}/lib_search/params_split_cc2640.xml" ${SRC_BLE_CORE}/../blelib "${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"">
|
||||
<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1209999684." name="/" resourcePath="">
|
||||
<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.1995933290" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.712529365">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.642166892" 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.2118383476" 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.1311223475" 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.2068086094" 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.106957297" 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.713283235" 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.1841804875" 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.1173627832" 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.566365077" 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.1988132749" 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.27459190" 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.1989794583" 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.1807944232" 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.2073917641" 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.1725374228" 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.883225147" 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.267030585" 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.869787934" 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.2013885834" 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.943131176" 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.1011898502" 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.470067069" 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.1944011103" 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.712529365" 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.628427859" 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.1500606998" 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.18052251" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value=""${ProjName}.map"" valueType="string"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1548460288" 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.419310182" 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=""${ProjName}.map"" 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.1951932064" 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.807068870" 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.2093334093" 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.890975428" 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.1465739067" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value=""${ProjName}_linkInfo.xml"" valueType="string"/>
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.1076183415" 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.1301855062" 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.1025070308" 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.98059634" 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.428150924" 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.989938850" 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=""${ProjName}_linkInfo.xml"" 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.342284887" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
|
||||
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1524223690" 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.797560737" 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.1167041718" 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>
|
||||
|
||||
-1
@@ -1 +0,0 @@
|
||||
This file exists to prevent Eclipse/CDT from adding the C sources contained in this directory (or below) to any enclosing project.
|
||||
-62
@@ -1,62 +0,0 @@
|
||||
#
|
||||
# This file was generated based on the configuration script:
|
||||
# C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\throughput_example_central\ccs\config\app_ble.cfg
|
||||
#
|
||||
# This makefile may be included in other makefiles that need to build
|
||||
# the libraries containing the compiled source files generated as
|
||||
# part of the configuration step.
|
||||
|
||||
#
|
||||
# ======== GEN_SRC_DIR =========
|
||||
# The path to the sources generated during configuration
|
||||
#
|
||||
# This path must be either absolute or relative to the build directory.
|
||||
#
|
||||
# The absolute path to the generated source directory (at the time the
|
||||
# sources were generated) is:
|
||||
# C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\throughput_example_central\ccs\config\src
|
||||
#
|
||||
GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/throughput_example_central/ccs/config/src
|
||||
|
||||
ifeq (,$(wildcard $(GEN_SRC_DIR)))
|
||||
$(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
|
||||
endif
|
||||
|
||||
#
|
||||
# ======== .force ========
|
||||
# The .force goal is used to force the build of any goal that names it as
|
||||
# a prerequisite
|
||||
#
|
||||
.PHONY: .force
|
||||
|
||||
#
|
||||
# ======== library macros ========
|
||||
#
|
||||
sysbios_SRC = $(GEN_SRC_DIR)/sysbios
|
||||
sysbios_LIB = $(GEN_SRC_DIR)/sysbios/rom_sysbios.aem3
|
||||
|
||||
#
|
||||
# ======== dependencies ========
|
||||
#
|
||||
all: $(sysbios_LIB)
|
||||
clean: .sysbios_clean
|
||||
|
||||
|
||||
# ======== convenient build goals ========
|
||||
.PHONY: sysbios
|
||||
sysbios: $(GEN_SRC_DIR)/sysbios/rom_sysbios.aem3
|
||||
|
||||
# CDT managed make executables depend on $(OBJS)
|
||||
OBJS += $(sysbios_LIB)
|
||||
|
||||
#
|
||||
# ======== rules ========
|
||||
#
|
||||
$(sysbios_LIB): .force
|
||||
@echo making $@ ...
|
||||
@$(MAKE) -C $(sysbios_SRC)
|
||||
|
||||
.sysbios_clean:
|
||||
@echo cleaning $(sysbios_SRC) ...
|
||||
-@$(MAKE) --no-print-directory -C $(sysbios_SRC) clean
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
-107
@@ -1,107 +0,0 @@
|
||||
|
||||
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
|
||||
|
||||
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/
|
||||
|
||||
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/
|
||||
|
||||
BIOS_ROOT = C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
|
||||
|
||||
BIOS_DEFS = -Dti_sysbios_BIOS_swiEnabled__D=TRUE -Dti_sysbios_BIOS_taskEnabled__D=TRUE -Dti_sysbios_BIOS_clockEnabled__D=TRUE -Dti_sysbios_BIOS_runtimeCreatesEnabled__D=TRUE -Dti_sysbios_knl_Task_moduleStateCheckFlag__D=FALSE -Dti_sysbios_knl_Task_objectCheckFlag__D=FALSE -Dti_sysbios_hal_Hwi_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Swi_DISABLE_ALL_HOOKS -Dti_sysbios_BIOS_smpEnabled__D=FALSE -Dti_sysbios_Build_useHwiMacros -Dti_sysbios_knl_Swi_numPriorities__D=6 -Dti_sysbios_knl_Task_deleteTerminatedTasks__D=FALSE -Dti_sysbios_knl_Task_numPriorities__D=6 -Dti_sysbios_knl_Task_checkStackFlag__D=FALSE -Dti_sysbios_knl_Task_initStackFlag__D=TRUE -Dti_sysbios_knl_Task_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Clock_TICK_SOURCE=ti_sysbios_knl_Clock_TickSource_TIMER -Dti_sysbios_knl_Clock_TICK_MODE=ti_sysbios_knl_Clock_TickMode_DYNAMIC -Dti_sysbios_hal_Core_delegate_getId=ti_sysbios_hal_CoreNull_getId__E -Dti_sysbios_hal_Core_delegate_interruptCore=ti_sysbios_hal_CoreNull_interruptCore__E -Dti_sysbios_hal_Core_delegate_lock=ti_sysbios_hal_CoreNull_lock__E -Dti_sysbios_hal_Core_delegate_unlock=ti_sysbios_hal_CoreNull_unlock__E -Dti_sysbios_hal_Core_numCores__D=1 -Dti_sysbios_hal_CoreNull_numCores__D=1 -Dti_sysbios_utils_Load_taskEnabled__D=TRUE -Dti_sysbios_utils_Load_swiEnabled__D=FALSE -Dti_sysbios_utils_Load_hwiEnabled__D=FALSE -Dti_sysbios_family_arm_m3_Hwi_dispatcherSwiSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherTaskSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherAutoNestingSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherIrpTrackingSupport__D=TRUE -Dti_sysbios_knl_Semaphore_supportsEvents__D=FALSE -Dti_sysbios_knl_Semaphore_supportsPriority__D=FALSE -Dxdc_runtime_Assert_DISABLE_ALL -Dxdc_runtime_Log_DISABLE_ALL
|
||||
|
||||
BIOS_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
|
||||
|
||||
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/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/Users/antoz/workspace_v8/throughput_example_central_cc2650lp_app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_central/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/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/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272" --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include" -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/
|
||||
|
||||
CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
|
||||
ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
|
||||
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
|
||||
|
||||
define RM
|
||||
$(if $(wildcard $1),$(DEL) $1,:)
|
||||
endef
|
||||
|
||||
define ASSEMBLE
|
||||
@echo asmem3 $< ...
|
||||
@$(ASM) $(BIOS_DEFS) $(XOPTS) $(INCS) $<
|
||||
endef
|
||||
|
||||
all: rom_sysbios.aem3
|
||||
|
||||
m3_Hwi_asm.obj: family/arm/m3/Hwi_asm.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_Hwi_asm.obj
|
||||
|
||||
m3_Hwi_asm_switch.obj: family/arm/m3/Hwi_asm_switch.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_Hwi_asm_switch.obj
|
||||
|
||||
m3_IntrinsicsSupport_asm.obj: family/arm/m3/IntrinsicsSupport_asm.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_IntrinsicsSupport_asm.obj
|
||||
|
||||
m3_TaskSupport_asm.obj: family/arm/m3/TaskSupport_asm.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_TaskSupport_asm.obj
|
||||
|
||||
|
||||
rom_sysbios.obj: BIOS.c knl/Clock.c knl/Idle.c knl/Intrinsics.c knl/Event.c knl/Mailbox.c knl/Queue.c knl/Semaphore.c knl/Swi.c knl/Swi_andn.c knl/Task.c family/arm/m3/Hwi.c family/arm/m3/TaskSupport.c family/arm/cc26xx/Boot.c family/arm/cc26xx/Timer.c family/arm/cc26xx/TimestampProvider.c hal/Hwi.c hal/Hwi_stack.c hal/Hwi_startup.c gates/GateHwi.c gates/GateMutex.c heaps/HeapMem.c xdc/runtime/xdc_noinit.c xdc/runtime/Assert.c xdc/runtime/Core-mem.c xdc/runtime/Core-smem.c xdc/runtime/Core-label.c xdc/runtime/Core-params.c xdc/runtime/Diags.c xdc/runtime/Error.c xdc/runtime/Gate.c xdc/runtime/Log.c xdc/runtime/Memory.c xdc/runtime/Registry.c xdc/runtime/Startup.c xdc/runtime/System.c xdc/runtime/SysCallback.c xdc/runtime/Text.c xdc/runtime/Timestamp.c makefile
|
||||
@-$(call RM, $@)
|
||||
@echo clem3 $< ...
|
||||
@$(CC) $(BIOS_DEFS) $(XOPTS) $(INCS) --output_file=rom_sysbios.obj \
|
||||
$(BIOS_ROOT)BIOS.c \
|
||||
$(BIOS_ROOT)knl/Clock.c \
|
||||
$(BIOS_ROOT)knl/Idle.c \
|
||||
$(BIOS_ROOT)knl/Intrinsics.c \
|
||||
$(BIOS_ROOT)knl/Event.c \
|
||||
$(BIOS_ROOT)knl/Mailbox.c \
|
||||
$(BIOS_ROOT)knl/Queue.c \
|
||||
$(BIOS_ROOT)knl/Semaphore.c \
|
||||
$(BIOS_ROOT)knl/Swi.c \
|
||||
$(BIOS_ROOT)knl/Swi_andn.c \
|
||||
$(BIOS_ROOT)knl/Task.c \
|
||||
$(BIOS_ROOT)family/arm/m3/Hwi.c \
|
||||
$(BIOS_ROOT)family/arm/m3/TaskSupport.c \
|
||||
$(BIOS_ROOT)family/arm/cc26xx/Boot.c \
|
||||
$(BIOS_ROOT)family/arm/cc26xx/Timer.c \
|
||||
$(BIOS_ROOT)family/arm/cc26xx/TimestampProvider.c \
|
||||
$(BIOS_ROOT)hal/Hwi.c \
|
||||
$(BIOS_ROOT)hal/Hwi_stack.c \
|
||||
$(BIOS_ROOT)hal/Hwi_startup.c \
|
||||
$(BIOS_ROOT)gates/GateHwi.c \
|
||||
$(BIOS_ROOT)gates/GateMutex.c \
|
||||
$(BIOS_ROOT)heaps/HeapMem.c \
|
||||
$(XDC_ROOT)xdc/runtime/xdc_noinit.c \
|
||||
$(XDC_ROOT)xdc/runtime/Assert.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-mem.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-smem.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-label.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-params.c \
|
||||
$(XDC_ROOT)xdc/runtime/Diags.c \
|
||||
$(XDC_ROOT)xdc/runtime/Error.c \
|
||||
$(XDC_ROOT)xdc/runtime/Gate.c \
|
||||
$(XDC_ROOT)xdc/runtime/Log.c \
|
||||
$(XDC_ROOT)xdc/runtime/Memory.c \
|
||||
$(XDC_ROOT)xdc/runtime/Registry.c \
|
||||
$(XDC_ROOT)xdc/runtime/Startup.c \
|
||||
$(XDC_ROOT)xdc/runtime/System.c \
|
||||
$(XDC_ROOT)xdc/runtime/SysCallback.c \
|
||||
$(XDC_ROOT)xdc/runtime/Text.c \
|
||||
$(XDC_ROOT)xdc/runtime/Timestamp.c \
|
||||
|
||||
rom_sysbios.aem3: rom_sysbios.obj m3_Hwi_asm.obj m3_Hwi_asm_switch.obj m3_IntrinsicsSupport_asm.obj m3_TaskSupport_asm.obj
|
||||
@-$(call RM, $@)
|
||||
@echo arem3 $^ ...
|
||||
@$(AR) $@ $^ C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/rom/cortexm/cc26xx/golden/CC26xx/rom_sysbios_config.obj
|
||||
|
||||
clean:
|
||||
@$(DEL) ..\makefile.libs
|
||||
@-$(call RM, *)
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
||||
This file exists to prevent Eclipse/CDT from adding the C sources contained in this directory (or below) to any enclosing project.
|
||||
-62
@@ -1,62 +0,0 @@
|
||||
#
|
||||
# This file was generated based on the configuration script:
|
||||
# C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\throughput_example_peripheral\ccs\config\app_ble.cfg
|
||||
#
|
||||
# This makefile may be included in other makefiles that need to build
|
||||
# the libraries containing the compiled source files generated as
|
||||
# part of the configuration step.
|
||||
|
||||
#
|
||||
# ======== GEN_SRC_DIR =========
|
||||
# The path to the sources generated during configuration
|
||||
#
|
||||
# This path must be either absolute or relative to the build directory.
|
||||
#
|
||||
# The absolute path to the generated source directory (at the time the
|
||||
# sources were generated) is:
|
||||
# C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\throughput_example_peripheral\ccs\config\src
|
||||
#
|
||||
GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/throughput_example_peripheral/ccs/config/src
|
||||
|
||||
ifeq (,$(wildcard $(GEN_SRC_DIR)))
|
||||
$(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
|
||||
endif
|
||||
|
||||
#
|
||||
# ======== .force ========
|
||||
# The .force goal is used to force the build of any goal that names it as
|
||||
# a prerequisite
|
||||
#
|
||||
.PHONY: .force
|
||||
|
||||
#
|
||||
# ======== library macros ========
|
||||
#
|
||||
sysbios_SRC = $(GEN_SRC_DIR)/sysbios
|
||||
sysbios_LIB = $(GEN_SRC_DIR)/sysbios/rom_sysbios.aem3
|
||||
|
||||
#
|
||||
# ======== dependencies ========
|
||||
#
|
||||
all: $(sysbios_LIB)
|
||||
clean: .sysbios_clean
|
||||
|
||||
|
||||
# ======== convenient build goals ========
|
||||
.PHONY: sysbios
|
||||
sysbios: $(GEN_SRC_DIR)/sysbios/rom_sysbios.aem3
|
||||
|
||||
# CDT managed make executables depend on $(OBJS)
|
||||
OBJS += $(sysbios_LIB)
|
||||
|
||||
#
|
||||
# ======== rules ========
|
||||
#
|
||||
$(sysbios_LIB): .force
|
||||
@echo making $@ ...
|
||||
@$(MAKE) -C $(sysbios_SRC)
|
||||
|
||||
.sysbios_clean:
|
||||
@echo cleaning $(sysbios_SRC) ...
|
||||
-@$(MAKE) --no-print-directory -C $(sysbios_SRC) clean
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
-107
@@ -1,107 +0,0 @@
|
||||
|
||||
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
|
||||
|
||||
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/
|
||||
|
||||
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/
|
||||
|
||||
BIOS_ROOT = C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
|
||||
|
||||
BIOS_DEFS = -Dti_sysbios_BIOS_swiEnabled__D=TRUE -Dti_sysbios_BIOS_taskEnabled__D=TRUE -Dti_sysbios_BIOS_clockEnabled__D=TRUE -Dti_sysbios_BIOS_runtimeCreatesEnabled__D=TRUE -Dti_sysbios_knl_Task_moduleStateCheckFlag__D=FALSE -Dti_sysbios_knl_Task_objectCheckFlag__D=FALSE -Dti_sysbios_hal_Hwi_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Swi_DISABLE_ALL_HOOKS -Dti_sysbios_BIOS_smpEnabled__D=FALSE -Dti_sysbios_Build_useHwiMacros -Dti_sysbios_knl_Swi_numPriorities__D=6 -Dti_sysbios_knl_Task_deleteTerminatedTasks__D=FALSE -Dti_sysbios_knl_Task_numPriorities__D=6 -Dti_sysbios_knl_Task_checkStackFlag__D=FALSE -Dti_sysbios_knl_Task_initStackFlag__D=TRUE -Dti_sysbios_knl_Task_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Clock_TICK_SOURCE=ti_sysbios_knl_Clock_TickSource_TIMER -Dti_sysbios_knl_Clock_TICK_MODE=ti_sysbios_knl_Clock_TickMode_DYNAMIC -Dti_sysbios_hal_Core_delegate_getId=ti_sysbios_hal_CoreNull_getId__E -Dti_sysbios_hal_Core_delegate_interruptCore=ti_sysbios_hal_CoreNull_interruptCore__E -Dti_sysbios_hal_Core_delegate_lock=ti_sysbios_hal_CoreNull_lock__E -Dti_sysbios_hal_Core_delegate_unlock=ti_sysbios_hal_CoreNull_unlock__E -Dti_sysbios_hal_Core_numCores__D=1 -Dti_sysbios_hal_CoreNull_numCores__D=1 -Dti_sysbios_utils_Load_taskEnabled__D=TRUE -Dti_sysbios_utils_Load_swiEnabled__D=FALSE -Dti_sysbios_utils_Load_hwiEnabled__D=FALSE -Dti_sysbios_family_arm_m3_Hwi_dispatcherSwiSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherTaskSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherAutoNestingSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherIrpTrackingSupport__D=TRUE -Dti_sysbios_knl_Semaphore_supportsEvents__D=FALSE -Dti_sysbios_knl_Semaphore_supportsPriority__D=FALSE -Dxdc_runtime_Assert_DISABLE_ALL -Dxdc_runtime_Log_DISABLE_ALL
|
||||
|
||||
BIOS_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
|
||||
|
||||
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/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/Users/antoz/workspace_v8/throughput_example_peripheral_cc2650lp_app" --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/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272" --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include" -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/
|
||||
|
||||
CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
|
||||
ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
|
||||
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
|
||||
|
||||
define RM
|
||||
$(if $(wildcard $1),$(DEL) $1,:)
|
||||
endef
|
||||
|
||||
define ASSEMBLE
|
||||
@echo asmem3 $< ...
|
||||
@$(ASM) $(BIOS_DEFS) $(XOPTS) $(INCS) $<
|
||||
endef
|
||||
|
||||
all: rom_sysbios.aem3
|
||||
|
||||
m3_Hwi_asm.obj: family/arm/m3/Hwi_asm.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_Hwi_asm.obj
|
||||
|
||||
m3_Hwi_asm_switch.obj: family/arm/m3/Hwi_asm_switch.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_Hwi_asm_switch.obj
|
||||
|
||||
m3_IntrinsicsSupport_asm.obj: family/arm/m3/IntrinsicsSupport_asm.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_IntrinsicsSupport_asm.obj
|
||||
|
||||
m3_TaskSupport_asm.obj: family/arm/m3/TaskSupport_asm.sv7M makefile
|
||||
@-$(call RM, $@)
|
||||
$(ASSEMBLE) --output_file=m3_TaskSupport_asm.obj
|
||||
|
||||
|
||||
rom_sysbios.obj: BIOS.c knl/Clock.c knl/Idle.c knl/Intrinsics.c knl/Event.c knl/Mailbox.c knl/Queue.c knl/Semaphore.c knl/Swi.c knl/Swi_andn.c knl/Task.c family/arm/m3/Hwi.c family/arm/m3/TaskSupport.c family/arm/cc26xx/Boot.c family/arm/cc26xx/Timer.c family/arm/cc26xx/TimestampProvider.c hal/Hwi.c hal/Hwi_stack.c hal/Hwi_startup.c gates/GateHwi.c gates/GateMutex.c heaps/HeapMem.c xdc/runtime/xdc_noinit.c xdc/runtime/Assert.c xdc/runtime/Core-mem.c xdc/runtime/Core-smem.c xdc/runtime/Core-label.c xdc/runtime/Core-params.c xdc/runtime/Diags.c xdc/runtime/Error.c xdc/runtime/Gate.c xdc/runtime/Log.c xdc/runtime/Memory.c xdc/runtime/Registry.c xdc/runtime/Startup.c xdc/runtime/System.c xdc/runtime/SysCallback.c xdc/runtime/Text.c xdc/runtime/Timestamp.c makefile
|
||||
@-$(call RM, $@)
|
||||
@echo clem3 $< ...
|
||||
@$(CC) $(BIOS_DEFS) $(XOPTS) $(INCS) --output_file=rom_sysbios.obj \
|
||||
$(BIOS_ROOT)BIOS.c \
|
||||
$(BIOS_ROOT)knl/Clock.c \
|
||||
$(BIOS_ROOT)knl/Idle.c \
|
||||
$(BIOS_ROOT)knl/Intrinsics.c \
|
||||
$(BIOS_ROOT)knl/Event.c \
|
||||
$(BIOS_ROOT)knl/Mailbox.c \
|
||||
$(BIOS_ROOT)knl/Queue.c \
|
||||
$(BIOS_ROOT)knl/Semaphore.c \
|
||||
$(BIOS_ROOT)knl/Swi.c \
|
||||
$(BIOS_ROOT)knl/Swi_andn.c \
|
||||
$(BIOS_ROOT)knl/Task.c \
|
||||
$(BIOS_ROOT)family/arm/m3/Hwi.c \
|
||||
$(BIOS_ROOT)family/arm/m3/TaskSupport.c \
|
||||
$(BIOS_ROOT)family/arm/cc26xx/Boot.c \
|
||||
$(BIOS_ROOT)family/arm/cc26xx/Timer.c \
|
||||
$(BIOS_ROOT)family/arm/cc26xx/TimestampProvider.c \
|
||||
$(BIOS_ROOT)hal/Hwi.c \
|
||||
$(BIOS_ROOT)hal/Hwi_stack.c \
|
||||
$(BIOS_ROOT)hal/Hwi_startup.c \
|
||||
$(BIOS_ROOT)gates/GateHwi.c \
|
||||
$(BIOS_ROOT)gates/GateMutex.c \
|
||||
$(BIOS_ROOT)heaps/HeapMem.c \
|
||||
$(XDC_ROOT)xdc/runtime/xdc_noinit.c \
|
||||
$(XDC_ROOT)xdc/runtime/Assert.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-mem.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-smem.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-label.c \
|
||||
$(XDC_ROOT)xdc/runtime/Core-params.c \
|
||||
$(XDC_ROOT)xdc/runtime/Diags.c \
|
||||
$(XDC_ROOT)xdc/runtime/Error.c \
|
||||
$(XDC_ROOT)xdc/runtime/Gate.c \
|
||||
$(XDC_ROOT)xdc/runtime/Log.c \
|
||||
$(XDC_ROOT)xdc/runtime/Memory.c \
|
||||
$(XDC_ROOT)xdc/runtime/Registry.c \
|
||||
$(XDC_ROOT)xdc/runtime/Startup.c \
|
||||
$(XDC_ROOT)xdc/runtime/System.c \
|
||||
$(XDC_ROOT)xdc/runtime/SysCallback.c \
|
||||
$(XDC_ROOT)xdc/runtime/Text.c \
|
||||
$(XDC_ROOT)xdc/runtime/Timestamp.c \
|
||||
|
||||
rom_sysbios.aem3: rom_sysbios.obj m3_Hwi_asm.obj m3_Hwi_asm_switch.obj m3_IntrinsicsSupport_asm.obj m3_TaskSupport_asm.obj
|
||||
@-$(call RM, $@)
|
||||
@echo arem3 $^ ...
|
||||
@$(AR) $@ $^ C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/rom/cortexm/cc26xx/golden/CC26xx/rom_sysbios_config.obj
|
||||
|
||||
clean:
|
||||
@$(DEL) ..\makefile.libs
|
||||
@-$(call RM, *)
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+71
-135
@@ -129,22 +129,18 @@ 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);
|
||||
}
|
||||
|
||||
@@ -152,199 +148,139 @@ 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);
|
||||
}
|
||||
|
||||
static void ReadBatVolt(uint8_t *buf){
|
||||
// Read data twice since the first data we get is previous data
|
||||
ADCChannelSelect(ADC_CH_BAT);
|
||||
CPUdelay(10);
|
||||
ADC_read(buf);
|
||||
|
||||
ADCChannelSelect(ADC_CH_BAT);
|
||||
CPUdelay(10);
|
||||
ADC_read(buf);
|
||||
|
||||
uint16_t bat_volt;
|
||||
|
||||
bat_volt = (uint16_t) (buf[0] << 8) | (uint16_t) (buf[1]);
|
||||
CPUdelay(10);
|
||||
// Battery voltage < 3V, turn off Elite.
|
||||
if(bat_volt < 8200 && bat_volt > 200){
|
||||
PIN_setOutputValue(pin_handle, enable_5v, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 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 40000 // 40 uA = 40,000,000 pA
|
||||
//#define GAIN_MID_BOUNDARY1 20000 // 20 uA = 20,000,000 pA
|
||||
//#define GAIN_MID_BOUNDARY2 400000 // 400 uA = 400,000,000 pA
|
||||
//#define GAIN_LARGE_BOUNDARY 200000 // 200 uA = 200,000 nA
|
||||
|
||||
//#define GAIN_SMALL_BOUNDARY 8000 // 8 uA = 8,000,000 pA
|
||||
//#define GAIN_MID_BOUNDARY1 3000 // 3 uA = 3,000,000 pA
|
||||
//#define GAIN_MID_BOUNDARY2 90000 // 90 uA = 90,000,000 pA
|
||||
//#define GAIN_LARGE_BOUNDARY 70000 // 70 uA = 70,000 nA
|
||||
|
||||
/* for Elite1.4-re which 6.3kohm replaced by 10kohm */
|
||||
// theoretical boundary <40, 30~1350, >1000 (uA)
|
||||
#define GAIN_SMALL_BOUNDARY 40000 // 40 uA = 40,000,000 pA
|
||||
#define GAIN_MID_BOUNDARY1 30000 // 30 uA = 30,000,000 pA
|
||||
#define GAIN_MID_BOUNDARY2 1350000 // 1350 uA = 1350,000,000 pA
|
||||
#define GAIN_LARGE_BOUNDARY 1000000 // 1000 uA = 1000,000 nA
|
||||
|
||||
static int32_t AutoGainReadCurrent(uint8_t *buf){
|
||||
|
||||
int32_t Real_Current = 0;
|
||||
|
||||
if(INSTRUCTION.ADCGainLevel == GAIN_AUTO){
|
||||
INSTRUCTION.ADCGainLevel = GAIN_200R;
|
||||
}
|
||||
|
||||
if(INSTRUCTION.ADCGainLevel == GAIN_200R){
|
||||
uint8_t CurrentCount1 = 0;
|
||||
while(CurrentCount1 < 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CurrentCount1++;
|
||||
if(CurrentCount1 == 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
break;
|
||||
}
|
||||
}
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
|
||||
return Real_Current;
|
||||
}
|
||||
|
||||
|
||||
static void AutoGainChange(int32_t Real_Current){
|
||||
if(INSTRUCTION.ADCGainLevel == GAIN_200R){
|
||||
// switch to mid range current
|
||||
if(Real_Current < GAIN_LARGE_BOUNDARY && Real_Current > -1*GAIN_LARGE_BOUNDARY){
|
||||
uint8_t CurrentCount = 0;
|
||||
// switch to small range current
|
||||
if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
|
||||
INSTRUCTION.ADCGainLevel = GAIN_200K;
|
||||
while(CurrentCount < 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CurrentCount++;
|
||||
if(CurrentCount == 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
break;
|
||||
}
|
||||
GAIN_200K_counter++;
|
||||
if(GAIN_200K_counter > 5){
|
||||
INSTRUCTION.ADCGainLevel = GAIN_200K;
|
||||
GAIN_200K_counter = 0;
|
||||
}
|
||||
}else{
|
||||
CurrentCount = 0;
|
||||
INSTRUCTION.ADCGainLevel = GAIN_10K;
|
||||
while(CurrentCount < 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CurrentCount++;
|
||||
if(CurrentCount == 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
break;
|
||||
}
|
||||
GAIN_10K_counter++;
|
||||
if(GAIN_10K_counter > 5){
|
||||
INSTRUCTION.ADCGainLevel = GAIN_10K;
|
||||
GAIN_10K_counter = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// 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(GAIN_200K_counter > 0){
|
||||
GAIN_200K_counter--;
|
||||
}
|
||||
if(GAIN_10K_counter > 0){
|
||||
GAIN_10K_counter--;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
|
||||
uint8_t CurrentCount1 = 0;
|
||||
while(CurrentCount1 < 3){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CurrentCount1++;
|
||||
if(CurrentCount1 == 3){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// switch to large range current
|
||||
if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
|
||||
uint8_t CurrentCount = 0;
|
||||
INSTRUCTION.ADCGainLevel = GAIN_200R;
|
||||
while(CurrentCount < 3){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CurrentCount++;
|
||||
if(CurrentCount == 3){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
break;
|
||||
}
|
||||
GAIN_200R_counter++;
|
||||
if(GAIN_200R_counter > 5){
|
||||
INSTRUCTION.ADCGainLevel = GAIN_200R;
|
||||
GAIN_200R_counter = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// switch to small range current
|
||||
else if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
|
||||
uint8_t CurrentCount = 0;
|
||||
INSTRUCTION.ADCGainLevel = GAIN_200K;
|
||||
while(CurrentCount < 3){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CurrentCount++;
|
||||
if(CurrentCount == 3){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
break;
|
||||
}
|
||||
GAIN_200K_counter++;
|
||||
if(GAIN_200K_counter > 5){
|
||||
INSTRUCTION.ADCGainLevel = GAIN_200K;
|
||||
GAIN_200K_counter = 0;
|
||||
}
|
||||
|
||||
}else{
|
||||
if(GAIN_200R_counter > 0){
|
||||
GAIN_200R_counter--;
|
||||
}
|
||||
if(GAIN_200K_counter > 0){
|
||||
GAIN_200K_counter--;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(INSTRUCTION.ADCGainLevel == GAIN_200K){
|
||||
uint8_t CurrentCount1 = 0;
|
||||
while(CurrentCount1 < 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CurrentCount1++;
|
||||
if(CurrentCount1 == 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
break;
|
||||
}
|
||||
}
|
||||
//Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
|
||||
// switch to mid range current
|
||||
if(Real_Current > GAIN_SMALL_BOUNDARY || Real_Current < -1*GAIN_SMALL_BOUNDARY){
|
||||
uint8_t CurrentCount = 0;
|
||||
// switch to large range current
|
||||
if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
|
||||
INSTRUCTION.ADCGainLevel = GAIN_200R;
|
||||
while(CurrentCount < 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CurrentCount++;
|
||||
if(CurrentCount == 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
break;
|
||||
}
|
||||
GAIN_200R_counter++;
|
||||
if(GAIN_200R_counter > 5){
|
||||
INSTRUCTION.ADCGainLevel = GAIN_200R;
|
||||
GAIN_200R_counter = 0;
|
||||
}
|
||||
|
||||
}else{
|
||||
CurrentCount = 0;
|
||||
INSTRUCTION.ADCGainLevel = GAIN_10K;
|
||||
while(CurrentCount < 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CurrentCount++;
|
||||
if(CurrentCount == 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
break;
|
||||
}
|
||||
GAIN_10K_counter++;
|
||||
if(GAIN_10K_counter > 5){
|
||||
INSTRUCTION.ADCGainLevel = GAIN_10K;
|
||||
GAIN_10K_counter = 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
// 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);
|
||||
// }
|
||||
}
|
||||
}else{
|
||||
if(GAIN_200R_counter > 0){
|
||||
GAIN_200R_counter--;
|
||||
}
|
||||
if(GAIN_10K_counter > 0){
|
||||
GAIN_10K_counter--;
|
||||
}
|
||||
}
|
||||
}
|
||||
return Real_Current;
|
||||
}
|
||||
|
||||
#define ReadADCVolt(x) ((x==0)? ReadVoutVolt(spi_ADC_rxbuf) : ReadVolt(spi_ADC_rxbuf))
|
||||
|
||||
#endif
|
||||
|
||||
+192
-4
@@ -2,6 +2,10 @@
|
||||
#ifndef ELITECCMODE
|
||||
#define ELITECCMODE
|
||||
|
||||
#define Iset CC->Iset
|
||||
#define Vset INSTRUCTION.Vset
|
||||
#define DELTAVOLTMAX 100000
|
||||
|
||||
static void CCModeDACControl(CCMode *CC, int32_t IUC_Measure_Difference);
|
||||
|
||||
static int32_t CCModeReadCurrent(CCMode *CC){
|
||||
@@ -46,10 +50,19 @@ static int32_t CCModeReadCurrent(CCMode *CC){
|
||||
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);
|
||||
|
||||
if(INSTRUCTION.VoVi_Switch == 2){
|
||||
int32_t Vscan = ((INSTRUCTION.VoltConstant - 25000) * 1000 / 5) - CC->BatteryV;
|
||||
NotifyVolt[0] = (uint8_t) (Vscan >> 24);
|
||||
NotifyVolt[1] = (uint8_t) ((Vscan & 0x00FF0000) >> 16);
|
||||
NotifyVolt[2] = (uint8_t) ((Vscan & 0x0000FF00) >> 8);
|
||||
NotifyVolt[3] = (uint8_t) (Vscan & 0x000000FF);
|
||||
}else{
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -129,4 +142,179 @@ static void CCCurrent2IUC(CCMode *CC){
|
||||
CurrentValue = CC->value - CC_ZERO_POINT;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static uint16_t CCCurve(CCMode *CC){
|
||||
static uint16_t DACOutCode;
|
||||
static int32_t Vout;
|
||||
static int32_t DeltaVout;
|
||||
|
||||
if(DACReset){
|
||||
Vout = Vset;
|
||||
DACReset = false;
|
||||
}else{
|
||||
DeltaVout = Vset - (Vout);
|
||||
Vout = Vout + DeltaVout;
|
||||
}
|
||||
|
||||
INSTRUCTION.VoltConstant = Vout / 40000 + 25000; //5nV=>usercode
|
||||
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
|
||||
DAC_outputV(DACOutCode);
|
||||
|
||||
int32_t RealV;
|
||||
RealV = (int32_t)(Vout / 200); //[5nV]
|
||||
InputNotify(NOTIFY_IMPEDANCE, RealV);
|
||||
|
||||
|
||||
return DACOutCode;
|
||||
}
|
||||
|
||||
static void CC_Plot(CCMode *CC){
|
||||
/**********************************************
|
||||
CURRENT_MODE->_VoVi_Switch : 1 read Vin volt
|
||||
->_VoVi_Switch : 0 read Vout volt
|
||||
|
||||
***********************************************/
|
||||
static uint8_t VoltCurrentSwitch = 0;
|
||||
|
||||
if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
|
||||
// read current
|
||||
if(INSTRUCTION.AutoGainEnable){
|
||||
CC->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
|
||||
AutoGainChange(CC->_MeasureData);
|
||||
}else{
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CC->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
InputNotify(NOTIFY_CURRENT, CC->_MeasureData);
|
||||
|
||||
|
||||
CC_Vscan(CC);
|
||||
CCCurve(CC);
|
||||
|
||||
// read Volt
|
||||
if(INSTRUCTION.VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}else if(INSTRUCTION.VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
}else if(INSTRUCTION.VoVi_Switch == 0x02){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 1){ /**read Vin**/
|
||||
// read Volt
|
||||
if(INSTRUCTION.VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}else if(INSTRUCTION.VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
}else if(INSTRUCTION.VoVi_Switch == 0x02){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
|
||||
// read Volt
|
||||
if(INSTRUCTION.VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);// read vin volt
|
||||
CC->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
|
||||
}else if(INSTRUCTION.VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);// read vout volt
|
||||
CC->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
|
||||
}else if(INSTRUCTION.VoVi_Switch == 0x02){
|
||||
ReadVolt(spi_ADC_rxbuf);// read vin volt
|
||||
CC->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
if(INSTRUCTION.VoVi_Switch == 0x02){
|
||||
int32_t Vscan = (Vset / 200 - CC->MeasureVolt);
|
||||
Vscan = (int32_t)(Vscan);//[1uV]
|
||||
InputNotify(NOTIFY_VOLT, Vscan);
|
||||
}else{
|
||||
InputNotify(NOTIFY_VOLT, CC->MeasureVolt);
|
||||
}
|
||||
|
||||
// read current
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 3){ /**read Iin**/
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
VoltCurrentSwitch = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void CC_Vscan(CCMode *CC){
|
||||
static int32_t Iin = 0;
|
||||
static int32_t deltaI = 0;
|
||||
static int32_t deltaV = 0;
|
||||
static int32_t Vmax = 0;
|
||||
static int32_t Vmin = 0;
|
||||
uint8_t divisionRate;
|
||||
|
||||
if(VscanReset){
|
||||
Vset = 0;
|
||||
Vmax = ((int32_t)(CC->VMax) - 25000) * 4 * 10000; //[5nV]
|
||||
Vmin = ((int32_t)(CC->VMin) - 25000) * 4 * 10000; //[5nV]
|
||||
Iset = INSTRUCTION.ConstantCurrent * 200 ; //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA]
|
||||
if(CC->Charge == 0){
|
||||
Iset *= -1;
|
||||
}
|
||||
Iin = CC->_MeasureData * 20; //[50pA] nA => 50pA
|
||||
deltaI = Iin - Iset;
|
||||
if(deltaI > 20000000 || deltaI < -20000000){ //1mA
|
||||
divisionRate = 1000;
|
||||
}else{
|
||||
divisionRate = 10;
|
||||
}
|
||||
deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000 //pV=> 5nV
|
||||
if(deltaV > DELTAVOLTMAX){ //100000 = 500uV
|
||||
deltaV = DELTAVOLTMAX;
|
||||
}else if(deltaV < (-DELTAVOLTMAX)){
|
||||
deltaV = (-DELTAVOLTMAX);
|
||||
}
|
||||
Vset = Vset + deltaV; //[5nV]
|
||||
|
||||
if(Vset <= Vmin){
|
||||
Vset = Vmin;
|
||||
}else if(Vset >= Vmax){
|
||||
Vset = Vmax;
|
||||
}
|
||||
}
|
||||
|
||||
if(!VscanReset){
|
||||
Iin = CC->_MeasureData * 20; //[50pA] nA => 50pA
|
||||
deltaI = Iin - Iset;
|
||||
if(deltaI > 20000000 || deltaI < -20000000){ //1mA
|
||||
divisionRate = 1000;
|
||||
}else{
|
||||
divisionRate = 10;
|
||||
}
|
||||
deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000 //pV=> 5nV
|
||||
if(deltaV > DELTAVOLTMAX){
|
||||
deltaV = DELTAVOLTMAX;
|
||||
}else if(deltaV < (-DELTAVOLTMAX)){
|
||||
deltaV = (-DELTAVOLTMAX);
|
||||
}
|
||||
Vset = Vset + deltaV; //[5nV]
|
||||
|
||||
if(Vset <= Vmin){
|
||||
Vset = Vmin;
|
||||
}else if(Vset >= Vmax){
|
||||
Vset = Vmax;
|
||||
}
|
||||
}
|
||||
|
||||
// int32_t RealV;
|
||||
// RealV = (int32_t)(deltaV);
|
||||
// InputNotify(NOTIFY_IMPEDANCE, RealV);
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
+206
@@ -0,0 +1,206 @@
|
||||
#ifndef ELITECV3
|
||||
#define ELITECV3
|
||||
|
||||
#define Vset INSTRUCTION.Vset
|
||||
|
||||
static uint16_t CV3Curve(CV3Mode *CV3){
|
||||
static uint16_t DACOutCode;
|
||||
static int32_t Vin;
|
||||
static int32_t Vout;
|
||||
static int32_t DeltaVout;
|
||||
|
||||
Vin = CV3->MeasureVolt * 200;//[5nV]
|
||||
if(DACReset){
|
||||
Vout = Vset + Vin;
|
||||
DACReset = false;
|
||||
}else{
|
||||
DeltaVout = Vset - (Vout - Vin);
|
||||
Vout = Vout + DeltaVout;
|
||||
}
|
||||
|
||||
INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
|
||||
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
|
||||
|
||||
int32_t RealV2;
|
||||
RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
|
||||
InputNotify(NOTIFY_VOLT, RealV2);
|
||||
|
||||
int32_t RealV;
|
||||
RealV = (int32_t)(Vout / 200);//[1uV]
|
||||
InputNotify(NOTIFY_IMPEDANCE, RealV);
|
||||
|
||||
DAC_outputV(DACOutCode);
|
||||
|
||||
return DACOutCode;
|
||||
}
|
||||
|
||||
|
||||
static void CV3_Plot(CV3Mode *CV3){
|
||||
/**********************************************
|
||||
CURRENT_MODE->_VoVi_Switch : 1 read Vin volt
|
||||
->_VoVi_Switch : 0 read Vout volt
|
||||
|
||||
***********************************************/
|
||||
static uint8_t VoltCurrentSwitch = 0;
|
||||
|
||||
if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
|
||||
// read current
|
||||
if(INSTRUCTION.AutoGainEnable){
|
||||
CV3->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
|
||||
AutoGainChange(CV3->_MeasureData);
|
||||
}else{
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CV3->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
InputNotify(NOTIFY_CURRENT, CV3->_MeasureData);
|
||||
|
||||
// read Volt
|
||||
if(CV3->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}else if(CV3->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 1){ /**read Vin**/
|
||||
// read Volt
|
||||
if(CV3->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}else if(CV3->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
|
||||
// read Volt
|
||||
if(CV3->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);// read vin volt
|
||||
CV3->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
|
||||
}else if(CV3->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);// read vout volt
|
||||
CV3->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
CV3Curve(CV3);
|
||||
|
||||
// read current
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 3){ /**read Iin**/
|
||||
// read current
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
|
||||
VoltCurrentSwitch = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void CV3_Vscan(CV3Mode *CV3){
|
||||
static int32_t Vmax;
|
||||
static int32_t Vmin;
|
||||
static int32_t Vinit;
|
||||
static uint32_t Vstep;
|
||||
static int16_t VminCounter;
|
||||
static int16_t VmaxCounter;
|
||||
static bool direction_up; // direction_up = true, if InitDirection=1
|
||||
static bool current_direction_up; // current_direction_up = true, Vstep => positive. vice versa
|
||||
static uint16_t CycleCounter;
|
||||
|
||||
NotifyCycleNumber = (INSTRUCTION.CycleNumber - CV3->CycleNumber + 1);
|
||||
|
||||
if(VscanReset){
|
||||
VmaxCounter = 0;
|
||||
VminCounter = 0;
|
||||
CycleCounter = 0;
|
||||
Vmax = ((int32_t)(CV3->VMax) - 25000) * 4 * 10000; //[5nV]
|
||||
Vmin = ((int32_t)(CV3->VMin) - 25000) * 4 * 10000; //[5nV]
|
||||
Vinit = ((int32_t)(CV3->VInit) - 25000) * 4 * 10000; //[5nV]
|
||||
Vset = Vinit;
|
||||
|
||||
if(CV3->InitDirection){
|
||||
direction_up = true;
|
||||
current_direction_up = true;
|
||||
}else{
|
||||
direction_up = false;
|
||||
current_direction_up = false;
|
||||
}
|
||||
|
||||
if(Vmin == Vinit){
|
||||
VminCounter = -1;
|
||||
}
|
||||
if(Vmax == Vinit){
|
||||
VmaxCounter = -1;
|
||||
}
|
||||
|
||||
if(INSTRUCTION.Step <= 10){
|
||||
Vstep = INSTRUCTION.Step * INSTRUCTION.VscanRate / 5 ; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
|
||||
}else{
|
||||
Vstep = INSTRUCTION.Step / 5 * INSTRUCTION.VscanRate; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
|
||||
}
|
||||
}
|
||||
|
||||
if(!VscanReset){
|
||||
/*stop condition*/
|
||||
if (Vset >= Vmax){
|
||||
VmaxCounter++;
|
||||
}else if (Vset <= Vmin){
|
||||
VminCounter++;
|
||||
}
|
||||
|
||||
if (current_direction_up){
|
||||
Vset = Vset + Vstep;
|
||||
}else{
|
||||
Vset = Vset - Vstep;
|
||||
}
|
||||
|
||||
if(VmaxCounter != 0 && VminCounter != 0){
|
||||
if(VmaxCounter == VminCounter && direction_up && current_direction_up){
|
||||
if(CycleCounter != VmaxCounter){
|
||||
if(Vset >= Vinit){
|
||||
CV3->CycleNumber--;
|
||||
CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
|
||||
}
|
||||
}
|
||||
}
|
||||
if(VmaxCounter == VminCounter && !direction_up && !current_direction_up){
|
||||
if(CycleCounter != VmaxCounter){
|
||||
if(Vset <= Vinit){
|
||||
CV3->CycleNumber--;
|
||||
CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*stop condition*/
|
||||
if (Vset >= Vmax){
|
||||
current_direction_up = false;
|
||||
}else if (Vset <= Vmin){
|
||||
current_direction_up = true;
|
||||
}
|
||||
|
||||
/*stop condition*/
|
||||
if(CV3->CycleNumber == 0){
|
||||
// PeriodicEvent = false;
|
||||
InitEliteFlag();
|
||||
INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
INSTRUCTION.Charge = 0x01;
|
||||
INSTRUCTION.ConstantCurrent = 0x00;
|
||||
INSTRUCTION.MaxVolt = 0xC350;
|
||||
INSTRUCTION.MinVolt = 0x0000;
|
||||
INSTRUCTION.NotifyRate = 500;
|
||||
INSTRUCTION.VoVi_Switch = 0x02;//read Vscan = Vout - Vin
|
||||
}
|
||||
}
|
||||
|
||||
// int32_t RealV;
|
||||
// RealV = (int32_t)(Vset / 500);//[1uV]
|
||||
// InputNotify(NOTIFY_VOLT, RealV);
|
||||
}
|
||||
|
||||
#endif
|
||||
+143
-430
@@ -134,459 +134,172 @@ static uint16_t DPVCurve(WorkMode *WorkModeData) {
|
||||
|
||||
static uint16_t CVCurve(CVMode *CV) {
|
||||
static uint16_t DACOutCode;
|
||||
static bool direction_up; // direction_up = true, if Vfinal > Vorigin
|
||||
static bool current_direction_up; // current_direction_up = true, Vstep => positive. vice versa
|
||||
static bool firstADCData; //firstADCdata=true,when min<x<max,cyclenumber--
|
||||
// reset origin volt at the begin
|
||||
if (DACReset) {
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
if (CV->_VStop > CV->_VOrigin) {
|
||||
direction_up = true;
|
||||
current_direction_up = true;
|
||||
} else {
|
||||
direction_up = false;
|
||||
current_direction_up = false;
|
||||
}
|
||||
|
||||
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
|
||||
DAC_outputV(DACOutCode); // output VOLT_ORIGIN
|
||||
DACReset = false;
|
||||
firstADCData = true;
|
||||
return DACOutCode;
|
||||
}
|
||||
|
||||
if (CT.StepTimeCounter == CV->_StepTime) {
|
||||
// Decide next direction
|
||||
if (CV->_VoVi_Switch == 0x00){ //user see Vout
|
||||
if (direction_up) {
|
||||
if (INSTRUCTION.VoltConstant >= CV->_VStop) {
|
||||
current_direction_up = false; // problem occurs when origin == 0000 final == ffff!!!!!!
|
||||
firstADCData = false;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant <= CV->_VOrigin) {
|
||||
current_direction_up = true;
|
||||
firstADCData = false;
|
||||
if (CV->_CycleNumber == 0) {
|
||||
PeriodicEvent = false; // periodic event end
|
||||
DACReset = true;
|
||||
}
|
||||
CV->_CycleNumber--;
|
||||
}
|
||||
|
||||
|
||||
else if(current_direction_up){
|
||||
if(INSTRUCTION.VoltConstant + CV->_Step > CV->_VStop){
|
||||
current_direction_up = false;
|
||||
}
|
||||
}
|
||||
else if(!current_direction_up){
|
||||
if(INSTRUCTION.VoltConstant - CV->_Step < CV->_VOrigin){
|
||||
current_direction_up = true;
|
||||
if (CV->_CycleNumber == 0) {
|
||||
PeriodicEvent = false; // periodic event end
|
||||
DACReset = true;
|
||||
}
|
||||
CV->_CycleNumber--;
|
||||
}
|
||||
}
|
||||
if (firstADCData){
|
||||
CV->_CycleNumber--;
|
||||
firstADCData = false;
|
||||
}
|
||||
|
||||
} else {
|
||||
if (INSTRUCTION.VoltConstant < CV->_VStop) {
|
||||
current_direction_up = true; // problem occurs when origin == 0000 final == ffff!!!!!!
|
||||
firstADCData = false;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant > CV->_VOrigin) {
|
||||
current_direction_up = false;
|
||||
firstADCData = false;
|
||||
if (CV->_CycleNumber == 0) {
|
||||
PeriodicEvent = false; // periodic event end
|
||||
DACReset = true;
|
||||
}
|
||||
CV->_CycleNumber--;
|
||||
}
|
||||
else if(current_direction_up){
|
||||
if(INSTRUCTION.VoltConstant + CV->_Step > CV->_VOrigin){
|
||||
current_direction_up = false;
|
||||
if (CV->_CycleNumber == 0) {
|
||||
PeriodicEvent = false; // periodic event end
|
||||
DACReset = true;
|
||||
}
|
||||
CV->_CycleNumber--;
|
||||
}
|
||||
}
|
||||
else if(!current_direction_up){
|
||||
if(INSTRUCTION.VoltConstant - CV->_Step < CV->_VStop){
|
||||
current_direction_up = true;
|
||||
}
|
||||
}
|
||||
if (firstADCData){//first data =2899mv,CV->_CycleNumber--;
|
||||
CV->_CycleNumber--;
|
||||
firstADCData = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (CV->_VoVi_Switch == 0x01){ //user see Vin
|
||||
if (direction_up) {
|
||||
if (INSTRUCTION.VoltConstant >= CV->_VStop) {
|
||||
current_direction_up = false; // problem occurs when origin == 0000 final == ffff!!!!!!
|
||||
firstADCData = false;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant <= CV->_VOrigin) {
|
||||
current_direction_up = true;
|
||||
firstADCData = false;
|
||||
if (CV->_CycleNumber == 0) {
|
||||
PeriodicEvent = false; // periodic event end
|
||||
DACReset = true;
|
||||
}
|
||||
CV->_CycleNumber--;
|
||||
}
|
||||
|
||||
|
||||
else if(current_direction_up){
|
||||
if(INSTRUCTION.VoltConstant + CV->_Step > CV->_VStop){
|
||||
current_direction_up = false;
|
||||
}
|
||||
}
|
||||
else if(!current_direction_up){
|
||||
if(INSTRUCTION.VoltConstant - CV->_Step < CV->_VOrigin){
|
||||
current_direction_up = true;
|
||||
if (CV->_CycleNumber == 0) {
|
||||
PeriodicEvent = false; // periodic event end
|
||||
DACReset = true;
|
||||
}
|
||||
CV->_CycleNumber--;
|
||||
}
|
||||
}
|
||||
if (firstADCData){
|
||||
CV->_CycleNumber--;
|
||||
firstADCData = false;
|
||||
}
|
||||
|
||||
} else {
|
||||
if (INSTRUCTION.VoltConstant < CV->_VStop) {
|
||||
current_direction_up = true; // problem occurs when origin == 0000 final == ffff!!!!!!
|
||||
firstADCData = false;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant > CV->_VOrigin){
|
||||
current_direction_up = false;
|
||||
firstADCData = false;
|
||||
if (CV->_CycleNumber == 0) {
|
||||
PeriodicEvent = false; // periodic event end
|
||||
DACReset = true;
|
||||
}
|
||||
CV->_CycleNumber--;
|
||||
}
|
||||
else if(current_direction_up){
|
||||
if(INSTRUCTION.VoltConstant + CV->_Step > CV->_VOrigin){
|
||||
current_direction_up = false;
|
||||
if (CV->_CycleNumber == 0) {
|
||||
PeriodicEvent = false; // periodic event end
|
||||
DACReset = true;
|
||||
}
|
||||
CV->_CycleNumber--;
|
||||
}
|
||||
}
|
||||
else if(!current_direction_up){
|
||||
if(INSTRUCTION.VoltConstant - CV->_Step < CV->_VStop){
|
||||
current_direction_up = true;
|
||||
}
|
||||
}
|
||||
if (firstADCData){//first data =2899mv,CV->_CycleNumber--;
|
||||
CV->_CycleNumber--;
|
||||
firstADCData = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
// if (current_direction_up == true){
|
||||
// LED_color(DARKLED, 255, 0, 0);
|
||||
// }
|
||||
// else if (current_direction_up == false){
|
||||
// LED_color(DARKLED, 255, 0, 255);
|
||||
// }
|
||||
|
||||
// Next output voltage
|
||||
if (CV->_VoVi_Switch == 0x00){
|
||||
if (direction_up) {
|
||||
if (current_direction_up) {
|
||||
// DACUserCode overflow ?
|
||||
if (INSTRUCTION.VoltConstant + CV->_Step < INSTRUCTION.VoltConstant) {
|
||||
INSTRUCTION.VoltConstant = CV->_VStop;
|
||||
}
|
||||
// reach Vfinal ?
|
||||
else if (INSTRUCTION.VoltConstant + CV->_Step > CV->_VStop) {
|
||||
INSTRUCTION.VoltConstant =CV->_VStop;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant >= CV->_VStop){
|
||||
INSTRUCTION.VoltConstant =CV->_VStop;
|
||||
}
|
||||
else {
|
||||
INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + CV->_Step;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// DACUserCode underflow ?
|
||||
if (INSTRUCTION.VoltConstant - CV->_Step > INSTRUCTION.VoltConstant) {
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
// reach Vorigin ?
|
||||
else if (INSTRUCTION.VoltConstant - CV->_Step < CV->_VOrigin) {
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant <= CV->_VOrigin){
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
else {
|
||||
INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant - CV->_Step;
|
||||
if(INSTRUCTION.VoltConstant > 60000){
|
||||
INSTRUCTION.VoltConstant = 0;
|
||||
current_direction_up = true;
|
||||
if (CV->_CycleNumber == 0) {
|
||||
PeriodicEvent = false; // periodic event end
|
||||
DACReset = true;
|
||||
}
|
||||
CV->_CycleNumber--;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (current_direction_up) {
|
||||
|
||||
if (INSTRUCTION.VoltConstant + CV->_Step < INSTRUCTION.VoltConstant) {
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
|
||||
else if (INSTRUCTION.VoltConstant + CV->_Step > CV->_VOrigin) {
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant >= CV->_VOrigin){
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
else {
|
||||
INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + CV->_Step;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (INSTRUCTION.VoltConstant - CV->_Step > INSTRUCTION.VoltConstant) {
|
||||
INSTRUCTION.VoltConstant = CV->_VStop ;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant - CV->_Step < CV->_VStop) {
|
||||
INSTRUCTION.VoltConstant = CV->_VStop;
|
||||
}
|
||||
else if(INSTRUCTION.VoltConstant <= CV->_VStop){
|
||||
INSTRUCTION.VoltConstant = CV->_VStop;
|
||||
}
|
||||
else {
|
||||
INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant - CV->_Step;
|
||||
|
||||
if(INSTRUCTION.VoltConstant > 60000){
|
||||
INSTRUCTION.VoltConstant = 0;
|
||||
current_direction_up = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (CV->_VoVi_Switch == 0x01){
|
||||
if (direction_up) {
|
||||
if (current_direction_up) {
|
||||
// DACUserCode overflow ?
|
||||
if (INSTRUCTION.VoltConstant + CV->_Step < INSTRUCTION.VoltConstant) {
|
||||
INSTRUCTION.VoltConstant = CV->_VStop;
|
||||
}
|
||||
// reach Vfinal ?
|
||||
else if (INSTRUCTION.VoltConstant + CV->_Step > CV->_VStop) {
|
||||
INSTRUCTION.VoltConstant =CV->_VStop;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant >= CV->_VStop){
|
||||
INSTRUCTION.VoltConstant =CV->_VStop;
|
||||
}
|
||||
else {
|
||||
INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + CV->_Step;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// DACUserCode underflow ?
|
||||
if (INSTRUCTION.VoltConstant - CV->_Step > INSTRUCTION.VoltConstant) {
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
// reach Vorigin ?
|
||||
else if (INSTRUCTION.VoltConstant - CV->_Step < CV->_VOrigin) {
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant <= CV->_VOrigin){
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
else {
|
||||
INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant - CV->_Step;
|
||||
if(INSTRUCTION.VoltConstant > 60000){
|
||||
INSTRUCTION.VoltConstant = 0;
|
||||
current_direction_up = true;
|
||||
if (CV->_CycleNumber == 0) {
|
||||
PeriodicEvent = false; // periodic event end
|
||||
DACReset = true;
|
||||
}
|
||||
CV->_CycleNumber--;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (current_direction_up) {
|
||||
// DACUserCode overflow ?
|
||||
if (INSTRUCTION.VoltConstant + CV->_Step < INSTRUCTION.VoltConstant) {
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
// ex:command 3->1V ,when 1 to 3V, 2.99+0.1 > 3V
|
||||
else if (INSTRUCTION.VoltConstant + CV->_Step > CV->_VOrigin) {
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant >= CV->_VOrigin){
|
||||
INSTRUCTION.VoltConstant = CV->_VOrigin;
|
||||
}
|
||||
else {
|
||||
INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + CV->_Step;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (INSTRUCTION.VoltConstant - CV->_Step > INSTRUCTION.VoltConstant) {
|
||||
INSTRUCTION.VoltConstant = CV->_VStop ;
|
||||
}
|
||||
else if (INSTRUCTION.VoltConstant - CV->_Step < CV->_VStop) {
|
||||
INSTRUCTION.VoltConstant = CV->_VStop;
|
||||
}
|
||||
else if(INSTRUCTION.VoltConstant <= CV->_VStop){
|
||||
INSTRUCTION.VoltConstant = CV->_VStop;
|
||||
}
|
||||
else {
|
||||
INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant - CV->_Step;
|
||||
|
||||
if(INSTRUCTION.VoltConstant > 60000){
|
||||
INSTRUCTION.VoltConstant = 0;
|
||||
current_direction_up = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
|
||||
DAC_outputV(DACOutCode);
|
||||
}
|
||||
//firstADCdata=true,when min<x<max,cyclenumber--
|
||||
return DACOutCode;
|
||||
}
|
||||
|
||||
static void CV_Plot(CVMode *CV){
|
||||
static uint8_t PreviousGain = GAIN_200R;
|
||||
/**********************************************
|
||||
CURRENT_MODE->_VoVi_Switch : 1 read Vin volt
|
||||
->_VoVi_Switch : 0 read Vout volt
|
||||
|
||||
***********************************************/
|
||||
static uint8_t VoltCurrentSwitch = 0;
|
||||
uint16_t ADC_measure = 0;
|
||||
|
||||
if(VoltCurrentSwitch < 5){
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
VoltCurrentSwitch ++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 5){
|
||||
if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
|
||||
// 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{
|
||||
AutoGainChange(CV->_MeasureData);
|
||||
}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){
|
||||
|
||||
InputNotify(NOTIFY_CURRENT, CV->_MeasureData);
|
||||
|
||||
// read Volt
|
||||
if(CV->_VoVi_Switch == 0x01){
|
||||
// read vin volt
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}else if(CV->_VoVi_Switch == 0x00){
|
||||
// read vout volt
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
}
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 9){
|
||||
if(CV->_VoVi_Switch == 0x01){
|
||||
// read vin volt
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
|
||||
//CV->MeasureVolt = 20000;
|
||||
CV->MeasureVolt = DecodeADCVolt(ADC_measure);
|
||||
}else if(CV->_VoVi_Switch == 0x00){
|
||||
// read vout volt
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
|
||||
CV->MeasureVolt = DecodeADCVoutVolt(ADC_measure);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
// else if (VoltCurrentSwitch < 13){
|
||||
// ReadBatVolt(spi_ADC_rxbuf);
|
||||
// VoltCurrentSwitch ++;
|
||||
// }
|
||||
// else if (VoltCurrentSwitch == 13){
|
||||
// // read battery volt
|
||||
// ReadBatVolt(spi_ADC_rxbuf);
|
||||
// ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
|
||||
// CV->_MeasureBatvolt = DecodeADCBatVolt(ADC_measure);
|
||||
// CV->_MeasureBatvolt = CV->_MeasureBatvolt/10 - 250; // (5.00V) 5000->250 usercode
|
||||
// VoltCurrentSwitch ++;
|
||||
// }
|
||||
else{
|
||||
else if(VoltCurrentSwitch == 1){ /**read Vin**/
|
||||
// read Volt
|
||||
if(CV->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}else if(CV->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
|
||||
// read Volt
|
||||
if(CV->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);// read vin volt
|
||||
CV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
|
||||
}else if(CV->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);// read vout volt
|
||||
CV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
InputNotify(NOTIFY_VOLT, CV->MeasureVolt);
|
||||
|
||||
// read current
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 3){ /**read Iin**/
|
||||
// read current
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
|
||||
VoltCurrentSwitch = 0;
|
||||
}
|
||||
|
||||
NotifyCurrent[0] = (uint8_t) (CV->_MeasureData >> 24);
|
||||
NotifyCurrent[1] = (uint8_t) ((CV->_MeasureData & 0x00FF0000) >> 16);
|
||||
NotifyCurrent[2] = (uint8_t) ((CV->_MeasureData & 0x0000FF00) >> 8);
|
||||
NotifyCurrent[3] = (uint8_t) (CV->_MeasureData & 0x000000FF);
|
||||
|
||||
if ((CV->_VoVi_Switch == 0x01) || (CV->_VoVi_Switch == 0x00)){ //user see Vin || user see Vout
|
||||
// NotifyVolt[0] = (uint8_t) (CV->MeasureVolt >> 24);
|
||||
// NotifyVolt[1] = (uint8_t) ((CV->MeasureVolt & 0x00FF0000) >> 16);
|
||||
// NotifyVolt[2] = (uint8_t) ((CV->MeasureVolt & 0x0000FF00) >> 8);
|
||||
// NotifyVolt[3] = (uint8_t) (CV->MeasureVolt & 0x000000FF);
|
||||
|
||||
int32_t RealV;
|
||||
RealV = (int32_t)(INSTRUCTION.VoltConstant - 25000)/5;
|
||||
NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
|
||||
NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
|
||||
NotifyVolt[2] = (uint8_t)((RealV & 0x0000FF00) >> 8);
|
||||
NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
|
||||
}
|
||||
|
||||
// NotifyBatVolt = (uint8_t) (CV->_MeasureBatvolt & 0x000000FF);
|
||||
}
|
||||
|
||||
static void CV_Vscan(CVMode *CV){
|
||||
static int32_t Vmax;
|
||||
static int32_t Vmin;
|
||||
static int32_t Vinit;
|
||||
static uint32_t Vstep;
|
||||
static int16_t VminCounter;
|
||||
static int16_t VmaxCounter;
|
||||
static bool direction_up; // direction_up = true, if InitDirection=1
|
||||
static bool current_direction_up; // current_direction_up = true, Vstep => positive. vice versa
|
||||
static uint16_t CycleCounter;
|
||||
|
||||
NotifyCycleNumber = (INSTRUCTION.CycleNumber - CV->_CycleNumber + 1);
|
||||
|
||||
if(VscanReset){
|
||||
VmaxCounter = 0;
|
||||
VminCounter = 0;
|
||||
CycleCounter = 0;
|
||||
if(CV->_VOrigin <= CV->_VStop){
|
||||
direction_up = true;
|
||||
current_direction_up = true;
|
||||
Vmin = ((int32_t)(CV->_VOrigin) - 25000) * 4 * 10000; //[5nV]
|
||||
Vmax = ((int32_t)(CV->_VStop) - 25000) * 4 * 10000; //[5nV]
|
||||
Vinit = ((int32_t)(CV->_VOrigin) - 25000) * 4 * 10000; //[5nV]
|
||||
}else{
|
||||
direction_up = false;
|
||||
current_direction_up = false;
|
||||
Vmax = ((int32_t)(CV->_VOrigin) - 25000) * 4 * 10000; //[5nV]
|
||||
Vmin = ((int32_t)(CV->_VStop) - 25000) * 4 * 10000; //[5nV]
|
||||
Vinit = ((int32_t)(CV->_VOrigin) - 25000) * 4 * 10000; //[5nV]
|
||||
}
|
||||
|
||||
if(Vmin == Vinit){
|
||||
VminCounter = -1;
|
||||
}
|
||||
if(Vmax == Vinit){
|
||||
VmaxCounter = -1;
|
||||
}
|
||||
|
||||
if(INSTRUCTION.Step <= 10){
|
||||
Vstep = INSTRUCTION.Step * INSTRUCTION.VscanRate / 5 ; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
|
||||
}else{
|
||||
Vstep = INSTRUCTION.Step / 5 * INSTRUCTION.VscanRate;; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
|
||||
}
|
||||
|
||||
Vset = Vinit;
|
||||
OneWayVoltScan();
|
||||
}
|
||||
|
||||
if(!VscanReset){
|
||||
/*stop condition*/
|
||||
if (Vset >= Vmax){
|
||||
VmaxCounter++;
|
||||
}else if (Vset <= Vmin){
|
||||
VminCounter++;
|
||||
}
|
||||
|
||||
if (current_direction_up){
|
||||
Vset = Vset + Vstep;
|
||||
}else{
|
||||
Vset = Vset - Vstep;
|
||||
}
|
||||
|
||||
if(VmaxCounter != 0 && VminCounter != 0){
|
||||
if(VmaxCounter == VminCounter && direction_up && current_direction_up){
|
||||
if(CycleCounter != VmaxCounter){
|
||||
if(Vset >= Vinit){
|
||||
CV->_CycleNumber--;
|
||||
CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
|
||||
}
|
||||
}
|
||||
}
|
||||
if(VmaxCounter == VminCounter && !direction_up && !current_direction_up){
|
||||
if(CycleCounter != VmaxCounter){
|
||||
if(Vset <= Vinit){
|
||||
CV->_CycleNumber--;
|
||||
CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*stop condition*/
|
||||
if (Vset >= Vmax){
|
||||
current_direction_up = false;
|
||||
}else if (Vset <= Vmin){
|
||||
current_direction_up = true;
|
||||
}
|
||||
|
||||
/*stop condition*/
|
||||
if(CV->_CycleNumber == 0){
|
||||
PeriodicEvent = false;
|
||||
InitEliteFlag();
|
||||
}
|
||||
}
|
||||
//test version add
|
||||
// int32_t RealV;
|
||||
// RealV = (int32_t)(Vset / 200);//[1uV]
|
||||
// InputNotify(NOTIFY_IMPEDANCE, RealV);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
+119
@@ -0,0 +1,119 @@
|
||||
#ifndef ELITECVSCAN
|
||||
#define ELITECVSCAN
|
||||
|
||||
#define Vset INSTRUCTION.Vset
|
||||
|
||||
static uint16_t CVSCANCurve(CVSCANMode *CVSCAN){
|
||||
static uint16_t DACOutCode;
|
||||
static int32_t Vin;
|
||||
static int32_t Vout;
|
||||
static int32_t DeltaVout;
|
||||
|
||||
Vin = CVSCAN->MeasureVolt * 200;//[5nV]
|
||||
if(DACReset){
|
||||
Vout = Vset + Vin;
|
||||
DACReset = false;
|
||||
}else{
|
||||
DeltaVout = Vset - (Vout - Vin);
|
||||
Vout = Vout + DeltaVout;
|
||||
}
|
||||
|
||||
INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
|
||||
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
|
||||
|
||||
int32_t RealV2;
|
||||
RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
|
||||
InputNotify(NOTIFY_VOLT, RealV2);
|
||||
|
||||
int32_t RealV;
|
||||
RealV = (int32_t)(Vout / 200);//[1uV]
|
||||
InputNotify(NOTIFY_IMPEDANCE, RealV);
|
||||
|
||||
DAC_outputV(DACOutCode);
|
||||
|
||||
return DACOutCode;
|
||||
}
|
||||
|
||||
|
||||
static void CVSCAN_Plot(CVSCANMode *CVSCAN){
|
||||
/**********************************************
|
||||
CURRENT_MODE->_VoVi_Switch : 1 read Vin volt
|
||||
->_VoVi_Switch : 0 read Vout volt
|
||||
|
||||
***********************************************/
|
||||
static uint8_t VoltCurrentSwitch = 0;
|
||||
|
||||
if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
|
||||
// read current
|
||||
if(INSTRUCTION.AutoGainEnable){
|
||||
CVSCAN->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
|
||||
AutoGainChange(CVSCAN->_MeasureData);
|
||||
}else{
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
CVSCAN->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
InputNotify(NOTIFY_CURRENT, CVSCAN->_MeasureData);
|
||||
|
||||
// read Volt
|
||||
if(CVSCAN->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}else if(CVSCAN->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 1){ /**read Vin**/
|
||||
// read Volt
|
||||
if(CVSCAN->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}else if(CVSCAN->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
|
||||
// read Volt
|
||||
if(CVSCAN->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);// read vin volt
|
||||
CVSCAN->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
|
||||
}else if(CVSCAN->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);// read vout volt
|
||||
CVSCAN->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
CVSCANCurve(CVSCAN);
|
||||
|
||||
// read current
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 3){ /**read Iin**/
|
||||
// read current
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
|
||||
VoltCurrentSwitch = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void CVSCAN_Vscan(CVSCANMode *CVSCAN){
|
||||
static int32_t Vinit;
|
||||
|
||||
if(VscanReset){
|
||||
Vinit = ((int32_t)(CVSCAN->VInit) - 25000) * 4 * 10000; //[5nV]
|
||||
Vset = Vinit;
|
||||
}
|
||||
|
||||
if(!VscanReset){
|
||||
Vset = Vinit;
|
||||
}
|
||||
|
||||
// int32_t RealV;
|
||||
// RealV = (int32_t)(Vset / 500);//[1uV]
|
||||
// InputNotify(NOTIFY_VOLT, RealV);
|
||||
}
|
||||
|
||||
#endif
|
||||
+1
-1
@@ -59,7 +59,7 @@ static uint16_t DAC_outputV(uint16_t voltLV) {
|
||||
|
||||
static int32_t User2Real(uint16_t UserCode){
|
||||
/* transfer usercode to real voltage value (mV) */
|
||||
return (int32_t) ((UserCode - 25000)*2)/10;
|
||||
return (int32_t)((UserCode - 25000) / 5);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
+854
-160
File diff suppressed because it is too large
Load Diff
+21
@@ -9,12 +9,33 @@ static void InitCT(){
|
||||
CT.StandByCounter = 0;
|
||||
}
|
||||
|
||||
static void InitGPT(){
|
||||
GPT.GptimerCounter = 0;
|
||||
GPT.GptimerCounter0 = 0;
|
||||
GPT.DeltaGptimerCounter = 0;
|
||||
GPT.SampleRate_counter = 0;
|
||||
GPT.StepTimeCounter = 0;
|
||||
GPT.NotifyCounter = 0;
|
||||
GPT.VscanRateCounter = 0;
|
||||
GPT.LeadTimeCounter = 0;
|
||||
|
||||
}
|
||||
|
||||
static void InitFlag(){
|
||||
PeriodicEvent = false; // is there an PeriodicEvent?
|
||||
InitPeriodicEvent = true; // need to create a WorkModeData?
|
||||
DACReset = true;
|
||||
VscanReset = true;
|
||||
NotifyReset = true;
|
||||
ADCReset = true;
|
||||
EliteWorkReset = true;
|
||||
LeadTimeReset = true;
|
||||
CCModeDACEnable = 0; // to make sure DAC work after ADC
|
||||
Free_Work_Mode = true; // Free(WorkModeData)
|
||||
GAIN_200R_counter = 0;
|
||||
GAIN_200K_counter = 0;
|
||||
GAIN_10K_counter = 0;
|
||||
|
||||
// NotifyReady = false;
|
||||
// DiscardIVFirstData = 0;
|
||||
}
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_In
|
||||
#define elite_gptimer_start() GPTimerCC26XX_start(gptimer_handle)
|
||||
#define elite_gptimer_stop() GPTimerCC26XX_stop(gptimer_handle)
|
||||
#define elite_gptimer_close() GPTimerCC26XX_close(gptimer_handle)
|
||||
#define CLOCK_FREQ 4000 // clock freq = 0.1 ms
|
||||
#define CLOCK_FREQ 4800 // clock freq = 0.1 ms
|
||||
|
||||
#define elite_gptimer_open() \
|
||||
do { \
|
||||
|
||||
+17
-71
@@ -2,82 +2,28 @@
|
||||
#ifndef ELITEIT
|
||||
#define ELITEIT
|
||||
|
||||
#define absolute(a) ((a<0)? -a:a)
|
||||
static void IT_Plot(ITMode *IT) {
|
||||
static uint8_t ADCSwitch = 0;
|
||||
|
||||
//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 RealCurrent = 0, RealVolt = 0;
|
||||
static uint8_t PreviousGain = GAIN_200R;
|
||||
|
||||
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);
|
||||
if(ADCSwitch == 0){ /**read Iin(buffer)**/
|
||||
if(INSTRUCTION.AutoGainEnable){
|
||||
IT->_MeasureCurrent = AutoGainReadCurrent(spi_ADC_rxbuf);
|
||||
AutoGainChange(IT->_MeasureCurrent);
|
||||
}else{
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
IT->_MeasureCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
}
|
||||
InputNotify(NOTIFY_CURRENT, IT->_MeasureCurrent);
|
||||
ADCSwitch++;
|
||||
}
|
||||
else{
|
||||
else if(ADCSwitch == 1){ /**read Iin**/
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
RealCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
ADCSwitch++;
|
||||
}
|
||||
else if(ADCSwitch == 2){ /**read Iin**/
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
ADCSwitch = 0;
|
||||
}
|
||||
|
||||
CURRENT_MODE->_MeasureData = RealCurrent;
|
||||
|
||||
|
||||
// if(INSTRUCTION.eliteFxn == IV_CURVE){
|
||||
// // RealVo = Vo - RealCurrent * 100R
|
||||
// RealVolt = (INSTRUCTION.VoltConstant - DAC_ZERO)/5 - 200*(RealCurrent/1e6);
|
||||
//
|
||||
// NotifyVolt[0] = (uint8_t) (RealVolt >> 24);
|
||||
// NotifyVolt[1] = (uint8_t) ((RealVolt & 0x00FF0000) >> 16);
|
||||
// NotifyVolt[2] = (uint8_t) ((RealVolt & 0x0000FF00) >> 8);
|
||||
// NotifyVolt[3] = (uint8_t) (RealVolt & 0x000000FF);
|
||||
// }
|
||||
return RealCurrent;
|
||||
}
|
||||
|
||||
|
||||
|
||||
+111
-155
@@ -2,6 +2,8 @@
|
||||
#ifndef ELITEIV
|
||||
#define ELITEIV
|
||||
|
||||
#define Vset INSTRUCTION.Vset
|
||||
|
||||
static uint16_t VoltScan(WorkMode *WorkModeData) {
|
||||
uint16_t Voltage;
|
||||
if (INSTRUCTION.VoltOrigin == INSTRUCTION.VoltFinal) {
|
||||
@@ -19,202 +21,156 @@ static uint16_t VoltScan(WorkMode *WorkModeData) {
|
||||
|
||||
// IV plot mode
|
||||
else {
|
||||
Voltage = OneWayVoltScan(WorkModeData->IV);
|
||||
Voltage = OneWayVoltScan();
|
||||
}
|
||||
|
||||
return Voltage;
|
||||
}
|
||||
|
||||
static uint16_t OneWayVoltScan(IVMode *IV) {
|
||||
uint16_t DACOutCode;
|
||||
static uint16_t OneWayVoltScan() {
|
||||
static uint16_t DACOutCode;
|
||||
static int32_t Vout;
|
||||
static int32_t DeltaVout;
|
||||
|
||||
// reset origin volt at the begin
|
||||
if (DACReset) {
|
||||
// DACUserCode = IV->GetVOrigin((struct VoltOutPara *) IV);
|
||||
INSTRUCTION.VoltConstant = IV->_VOrigin;
|
||||
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
|
||||
DACReset = false;
|
||||
|
||||
// output VOLT_ORIGIN
|
||||
DAC_outputV(DACOutCode);
|
||||
return DACOutCode;
|
||||
if(DACReset){
|
||||
Vout = Vset;
|
||||
DACReset = false;
|
||||
}else{
|
||||
DeltaVout = Vset - (Vout);
|
||||
Vout = Vout + DeltaVout;
|
||||
}
|
||||
|
||||
if (CT.StepTimeCounter == IV->_StepTime){
|
||||
if (IV->_VOrigin < IV->_VStop) {
|
||||
// output the next output volt
|
||||
INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + IV->_Step;
|
||||
// Only used in two-wire IV
|
||||
// if(INSTRUCTION.VoltConstant > IV->_VStop){
|
||||
// INSTRUCTION.VoltConstant = IV->_VStop;
|
||||
// }
|
||||
|
||||
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
|
||||
DAC_outputV(DACOutCode);
|
||||
|
||||
// end IV task if we reach INSTRUCTION.VoltFinal
|
||||
// if (INSTRUCTION.VoltConstant >= IV->_VStop) {
|
||||
// PeriodicEvent = false;
|
||||
// DACReset = true;
|
||||
// }
|
||||
} else {
|
||||
INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant - IV->_Step;
|
||||
|
||||
// check if DACUserCode underflow
|
||||
if(INSTRUCTION.VoltConstant >= 60000){
|
||||
INSTRUCTION.VoltConstant = IV->_VStop;
|
||||
}
|
||||
|
||||
// output the next output volt
|
||||
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
|
||||
DAC_outputV(DACOutCode);
|
||||
|
||||
// end IV task if we reach INSTRUCTION.VoltFinal
|
||||
// if (INSTRUCTION.VoltConstant <= IV->_VStop){
|
||||
// PeriodicEvent = false;
|
||||
// DACReset = true;
|
||||
//// reset();
|
||||
// }
|
||||
}
|
||||
if (IV->_VoVi_Switch == 0x00 || IV->_VoVi_Switch == 0x01){ //user see Vout/user see Vin
|
||||
if (IV->_VOrigin < IV->_VStop) {
|
||||
if(INSTRUCTION.VoltConstant >= IV->_VStop){
|
||||
PeriodicEvent = false;
|
||||
DACReset = true;
|
||||
}
|
||||
}
|
||||
else{
|
||||
if(INSTRUCTION.VoltConstant <= IV->_VStop){
|
||||
PeriodicEvent = false;
|
||||
DACReset = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
INSTRUCTION.VoltConstant = Vout / 40000 + 25000; //5nV=>usercode
|
||||
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
|
||||
DAC_outputV(DACOutCode);
|
||||
|
||||
if ((INSTRUCTION.eliteFxn == IV_CURVE)||(INSTRUCTION.eliteFxn == CV_CURVE)||(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)){
|
||||
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);
|
||||
|
||||
RealV = (int32_t)(Vout / 200);//[1uV]
|
||||
InputNotify(NOTIFY_IMPEDANCE, RealV);
|
||||
}
|
||||
|
||||
|
||||
return DACOutCode;
|
||||
}
|
||||
|
||||
static void IV_Plot(IVMode *IV) {
|
||||
/**********************************************
|
||||
CURRENT_MODE->_VoVi_Switch : 1 read Vin volt
|
||||
->_VoVi_Switch : 0 read Vout volt
|
||||
|
||||
***********************************************/
|
||||
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){
|
||||
if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
|
||||
// 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{
|
||||
AutoGainChange(IV->_MeasureData);
|
||||
}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){
|
||||
|
||||
InputNotify(NOTIFY_CURRENT, IV->_MeasureData);
|
||||
|
||||
// read Volt
|
||||
if(IV->_VoVi_Switch == 0x01){
|
||||
// read vin volt
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}else if(IV->_VoVi_Switch == 0x00){
|
||||
// read vout volt
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 9){
|
||||
else if(VoltCurrentSwitch == 1){ /**read Vin**/
|
||||
// read Volt
|
||||
if(IV->_VoVi_Switch == 0x01){
|
||||
// read vin volt
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
|
||||
IV->MeasureVolt = DecodeADCVolt(ADC_measure);
|
||||
}else if(IV->_VoVi_Switch == 0x00){
|
||||
// read vout volt
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
|
||||
IV->MeasureVolt = DecodeADCVoutVolt(ADC_measure);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
// else if (VoltCurrentSwitch < 13){
|
||||
// ReadBatVolt(spi_ADC_rxbuf);
|
||||
// VoltCurrentSwitch ++;
|
||||
// }
|
||||
// else if (VoltCurrentSwitch == 13){
|
||||
// // read battery volt
|
||||
// ReadBatVolt(spi_ADC_rxbuf);
|
||||
// ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
|
||||
// IV->_MeasureBatvolt = DecodeADCBatVolt(ADC_measure);
|
||||
// IV->_MeasureBatvolt = IV->_MeasureBatvolt/10 - 250; // (5.00V) 5000->250 usercode
|
||||
// VoltCurrentSwitch ++;
|
||||
// }
|
||||
else{
|
||||
else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
|
||||
// read Volt
|
||||
if(IV->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
IV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
|
||||
}else if(IV->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
IV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
InputNotify(NOTIFY_VOLT, IV->MeasureVolt);
|
||||
|
||||
// read current
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 3){ /**read Iin**/
|
||||
// read current
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
|
||||
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{
|
||||
if(IV->MeasureVolt <= ((int32_t) (IV->_VStop) - DAC_ZERO)/5){
|
||||
PeriodicEvent = false;
|
||||
DACReset = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// NotifyBatVolt = (uint8_t) (IV->_MeasureBatvolt & 0x000000FF);
|
||||
}
|
||||
|
||||
static void IV_Vscan(IVMode *IV){
|
||||
static int32_t Voringin;
|
||||
static int32_t Vstop;
|
||||
static uint32_t Vstep;
|
||||
static bool direction_up;
|
||||
static bool current_direction_up;
|
||||
|
||||
if(VscanReset){
|
||||
if(IV->_VOrigin <= IV->_VStop){
|
||||
direction_up = true;
|
||||
current_direction_up = true;
|
||||
}else{
|
||||
direction_up = false;
|
||||
current_direction_up = false;
|
||||
}
|
||||
|
||||
if(INSTRUCTION.Step <= 10){
|
||||
Vstep = INSTRUCTION.Step * INSTRUCTION.VscanRate / 5 ; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
|
||||
}else{
|
||||
Vstep = INSTRUCTION.Step / 5 * INSTRUCTION.VscanRate;; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
|
||||
}
|
||||
|
||||
Voringin = ((int32_t)(IV->_VOrigin) - 25000) * 4 * 10000; //[5nV]
|
||||
Vstop = ((int32_t)(IV->_VStop) - 25000) * 4 * 10000; //[5nV]
|
||||
Vset = Voringin;
|
||||
OneWayVoltScan();
|
||||
}
|
||||
|
||||
if(!VscanReset){
|
||||
if(current_direction_up){
|
||||
if(Vset >= Vstop){
|
||||
PeriodicEvent = false;
|
||||
InitEliteFlag();
|
||||
}
|
||||
}else{
|
||||
if(Vset <= Vstop){
|
||||
PeriodicEvent = false;
|
||||
InitEliteFlag();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (current_direction_up){
|
||||
Vset = Vset + Vstep;
|
||||
}else{
|
||||
Vset = Vset - Vstep;
|
||||
}
|
||||
|
||||
}
|
||||
//test version add
|
||||
// int32_t RealV;
|
||||
// RealV = (int32_t)(Vset / 200);//[1uV]
|
||||
// InputNotify(NOTIFY_IMPEDANCE, RealV);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
+25
-3
@@ -46,7 +46,7 @@ struct HEADSTAGE_INSTRUCTION {
|
||||
// volt san parameter
|
||||
uint16_t VoltOrigin;
|
||||
uint16_t VoltFinal;
|
||||
uint16_t Step;
|
||||
uint32_t Step;
|
||||
uint16_t StepTime;
|
||||
|
||||
// constant volt
|
||||
@@ -59,7 +59,7 @@ struct HEADSTAGE_INSTRUCTION {
|
||||
uint8_t AutoGainEnable;
|
||||
|
||||
/** Notify parameter **/
|
||||
uint16_t NotifyRate;
|
||||
uint32_t NotifyRate;
|
||||
|
||||
/** Constant Current Parameter **/
|
||||
// Charge is a bool; true => current > 0, vice versa
|
||||
@@ -73,10 +73,26 @@ struct HEADSTAGE_INSTRUCTION {
|
||||
// elite function
|
||||
uint8_t eliteFxn;
|
||||
|
||||
uint8_t CycleNumber;
|
||||
uint16_t CycleNumber;
|
||||
|
||||
uint8_t VoVi_Switch;
|
||||
|
||||
uint16_t InitVolt;
|
||||
|
||||
uint16_t MaxVolt;
|
||||
|
||||
uint16_t MinVolt;
|
||||
|
||||
uint16_t InitDirection;
|
||||
|
||||
uint32_t MaxCurrent;
|
||||
|
||||
uint8_t VscanRateIndex;
|
||||
|
||||
uint32_t VscanRate;
|
||||
|
||||
int32_t Vset;
|
||||
|
||||
} INSTRUCTION = {0};
|
||||
|
||||
/*********************************************************************
|
||||
@@ -107,6 +123,12 @@ static void InitEliteInstruction(){
|
||||
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
|
||||
INSTRUCTION.InitVolt = DAC_ZERO;
|
||||
INSTRUCTION.MaxVolt = DAC_ZERO;
|
||||
INSTRUCTION.MinVolt = DAC_ZERO;
|
||||
INSTRUCTION.InitDirection = 1; //0:reverse 1:forward
|
||||
INSTRUCTION.VscanRate = 1;
|
||||
INSTRUCTION.Vset = DAC_ZERO;
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
|
||||
+13
-5
@@ -10,17 +10,25 @@ static bool TurnOnElite(uint8_t key) {
|
||||
if (key == 0) {
|
||||
// press 1 sec, power on LED
|
||||
if (TurnOnCounter >= CLOCK_ONE_SECOND) {
|
||||
PIN_setOutputValue(pin_handle, enable_5v, 1); // enable 5V
|
||||
TurnOn10V();
|
||||
LEDPowerON();
|
||||
return true;
|
||||
headstage_battery_volt();
|
||||
uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
|
||||
((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
|
||||
if( bat < 768 && bat > 20){
|
||||
PIN_setOutputValue(pin_handle, enable_5v, 0);
|
||||
return false;
|
||||
}else{
|
||||
PIN_setOutputValue(pin_handle, enable_5v, 1); // enable 5V
|
||||
TurnOn10V();
|
||||
LEDPowerON();
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
TurnOnCounter++;
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
TurnOnCounter = 0;
|
||||
PIN_setOutputValue(pin_handle, enable_5v, 0); // enable 5V
|
||||
PIN_setOutputValue(pin_handle, enable_5v, 0);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
+15
-2
@@ -58,7 +58,8 @@ static void WorkModeLED() {
|
||||
break;
|
||||
}
|
||||
case CONSTANT_CURRENT:{
|
||||
WORKLED();
|
||||
// WORKLED();
|
||||
LED_color(0xE2, 0x00, 0x00, 0xAA);
|
||||
break;
|
||||
}
|
||||
case VIS_RST: {
|
||||
@@ -69,10 +70,22 @@ static void WorkModeLED() {
|
||||
WORKLED();
|
||||
break;
|
||||
}
|
||||
case READ_VOUT_VALUE: {
|
||||
case CYCLIC_VOLTAMMETRY: {
|
||||
WORKLED();
|
||||
break;
|
||||
}
|
||||
case LINEAR_SWEEP_VOLTAMMETRY: {
|
||||
WORKLED();
|
||||
break;
|
||||
}
|
||||
case CONSTANT_VSCAN: {
|
||||
WORKLED();
|
||||
break;
|
||||
}
|
||||
// case READ_VOUT_VALUE: {
|
||||
// WORKLED();
|
||||
// break;
|
||||
// }
|
||||
|
||||
default: {
|
||||
LEDPowerON();
|
||||
|
||||
+186
@@ -0,0 +1,186 @@
|
||||
#ifndef ELITELSV
|
||||
#define ELITELSV
|
||||
|
||||
#define Vset INSTRUCTION.Vset
|
||||
|
||||
static uint16_t LSVCurve(LSVMode *LSV){
|
||||
static uint16_t DACOutCode;
|
||||
static int32_t Vin;
|
||||
static int32_t Vout;
|
||||
static int32_t DeltaVout;
|
||||
|
||||
Vin = LSV->MeasureVolt * 200;//[5nV]
|
||||
if(DACReset){
|
||||
Vout = Vset + Vin;
|
||||
DACReset = false;
|
||||
}else{
|
||||
DeltaVout = Vset - (Vout - Vin);
|
||||
Vout = Vout + DeltaVout;
|
||||
}
|
||||
|
||||
INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
|
||||
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
|
||||
|
||||
int32_t RealV2;
|
||||
RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
|
||||
InputNotify(NOTIFY_VOLT, RealV2);
|
||||
|
||||
int32_t RealV;
|
||||
RealV = (int32_t)(Vout / 200);//[1uV]
|
||||
InputNotify(NOTIFY_IMPEDANCE, RealV);
|
||||
|
||||
DAC_outputV(DACOutCode);
|
||||
//
|
||||
return DACOutCode;
|
||||
}
|
||||
|
||||
|
||||
static void LSV_Plot(LSVMode *LSV){
|
||||
/**********************************************
|
||||
MODE->_VoVi_Switch : 1 read Vin volt
|
||||
->_VoVi_Switch : 0 read Vout volt
|
||||
|
||||
***********************************************/
|
||||
static uint8_t VoltCurrentSwitch = 0;
|
||||
|
||||
if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
|
||||
// read current
|
||||
if(INSTRUCTION.AutoGainEnable){
|
||||
LSV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
|
||||
AutoGainChange(LSV->_MeasureData);
|
||||
}else{
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
LSV->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
InputNotify(NOTIFY_CURRENT, LSV->_MeasureData);
|
||||
|
||||
// read Volt
|
||||
if(LSV->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}else if(LSV->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 1){ /**read Vin**/
|
||||
// read Volt
|
||||
if(LSV->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
}else if(LSV->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
|
||||
// read Volt
|
||||
if(LSV->_VoVi_Switch == 0x01){
|
||||
ReadVolt(spi_ADC_rxbuf);// read vin volt
|
||||
LSV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
|
||||
}else if(LSV->_VoVi_Switch == 0x00){
|
||||
ReadVoutVolt(spi_ADC_rxbuf);// read vout volt
|
||||
LSV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
LSVCurve(LSV);
|
||||
|
||||
// read current
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
|
||||
VoltCurrentSwitch++;
|
||||
}
|
||||
else if(VoltCurrentSwitch == 3){ /**read Iin**/
|
||||
// read current
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
|
||||
VoltCurrentSwitch = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void LSV_Vscan(LSVMode *LSV){
|
||||
static int32_t Vmax;
|
||||
static int32_t Vmin;
|
||||
static int32_t Vinit;
|
||||
static uint32_t Vstep;
|
||||
static int16_t VminCounter;
|
||||
static int16_t VmaxCounter;
|
||||
static bool direction_up; // direction_up = true, if InitDirection=1
|
||||
static bool current_direction_up; // current_direction_up = true, Vstep => positive. vice versa
|
||||
static uint16_t CycleCounter;
|
||||
|
||||
NotifyCycleNumber = (INSTRUCTION.CycleNumber - LSV->CycleNumber + 1);
|
||||
|
||||
if(VscanReset){
|
||||
VmaxCounter = 0;
|
||||
VminCounter = 0;
|
||||
CycleCounter = 0;
|
||||
if(LSV->VOrigin <= LSV->VStop){
|
||||
direction_up = true;
|
||||
current_direction_up = true;
|
||||
Vmin = ((int32_t)(LSV->VOrigin) - 25000) * 4 * 10000; //[5nV]
|
||||
Vmax = ((int32_t)(LSV->VStop) - 25000) * 4 * 10000; //[5nV]
|
||||
Vinit = ((int32_t)(LSV->VOrigin) - 25000) * 4 * 10000; //[5nV]
|
||||
}else{
|
||||
direction_up = false;
|
||||
current_direction_up = false;
|
||||
Vmax = ((int32_t)(LSV->VOrigin) - 25000) * 4 * 10000; //[5nV]
|
||||
Vmin = ((int32_t)(LSV->VStop) - 25000) * 4 * 10000; //[5nV]
|
||||
Vinit = ((int32_t)(LSV->VOrigin) - 25000) * 4 * 10000; //[5nV]
|
||||
}
|
||||
|
||||
if(INSTRUCTION.Step <= 10){
|
||||
Vstep = INSTRUCTION.Step * INSTRUCTION.VscanRate / 5 ; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
|
||||
}else{
|
||||
Vstep = INSTRUCTION.Step / 5 * INSTRUCTION.VscanRate; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
|
||||
}
|
||||
|
||||
Vset = Vinit;
|
||||
}
|
||||
|
||||
if(!VscanReset){
|
||||
|
||||
if (current_direction_up){
|
||||
Vset = Vset + Vstep;
|
||||
}else{
|
||||
Vset = Vset - Vstep;
|
||||
}
|
||||
|
||||
|
||||
/*stop condition*/
|
||||
if (Vset >= Vmax){
|
||||
Vset = Vmin;
|
||||
|
||||
INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
INSTRUCTION.Charge = 0x01;
|
||||
INSTRUCTION.ConstantCurrent = 0x00;
|
||||
INSTRUCTION.MaxVolt = 0xC350;
|
||||
INSTRUCTION.MinVolt = 0x0000;
|
||||
INSTRUCTION.NotifyRate = 500;
|
||||
INSTRUCTION.VoVi_Switch = 0x02;//read Vscan = Vout - Vin
|
||||
// PeriodicEvent = false;
|
||||
InitEliteFlag();
|
||||
}else if (Vset <= Vmin){
|
||||
Vset = Vmax;
|
||||
|
||||
INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
INSTRUCTION.Charge = 0x01;
|
||||
INSTRUCTION.ConstantCurrent = 0x00;
|
||||
INSTRUCTION.MaxVolt = 0xC350;
|
||||
INSTRUCTION.MinVolt = 0x0000;
|
||||
INSTRUCTION.NotifyRate = 500;
|
||||
INSTRUCTION.VoVi_Switch = 0x02;//read Vscan = Vout - Vin
|
||||
// PeriodicEvent = false;
|
||||
InitEliteFlag();
|
||||
}
|
||||
}
|
||||
//test version add
|
||||
// int32_t RealV;
|
||||
// RealV = (int32_t)(Vset / 200);//[1uV]
|
||||
// InputNotify(NOTIFY_VOLT, RealV);
|
||||
}
|
||||
|
||||
#endif
|
||||
+56
-7
@@ -13,6 +13,12 @@
|
||||
|
||||
#define NOT_BUF_OFFSET_INIT 8
|
||||
|
||||
/*notify's input type*/
|
||||
#define NOTIFY_CURRENT 0
|
||||
#define NOTIFY_VOLT 1
|
||||
#define NOTIFY_IMPEDANCE 2
|
||||
#define NOTIFY_VOLT_BAT 3
|
||||
|
||||
/**
|
||||
* the index where to start insert data into buffer.
|
||||
* start from 6.
|
||||
@@ -24,12 +30,14 @@ static uint32_t not_time_stamp;
|
||||
static uint8_t NotifyCurrent[4] = {0};
|
||||
static uint8_t NotifyVolt[4] = {0};
|
||||
static uint8_t NotifyImpedance[4] = {0};
|
||||
static uint8_t NotifyBatVolt = 0;
|
||||
static uint8_t NotifyVoltBat[4] = {0};
|
||||
static uint16_t NotifyCycleNumber = 0;
|
||||
|
||||
/**
|
||||
* counter of notify send.
|
||||
*/
|
||||
static uint32_t notify_counter = 0;
|
||||
static bool NotifyEnable = 0;
|
||||
|
||||
// ****************** New Notify Format ******************************** //
|
||||
/*
|
||||
@@ -105,10 +113,8 @@ static void SendNotify() {
|
||||
not_buf[16] = (not_time_stamp >> 24) & 0xff;
|
||||
|
||||
// cyclic voltametry cycle number
|
||||
not_buf[17] = INSTRUCTION.CycleNumber;
|
||||
|
||||
//battery volt
|
||||
not_buf[18] = NotifyBatVolt;
|
||||
not_buf[17] = (NotifyCycleNumber >> 8) & 0xff;
|
||||
not_buf[18] = NotifyCycleNumber & 0xff;
|
||||
|
||||
SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
|
||||
}
|
||||
@@ -120,8 +126,13 @@ static void FlushNotify(){
|
||||
not_buf[i + 1] = 0;
|
||||
not_buf[i + 5] = 0;
|
||||
not_buf[i + 9] = 0;
|
||||
NotifyCurrent[i] = 0;
|
||||
NotifyVolt[i] = 0;
|
||||
NotifyImpedance[i] = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 1 Timestamp = 32 usec; 31 Timestamp ~= 1 msec
|
||||
not_time_stamp = 0; // msec
|
||||
|
||||
@@ -132,11 +143,49 @@ static void FlushNotify(){
|
||||
|
||||
// cyclic voltametry cycle number
|
||||
not_buf[17] = 0x00;
|
||||
|
||||
//battery volt
|
||||
not_buf[18] = 0x00;
|
||||
NotifyCycleNumber = 0;
|
||||
|
||||
SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
|
||||
}
|
||||
|
||||
static void InputNotify(int NotifyType, int32_t Data){
|
||||
|
||||
switch (NotifyType) {
|
||||
case NOTIFY_CURRENT:
|
||||
NotifyCurrent[0] = (uint8_t)((Data & 0xFF000000) >> 24);
|
||||
NotifyCurrent[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
|
||||
NotifyCurrent[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
|
||||
NotifyCurrent[3] = (uint8_t)(Data & 0x000000FF);
|
||||
break;
|
||||
|
||||
case NOTIFY_IMPEDANCE:
|
||||
NotifyImpedance[0] = (uint8_t)((Data & 0xFF000000) >> 24);
|
||||
NotifyImpedance[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
|
||||
NotifyImpedance[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
|
||||
NotifyImpedance[3] = (uint8_t)(Data & 0x000000FF);
|
||||
break;
|
||||
|
||||
case NOTIFY_VOLT :
|
||||
NotifyVolt[0] = (uint8_t)((Data & 0xFF000000) >> 24);
|
||||
NotifyVolt[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
|
||||
NotifyVolt[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
|
||||
NotifyVolt[3] = (uint8_t)(Data & 0x000000FF);
|
||||
break;
|
||||
|
||||
case NOTIFY_VOLT_BAT :
|
||||
NotifyVoltBat[0] = (uint8_t)((Data & 0xFF000000) >> 24);
|
||||
NotifyVoltBat[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
|
||||
NotifyVoltBat[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
|
||||
NotifyVoltBat[3] = (uint8_t)(Data & 0x000000FF);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void FlushCISNotify(){
|
||||
for (int i = 0; i < 20; i++) {
|
||||
cis_buf[i] = 0;
|
||||
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
+3
@@ -5,6 +5,7 @@
|
||||
static void reset() {
|
||||
InitFlag();
|
||||
InitCT();
|
||||
InitGPT();
|
||||
|
||||
// IV/CV mode reset
|
||||
DiscardIVFirstData = 0;
|
||||
@@ -51,6 +52,7 @@ static void reset() {
|
||||
static void Eliteinterrupt() {
|
||||
InitFlag();
|
||||
InitCT();
|
||||
InitGPT();
|
||||
|
||||
// IV/CV mode reset
|
||||
DiscardIVFirstData = 0;
|
||||
@@ -92,6 +94,7 @@ static void CleanBuffer() {
|
||||
InitFlag();
|
||||
InitEliteInstruction();
|
||||
InitCT();
|
||||
InitGPT();
|
||||
DiscardIVFirstData = 0;
|
||||
avg_number = 0;
|
||||
ADCRealCurrent_long = 0;
|
||||
|
||||
+34
-8
@@ -1,22 +1,48 @@
|
||||
|
||||
#ifndef ELITEVT
|
||||
#define ELITEVT
|
||||
static int32_t VTInputVoltData(uint16_t VoVi_Switch, VTMode *VT);
|
||||
|
||||
static void VT_Plot(VTMode *VT) {
|
||||
|
||||
// ADC gain is don't care when measuring voltage
|
||||
INSTRUCTION.ADCGainLevel = GAIN_200R;
|
||||
ADCGainControl(INSTRUCTION.ADCGainLevel);
|
||||
|
||||
// read ADC volt
|
||||
ReadVolt(spi_ADC_rxbuf);
|
||||
static uint8_t ADCSwitch = 0;
|
||||
int32_t VoltData;
|
||||
|
||||
// decode ADC value and put it into notify buffer
|
||||
VT->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
|
||||
if(ADCSwitch == 0){ /**read V(buffer)**/
|
||||
ReadADCVolt(VT->_VoVi_Switch);
|
||||
VoltData = VTInputVoltData(VT->_VoVi_Switch, VT);
|
||||
InputNotify(NOTIFY_VOLT, VoltData);
|
||||
ADCSwitch++;
|
||||
}
|
||||
else if(ADCSwitch == 1){ /**read V**/
|
||||
ReadADCVolt(VT->_VoVi_Switch);
|
||||
ADCSwitch++;
|
||||
}
|
||||
else if(ADCSwitch == 2){ /**read V**/
|
||||
ReadADCVolt(VT->_VoVi_Switch);
|
||||
ADCSwitch = 0;
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
static int32_t VTInputVoltData(uint16_t VoVi_Switch, VTMode *VT){
|
||||
uint8_t ADCChannel;
|
||||
int32_t VoltData;
|
||||
|
||||
if(VoVi_Switch == 0x01){
|
||||
ADCChannel = ADC_CH_VOLT;
|
||||
VT->_MeasureVin = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADCChannel, spi_ADC_rxbuf);
|
||||
VoltData = VT->_MeasureVin;
|
||||
}else if(VoVi_Switch == 0x00){
|
||||
ADCChannel = ADC_CH_DAC;
|
||||
VT->_MeasureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADCChannel, spi_ADC_rxbuf);
|
||||
VoltData = VT->_MeasureVout;
|
||||
}
|
||||
|
||||
return VoltData;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
+276
-323
@@ -1,57 +1,7 @@
|
||||
/**
|
||||
*
|
||||
* struct WorkMode{
|
||||
* // Measure Only
|
||||
* ITMode;
|
||||
* VTMode;
|
||||
*
|
||||
* // Measure + VoltOut
|
||||
* RTMode;
|
||||
* IVMode;
|
||||
* CVMode;
|
||||
*
|
||||
* // Volt out only
|
||||
* VOutMode
|
||||
* }
|
||||
*
|
||||
* -------------------------------
|
||||
* // Measure Only
|
||||
* struct ITMode{
|
||||
* MeasureData
|
||||
* SetMeasureData()
|
||||
* GetMeasureData()
|
||||
* }
|
||||
*
|
||||
* -------------------------------
|
||||
* // VoltOut parameter
|
||||
* stuct VOutMode{
|
||||
* Vout_UC
|
||||
* VoltOrigin
|
||||
* Vstop;
|
||||
* Step;
|
||||
* StepTime;
|
||||
* CycleNumber;
|
||||
* }
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef ELITE_WORK_DATA
|
||||
#define ELITE_WORK_DATA
|
||||
|
||||
#include "EliteInstruction.h"
|
||||
#define IV_CURVE 0b00010000
|
||||
#define CV_CURVE 0b00100000
|
||||
#define VOLT_OUTPUT 0b00110000
|
||||
#define ZT_CURVE 0b01000000
|
||||
#define VT_CURVE 0b01010000
|
||||
#define IT_CURVE 0b01100000
|
||||
#define SET_SAMPLE_RATE 0b01110000
|
||||
#define SET_ADC_GAIN 0b10000000
|
||||
#define DIFFERENTIAL_PULSE_VOLTAMMETRY 0b10100000
|
||||
#define SQUARE_WAVE_VOLTAMMETRY 0b10110000
|
||||
#define POTENTIAL_STATE 0b11000000
|
||||
#define CONSTANT_CURRENT 0b11010000
|
||||
#define READ_VOUT_VALUE 0b11100000
|
||||
|
||||
static bool Free_Work_Mode = false;
|
||||
typedef void (*InitWorkData) ();
|
||||
@@ -60,8 +10,6 @@ typedef void (*InitWorkData) ();
|
||||
#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 */
|
||||
@@ -72,19 +20,6 @@ typedef void (*InitWorkData) ();
|
||||
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)
|
||||
@@ -104,13 +39,17 @@ typedef void (*InitWorkData) ();
|
||||
* @_Transform2RealnA : transform a current user code (IUC) to real current in nA
|
||||
*/
|
||||
#define CC_PARA \
|
||||
MEASURE; \
|
||||
int32_t _MeasureData; \
|
||||
uint16_t _VoVi_Switch; \
|
||||
uint8_t Charge; \
|
||||
int32_t BatteryV; \
|
||||
int32_t value; \
|
||||
uint16_t Done; \
|
||||
uint16_t VMax; \
|
||||
uint16_t VMin; \
|
||||
int32_t MeasureVolt; \
|
||||
int32_t Vset; \
|
||||
int32_t Iset; \
|
||||
int32_t (*_Transform2RealnA)(struct CCModePara *)
|
||||
|
||||
|
||||
@@ -119,6 +58,45 @@ typedef void (*InitWorkData) ();
|
||||
void (*SetLimitValue) (struct Limit *, uint32_t); \
|
||||
uint32_t (*GetLimitValue) (struct Limit*)
|
||||
|
||||
#define CV3_PARA \
|
||||
int32_t _MeasureData; \
|
||||
uint16_t _VoVi_Switch; \
|
||||
int32_t MeasureVolt; \
|
||||
uint16_t VInit; \
|
||||
uint16_t VMax; \
|
||||
uint16_t VMin; \
|
||||
uint16_t VOrigin; \
|
||||
uint16_t VStop; \
|
||||
uint16_t InitDirection; \
|
||||
uint16_t Step; \
|
||||
uint16_t StepTime; \
|
||||
uint16_t CycleNumber; \
|
||||
uint32_t VscanRate; \
|
||||
int32_t Vset
|
||||
|
||||
#define LSV_PARA \
|
||||
int32_t _MeasureData; \
|
||||
uint16_t _VoVi_Switch; \
|
||||
int32_t MeasureVolt; \
|
||||
uint16_t VInit; \
|
||||
uint16_t VMax; \
|
||||
uint16_t VMin; \
|
||||
uint16_t VOrigin; \
|
||||
uint16_t VStop; \
|
||||
uint16_t InitDirection; \
|
||||
uint16_t Step; \
|
||||
uint16_t StepTime; \
|
||||
uint16_t CycleNumber; \
|
||||
uint32_t VscanRate; \
|
||||
int32_t Vset
|
||||
|
||||
#define CVSCAN_PARA \
|
||||
int32_t _MeasureData; \
|
||||
uint16_t _VoVi_Switch; \
|
||||
int32_t MeasureVolt; \
|
||||
uint16_t VInit; \
|
||||
int32_t Vset
|
||||
|
||||
struct Measure{
|
||||
MEASURE;
|
||||
};
|
||||
@@ -134,18 +112,13 @@ struct Limit{
|
||||
struct CCModePara{
|
||||
CC_PARA;
|
||||
};
|
||||
|
||||
struct CV3ModePara{
|
||||
CV3_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
|
||||
@@ -156,142 +129,74 @@ uint32_t _GetLimitValue(struct Limit *self){
|
||||
return self->_LimitValue;
|
||||
}
|
||||
|
||||
/* IT Mode Data */
|
||||
typedef struct _ITMode{
|
||||
MEASURE;
|
||||
LIMIT;
|
||||
}ITMode;
|
||||
|
||||
ITMode * InitITMode(){
|
||||
ITMode *ret = malloc(sizeof(ITMode));
|
||||
ret->_MeasureData = 0;
|
||||
// ret->SetMeasureData = &_SetMeasureData;
|
||||
// ret->GetMeasureData = &_GetMeasureData;
|
||||
|
||||
ret->_LimitValue = 0;
|
||||
|
||||
ret->SetLimitValue = &_SetLimitValue;
|
||||
ret->GetLimitValue = &_GetLimitValue;
|
||||
return ret;
|
||||
}
|
||||
/* End of IT Mode Data */
|
||||
|
||||
/* VT Mode Data */
|
||||
typedef struct _VTMode{
|
||||
MEASURE;
|
||||
}VTMode;
|
||||
|
||||
VTMode * InitVTMode(){
|
||||
VTMode *ret = malloc(sizeof(VTMode));
|
||||
ret->_MeasureData = 0;
|
||||
// ret->SetMeasureData = &_SetMeasureData;
|
||||
// ret->GetMeasureData = &_GetMeasureData;
|
||||
return ret;
|
||||
}
|
||||
/* End of VT Mode Data */
|
||||
|
||||
/* ReadVOut Mode Data */
|
||||
typedef struct _RVoutMode{
|
||||
MEASURE;
|
||||
}RVoutMode;
|
||||
|
||||
RVoutMode * InitRVoutMode(){
|
||||
RVoutMode *ret = malloc(sizeof(RVoutMode));
|
||||
ret->_MeasureData = 0;
|
||||
// ret->SetMeasureData = &_SetMeasureData;
|
||||
// ret->GetMeasureData = &_GetMeasureData;
|
||||
return ret;
|
||||
}
|
||||
/* End of ReadVOut Mode Data */
|
||||
/***** End of Measure Only Mode *****/
|
||||
|
||||
|
||||
/**** VoltOut Only Mode ****/
|
||||
//// VoltOut
|
||||
//void _SetVoltOut(struct VoltOutPara *self, uint16_t VoltOut){
|
||||
// self->_VoltOut = VoltOut;
|
||||
//}
|
||||
//uint16_t _GetVoltOut(struct VoltOutPara *self){
|
||||
// return self->_VoltOut;
|
||||
//}
|
||||
//
|
||||
//// VOrigin
|
||||
//void _SetVOrigin(struct VoltOutPara *self, uint16_t VOrigin){
|
||||
// self->_VOrigin = VOrigin;
|
||||
//}
|
||||
//uint16_t _GetVOrigin(struct VoltOutPara *self){
|
||||
// return self->_VOrigin;
|
||||
//}
|
||||
//
|
||||
//// VStop
|
||||
//void _SetVStop(struct VoltOutPara *self, uint16_t VStop){
|
||||
// self->_VStop = VStop;
|
||||
//}
|
||||
//uint16_t _GetVStop(struct VoltOutPara *self){
|
||||
// return self->_VStop;
|
||||
//}
|
||||
//
|
||||
//// Step
|
||||
//void _SetStep(struct VoltOutPara *self, uint16_t Step){
|
||||
// self->_Step = Step;
|
||||
//}
|
||||
//uint16_t _GetStep(struct VoltOutPara *self){
|
||||
// return self->_Step;
|
||||
//}
|
||||
//
|
||||
//// StepTime
|
||||
//void _SetStepTime(struct VoltOutPara *self, uint16_t StepTime){
|
||||
// self->_StepTime = StepTime;
|
||||
//}
|
||||
//uint16_t _GetStepTime(struct VoltOutPara *self){
|
||||
// return self->_StepTime;
|
||||
//}
|
||||
//
|
||||
//// CycleNumber
|
||||
//void _SetCycleNumber(struct VoltOutPara *self, uint16_t CycleNumber){
|
||||
// self->_CycleNumber = CycleNumber;
|
||||
//}
|
||||
//uint16_t _GetCycleNumber(struct VoltOutPara *self){
|
||||
// return self->_CycleNumber;
|
||||
//}
|
||||
|
||||
|
||||
/* VoltOut Mode Data */
|
||||
typedef struct _VoltOutMode{
|
||||
VOUT_PARA;
|
||||
uint16_t _Vset;
|
||||
}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;
|
||||
ret->_Vset = INSTRUCTION.VoltConstant;
|
||||
return ret;
|
||||
}
|
||||
/* End of VoltOut Mode Data */
|
||||
/**** End of VoltOut Only Mode ****/
|
||||
|
||||
|
||||
/**** Measure + VoltOut Mode ****/
|
||||
/* IT Mode Data */
|
||||
typedef struct _ITMode{
|
||||
int32_t _MeasureCurrent;
|
||||
}ITMode;
|
||||
|
||||
ITMode * InitITMode(){
|
||||
ITMode *ret = malloc(sizeof(ITMode));
|
||||
ret->_MeasureCurrent = 0;
|
||||
return ret;
|
||||
}
|
||||
/* End of IT Mode Data */
|
||||
|
||||
/* VT Mode Data */
|
||||
typedef struct _VTMode{
|
||||
int32_t _MeasureVin;
|
||||
int32_t _MeasureVout;
|
||||
uint16_t _VoVi_Switch;
|
||||
}VTMode;
|
||||
|
||||
VTMode * InitVTMode(){
|
||||
VTMode *ret = malloc(sizeof(VTMode));
|
||||
ret->_MeasureVin = 0;
|
||||
ret->_MeasureVout = 0;
|
||||
ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
|
||||
return ret;
|
||||
}
|
||||
/* End of VT Mode Data */
|
||||
|
||||
|
||||
/* RT Mode Data */
|
||||
typedef struct _RTMode{
|
||||
int32_t _MeasureCurrent;
|
||||
int32_t _MeasureVin;
|
||||
int32_t _MeasureVout;
|
||||
uint16_t _VoVi_Switch;
|
||||
int32_t _Vset;
|
||||
}RTMode;
|
||||
|
||||
RTMode * InitRTMode(){
|
||||
RTMode *ret = malloc(sizeof(RTMode));
|
||||
ret->_MeasureCurrent = 0;
|
||||
ret->_MeasureVin = 0;
|
||||
ret->_MeasureVout = 0;
|
||||
ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
|
||||
ret->_Vset = INSTRUCTION.VoltConstant;
|
||||
return ret;
|
||||
}
|
||||
/* End of RT Mode Data */
|
||||
|
||||
/* IV Mode Data */
|
||||
typedef struct _IVMode{
|
||||
MEASURE;
|
||||
int32_t _MeasureData;
|
||||
uint16_t _VoVi_Switch;
|
||||
int32_t MeasureVolt;
|
||||
VOUT_PARA;
|
||||
LIMIT;
|
||||
@@ -311,67 +216,16 @@ IVMode *InitIVMode(){
|
||||
ret->_StepTime = INSTRUCTION.StepTime;
|
||||
ret->_CycleNumber = 1;
|
||||
ret->_MeasureBatvolt = 0;
|
||||
|
||||
|
||||
// ret->SetVoltOut = &_SetVoltOut;
|
||||
// ret->GetVoltOut = &_GetVoltOut;
|
||||
// ret->SetVOrigin = &_SetVOrigin;
|
||||
// ret->GetVOrigin = &_GetVOrigin;
|
||||
// ret->SetVStop = &_SetVStop;
|
||||
// ret->GetVStop = &_GetVStop;
|
||||
// ret->SetStep = &_SetStep;
|
||||
// ret->GetStep = &_GetStep;
|
||||
// ret->SetStepTime = &_SetStepTime;
|
||||
// ret->GetStepTime = &_GetStepTime;
|
||||
// ret->SetCycleNumber = &_SetCycleNumber;
|
||||
// ret->GetCycleNumber = &_GetCycleNumber;
|
||||
|
||||
ret->_LimitValue = 1e5;
|
||||
|
||||
ret->SetLimitValue = &_SetLimitValue;
|
||||
ret->GetLimitValue = &_GetLimitValue;
|
||||
return ret;
|
||||
}
|
||||
/* End of IV Mode Data */
|
||||
|
||||
/* RT Mode Data */
|
||||
typedef struct _RTMode{
|
||||
MEASURE;
|
||||
VOUT_PARA;
|
||||
}RTMode;
|
||||
|
||||
RTMode * InitRTMode(){
|
||||
RTMode *ret = malloc(sizeof(RTMode));
|
||||
ret->_MeasureData = 0;
|
||||
// ret->SetMeasureData = &_SetMeasureData;
|
||||
// ret->GetMeasureData = &_GetMeasureData;
|
||||
|
||||
ret->_VoltOut = DAC_ZERO; // 25000 is DAC_ZERO
|
||||
ret->_VOrigin = DAC_ZERO;
|
||||
ret->_VStop = DAC_ZERO;
|
||||
ret->_Step = 0;
|
||||
ret->_StepTime = 10000; // STEPTIME_ONE_SEC
|
||||
ret->_CycleNumber = 1;
|
||||
|
||||
// ret->SetVoltOut = &_SetVoltOut;
|
||||
// ret->GetVoltOut = &_GetVoltOut;
|
||||
// ret->SetVOrigin = &_SetVOrigin;
|
||||
// ret->GetVOrigin = &_GetVOrigin;
|
||||
// ret->SetVStop = &_SetVStop;
|
||||
// ret->GetVStop = &_GetVStop;
|
||||
// ret->SetStep = &_SetStep;
|
||||
// ret->GetStep = &_GetStep;
|
||||
// ret->SetStepTime = &_SetStepTime;
|
||||
// ret->GetStepTime = &_GetStepTime;
|
||||
// ret->SetCycleNumber = &_SetCycleNumber;
|
||||
// ret->GetCycleNumber = &_GetCycleNumber;
|
||||
return ret;
|
||||
}
|
||||
/* End of RT Mode Data */
|
||||
|
||||
/* CV Mode*/
|
||||
typedef struct _CVMode{
|
||||
MEASURE;
|
||||
int32_t _MeasureData;
|
||||
uint16_t _VoVi_Switch;
|
||||
int32_t MeasureVolt;
|
||||
VOUT_PARA;
|
||||
int32_t _MeasureBatvolt;
|
||||
@@ -380,10 +234,7 @@ typedef struct _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;
|
||||
@@ -392,22 +243,11 @@ CVMode * InitCVMode(){
|
||||
ret->_CycleNumber = INSTRUCTION.CycleNumber;
|
||||
ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
|
||||
ret->_MeasureBatvolt = 0;
|
||||
// ret->SetVoltOut = &_SetVoltOut;
|
||||
// ret->GetVoltOut = &_GetVoltOut;
|
||||
// ret->SetVOrigin = &_SetVOrigin;
|
||||
// ret->GetVOrigin = &_GetVOrigin;
|
||||
// ret->SetVStop = &_SetVStop;
|
||||
// ret->GetVStop = &_GetVStop;
|
||||
// ret->SetStep = &_SetStep;
|
||||
// ret->GetStep = &_GetStep;
|
||||
// ret->SetStepTime = &_SetStepTime;
|
||||
// ret->GetStepTime = &_GetStepTime;
|
||||
// ret->SetCycleNumber = &_SetCycleNumber;
|
||||
// ret->GetCycleNumber = &_GetCycleNumber;
|
||||
return ret;
|
||||
}
|
||||
/*End of CV Mode*/
|
||||
|
||||
|
||||
/* Const Current Mode */
|
||||
#define CC_ZERO_POINT 0
|
||||
#define MAX_DAC_UC 50000
|
||||
@@ -452,13 +292,84 @@ CCMode * InitCCMode(){
|
||||
ret->Done = 0;
|
||||
|
||||
ret->value = INSTRUCTION.ConstantCurrent;
|
||||
ret->VMax = INSTRUCTION.VoltLimit + DAC_ZERO;
|
||||
ret->VMin = INSTRUCTION.VoltLimit + DAC_ZERO;
|
||||
ret->VMax = INSTRUCTION.MaxVolt;
|
||||
ret->VMin = INSTRUCTION.MinVolt;
|
||||
ret->_Transform2RealnA = &_Transform2RealnA;
|
||||
ret->MeasureVolt = 0;
|
||||
ret->Vset = 0;
|
||||
ret->Iset = INSTRUCTION.ConstantCurrent;
|
||||
return ret;
|
||||
}
|
||||
/*End of Const Current Mode Mode*/
|
||||
|
||||
|
||||
/* CV3 Mode(CYCLIC_VOLTAMMETRY)*/
|
||||
typedef struct _CV3Mode{
|
||||
CV3_PARA;
|
||||
}CV3Mode;
|
||||
|
||||
CV3Mode * InitCV3Mode(){
|
||||
CV3Mode *ret = malloc(sizeof(CV3Mode));
|
||||
ret->_MeasureData = 0;
|
||||
ret->MeasureVolt = 0;
|
||||
ret->VInit = INSTRUCTION.InitVolt;
|
||||
ret->VMax = INSTRUCTION.MaxVolt;
|
||||
ret->VMin = INSTRUCTION.MinVolt;
|
||||
ret->VOrigin = INSTRUCTION.MinVolt;
|
||||
ret->VStop = INSTRUCTION.MaxVolt;
|
||||
ret->InitDirection = INSTRUCTION.InitDirection;
|
||||
ret->Step = INSTRUCTION.Step;
|
||||
ret->StepTime = INSTRUCTION.StepTime;
|
||||
ret->VscanRate = INSTRUCTION.VscanRate;
|
||||
ret->CycleNumber = INSTRUCTION.CycleNumber;
|
||||
ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
|
||||
ret->Vset = INSTRUCTION.InitVolt;
|
||||
return ret;
|
||||
}
|
||||
/*End of CV3 Mode*/
|
||||
|
||||
|
||||
/* LSV Mode(LINEAR_SWEEP_VOLTAMMETRY)*/
|
||||
typedef struct _LSVMode{
|
||||
LSV_PARA;
|
||||
}LSVMode;
|
||||
|
||||
LSVMode * InitLSVMode(){
|
||||
LSVMode *ret = malloc(sizeof(LSVMode));
|
||||
ret->_MeasureData = 0;
|
||||
ret->MeasureVolt = 0;
|
||||
ret->VInit = 25000;
|
||||
ret->VMax = 25000;
|
||||
ret->VMin = 25000;
|
||||
ret->VOrigin = INSTRUCTION.VoltOrigin;
|
||||
ret->VStop = INSTRUCTION.VoltFinal;
|
||||
ret->InitDirection = INSTRUCTION.InitDirection;
|
||||
ret->Step = INSTRUCTION.Step;
|
||||
ret->StepTime = INSTRUCTION.StepTime;
|
||||
ret->VscanRate = INSTRUCTION.VscanRate;
|
||||
ret->CycleNumber = INSTRUCTION.CycleNumber;
|
||||
ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
|
||||
ret->Vset = INSTRUCTION.InitVolt;
|
||||
return ret;
|
||||
}
|
||||
/*End of LSV Mode*/
|
||||
|
||||
/* CONSTANT_VSCAN Mode(CONSTANT_VSCAN)*/
|
||||
typedef struct _CVSCANMode{
|
||||
LSV_PARA;
|
||||
}CVSCANMode;
|
||||
|
||||
CVSCANMode * InitCVSCANMode(){
|
||||
CVSCANMode *ret = malloc(sizeof(CVSCANMode));
|
||||
ret->_MeasureData = 0;
|
||||
ret->MeasureVolt = 0;
|
||||
ret->VInit = INSTRUCTION.VoltOrigin;
|
||||
ret->Vset = INSTRUCTION.VoltOrigin;
|
||||
ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
|
||||
return ret;
|
||||
}
|
||||
/*End of CONSTANT_VSCAN Mode*/
|
||||
|
||||
/* Cycle CC Mode */
|
||||
typedef struct _CCCMode{
|
||||
CC_PARA;
|
||||
@@ -499,7 +410,8 @@ CCCMode * InitCCCMode(){
|
||||
/** Potential State Mode **/
|
||||
typedef struct _PS{
|
||||
// measure
|
||||
MEASURE; // circuit current
|
||||
int32_t _MeasureData;
|
||||
uint16_t _VoVi_Switch;
|
||||
int32_t ReferenceVolt;
|
||||
int32_t _MeasureVolt;
|
||||
VOUT_PARA;
|
||||
@@ -508,8 +420,6 @@ typedef struct _PS{
|
||||
PSMode *InitPSMode(){
|
||||
PSMode *ret = malloc(sizeof(PSMode));
|
||||
ret->_MeasureData = 0;
|
||||
// ret->SetMeasureData = &_SetMeasureData;
|
||||
// ret->GetMeasureData = &_GetMeasureData;
|
||||
ret->ReferenceVolt = 0;
|
||||
ret->_MeasureVolt = INSTRUCTION.VoltOrigin;
|
||||
|
||||
@@ -524,21 +434,39 @@ PSMode *InitPSMode(){
|
||||
|
||||
/** End of Potential State Mode **/
|
||||
|
||||
|
||||
|
||||
/* ReadVOut Mode Data */
|
||||
typedef struct _RVoutMode{
|
||||
int32_t _MeasureData;
|
||||
uint16_t _VoVi_Switch;
|
||||
}RVoutMode;
|
||||
|
||||
RVoutMode * InitRVoutMode(){
|
||||
RVoutMode *ret = malloc(sizeof(RVoutMode));
|
||||
ret->_MeasureData = 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
typedef union _WorkMode{
|
||||
// Measure only
|
||||
ITMode *IT;
|
||||
VTMode *VT;
|
||||
|
||||
// Output Only
|
||||
VoltOutMode *VO;
|
||||
|
||||
// Measure only
|
||||
ITMode *IT;
|
||||
VTMode *VT;
|
||||
|
||||
// Measure + Output
|
||||
RTMode *RT;
|
||||
IVMode *IV;
|
||||
CVMode *CV;
|
||||
RTMode *RT;
|
||||
CCMode *CC;
|
||||
// CCCMode *CCC;
|
||||
CV3Mode *CV3;
|
||||
LSVMode *LSV;
|
||||
CVSCANMode *CVSCAN;
|
||||
PSMode *PS;
|
||||
// CCCMode *CCC;
|
||||
|
||||
//test mode
|
||||
RVoutMode *RVout;
|
||||
@@ -551,33 +479,42 @@ WorkMode *CreateWorkMode(){
|
||||
|
||||
void InitWorkMode(WorkMode *WM){
|
||||
switch(INSTRUCTION.eliteFxn){
|
||||
case VOLT_OUTPUT:
|
||||
WM->VO = InitVoltOutMode();
|
||||
break;
|
||||
case IT_CURVE:
|
||||
WM->IT = InitITMode();
|
||||
break;
|
||||
case VT_CURVE:
|
||||
WM->VT = InitVTMode();
|
||||
break;
|
||||
case ZT_CURVE:
|
||||
WM->RT = InitRTMode();
|
||||
break;
|
||||
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 CYCLIC_VOLTAMMETRY:
|
||||
WM->CV3 = InitCV3Mode();
|
||||
break;
|
||||
case LINEAR_SWEEP_VOLTAMMETRY:
|
||||
WM->LSV = InitLSVMode();
|
||||
break;
|
||||
case CONSTANT_VSCAN:
|
||||
WM->CVSCAN = InitCVSCANMode();
|
||||
break;
|
||||
// case CYCLE_CONSTANT_CURRENT:
|
||||
// WM->CCC = InitCCCMode();
|
||||
// break;
|
||||
case READ_VOUT_VALUE:
|
||||
WM->RVout = InitRVoutMode();
|
||||
break;
|
||||
// case READ_VOUT_VALUE:
|
||||
// WM->RVout = InitRVoutMode();
|
||||
// break;
|
||||
default:
|
||||
WM->VT = InitVTMode();
|
||||
break;
|
||||
@@ -586,6 +523,30 @@ void InitWorkMode(WorkMode *WM){
|
||||
|
||||
void FreeWorkMode(WorkMode *WM){
|
||||
switch(INSTRUCTION.eliteFxn){
|
||||
case VOLT_OUTPUT:
|
||||
if(WM->VO != NULL){
|
||||
free(WM->VO);
|
||||
WM->VO = NULL;
|
||||
}
|
||||
break;
|
||||
case IT_CURVE:
|
||||
if(WM->IT != NULL){
|
||||
free(WM->IT);
|
||||
WM->IT = NULL;
|
||||
}
|
||||
break;
|
||||
case VT_CURVE:
|
||||
if(WM->VT != NULL){
|
||||
free(WM->VT);
|
||||
WM->VT = NULL;
|
||||
}
|
||||
break;
|
||||
case ZT_CURVE:
|
||||
if(WM->RT != NULL){
|
||||
free(WM->RT);
|
||||
WM->RT = NULL;
|
||||
}
|
||||
break;
|
||||
case IV_CURVE:
|
||||
if(WM->IV != NULL){
|
||||
free(WM->IV);
|
||||
@@ -598,44 +559,36 @@ void FreeWorkMode(WorkMode *WM){
|
||||
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;
|
||||
case CYCLIC_VOLTAMMETRY:
|
||||
if(WM->CV3 != NULL){
|
||||
free(WM->CV3);
|
||||
WM->CV3 = NULL;
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case LINEAR_SWEEP_VOLTAMMETRY:
|
||||
if(WM->LSV != NULL){
|
||||
free(WM->LSV);
|
||||
WM->LSV = NULL;
|
||||
}
|
||||
break;
|
||||
case CONSTANT_VSCAN:
|
||||
if(WM->CVSCAN != NULL){
|
||||
free(WM->CVSCAN);
|
||||
WM->CVSCAN = NULL;
|
||||
}
|
||||
break;
|
||||
// case READ_VOUT_VALUE:
|
||||
// if(WM->RVout != NULL){
|
||||
// free(WM->RVout);
|
||||
// WM->RVout = NULL;
|
||||
// }
|
||||
// break;
|
||||
// case CYCLE_CONSTANT_CURRENT:
|
||||
// if(WM->CCC != NULL){
|
||||
// free(WM->CCC);
|
||||
@@ -643,13 +596,13 @@ void FreeWorkMode(WorkMode *WM){
|
||||
// }
|
||||
// break;
|
||||
default:
|
||||
if(WM->IV != NULL){
|
||||
free(WM->IV);
|
||||
WM->IV = NULL;
|
||||
if(WM->VT != NULL){
|
||||
free(WM->VT);
|
||||
WM->VT = NULL;
|
||||
}
|
||||
break;
|
||||
}
|
||||
// free(WM);
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
+56
-89
@@ -2,54 +2,59 @@
|
||||
#ifndef ELITEZT
|
||||
#define ELITEZT
|
||||
|
||||
static void ZT_notify(int32_t impedance);
|
||||
|
||||
// output a certain voltage e.g. 2v
|
||||
// and measure the input voltage
|
||||
// => calculate the resister
|
||||
// change the output voltage step
|
||||
// => get a R-T curve (with resolution = 1 sample/volt step )
|
||||
|
||||
static int32_t RTInputVoltData(uint16_t VoVi_Switch, RTMode *RT);
|
||||
|
||||
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;
|
||||
static uint8_t ADCSwitch = 0;
|
||||
int32_t VoltData;
|
||||
|
||||
if(INSTRUCTION.AutoGainEnable){
|
||||
current_32 = AutoGainReadCurrent(spi_ADC_rxbuf);
|
||||
if(ADCSwitch == 0){ /**read Iin(buffer),read Vin**/
|
||||
if(INSTRUCTION.AutoGainEnable){
|
||||
RT->_MeasureCurrent = AutoGainReadCurrent(spi_ADC_rxbuf);
|
||||
AutoGainChange(RT->_MeasureCurrent);
|
||||
}else{
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
RT->_MeasureCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
}
|
||||
InputNotify(NOTIFY_CURRENT, RT->_MeasureCurrent);
|
||||
|
||||
ReadADCVolt(RT->_VoVi_Switch);
|
||||
ADCSwitch++;
|
||||
}
|
||||
else{
|
||||
else if(ADCSwitch == 1){ /**read Vin**/
|
||||
ReadADCVolt(RT->_VoVi_Switch);
|
||||
ADCSwitch++;
|
||||
}
|
||||
else if(ADCSwitch == 2){ /**read Vin(buffer),read Iin**/
|
||||
ReadADCVolt(RT->_VoVi_Switch);
|
||||
VoltData = RTInputVoltData(RT->_VoVi_Switch, RT);
|
||||
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
current_32 = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
ADCSwitch++;
|
||||
}
|
||||
else if(ADCSwitch == 3){ /**read Iin**/
|
||||
ReadCurrent(spi_ADC_rxbuf);
|
||||
ADCSwitch = 0;
|
||||
}
|
||||
|
||||
int32_t resister_32 = 0;
|
||||
resister_32 = 1000000000 / RT->_MeasureCurrent;
|
||||
// if(RT->_MeasureCurrent < 1000){
|
||||
// resister_32 = VoltData * (1000 / RT->_MeasureCurrent);
|
||||
// }else{
|
||||
// resister_32 = VoltData * 1000 / RT->_MeasureCurrent ;
|
||||
// }
|
||||
|
||||
volt_32 = User2Real(INSTRUCTION.VoltConstant)*1e6;
|
||||
// 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 / 1e6; //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);
|
||||
|
||||
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);
|
||||
InputNotify(NOTIFY_VOLT, VoltData);
|
||||
InputNotify(NOTIFY_CURRENT, RT->_MeasureCurrent);
|
||||
InputNotify(NOTIFY_IMPEDANCE, resister_32);
|
||||
|
||||
/* Elite 100 = 100R
|
||||
Elite 1000 = 1KR
|
||||
@@ -57,61 +62,23 @@ static void ZT_Plot(RTMode *RT) {
|
||||
Elite 100000 = 100KR
|
||||
Elite 1000000 = 1MR
|
||||
*/
|
||||
|
||||
// set ADC GAIN
|
||||
// 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);
|
||||
|
||||
// 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);
|
||||
// Real_Resister = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
|
||||
}
|
||||
|
||||
static int32_t RTInputVoltData(uint16_t VoVi_Switch, RTMode *RT){
|
||||
uint8_t ADCChannel;
|
||||
int32_t VoltData;
|
||||
|
||||
if(VoVi_Switch == 0x01){
|
||||
ADCChannel = ADC_CH_VOLT;
|
||||
RT->_MeasureVin = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADCChannel, spi_ADC_rxbuf);
|
||||
VoltData = RT->_MeasureVin;
|
||||
}else if(VoVi_Switch == 0x00){
|
||||
ADCChannel = ADC_CH_DAC;
|
||||
RT->_MeasureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADCChannel, spi_ADC_rxbuf);
|
||||
VoltData = RT->_MeasureVout;
|
||||
}
|
||||
|
||||
return VoltData;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
+5
-5
@@ -26,13 +26,13 @@
|
||||
/* I2C */
|
||||
#ifdef ELITE_VERSION_1_4
|
||||
#define Board_I2C0_SCL0 IOID_7
|
||||
#define Board_I2C0_SDA0 IOID_1
|
||||
#define Board_I2C0_SDA0 IOID_14
|
||||
#endif
|
||||
|
||||
#define shutdown_6994 IOID_10
|
||||
#define switch_on IOID_11
|
||||
#define enable_10v IOID_12
|
||||
#define enable_5v IOID_13
|
||||
#define power_enable IOID_12
|
||||
#define extreme_waste_of_current IOID_13
|
||||
|
||||
PIN_Handle pin_handle;
|
||||
static PIN_State ZM_rst;
|
||||
@@ -42,8 +42,8 @@ const PIN_Config BLE_IO[] = {
|
||||
ADC_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, // ADC_CS
|
||||
DAC_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, // DAC_CS
|
||||
|
||||
enable_10v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, // 10V_enable
|
||||
enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, // 5V_enable
|
||||
power_enable | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, // +5v, +10v, -10v enable
|
||||
extreme_waste_of_current | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, // extreme current waste
|
||||
shutdown_6994 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, // turn off power
|
||||
Turnon200R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
|
||||
Turnon10K | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
|
||||
|
||||
+79
@@ -0,0 +1,79 @@
|
||||
/*
|
||||
***********************************************************
|
||||
Read battery's method
|
||||
***********************************************************
|
||||
1.ReadBatVolt(spi_ADC_rxbuf)
|
||||
let "spi_ADC_rxbuf" be 8000
|
||||
8000 * 187.5uV * 2 = 3V ;
|
||||
2.AONBatMonBatteryVoltageGet()
|
||||
let "AONBatMonBatteryVoltageGet()" be 768
|
||||
768 * 125 / 320 / 100 = 3V ;
|
||||
|
||||
if you want to use first method, and get value 768
|
||||
conversion: 8000 * 187.5 * 1e-6 * 2 / 125 * 320 * 100 = 768
|
||||
=> 8000 * 12 / 125 = 768
|
||||
*/
|
||||
|
||||
#ifndef HEADSTAGE_BATT_H
|
||||
#define HEADSTAGE_BATT_H
|
||||
|
||||
#include <driverlib/aon_batmon.h>
|
||||
#define MAX_BATTERY_CAPACITY 4200
|
||||
|
||||
static uint8_t headstage_battery_percent() {
|
||||
static uint8_t battery_percent = 100;
|
||||
uint8_t internal_battery_percent;
|
||||
uint32_t internal_batt_sense = AONBatMonBatteryVoltageGet();
|
||||
internal_batt_sense = (internal_batt_sense * 125) >> 5;
|
||||
internal_batt_sense = (internal_batt_sense * 100) / MAX_BATTERY_CAPACITY;
|
||||
internal_battery_percent = internal_batt_sense & 0xFF;
|
||||
if (internal_battery_percent < battery_percent) battery_percent = internal_battery_percent;
|
||||
return battery_percent;
|
||||
}
|
||||
|
||||
static uint8_t headstage_battery_volt1() {
|
||||
uint32_t internal_batt_sense;
|
||||
uint8_t internal_battery_percent;
|
||||
|
||||
internal_batt_sense = AONBatMonBatteryVoltageGet();
|
||||
internal_battery_percent = internal_batt_sense & 0xFF;
|
||||
return internal_battery_percent;
|
||||
}
|
||||
|
||||
static uint8_t headstage_battery_volt2() {
|
||||
uint32_t internal_batt_sense;
|
||||
uint8_t internal_battery_percent;
|
||||
|
||||
internal_batt_sense = AONBatMonBatteryVoltageGet();
|
||||
internal_battery_percent = (internal_batt_sense >> 8) & 0xFF;
|
||||
return internal_battery_percent;
|
||||
}
|
||||
|
||||
static void headstage_battery_volt(){
|
||||
uint32_t bat_volt = 0;
|
||||
|
||||
ReadBatVolt(spi_ADC_rxbuf);
|
||||
bat_volt = (uint32_t) (spi_ADC_rxbuf[0] << 8) | (uint32_t) (spi_ADC_rxbuf[1]);
|
||||
bat_volt = bat_volt * 12 / 125; //x * 187.5 * 1e-6 * 2 / 125 * 320 * 100 ;
|
||||
InputNotify(NOTIFY_VOLT_BAT, bat_volt);
|
||||
}
|
||||
|
||||
static void EliteADCBattery(){
|
||||
static uint8_t ADCSwitch = 0;
|
||||
|
||||
if(ADCSwitch == 0){ /**read V**/
|
||||
ReadBatVolt(spi_ADC_rxbuf);
|
||||
ADCSwitch++;
|
||||
}
|
||||
else if(ADCSwitch == 1){ /**read V**/
|
||||
ReadBatVolt(spi_ADC_rxbuf);
|
||||
ADCSwitch++;
|
||||
}
|
||||
else if(ADCSwitch == 2){ /**read V(buffer)**/
|
||||
headstage_battery_volt();
|
||||
batteryCheckFlag = false;
|
||||
ADCSwitch = 0;
|
||||
}
|
||||
}
|
||||
|
||||
#endif // HEADSTAGE_BATT_H
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
#ifndef HEADSTAGE_POWER_H
|
||||
#define HEADSTAGE_POWER_H
|
||||
|
||||
#include <ti/drivers/Power.h>
|
||||
#include <ti/drivers/power/PowerCC26XX.h>
|
||||
|
||||
#define headstage_power_shutdown() Power_shutdown(NULL, 0)
|
||||
|
||||
#endif // HEADSTAGE_POWER_H
|
||||
+6
-6
@@ -3,13 +3,13 @@
|
||||
#define VERSION_DATE
|
||||
|
||||
#define VERSION_DATE_YEAR 20
|
||||
#define VERSION_DATE_MONTH 3
|
||||
#define VERSION_DATE_DAY 13
|
||||
#define VERSION_DATE_HOUR 17
|
||||
#define VERSION_DATE_MINUTE 49
|
||||
#define VERSION_DATE_MONTH 7
|
||||
#define VERSION_DATE_DAY 8
|
||||
#define VERSION_DATE_HOUR 10
|
||||
#define VERSION_DATE_MINUTE 19
|
||||
|
||||
// this is NOT the version hash !!
|
||||
// it's the last version hash
|
||||
#define VERSION_HASH bbc6c231a263d20f751cd2807f863e4e7783c8ef
|
||||
#define VERSION_GIT_BRANCH Elite_OBJ_Version
|
||||
#define VERSION_HASH 8808490caa465cc94d14896de28763a5e5c4672b
|
||||
#define VERSION_GIT_BRANCH Elite_OBJ_0.2mv
|
||||
#endif
|
||||
|
||||
+371
-112
@@ -374,11 +374,12 @@ characteristic change event
|
||||
#define HEADSTAGE_H
|
||||
|
||||
// product information
|
||||
#define DEVICE_NAME "Elite-ZM-v1.4-re"
|
||||
#define MAJOR_PRODUCT_NUMBER 0
|
||||
#define MINOR_PRODUCT_NUMBER 2
|
||||
#define DEVICE_NAME "Elite"
|
||||
#define MAJOR_PRODUCT_NUMBER 0 //0:Elite ,1:Neulive
|
||||
#define MINOR_PRODUCT_NUMBER 2 //1:Elite_legacy(Ori_Neulive) 2:Elite_zm 3:Elite_bat
|
||||
#define MAJOR_VERSION_NUMBER 1
|
||||
#define MINOR_VERSION_NUMBER 2
|
||||
#define MINOR_VERSION_NUMBER 5
|
||||
|
||||
|
||||
#define ELITE_VERSION_1_4
|
||||
//#define ELITE_VERSION_1_3
|
||||
@@ -528,6 +529,9 @@ static bool update_ins_rec_buffer();
|
||||
static void EliteDACControl();
|
||||
static void EliteADCControl();
|
||||
static void EliteNotifyControl();
|
||||
static void EliteVscanControl();
|
||||
static void EliteDone();
|
||||
static void InitEliteGPtimer();
|
||||
|
||||
// ADC function
|
||||
static void ADC_write(uint8_t ADCin);
|
||||
@@ -552,6 +556,8 @@ static bool TurnOnElite(uint8_t key);
|
||||
static void WorkModeLED();
|
||||
static void KeyWorkModeLED();
|
||||
|
||||
|
||||
static void headstage_battery_volt();
|
||||
/*=====================================
|
||||
==== instruction update function ====
|
||||
====================================*/
|
||||
@@ -566,43 +572,46 @@ static void set_update_instruction_callback(update_instruction_callback_type cal
|
||||
}
|
||||
|
||||
// define BT instruction
|
||||
#define INS_TYPE_RIS 0b00110000
|
||||
#define INS_TYPE_VIS 0b11000000
|
||||
#define INS_TYPE_CIS 0b01110000
|
||||
#define INS_TYPE_RIS 0x30
|
||||
#define INS_TYPE_VIS 0xC0
|
||||
#define INS_TYPE_CIS 0x70
|
||||
|
||||
// virtual instruction
|
||||
#define VIS_RST 0b11110000
|
||||
#define VIS_ASK 0b00110000
|
||||
#define VIS_STI 0b11000000
|
||||
#define VIS_FUH 0b10010000
|
||||
#define VIS_INT 0b01100000
|
||||
#define VIS_SHIFT_200K 0b10100000
|
||||
#define VIS_SHIFT_10K 0b11100000
|
||||
#define VIS_SHIFT_200R 0b10000000
|
||||
#define VIS_DEVICE_SHINY 0b00010000
|
||||
#define VIS_SHINY_DIS 0b00100000
|
||||
// VIS (virtual instruction)
|
||||
#define VIS_RST 0xF0
|
||||
#define VIS_ASK 0x30
|
||||
#define VIS_STI 0xC0
|
||||
#define VIS_FUH 0x90
|
||||
#define VIS_INT 0x60
|
||||
#define VIS_SHIFT_200K 0xA0
|
||||
#define VIS_SHIFT_10K 0xE0
|
||||
#define VIS_SHIFT_200R 0x80
|
||||
#define VIS_DEVICE_SHINY 0x10
|
||||
#define VIS_SHINY_DIS 0x20
|
||||
#define VIS_CC_ZERO 0x40
|
||||
|
||||
// real instruction
|
||||
#define IV_CURVE 0b00010000
|
||||
#define CV_CURVE 0b00100000
|
||||
#define VOLT_OUTPUT 0b00110000
|
||||
#define ZT_CURVE 0b01000000
|
||||
#define VT_CURVE 0b01010000
|
||||
#define IT_CURVE 0b01100000
|
||||
#define SET_SAMPLE_RATE 0b01110000
|
||||
#define SET_ADC_GAIN 0b10000000
|
||||
#define DIFFERENTIAL_PULSE_VOLTAMMETRY 0b10100000
|
||||
#define SQUARE_WAVE_VOLTAMMETRY 0b10110000
|
||||
#define POTENTIAL_STATE 0b11000000
|
||||
#define CONSTANT_CURRENT 0b11010000
|
||||
#define READ_VOUT_VALUE 0b11100000
|
||||
#define CYCLE_CONSTANT_CURRENT 0b11110000
|
||||
// RIS (real instruction)
|
||||
#define IV_CURVE 0x10
|
||||
#define CV_CURVE 0x20
|
||||
#define VOLT_OUTPUT 0x30
|
||||
#define ZT_CURVE 0x40
|
||||
#define VT_CURVE 0x50
|
||||
#define IT_CURVE 0x60
|
||||
#define SET_SAMPLE_RATE 0x70
|
||||
#define SET_ADC_GAIN 0x80
|
||||
#define DIFFERENTIAL_PULSE_VOLTAMMETRY 0xA0
|
||||
#define SQUARE_WAVE_VOLTAMMETRY 0xB0
|
||||
#define CYCLIC_VOLTAMMETRY 0xC0
|
||||
#define CONSTANT_CURRENT 0xD0
|
||||
#define CYCLE_CONSTANT_CURRENT 0xF0
|
||||
#define HIGH_CYCLE_CYCLIC_VOLTAMMETRY 0x01
|
||||
#define LINEAR_SWEEP_VOLTAMMETRY 0x02
|
||||
#define CONSTANT_VSCAN 0x03
|
||||
#define ADC_TEST 0x90
|
||||
//#define READ_VOUT_VALUE 0xE0
|
||||
|
||||
// CIS instruction
|
||||
// CIS (control instruction)
|
||||
#define CIS_VERSION 0x40
|
||||
|
||||
// test instruction
|
||||
#define ADC_TEST 0b10010000
|
||||
#define CIS_VOLT 0x10
|
||||
|
||||
// DAC and ADC function
|
||||
static uint16_t DAC_outputV(uint16_t voltLV);
|
||||
@@ -611,6 +620,7 @@ static int32_t DAC_to_realV(uint16_t DACcode);
|
||||
static uint16_t DACUserCode = 0x0000;
|
||||
|
||||
static uint32_t SampleRateTable[6] = {100, 1000, 10000, 50000, 100000, 1000000}; // 100 =>100 Hz, 1000000=>0.01 Hz
|
||||
static uint32_t VscanRateTable[5] = {2, 10, 100, 1000, 10000};
|
||||
|
||||
// record value for IV curve to calculate average current
|
||||
static uint8_t DiscardIVFirstData = 1;
|
||||
@@ -638,9 +648,41 @@ struct _CT{
|
||||
uint32_t StandByCounter;
|
||||
}CT = {0};
|
||||
|
||||
// gptimer counter
|
||||
struct _GPT{
|
||||
uint32_t GptimerCounter;
|
||||
uint32_t GptimerCounter0;
|
||||
uint8_t DeltaGptimerCounter;
|
||||
uint32_t SampleRate_counter;
|
||||
uint32_t StepTimeCounter;
|
||||
uint32_t NotifyCounter;
|
||||
uint32_t VscanRateCounter;
|
||||
uint32_t LeadTimeCounter;
|
||||
uint32_t BatteryADCCounter;
|
||||
uint32_t BatteryCheckCounter;
|
||||
}GPT = {0};
|
||||
|
||||
static bool notify_flag;
|
||||
static bool ADC_flag;
|
||||
static bool DAC_flag;
|
||||
static bool Vscan_flag;
|
||||
static bool VscanReset;
|
||||
static bool NotifyReset;
|
||||
static bool ADCReset;
|
||||
static bool EliteWorkReset;
|
||||
static bool LeadTimeReset;
|
||||
static bool firstNotifyFlag;
|
||||
static int16_t GAIN_200R_counter;
|
||||
static int16_t GAIN_200K_counter;
|
||||
static int16_t GAIN_10K_counter;
|
||||
static bool ADCbattery_flag;
|
||||
static bool batteryCheckFlag;
|
||||
|
||||
//static bool NotifyReady = false;
|
||||
static void InitFlag();
|
||||
static void InitCT();
|
||||
static void InitGPT();
|
||||
static void InitEliteFlag();
|
||||
|
||||
#include "EliteWorkData.h"
|
||||
// real instruction fxn
|
||||
@@ -650,8 +692,12 @@ static void DACCode2Real2Notify(uint16_t DACcode); // send notify voltage a
|
||||
//static void VOLT_OUTPUT();
|
||||
static void ZT_Plot(RTMode *RT);
|
||||
static void VT_Plot(VTMode *VT);
|
||||
static int32_t IT_PlotIT_Plot(WorkMode *WorkModeData);
|
||||
static void IT_Plot(ITMode *IT);
|
||||
static void RVout_Plot(RVoutMode *RVout);
|
||||
static void CV3_Plot(CV3Mode *CV3);
|
||||
static void CC_Plot(CCMode *CC);
|
||||
static void LSV_Plot(LSVMode *LSV);
|
||||
static void LSV_Vscan(LSVMode *LSV);
|
||||
|
||||
// the following fxn do the same thing
|
||||
// IVCurve_T is called if Vorigin > Vfinal, vice versa
|
||||
@@ -661,11 +707,21 @@ static uint8_t OldStep2NewStep(uint8_t OldStep);
|
||||
static uint16_t OldStep2NewStepTime(uint8_t StepTime);
|
||||
static uint8_t IVdone = 0;
|
||||
|
||||
static uint16_t OneWayVoltScan(IVMode *IV);
|
||||
static uint16_t OneWayVoltScan();
|
||||
static void ramp_test();
|
||||
static uint16_t DPVCurve(WorkMode *WorkModeData);
|
||||
static uint16_t CVCurve(CVMode *CV);
|
||||
static uint16_t SWVCurve(WorkMode *WorkModeData);
|
||||
static uint16_t CCCurve(CCMode *CC);
|
||||
static uint16_t CV3Curve(CV3Mode *CV3);
|
||||
static uint16_t LSVCurve(LSVMode *LSV);
|
||||
static uint16_t CVSCANCurve(CVSCANMode *CVSCAN);
|
||||
static void CVSCAN_Plot(CVSCANMode *CVSCAN);
|
||||
static void CVSCAN_Vscan(CVSCANMode *CVSCAN);
|
||||
static void AutoGainChange();
|
||||
|
||||
static void CV3_Vscan(CV3Mode *CV3);
|
||||
static void CC_Vscan(CCMode *CC);
|
||||
|
||||
static void reset();
|
||||
static void Eliteinterrupt();
|
||||
@@ -703,6 +759,11 @@ static void TurnOn10V();
|
||||
#include "impedance_meter.h"
|
||||
#include "EliteReadVout.h"
|
||||
#include "Elite_version.h"
|
||||
#include "EliteCV3Mode.h"
|
||||
#include "EliteLSVMode.h"
|
||||
#include "EliteCVSCANMode.h"
|
||||
#include "Elite_batt.h"
|
||||
#include "Elite_power.h"
|
||||
|
||||
// update instruction for Z meter
|
||||
static void update_ZM_instruction(uint8 *ins) {
|
||||
@@ -722,31 +783,36 @@ static void update_ZM_instruction(uint8 *ins) {
|
||||
case INS_TYPE_RIS: {
|
||||
switch (ins[2]) {
|
||||
case IV_CURVE: {
|
||||
// CleanBuffer();
|
||||
INSTRUCTION.eliteFxn = IV_CURVE;
|
||||
DACReset = true;
|
||||
INSTRUCTION.SampleRate = 100;
|
||||
InitEliteFlag();
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
|
||||
// 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.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
|
||||
// INSTRUCTION.VoltFinal = Usercode_Correction_to_DAC(INSTRUCTION.VoltFinal);
|
||||
// }
|
||||
INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
|
||||
INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
|
||||
|
||||
if (ins[7] | ins[8]) {
|
||||
INSTRUCTION.Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
|
||||
INSTRUCTION.Step = StepCode2DACcode(INSTRUCTION.Step);
|
||||
INSTRUCTION.Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);//1~1000 = 0.1mv ~ 100mv
|
||||
// INSTRUCTION.Step = StepCode2DACcode(INSTRUCTION.Step);
|
||||
|
||||
INSTRUCTION.StepTime = ins[9];
|
||||
INSTRUCTION.StepTime = OldStep2NewStepTime(INSTRUCTION.StepTime); //5000;10000;20000;
|
||||
INSTRUCTION.Step = INSTRUCTION.Step * 100000 / INSTRUCTION.StepTime;
|
||||
if(INSTRUCTION.Step >= 10000){//100mv, n=2
|
||||
INSTRUCTION.VscanRateIndex = 0;
|
||||
}else if (INSTRUCTION.Step >= 1000){//10mv, n=10
|
||||
INSTRUCTION.VscanRateIndex = 1;
|
||||
}else if (INSTRUCTION.Step >= 100){//1mv, n=100
|
||||
INSTRUCTION.VscanRateIndex = 2;
|
||||
}else if (INSTRUCTION.Step >= 10){//0.1mv, n=1000
|
||||
INSTRUCTION.VscanRateIndex = 3;
|
||||
}else if (INSTRUCTION.Step >= 1){//0.1mv, n=10000
|
||||
INSTRUCTION.VscanRateIndex = 4;
|
||||
}
|
||||
// if (ins[9]) {
|
||||
INSTRUCTION.StepTime = ins[9];
|
||||
INSTRUCTION.StepTime = OldStep2NewStepTime(INSTRUCTION.StepTime);
|
||||
// }
|
||||
INSTRUCTION.VscanRate = VscanRateTable[INSTRUCTION.VscanRateIndex];//N
|
||||
|
||||
INSTRUCTION.NotifyRate = INSTRUCTION.StepTime;
|
||||
// if(ins[10]) {
|
||||
//INSTRUCTION.VoVi_Switch = ins[10];
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
// }
|
||||
break;
|
||||
}
|
||||
@@ -785,7 +851,7 @@ static void update_ZM_instruction(uint8 *ins) {
|
||||
}
|
||||
if(ins[14]) {
|
||||
INSTRUCTION.VoVi_Switch = ins[14];
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -826,32 +892,37 @@ static void update_ZM_instruction(uint8 *ins) {
|
||||
case CV_CURVE: {
|
||||
// CleanBuffer();
|
||||
INSTRUCTION.eliteFxn = CV_CURVE;
|
||||
DACReset = true;
|
||||
INSTRUCTION.SampleRate = 100;
|
||||
InitEliteFlag();
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
|
||||
// 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.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
|
||||
// INSTRUCTION.VoltFinal = Usercode_Correction_to_DAC(INSTRUCTION.VoltFinal);
|
||||
// }
|
||||
INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
|
||||
INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
|
||||
|
||||
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);
|
||||
// }
|
||||
if (ins[10]) {
|
||||
INSTRUCTION.CycleNumber = ins[10];
|
||||
INSTRUCTION.Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
|
||||
// INSTRUCTION.Step = StepCode2DACcode(INSTRUCTION.Step);
|
||||
|
||||
INSTRUCTION.StepTime = ins[9];
|
||||
INSTRUCTION.StepTime = OldStep2NewStepTime(INSTRUCTION.StepTime);
|
||||
INSTRUCTION.Step = INSTRUCTION.Step * 100000 / INSTRUCTION.StepTime;
|
||||
if(INSTRUCTION.Step >= 10000){//100mv, n=2
|
||||
INSTRUCTION.VscanRateIndex = 0;
|
||||
}else if (INSTRUCTION.Step >= 1000){//10mv, n=10
|
||||
INSTRUCTION.VscanRateIndex = 1;
|
||||
}else if (INSTRUCTION.Step >= 100){//1mv, n=100
|
||||
INSTRUCTION.VscanRateIndex = 2;
|
||||
}else if (INSTRUCTION.Step >= 10){//0.1mv, n=1000
|
||||
INSTRUCTION.VscanRateIndex = 3;
|
||||
}else if (INSTRUCTION.Step >= 1){//0.1mv, n=10000
|
||||
INSTRUCTION.VscanRateIndex = 4;
|
||||
}
|
||||
INSTRUCTION.VscanRate = VscanRateTable[INSTRUCTION.VscanRateIndex];//N
|
||||
|
||||
INSTRUCTION.NotifyRate = INSTRUCTION.StepTime;
|
||||
|
||||
INSTRUCTION.CycleNumber = ins[10];
|
||||
// if(ins[11]) {
|
||||
//INSTRUCTION.VoVi_Switch = ins[11];
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
// }
|
||||
|
||||
break;
|
||||
@@ -865,51 +936,59 @@ static void update_ZM_instruction(uint8 *ins) {
|
||||
|
||||
// impedance test
|
||||
case ZT_CURVE: {
|
||||
// CleanBuffer();
|
||||
InitEliteFlag();
|
||||
INSTRUCTION.eliteFxn = ZT_CURVE;
|
||||
// INSTRUCTION.VoltConstant = ( ((uint16_t)(ins[3])) << 8) | (uint16_t)(ins[4]);
|
||||
INSTRUCTION.NotifyRate = (uint32_t)INSTRUCTION.SampleRate;
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
INSTRUCTION.StepTime = 100;
|
||||
INSTRUCTION.VoltConstant = 25000 + 5000;
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
break;
|
||||
}
|
||||
|
||||
case VT_CURVE: {
|
||||
// CleanBuffer();
|
||||
InitEliteFlag();
|
||||
INSTRUCTION.eliteFxn = VT_CURVE;
|
||||
// SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
|
||||
// VT_Plot(); // enable 10v = 0
|
||||
INSTRUCTION.NotifyRate = (uint32_t)INSTRUCTION.SampleRate;
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
break;
|
||||
}
|
||||
|
||||
case IT_CURVE: {
|
||||
// CleanBuffer();
|
||||
InitEliteFlag();
|
||||
INSTRUCTION.eliteFxn = IT_CURVE;
|
||||
// IT_Plot(); // enable 10v = 1
|
||||
INSTRUCTION.NotifyRate = (uint32_t)INSTRUCTION.SampleRate;
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
break;
|
||||
}
|
||||
case SET_SAMPLE_RATE: {
|
||||
INSTRUCTION.SampleRateIndex = ins[3];
|
||||
INSTRUCTION.SampleRate = SampleRateTable[INSTRUCTION.SampleRateIndex];
|
||||
CT.SampleRate_counter = 1;
|
||||
break;
|
||||
}
|
||||
case POTENTIAL_STATE: {
|
||||
INSTRUCTION.eliteFxn = POTENTIAL_STATE;
|
||||
|
||||
// test
|
||||
not_buf[0] = ins[3];
|
||||
not_buf[1] = ins[4];
|
||||
not_buf[2] = ins[5];
|
||||
not_buf[3] = ins[6];
|
||||
// SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
|
||||
break;
|
||||
}
|
||||
|
||||
case CONSTANT_CURRENT:{
|
||||
INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
|
||||
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;
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
INSTRUCTION.Charge = ins[3]; //0:discharge 1:charge
|
||||
INSTRUCTION.ConstantCurrent = ( (uint32_t) (ins[4])<<24 | (uint32_t) (ins[5])<<16 | (uint32_t) (ins[6])<<8 | (uint32_t) (ins[7]) );
|
||||
INSTRUCTION.MaxVolt = ((uint16_t) ins[8] << 8) | ((uint16_t) ins[9]);
|
||||
INSTRUCTION.MinVolt = ((uint16_t) ins[10] << 8) | ((uint16_t) ins[11]);
|
||||
INSTRUCTION.NotifyRate = 500;
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
|
||||
|
||||
/*******************************************************
|
||||
controller instruction
|
||||
ins[3] -> Charge, 0:discharge 1:charge
|
||||
ins[4:5] -> VoltLimit, 0 ~ 5V : 0 ~ 25000
|
||||
ins[6:9] -> ConstantCurrent, 0 ~ 15000uA : 0 ~ 1500000
|
||||
|
||||
|
||||
********************************************************/
|
||||
// INSTRUCTION.VscanRate = 100;
|
||||
|
||||
// if(!INSTRUCTION.Charge){
|
||||
// INSTRUCTION.VoltConstant = 50000;
|
||||
@@ -943,17 +1022,168 @@ static void update_ZM_instruction(uint8 *ins) {
|
||||
break;
|
||||
}
|
||||
|
||||
case READ_VOUT_VALUE:{
|
||||
// INSTRUCTION.ResisterMeter = ins[3];
|
||||
INSTRUCTION.eliteFxn = READ_VOUT_VALUE;
|
||||
/*uint8_t ReadVoutBuf[2] = {0};
|
||||
//CV3: 0xC0
|
||||
case CYCLIC_VOLTAMMETRY: {
|
||||
INSTRUCTION.eliteFxn = CYCLIC_VOLTAMMETRY;
|
||||
InitEliteFlag();
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
|
||||
INSTRUCTION.InitVolt = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
|
||||
|
||||
uint16_t E1 = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
|
||||
uint16_t E2 = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
|
||||
if(E1 >= E2){
|
||||
INSTRUCTION.MaxVolt = E1;
|
||||
INSTRUCTION.MinVolt = E2;
|
||||
}else if(E1 < E2){
|
||||
INSTRUCTION.MaxVolt = E2;
|
||||
INSTRUCTION.MinVolt = E1;
|
||||
}
|
||||
|
||||
if(INSTRUCTION.InitVolt > E1 || INSTRUCTION.InitVolt == INSTRUCTION.MaxVolt){
|
||||
INSTRUCTION.InitDirection = 0;//0:reverse 1:forward
|
||||
}else if(INSTRUCTION.InitVolt <= E1 || INSTRUCTION.InitVolt == INSTRUCTION.MinVolt){
|
||||
INSTRUCTION.InitDirection = 1;
|
||||
}
|
||||
|
||||
INSTRUCTION.VoltOrigin = INSTRUCTION.MinVolt;
|
||||
INSTRUCTION.VoltFinal = INSTRUCTION.MaxVolt;
|
||||
|
||||
//controller UI 0.01~1000mv send to Elite 1~100000
|
||||
INSTRUCTION.Step = ((uint32_t)(ins[9]) << 24) | ((uint32_t)(ins[10]) << 16) | ((uint32_t)(ins[11]) << 8) | (uint32_t)(ins[12]);//controller UI 0.1~100mv send to Elite 1~1000
|
||||
if(INSTRUCTION.Step >= 10000){//100mv, n=2
|
||||
INSTRUCTION.VscanRateIndex = 0;
|
||||
}else if (INSTRUCTION.Step >= 1000){//10mv, n=10
|
||||
INSTRUCTION.VscanRateIndex = 1;
|
||||
}else if (INSTRUCTION.Step >= 100){//1mv, n=100
|
||||
INSTRUCTION.VscanRateIndex = 2;
|
||||
}else if (INSTRUCTION.Step >= 10){//0.1mv, n=1000
|
||||
INSTRUCTION.VscanRateIndex = 3;
|
||||
}else if (INSTRUCTION.Step >= 1){//0.1mv, n=10000
|
||||
INSTRUCTION.VscanRateIndex = 4;
|
||||
}
|
||||
INSTRUCTION.VscanRate = VscanRateTable[INSTRUCTION.VscanRateIndex];//N
|
||||
|
||||
INSTRUCTION.MaxCurrent = ( (uint32_t) (ins[15])<<24 | (uint32_t) (ins[16])<<16 | (uint32_t) (ins[17])<<8 | (uint32_t) (ins[18]) );
|
||||
INSTRUCTION.CycleNumber = ins[19];
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
INSTRUCTION.NotifyRate = ((uint32_t)(ins[13]) << 8) | (uint32_t)(ins[14]);
|
||||
INSTRUCTION.NotifyRate = 10000 / INSTRUCTION.NotifyRate * 10;
|
||||
|
||||
ADC_write(0xA4);
|
||||
ADC_read(ReadVoutBuf);
|
||||
SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, 2, ReadVoutBuf);*/
|
||||
break;
|
||||
}
|
||||
|
||||
case HIGH_CYCLE_CYCLIC_VOLTAMMETRY: {
|
||||
INSTRUCTION.eliteFxn = CYCLIC_VOLTAMMETRY;
|
||||
InitEliteFlag();
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
|
||||
INSTRUCTION.InitVolt = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
|
||||
|
||||
uint16_t E1 = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
|
||||
uint16_t E2 = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
|
||||
if(E1 >= E2){
|
||||
INSTRUCTION.MaxVolt = E1;
|
||||
INSTRUCTION.MinVolt = E2;
|
||||
}else if(E1 < E2){
|
||||
INSTRUCTION.MaxVolt = E2;
|
||||
INSTRUCTION.MinVolt = E1;
|
||||
}
|
||||
|
||||
if(INSTRUCTION.InitVolt > E1 || INSTRUCTION.InitVolt == INSTRUCTION.MaxVolt){
|
||||
INSTRUCTION.InitDirection = 0;//0:reverse 1:forward
|
||||
}else if(INSTRUCTION.InitVolt <= E1 || INSTRUCTION.InitVolt == INSTRUCTION.MinVolt){
|
||||
INSTRUCTION.InitDirection = 1;
|
||||
}
|
||||
|
||||
INSTRUCTION.VoltOrigin = INSTRUCTION.MinVolt;
|
||||
INSTRUCTION.VoltFinal = INSTRUCTION.MaxVolt;
|
||||
|
||||
//controller UI 0.01~1000mv send to Elite 1~100000
|
||||
INSTRUCTION.Step = ((uint32_t)(ins[9]) << 24) | ((uint32_t)(ins[10]) << 16) | ((uint32_t)(ins[11]) << 8) | (uint32_t)(ins[12]);//controller UI 0.1~100mv send to Elite 1~1000
|
||||
if(INSTRUCTION.Step >= 10000){//100mv, n=2
|
||||
INSTRUCTION.VscanRateIndex = 0;
|
||||
}else if (INSTRUCTION.Step >= 1000){//10mv, n=10
|
||||
INSTRUCTION.VscanRateIndex = 1;
|
||||
}else if (INSTRUCTION.Step >= 100){//1mv, n=100
|
||||
INSTRUCTION.VscanRateIndex = 2;
|
||||
}else if (INSTRUCTION.Step >= 10){//0.1mv, n=1000
|
||||
INSTRUCTION.VscanRateIndex = 3;
|
||||
}else if (INSTRUCTION.Step >= 1){//0.1mv, n=10000
|
||||
INSTRUCTION.VscanRateIndex = 4;
|
||||
}
|
||||
INSTRUCTION.VscanRate = VscanRateTable[INSTRUCTION.VscanRateIndex];//N
|
||||
|
||||
INSTRUCTION.MaxCurrent = ( (uint32_t) (ins[15])<<24 | (uint32_t) (ins[16])<<16 | (uint32_t) (ins[17])<<8 | (uint32_t) (ins[18]) );
|
||||
INSTRUCTION.CycleNumber = ins[19] * 100;
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
INSTRUCTION.NotifyRate = ((uint32_t)(ins[13]) << 8) | (uint32_t)(ins[14]);
|
||||
INSTRUCTION.NotifyRate = 10000 / INSTRUCTION.NotifyRate * 10;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case LINEAR_SWEEP_VOLTAMMETRY:{//370002 61A8 7530 00002710 03E8 00E4E1C001
|
||||
INSTRUCTION.eliteFxn = LINEAR_SWEEP_VOLTAMMETRY;
|
||||
InitEliteFlag();
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
|
||||
INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
|
||||
INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
|
||||
|
||||
if(INSTRUCTION.VoltOrigin > INSTRUCTION.VoltFinal){
|
||||
INSTRUCTION.InitDirection = 0;//0:reverse 1:forward
|
||||
}else if(INSTRUCTION.VoltOrigin <= INSTRUCTION.VoltFinal){
|
||||
INSTRUCTION.InitDirection = 1;
|
||||
}
|
||||
|
||||
//controller UI 0.01~1000mv send to Elite 1~100000
|
||||
INSTRUCTION.Step = ((uint32_t)(ins[7]) << 24) | ((uint32_t)(ins[8]) << 16) | ((uint32_t)(ins[9]) << 8) | (uint32_t)(ins[10]);//controller UI 0.1~100mv send to Elite 1~1000
|
||||
if(INSTRUCTION.Step >= 10000){//100mv, n=2
|
||||
INSTRUCTION.VscanRateIndex = 0;
|
||||
}else if (INSTRUCTION.Step >= 1000){//10mv, n=10
|
||||
INSTRUCTION.VscanRateIndex = 1;
|
||||
}else if (INSTRUCTION.Step >= 100){//1mv, n=100
|
||||
INSTRUCTION.VscanRateIndex = 2;
|
||||
}else if (INSTRUCTION.Step >= 10){//0.1mv, n=1000
|
||||
INSTRUCTION.VscanRateIndex = 3;
|
||||
}else if (INSTRUCTION.Step >= 1){//0.1mv, n=10000
|
||||
INSTRUCTION.VscanRateIndex = 4;
|
||||
}
|
||||
INSTRUCTION.VscanRate = VscanRateTable[INSTRUCTION.VscanRateIndex];//N
|
||||
|
||||
INSTRUCTION.MaxCurrent = ( (uint32_t) (ins[13])<<24 | (uint32_t) (ins[14])<<16 | (uint32_t) (ins[15])<<8 | (uint32_t) (ins[16]) );
|
||||
INSTRUCTION.CycleNumber = 1;//ins[17];
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
INSTRUCTION.NotifyRate = ((uint32_t)(ins[11]) << 8) | (uint32_t)(ins[12]);
|
||||
INSTRUCTION.NotifyRate = 10000 / INSTRUCTION.NotifyRate * 10;
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case CONSTANT_VSCAN:{
|
||||
INSTRUCTION.eliteFxn = CONSTANT_VSCAN;
|
||||
InitEliteFlag();
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
INSTRUCTION.NotifyRate = ((uint32_t)(ins[5]) << 8) | (uint32_t)(ins[6]);
|
||||
INSTRUCTION.NotifyRate = 10000 / INSTRUCTION.NotifyRate * 10;
|
||||
INSTRUCTION.VoVi_Switch = 0x01;
|
||||
INSTRUCTION.VscanRate = VscanRateTable[0];//N
|
||||
break;
|
||||
}
|
||||
// case READ_VOUT_VALUE:{
|
||||
// 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;
|
||||
// }
|
||||
|
||||
case ADC_TEST: {
|
||||
INSTRUCTION.eliteFxn = ADC_TEST;
|
||||
int32_t ADCRealValue = 0;
|
||||
@@ -1106,6 +1336,23 @@ static void update_ZM_instruction(uint8 *ins) {
|
||||
break;
|
||||
}
|
||||
|
||||
case VIS_CC_ZERO:{
|
||||
INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
|
||||
INSTRUCTION.SampleRate = 15;
|
||||
INSTRUCTION.Charge = 0x01;
|
||||
INSTRUCTION.ConstantCurrent = 0x00;
|
||||
INSTRUCTION.MaxVolt = 0xC350;
|
||||
INSTRUCTION.MinVolt = 0x0000;
|
||||
INSTRUCTION.NotifyRate = 500;
|
||||
INSTRUCTION.VoVi_Switch = 0x02;//read Vscan = Vout - Vin
|
||||
|
||||
// uint8 *ins;
|
||||
// ins[0] = 0xC0;
|
||||
// ins[1] = 0xC0;
|
||||
// update_ZM_instruction(ins);
|
||||
break;
|
||||
}
|
||||
|
||||
default: {
|
||||
break;
|
||||
}
|
||||
@@ -1126,11 +1373,18 @@ static void update_ZM_instruction(uint8 *ins) {
|
||||
cis_buf[2] = VERSION_DATE_DAY;
|
||||
cis_buf[3] = VERSION_DATE_HOUR;
|
||||
cis_buf[4] = VERSION_DATE_MINUTE;
|
||||
|
||||
SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
|
||||
break;
|
||||
}
|
||||
|
||||
case CIS_VOLT: {
|
||||
FlushCISNotify();
|
||||
cis_buf[0] = CIS_VOLT;
|
||||
cis_buf[1] = NotifyVoltBat[3];
|
||||
cis_buf[2] = NotifyVoltBat[2];
|
||||
SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
break;
|
||||
@@ -1345,7 +1599,7 @@ static void headstage_init_device_info() {
|
||||
for (unsigned int i = 0; i < sizeof(DEVICE_NAME) - 1; i++) {
|
||||
*p++ = DEVICE_NAME[i];
|
||||
}
|
||||
*p++ = 11;
|
||||
*p++ = 16;
|
||||
*p++ = GAP_ADTYPE_MANUFACTURER_SPECIFIC;
|
||||
*p++ = 'B';
|
||||
*p++ = 'P';
|
||||
@@ -1357,6 +1611,11 @@ static void headstage_init_device_info() {
|
||||
*p++ = MINOR_VERSION_NUMBER;
|
||||
*p++ = year;
|
||||
*p++ = month;
|
||||
*p++ = 'B';
|
||||
*p++ = 'A';
|
||||
*p++ = 'T';
|
||||
*p++ = NotifyVoltBat[3];
|
||||
*p++ = NotifyVoltBat[2];
|
||||
|
||||
GGS_SetParameter(GGS_DEVICE_NAME_ATT, sizeof(DEVICE_NAME), DEVICE_NAME);
|
||||
|
||||
|
||||
+211
-122
@@ -20,6 +20,7 @@
|
||||
#include <ti/drivers/PIN.h>
|
||||
#include "board.h"
|
||||
#include "EliteWorkData.h"
|
||||
#include <driverlib/aon_batmon.h>
|
||||
|
||||
static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData);
|
||||
|
||||
@@ -34,6 +35,7 @@ static void SimpleBLEPeripheral_clockHandler(UArg arg) {
|
||||
static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask) {
|
||||
events |= SBP_PERIODIC_EVT;
|
||||
Semaphore_post(semaphore);
|
||||
GPT.GptimerCounter++;
|
||||
}
|
||||
|
||||
|
||||
@@ -79,7 +81,9 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
|
||||
(INSTRUCTION.eliteFxn == VT_CURVE) || \
|
||||
(INSTRUCTION.eliteFxn == ZT_CURVE) || \
|
||||
(INSTRUCTION.eliteFxn == CONSTANT_CURRENT) || \
|
||||
(INSTRUCTION.eliteFxn == READ_VOUT_VALUE) \
|
||||
(INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY) || \
|
||||
(INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY) || \
|
||||
(INSTRUCTION.eliteFxn == CONSTANT_VSCAN) \
|
||||
)
|
||||
|
||||
/*********************************************************************
|
||||
@@ -93,54 +97,87 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
|
||||
*/
|
||||
static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
|
||||
if ( IsPeriodicMode() ){
|
||||
|
||||
// DAC counter
|
||||
if (CT.StepTimeCounter == INSTRUCTION.StepTime){
|
||||
CT.StepTimeCounter = 1;
|
||||
}
|
||||
else{
|
||||
CT.StepTimeCounter++;
|
||||
}
|
||||
|
||||
// ADC counter
|
||||
if (CT.SampleRate_counter == INSTRUCTION.SampleRate){
|
||||
CT.SampleRate_counter = 1;
|
||||
}
|
||||
else{
|
||||
CT.SampleRate_counter++;
|
||||
}
|
||||
|
||||
// notify counter
|
||||
if (CT.NotifyCounter == INSTRUCTION.NotifyRate){
|
||||
CT.NotifyCounter = 1;
|
||||
}
|
||||
else{
|
||||
CT.NotifyCounter ++;
|
||||
}
|
||||
|
||||
/** Periodic Event **/
|
||||
// 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 FxnNameDACReset
|
||||
|
||||
GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
|
||||
GPT.GptimerCounter0 = GPT.GptimerCounter;
|
||||
|
||||
if(EliteWorkReset){
|
||||
InitEliteGPtimer();
|
||||
EliteWorkReset = false;
|
||||
}
|
||||
|
||||
|
||||
GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
|
||||
if(LeadTimeReset && GPT.LeadTimeCounter <= 2000){
|
||||
VscanReset = true;
|
||||
}else{
|
||||
if(firstNotifyFlag){
|
||||
GPT.NotifyCounter = INSTRUCTION.NotifyRate - 20;
|
||||
firstNotifyFlag = false;
|
||||
}
|
||||
VscanReset = false;
|
||||
LeadTimeReset = false;
|
||||
}
|
||||
|
||||
//DAC counter
|
||||
// In IV, CV, and func-gen mode, DAC will output voltage
|
||||
// else DAC do nothing.
|
||||
EliteDACControl(WorkModeData);
|
||||
GPT.StepTimeCounter = GPT.StepTimeCounter + GPT.DeltaGptimerCounter;
|
||||
if(GPT.StepTimeCounter >= INSTRUCTION.StepTime){
|
||||
GPT.StepTimeCounter -= INSTRUCTION.StepTime; //To get the time right
|
||||
DAC_flag = true;
|
||||
if(DAC_flag){
|
||||
EliteDACControl(WorkModeData);
|
||||
DAC_flag = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Control ADC to sample rate
|
||||
EliteADCControl(WorkModeData);
|
||||
//Vscan counter
|
||||
GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
|
||||
if(GPT.VscanRateCounter >= INSTRUCTION.VscanRate){
|
||||
GPT.VscanRateCounter -= INSTRUCTION.VscanRate; //To get the time right
|
||||
Vscan_flag = true;
|
||||
if(Vscan_flag){
|
||||
EliteVscanControl(WorkModeData);
|
||||
Vscan_flag = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Notify control, check if we need to send notify
|
||||
EliteNotifyControl();
|
||||
//ADC counter(Control ADC to sample rate)
|
||||
GPT.SampleRate_counter = GPT.SampleRate_counter + GPT.DeltaGptimerCounter;
|
||||
if(GPT.SampleRate_counter >= INSTRUCTION.SampleRate){
|
||||
GPT.SampleRate_counter = 0; //To get the data right, ADC must be delay 1.5ms
|
||||
ADC_flag = true;
|
||||
if(ADC_flag){
|
||||
EliteADCControl(WorkModeData);
|
||||
ADC_flag = false;
|
||||
}
|
||||
}
|
||||
|
||||
//Notify counter(Notify control, check if we need to send notify)
|
||||
GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
|
||||
if(GPT.NotifyCounter >= INSTRUCTION.NotifyRate){
|
||||
GPT.NotifyCounter -= INSTRUCTION.NotifyRate; //To get the time right
|
||||
notify_flag = true;
|
||||
if(VscanReset){
|
||||
notify_flag = false;
|
||||
}
|
||||
if(notify_flag){
|
||||
SendNotify();
|
||||
notify_flag = false;
|
||||
}
|
||||
}
|
||||
|
||||
EliteDone();
|
||||
}
|
||||
|
||||
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
|
||||
WorkModeData->VO->_Vset = INSTRUCTION.VoltConstant;
|
||||
DAC_outputV(Usercode_Correction_to_DAC(WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
|
||||
FreeWorkMode(WorkModeData);
|
||||
PeriodicEvent = false;
|
||||
InitPeriodicEvent = true;
|
||||
@@ -151,27 +188,8 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
|
||||
}
|
||||
|
||||
static void EliteDACControl(WorkMode *WorkModeData) {
|
||||
if (INSTRUCTION.eliteFxn == IV_CURVE) {
|
||||
// output a certain voltage and put it into NotifyVolt
|
||||
if(WorkModeData->IV->_VoVi_Switch == 0x00){ //user see Vout
|
||||
//DACCode2Real2Notify(VoltScan(WorkModeData));
|
||||
uint16_t DACcode;
|
||||
DACcode = VoltScan(WorkModeData);
|
||||
|
||||
}
|
||||
else if (WorkModeData->IV->_VoVi_Switch == 0x01){ //user see Vin
|
||||
VoltScan(WorkModeData);
|
||||
}
|
||||
}
|
||||
else if(INSTRUCTION.eliteFxn == CV_CURVE){
|
||||
if (WorkModeData->CV->_VoVi_Switch == 0x00){
|
||||
DACCode2Real2Notify(VoltScan(WorkModeData));
|
||||
}
|
||||
else if (WorkModeData->CV->_VoVi_Switch == 0x01){
|
||||
VoltScan(WorkModeData);
|
||||
}
|
||||
}
|
||||
else if (INSTRUCTION.eliteFxn == ZT_CURVE){
|
||||
|
||||
if (INSTRUCTION.eliteFxn == ZT_CURVE){
|
||||
if(INSTRUCTION.ResisterMeter == RESISTER_METER_SMALL){
|
||||
// output 1V
|
||||
if (DACReset) {
|
||||
@@ -183,19 +201,18 @@ static void EliteDACControl(WorkMode *WorkModeData) {
|
||||
else{
|
||||
// output 1V
|
||||
if (DACReset) {
|
||||
INSTRUCTION.VoltConstant = 25000 + 5000;
|
||||
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
|
||||
DACReset = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(INSTRUCTION.eliteFxn == CONSTANT_CURRENT){
|
||||
if (DACReset) {
|
||||
DAC_outputV(Usercode_Correction_to_DAC(25000));
|
||||
DACReset = false;
|
||||
}
|
||||
CCModeVoltOut(WorkModeData->CC);
|
||||
}
|
||||
// else if(INSTRUCTION.eliteFxn == CONSTANT_CURRENT){
|
||||
// if (DACReset) {
|
||||
// DAC_outputV(Usercode_Correction_to_DAC(25000));
|
||||
// DACReset = false;
|
||||
// }
|
||||
// CCModeVoltOut(WorkModeData->CC);
|
||||
// }
|
||||
|
||||
else{
|
||||
// IT, VT need only ADC measure
|
||||
@@ -204,80 +221,137 @@ static void EliteDACControl(WorkMode *WorkModeData) {
|
||||
}
|
||||
|
||||
static void EliteADCControl(WorkMode *WorkModeData) {
|
||||
if (CT.SampleRate_counter == INSTRUCTION.SampleRate - 1) {
|
||||
switch (INSTRUCTION.eliteFxn) {
|
||||
case IV_CURVE:{
|
||||
IV_Plot(WorkModeData->IV);
|
||||
// IT_Plot(WorkModeData);
|
||||
break;
|
||||
}
|
||||
case CV_CURVE:{
|
||||
CV_Plot(WorkModeData->CV);
|
||||
break;
|
||||
}
|
||||
case IT_CURVE:{
|
||||
IT_Plot(WorkModeData);
|
||||
// NotifyReady = true;
|
||||
break;
|
||||
}
|
||||
case VT_CURVE:{
|
||||
// read volt through ADC and put it into notify buffer
|
||||
VT_Plot(WorkModeData->VT);
|
||||
// NotifyReady = true;
|
||||
break;
|
||||
}
|
||||
case ZT_CURVE:{
|
||||
ZT_Plot(WorkModeData->RT);
|
||||
// NotifyReady = true;
|
||||
break;
|
||||
}
|
||||
case CONSTANT_CURRENT:{
|
||||
CCModeReadCurrent(WorkModeData->CC);
|
||||
switch (INSTRUCTION.eliteFxn) {
|
||||
case IV_CURVE:{
|
||||
OneWayVoltScan();
|
||||
IV_Plot(WorkModeData->IV);
|
||||
break;
|
||||
}
|
||||
case CV_CURVE:{
|
||||
OneWayVoltScan();
|
||||
CV_Plot(WorkModeData->CV);
|
||||
break;
|
||||
}
|
||||
case IT_CURVE:{
|
||||
IT_Plot(WorkModeData->IT);
|
||||
break;
|
||||
}
|
||||
case VT_CURVE:{
|
||||
// read volt through ADC and put it into notify buffer
|
||||
VT_Plot(WorkModeData->VT);
|
||||
break;
|
||||
}
|
||||
case ZT_CURVE:{
|
||||
ZT_Plot(WorkModeData->RT);
|
||||
break;
|
||||
}
|
||||
case CONSTANT_CURRENT:{
|
||||
CC_Plot(WorkModeData->CC);
|
||||
// CCModeReadCurrent(WorkModeData->CC);
|
||||
// CCModeReverseCurrent(WorkModeData->CC);
|
||||
break;
|
||||
break;
|
||||
}
|
||||
case CYCLIC_VOLTAMMETRY:{
|
||||
if (INSTRUCTION.VoltOrigin == INSTRUCTION.VoltFinal) {
|
||||
PeriodicEvent = false;
|
||||
}
|
||||
case READ_VOUT_VALUE:{
|
||||
RVout_Plot(WorkModeData->RVout);
|
||||
CV3_Plot(WorkModeData->CV3);
|
||||
break;
|
||||
}
|
||||
case LINEAR_SWEEP_VOLTAMMETRY:{
|
||||
if (INSTRUCTION.VoltOrigin == INSTRUCTION.VoltFinal) {
|
||||
PeriodicEvent = false;
|
||||
}
|
||||
LSV_Plot(WorkModeData->LSV);
|
||||
break;
|
||||
}
|
||||
case CONSTANT_VSCAN:{
|
||||
CVSCAN_Plot(WorkModeData->CVSCAN);
|
||||
break;
|
||||
}
|
||||
|
||||
/*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;
|
||||
}
|
||||
// case READ_VOUT_VALUE:{
|
||||
// RVout_Plot(WorkModeData->RVout);
|
||||
// break;
|
||||
// }
|
||||
default:{
|
||||
IT_Plot(WorkModeData->IT);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void EliteNotifyControl() {
|
||||
if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE)) {
|
||||
// output the last notify, and reset Elite
|
||||
if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)) {
|
||||
if (!PeriodicEvent) {
|
||||
SendNotify();
|
||||
reset();
|
||||
} else if (CT.StepTimeCounter == INSTRUCTION.StepTime/2) {
|
||||
SendNotify();
|
||||
}
|
||||
}
|
||||
else if(INSTRUCTION.eliteFxn == CONSTANT_CURRENT){
|
||||
if(CT.NotifyCounter == INSTRUCTION.NotifyRate){
|
||||
SendNotify();
|
||||
}
|
||||
}
|
||||
else if (CT.SampleRate_counter == INSTRUCTION.SampleRate) {
|
||||
SendNotify();
|
||||
}
|
||||
}
|
||||
|
||||
static void EliteDone() {
|
||||
if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)) {
|
||||
if (!PeriodicEvent) {
|
||||
SendNotify();
|
||||
reset();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void InitEliteGPtimer() {
|
||||
GPT.SampleRate_counter = INSTRUCTION.SampleRate - 10;
|
||||
GPT.VscanRateCounter = INSTRUCTION.VscanRate - 1;
|
||||
firstNotifyFlag = true;
|
||||
// GPT.GptimerCounter = 0;
|
||||
// GPT.GptimerCounter0 = 0;
|
||||
// GPT.DeltaGptimerCounter = 0;
|
||||
// GPT.StepTimeCounter = 0;
|
||||
}
|
||||
|
||||
static void InitEliteFlag() {
|
||||
DACReset = true;
|
||||
VscanReset = true;
|
||||
NotifyReset = true;
|
||||
ADCReset = true;
|
||||
EliteWorkReset = true;
|
||||
LeadTimeReset = true;
|
||||
}
|
||||
|
||||
static void EliteVscanControl(WorkMode *WorkModeData) {
|
||||
switch (INSTRUCTION.eliteFxn) {
|
||||
case IV_CURVE:{
|
||||
IV_Vscan(WorkModeData->IV);
|
||||
break;
|
||||
}
|
||||
case CV_CURVE:{
|
||||
CV_Vscan(WorkModeData->CV);
|
||||
break;
|
||||
}
|
||||
case CYCLIC_VOLTAMMETRY:{
|
||||
CV3_Vscan(WorkModeData->CV3);
|
||||
break;
|
||||
}
|
||||
case CONSTANT_CURRENT:{
|
||||
CC_Vscan(WorkModeData->CC);
|
||||
break;
|
||||
}
|
||||
case LINEAR_SWEEP_VOLTAMMETRY:{
|
||||
LSV_Vscan(WorkModeData->LSV);
|
||||
break;
|
||||
}
|
||||
case CONSTANT_VSCAN:{
|
||||
CVSCAN_Vscan(WorkModeData->CVSCAN);
|
||||
break;
|
||||
}
|
||||
default:{
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static uint16_t StepCode2DACcode(uint16_t StepCode){
|
||||
return (StepCode * 0x0005);
|
||||
return (StepCode * 0x0005 / 10);
|
||||
}
|
||||
|
||||
static uint16_t OldStep2NewStepTime(uint8_t StepTime) {
|
||||
@@ -298,6 +372,21 @@ static uint16_t OldStep2NewStepTime(uint8_t StepTime) {
|
||||
return STEPTIME_ONE_SEC;
|
||||
}
|
||||
}
|
||||
//test version add
|
||||
// switch (StepTimeLevel) {
|
||||
// case 0: { //0.5 sec
|
||||
// return 100;
|
||||
// }
|
||||
// case 1: { //1 sec
|
||||
// return 200;
|
||||
// }
|
||||
// case 2: { //2 sec
|
||||
// return 1000;
|
||||
// }
|
||||
// default: { //1 sec
|
||||
// return STEPTIME_ONE_SEC;
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
#endif /* IMPEDANCE_METER_H_ */
|
||||
|
||||
+35
-24
@@ -545,9 +545,9 @@ static void SimpleBLEPeripheral_init(void) {
|
||||
static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
|
||||
|
||||
#define CLOCK_ONE_SECOND 10000
|
||||
|
||||
// Initialize application
|
||||
SimpleBLEPeripheral_init();
|
||||
headstage_init_device_info();
|
||||
|
||||
ZM_init();
|
||||
Elite_SPI_init();
|
||||
@@ -562,6 +562,11 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
|
||||
elite_gptimer_start();
|
||||
|
||||
// Application main loops
|
||||
GPT.GptimerCounter0 = GPT.GptimerCounter;
|
||||
ADCbattery_flag = false;
|
||||
headstage_battery_volt();
|
||||
headstage_init_device_info();
|
||||
|
||||
for (;;) {
|
||||
// Waits for a signal to the semaphore associated with the calling thread.
|
||||
// Note that the semaphore associated with a thread is signaled when a
|
||||
@@ -618,15 +623,37 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
|
||||
counter6994++;
|
||||
} else if (counter6994 == CLOCK_ONE_SECOND/2) {
|
||||
PIN_setOutputValue(pin_handle, shutdown_6994, 1); // OFF = 1 => turn off 6994
|
||||
// #ifdef ELITE_VERSION_1_4
|
||||
// SPI_close(spiHandle0);
|
||||
// I2Cinit();
|
||||
// I2C_close(I2Chandle);
|
||||
// spiHandle0 = SPI_open(Board_SPI0, &spiParams0); // LED SPI
|
||||
// #endif
|
||||
counter6994++;
|
||||
}
|
||||
EliteKeyPress(key);
|
||||
if(key != 0){
|
||||
GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
|
||||
GPT.GptimerCounter0 = GPT.GptimerCounter;
|
||||
|
||||
GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
|
||||
GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
|
||||
|
||||
if(GPT.BatteryCheckCounter >= 50000){
|
||||
GPT.BatteryCheckCounter = 0;
|
||||
batteryCheckFlag = true;
|
||||
}
|
||||
|
||||
if(GPT.BatteryADCCounter >= 15 && batteryCheckFlag){
|
||||
GPT.BatteryADCCounter = 0; //To get the data right, ADC must be delay 1.5ms
|
||||
ADCbattery_flag = true;
|
||||
if(ADCbattery_flag){
|
||||
EliteADCBattery();
|
||||
ADCbattery_flag = false;
|
||||
}
|
||||
}
|
||||
|
||||
uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
|
||||
((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
|
||||
if( bat < 768 && bat > 20){
|
||||
PIN_setOutputValue(pin_handle, enable_5v, 0);
|
||||
}
|
||||
|
||||
}
|
||||
if(Free_Work_Mode){
|
||||
FreeWorkMode(WorkModeData);
|
||||
InitEliteInstruction();
|
||||
@@ -639,8 +666,7 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
|
||||
EliteOn = TurnOnElite(key);
|
||||
}
|
||||
}
|
||||
// if there is periodic event
|
||||
else {
|
||||
else { // if there is periodic event
|
||||
if(InitPeriodicEvent){
|
||||
InitWorkMode(WorkModeData);
|
||||
InitPeriodicEvent = false;
|
||||
@@ -648,26 +674,11 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
|
||||
|
||||
// Perform periodic application task
|
||||
SimpleBLEPeripheral_performPeriodicTask(WorkModeData);
|
||||
|
||||
// Turn off Elite if battery voltage < 3V
|
||||
// ReadBatVolt(spi_ADC_rxbuf);
|
||||
|
||||
key = PIN_getInputValue(switch_on);
|
||||
EliteKeyPress(key); // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// if (events & SBP_PERIODIC_EVT)
|
||||
// {
|
||||
// events &= ~SBP_PERIODIC_EVT;
|
||||
// Util_startClock(&periodicClock);
|
||||
// Perform periodic application task
|
||||
// SimpleBLEPeripheral_performPeriodicTask();
|
||||
// }
|
||||
|
||||
// headstage_gptimer_main_handle();
|
||||
|
||||
#ifdef FEATURE_OAD
|
||||
while (!Queue_empty(hOadQ)) {
|
||||
oadTargetWrite_t *oadWriteEvt = Queue_get(hOadQ);
|
||||
|
||||
Executable → Regular
Reference in New Issue
Block a user