Compare commits

...

1260 Commits

Author SHA1 Message Date
Benny Liu 17c866c5c6 pin define 2020-07-15 15:41:16 +08:00
Benny Liu eb1b4ddf30 Update BOARD_CHAO_I calibration data. 2020-07-15 10:50:05 +08:00
Benny Liu 52139ec1b1 Update BOARD_7A42 calibration data. 2020-07-10 18:10:00 +08:00
Benny Liu 142c8c38e1 Update BOARD_7A42 calibration data. 2020-07-10 18:01:21 +08:00
Benny Liu e1acbf5681 Update BOARD_C682 calibration data. 2020-07-10 16:32:51 +08:00
Benny Liu 3e8bbbeaf8 Update BOARD_C77F calibration data. 2020-07-10 15:35:30 +08:00
Benny Liu b0ced97ffb Update BOARD_C73D calibration data. 2020-07-10 11:48:15 +08:00
Benny Liu 67a82d0cb1 Update BOARD_C73D calibration data. 2020-07-08 15:55:35 +08:00
YiChin cf876bfaf9 update DEFAULT_DESIRED_CONN_INTERVAL range 6~6 2020-07-08 10:19:22 +08:00
YiChin 2fe991a23b update calibration data. 2020-07-08 09:22:10 +08:00
YiChin b9f8938c0e update calibration data. 2020-07-07 10:41:57 +08:00
Benny Liu 14129b8b3c update calibration data. 2020-07-06 15:24:59 +08:00
YiChin 502daf7204 update BOARD_C688 & BOARD_C5F1 calibration data. 2020-07-03 17:44:01 +08:00
YiChin 3013e88dca add BOARD_7C73 calibration data. 2020-07-03 12:09:07 +08:00
YiChin d37cf0f694 add BOARD_7C7E calibration data. 2020-07-02 18:24:56 +08:00
YiChin 4cf062fb06 update calibration data. 2020-07-02 18:16:05 +08:00
YiChin 4a8e090ff1 update calibration data. 2020-07-02 18:04:39 +08:00
YiChin 576df09f24 add BOARD_7AA4 & BOARD_7CE0 calibration data. 2020-07-02 18:02:36 +08:00
YiChin 3a01d5cc2c update BOARD_7A4F calibration data. 2020-07-02 15:04:43 +08:00
YiChin 165c89e6aa fix CC speed 2020-07-02 10:53:34 +08:00
YiChin 9eaedfc0e5 update header 2020-07-02 09:42:28 +08:00
YiChin 5eba9eff3a fix CC speed 2020-07-02 09:41:09 +08:00
Benny Liu b985a09863 Add calibration data. 2020-07-01 18:54:49 +08:00
YiChin 68aa82bbd8 Merge branch 'Elite_OBJ_0.2mv_0616_CVSCANf5' into Elite_OBJ_0.2mv2
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/simple_peripheral.c
2020-07-01 14:41:32 +08:00
Benny Liu 6b1c0ca9aa Don't care. 2020-07-01 14:37:30 +08:00
YiChin d176628edb LED not run when battery volt < 3V (boot) 2020-07-01 12:20:53 +08:00
YiChin 8548712049 update batt.h 2020-07-01 10:47:18 +08:00
YiChin bc819082cc measure bat volt (no periodic event) 2020-07-01 10:18:24 +08:00
YiChin 64fb0fc78a add Battery Counter 2020-06-30 18:31:42 +08:00
YiChin 0a4303dff0 when PeriodicEvent = true, headstage_battery_volt() not perform 2020-06-30 17:15:51 +08:00
YiChin caa0bfaf8d add NotifyVoltBat buffer 2020-06-30 16:44:25 +08:00
Benny Liu c6e300bfff don't care. 2020-06-30 14:32:23 +08:00
YiChin cf1d92d9ec test 2020-06-30 14:12:28 +08:00
YiChin 25796a879d test 2020-06-30 13:57:30 +08:00
Benny Liu f6e8385a8f Disable battery voltage detection. 2020-06-30 13:32:22 +08:00
Benny Liu b52ea2fe1e BOARD_C5DA calibration data.
Disable battery voltage detection.
2020-06-30 13:21:13 +08:00
YiChin 2a6920a3d3 test 2020-06-30 11:05:41 +08:00
YiChin fac1427eb6 test battery(not ok) 2020-06-29 18:47:14 +08:00
Benny Liu ed13172c92 BOARD_C5DA calibration data. 2020-06-29 18:28:02 +08:00
YiChin 07ebae4f64 Elite power off when low battery[init] 2020-06-29 15:35:18 +08:00
Benny Liu 1391ebd695 BOARD_C5DA calibration data. 2020-06-29 15:11:25 +08:00
YiChin 6cf988a54c Elite power off when low battery[init] 2020-06-24 17:42:14 +08:00
YiChin 76b74b53f9 Elite power off when low battery 2020-06-24 17:22:28 +08:00
YiChin 786991d971 update battery 2020-06-24 16:36:15 +08:00
YiChin c33b46521e test battery 2020-06-23 13:44:14 +08:00
YiChin fc41b62329 CC mode use GAIN_AUTO 2020-06-23 11:56:30 +08:00
YiChin ab2eeb7f96 CC mode use GAIN_200R 2020-06-23 11:05:07 +08:00
YiChin bc3106fc26 fix CC mode (not ok) 2020-06-22 11:10:32 +08:00
YiChin f2d404ed60 fix CC mode (not ok) 2020-06-20 16:13:01 +08:00
YiChin 53038c0c84 update BOARDs calibration data. 2020-06-19 18:19:06 +08:00
YiChin b835a0136b update BORAD_CHAO_I calibration data. 2020-06-19 15:41:43 +08:00
YiChin e12102a8a7 update BOARDs calibration data. 2020-06-19 14:50:18 +08:00
YiChin 728b9ae8bf update DEFAULT_DESIRED_CONN_INTERVAL range 8~16 2020-06-19 11:01:49 +08:00
YiChin 9f5a6a09de update RT mode 2020-06-18 17:57:11 +08:00
YiChin d26da674f5 update VT mode 2020-06-18 14:59:11 +08:00
YiChin b781023863 update VT mode 2020-06-18 14:31:06 +08:00
YiChin a42f6441fa update IT mode 2020-06-18 12:07:22 +08:00
YiChin 2c4122bb77 update VO mode 2020-06-18 11:36:11 +08:00
YiChin a05b81a7b4 add CVSCAN_Plot() & CVSCANCurve() 2020-06-17 15:22:34 +08:00
YiChin 2c8cc334e2 add CONSTANT_VSCAN mode instruction 2020-06-17 12:10:25 +08:00
YiChin 59786e995f update BOARD_ANGUS calibration data. 2020-06-16 18:25:58 +08:00
YiChin ebc1d29195 update BOARD_C635 calibration data. 2020-06-16 09:53:26 +08:00
YiChin 2d8d706141 update BOARD_C682 calibration data. 2020-06-15 18:23:10 +08:00
YiChin eb25a2e674 update BOARD_C73D calibration data. 2020-06-15 16:22:23 +08:00
YiChin 241ff38555 update CC mode LED 2020-06-12 18:25:46 +08:00
YiChin 059bc76536 end of LSV&CV3 is cc i =0 2020-06-12 12:12:04 +08:00
YiChin 4678e304ee add LSVCurve() 2020-06-12 12:10:27 +08:00
YiChin db7d1e1141 add LSV_Plot() 2020-06-12 12:07:14 +08:00
YiChin 218997b6b3 add LSV instruction 2020-06-12 11:55:12 +08:00
YiChin f05c37d53e update DEFAULT_DESIRED_CONN_INTERVAL range 8~20 2020-06-12 11:52:24 +08:00
YiChin 90767f36e5 Change BOARD_517 feedback R to 200k, 6.2k, 200R. & update calibration code. 2020-06-12 11:08:15 +08:00
YiChin 81b1ff935a fix cycle I-V cycle 2020-06-09 18:31:50 +08:00
YiChin 0f5f228707 add high cycle CV3 mode 2020-06-08 13:55:08 +08:00
YiChin f0ea8bfcf5 update CV3 unit to 5nv 2020-06-08 11:06:00 +08:00
YiChin a2f0d62819 fix cc mode 2020-06-05 17:03:50 +08:00
YiChin e238d117a9 update cc mode's magnification 2020-06-05 10:30:35 +08:00
YiChin 82dbe82bd1 update calibration code. 2020-06-03 10:34:43 +08:00
Benny Liu 8ba6180c8c update calibration code. 2020-06-02 18:44:49 +08:00
Benny Liu e2d5470b47 update calibration code. 2020-06-02 18:36:30 +08:00
YiChin 2532e703ae Merge branch 'Elite_OBJ_0.2mv_0525_currentAutoGain' into Elite_OBJ_0.2mv
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
2020-06-02 13:56:28 +08:00
Benny Liu 10497683c8 update calibration code. 2020-06-02 13:50:11 +08:00
YiChin 53932d4cb3 fix cc mode switch 2020-06-02 13:20:22 +08:00
YiChin 7b0f5ce687 fix cc mode 2020-06-01 17:06:19 +08:00
YiChin 653c2059e2 fix cc mode 2020-06-01 16:09:32 +08:00
YiChin 5c949be67c IV CV CC mode print Vout 2020-06-01 12:47:39 +08:00
YiChin c73ab1bbd4 add BOARDs calibration data. 2020-05-29 18:23:13 +08:00
YiChin 083cbb0611 cc mode NotifyRate = 100ms 2020-05-29 17:08:11 +08:00
YiChin f998c01010 fix VIS_CC_ZERO 2020-05-29 16:49:22 +08:00
YiChin faf57cba6a BOARD_C666 C77F 7AA3 7A42 calibration data. 2020-05-29 11:47:10 +08:00
YiChin 83b70de310 BOARD_7ACD 7AEC 7C45 7ADE calibration data. 2020-05-29 11:22:36 +08:00
YiChin b4fb63f1e8 fix CC mode 2020-05-29 10:57:35 +08:00
YiChin 832fe1695f fix CC mode 2020-05-28 17:34:55 +08:00
YiChin d6b6b65e5f test CC mode 2020-05-28 15:25:29 +08:00
YiChin 1698f0b544 fix RT ADC 2020-05-27 16:13:24 +08:00
YiChin d10a6d16a8 fix IV & CV2 & CV3 ADC step 2020-05-27 15:34:59 +08:00
YiChin f864acfa26 fix VT ADC 2020-05-27 14:36:51 +08:00
YiChin ba7703a772 fix IT ADC 2020-05-27 14:21:12 +08:00
YiChin b7739ab42d fix cycle-IV cycle 2020-05-27 12:40:29 +08:00
YiChin a6208f00d0 let ADC data right, ADC time must be delay 2020-05-27 12:01:33 +08:00
YiChin c53a2d8872 fix ADCGain 2020-05-26 16:10:26 +08:00
YiChin 9c69e16046 fix ADCGain 2020-05-26 15:19:02 +08:00
YiChin cc57bc47a6 fix ADCGain 2020-05-26 15:07:58 +08:00
YiChin b2b07ae05f fix ADCGain 2020-05-26 11:10:40 +08:00
YiChin fec9ddcdf8 fix ADCGain 2020-05-26 10:46:41 +08:00
YiChin 3eb17d14e6 add ADCGain counter 2020-05-25 18:11:29 +08:00
YiChin 8ca4eb3812 take away if(PreviousGain != INSTRUCTION.ADCGainLevel) 2020-05-25 15:52:38 +08:00
YiChin 8341560686 fix OldStep2NewStepTime() 2020-05-22 15:42:33 +08:00
YiChin 39f39773b8 [test version] 2020-05-22 12:55:34 +08:00
YiChin a01c9b9dc0 [test version] 2020-05-22 12:30:15 +08:00
YiChin 124ca6ea84 send IT data 2020-05-22 11:41:34 +08:00
YiChin befb4f80e2 adjust CV3 & CV & IV DAC 2020-05-22 10:01:10 +08:00
Roy 5a7980dca5 fix CV3 cycle 2020-05-21 21:45:32 +08:00
YiChin 889a3d4147 fix CV3 cycle 2020-05-21 18:01:28 +08:00
YiChin 0245adae4a fix CV cycle 2020-05-21 16:35:29 +08:00
YiChin 8b94eaa6dd test LeadTimeCounter maybe ok 2020-05-21 12:43:53 +08:00
YiChin 323dc2cf77 test LeadTimeCounter 2020-05-21 11:03:21 +08:00
YiChin e89cd406e4 test LeadTimeCounter 2020-05-20 18:24:11 +08:00
YiChin 8de29a213c don't care 2020-05-19 18:24:59 +08:00
YiChin 571edc35aa fix cv mode 2020-05-19 18:17:23 +08:00
YiChin ee04ca568e BOARD_7CC4 calibration data. 2020-05-19 15:26:51 +08:00
YiChin 67ef9adad1 fix flag 2020-05-19 15:17:42 +08:00
YiChin 4ec0bb12f7 add InitEliteGPtimer() 2020-05-19 12:12:35 +08:00
YiChin 5f5921e411 BOARD_7A96 calibration data. 2020-05-18 17:05:21 +08:00
YiChin da6a3f90f9 add ADCflag 2020-05-18 16:56:19 +08:00
YiChin 21135acf32 fix IV mode 2020-05-15 18:22:03 +08:00
YiChin b8e052de0d CV3 cycle number 2020-05-15 12:05:38 +08:00
YiChin cf33bcba2a [515 version] 2020-05-15 11:32:37 +08:00
YiChin 45e7e2d5b7 CV3 send vout data 2020-05-15 09:38:46 +08:00
YiChin 04286e891d BOARD_7C8C calibration data. 2020-05-14 17:56:41 +08:00
YiChin 2e4720c607 fix StepTime 2020-05-14 15:58:36 +08:00
YiChin 5333cd9c98 fix autoGain 2020-05-14 15:51:22 +08:00
YiChin a116cbfa3e fix Steptime 2020-05-14 15:27:36 +08:00
YiChin bae6a4bce3 fix notifytimer 2020-05-14 13:51:02 +08:00
YiChin bc10083c25 fix notifytimer flag 2020-05-14 11:13:13 +08:00
YiChin 6f7cea2590 fix notifytimer 2020-05-14 11:11:35 +08:00
YiChin f3c010ebf8 fix gptimer 2020-05-14 10:21:41 +08:00
YiChin ffbdd27df0 add gptimer counter 2020-05-14 10:19:40 +08:00
YiChin 4f9fb2b8fb Merge branch 'Elite_OBJ_0.2mv_addCV3' into Elite_OBJ_0.2mv 2020-05-14 10:15:58 +08:00
Benny Liu f7d2b168d4 BOARD_CHAO_I calibration data. 2020-05-11 17:26:03 +08:00
YiChin 5a9a3754e7 clear buffer when mdoe done ok 2020-04-30 17:33:23 +08:00
YiChin 97040855af clear buffer when mdoe done 2020-04-30 17:09:46 +08:00
YiChin 77ee73a878 fix DAC 2020-04-30 15:29:57 +08:00
YiChin cbd8f96f60 change ADC step 2020-04-30 15:26:45 +08:00
YiChin 631396c50e add InputNitify() 2020-04-30 15:24:06 +08:00
YiChin d25103373e take away CPUdelay() 2020-04-30 15:17:45 +08:00
YiChin 8ddb66393d [Shipping version]CV3:E1&E2 UI, Enter is cc i=0, show Vscan 2020-04-28 17:14:13 +08:00
YiChin f8d37fcf20 CV3_demo 2020-04-24 18:42:55 +08:00
YiChin a22253e384 CV3 read Vscan, when cc i = 0 2020-04-20 13:39:07 +08:00
YiChin 116d4cfb76 fix VIS_CC_ZERO is CC i=0 ,without VIS_STI 2020-04-17 10:02:14 +08:00
YiChin bd070a4ce8 fix VIS_CC_ZERO is CC i=0 2020-04-16 10:53:24 +08:00
YiChin 5beb62613f VIS_CC_ZERO is CC i=0 (maybe ok) 2020-04-16 10:05:28 +08:00
YiChin e27204bd50 when E1 = E2, PeriodicEvent = false 2020-04-15 10:26:46 +08:00
YiChin 34e9c644c5 take away CV3's direction 2020-04-13 11:32:52 +08:00
YiChin 74d2024731 Vmax & Vmin => E1 & E2 2020-04-10 14:53:46 +08:00
YiChin 7615f141ef VIS_CC_ZERO is Vout = 1V 2020-04-09 16:20:08 +08:00
YiChin 38a45cdb1d CV3 2020-04-09 16:16:45 +08:00
YiChin 9623751337 CV3 instruction 2020-04-09 15:51:10 +08:00
YiChin dbf25c5712 take away READ_VOUT_VALUE instruction 2020-04-09 15:42:40 +08:00
yichin 7b2a51ee24 update cali script 2020-03-16 12:39:08 +08:00
yichin bf57c10785 update cali script 2020-03-16 12:06:07 +08:00
yichin 854e82a198 update cali script 2020-03-16 10:45:57 +08:00
yichin 3107807268 update cali script 2020-03-16 10:41:15 +08:00
YiChin dff6c0a9e2 modify RT 2020-03-11 13:52:35 +08:00
royluo 8480f60266 update version script 2020-03-11 12:00:27 +08:00
YiChin 8808490caa modify device information 2020-03-09 09:47:14 +08:00
YiChin 59a4d9dafe ship version(0.2mV) 2020-02-25 18:32:13 +08:00
yichin 1d8d987d22 don't care 2020-02-25 10:38:03 +08:00
yichin 5538e13e69 Merge remote-tracking branch 'origin/Elite_0213_0.2mv_sinica_roy' into Elite_0213_0.2mv_sinica_roy 2020-02-25 10:08:58 +08:00
YiChin 1b75ccb056 send IV CV 's V(uV) (Theoretical value) 2020-02-21 17:57:26 +08:00
YiChin 131051e227 CV 1~4mV debug 2020-02-21 15:57:15 +08:00
YiChin e0e116b1d1 take away NotifyImpedance 2020-02-19 18:31:44 +08:00
YiChin 9a9cf40c74 return version from CIS 2020-02-19 16:01:18 +08:00
YiChin 246052bf9c return version from CIS 2020-02-19 15:48:05 +08:00
yichin 66229c2821 Merge remote-tracking branch 'origin/Elite_0213_0.2mv_sinica_roy' into Elite_0213_0.2mv_sinica_roy
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h
2020-02-19 13:29:32 +08:00
YiChin 347259fe7e don't care 2020-02-19 13:18:11 +08:00
YiChin d1b3aa9506 RTmode:1K bug ok 2020-02-19 11:53:05 +08:00
yichin 6cdecd9e87 BOARD_SATURN 2020-02-19 11:30:13 +08:00
YiChin 56937a0780 IVmode: VoltStep 0.2mv ok 2020-02-19 10:04:59 +08:00
YiChin cb1ca49985 boards calibration data_20200217 2020-02-19 10:02:11 +08:00
YiChin 7e9dfbc4c2 test 2020-02-18 18:38:50 +08:00
YiChin d86b008bb1 test 2020-02-18 11:47:11 +08:00
Roy ceac955327 test:CV can't run 2020-02-17 17:51:31 +08:00
yichin 64effd5a02 board C64C calibration data 2020-02-17 12:33:01 +08:00
YiChin c7d531f0a5 test data:NotifyImpedance 2020-02-17 12:27:08 +08:00
YiChin 37caa92565 test data:NotifyImpedance 2020-02-17 11:28:25 +08:00
YiChin 4c04c57728 don't care 2020-02-14 17:33:36 +08:00
YiChin 9bc16f7687 VoltStep 0.2mv OK 2020-02-14 16:41:55 +08:00
YiChin e11eae5302 test 2020-02-14 11:36:15 +08:00
YiChin 2269a2b4d7 test 2020-02-13 17:47:04 +08:00
YiChin 3ffa567f1b test:device Identify 2020-02-11 15:57:38 +08:00
YiChin de4d766ed5 test:device Identify 2020-02-10 16:42:23 +08:00
YiChin 7b5d46edff test:device Identify 2020-02-10 16:27:40 +08:00
YiChin 7399ddce01 battery function take away 2020-02-06 15:28:51 +08:00
YiChin 7e16a54533 CVmode overflow debug(Vin) 2020-02-06 10:08:26 +08:00
YiChin 778495a07a IVmode can stop 2020-02-06 09:56:33 +08:00
YiChin 527a90f732 calibration data 2020-02-06 09:44:01 +08:00
Benny Liu 4e01c27e8e calibration data of board_C5F3 2020-01-13 17:30:38 +08:00
Benny Liu a71e456e81 calibration data of various boards 2020-01-13 16:40:01 +08:00
royluo df1c1f9f7e CV mode cyclenumber debug with Vin 2020-01-06 17:44:22 +08:00
royluo 06584e7d1c change ADC level 2019-12-31 10:56:11 +08:00
royluo 5ea5b16d89 add Bat() 2019-12-31 10:54:27 +08:00
Benny Liu 10e2d12bc2 calibration data of various boards 2019-12-25 16:55:49 +08:00
Benny Liu 857388b204 change to Vin 2019-12-25 15:41:05 +08:00
royluo 78d788cab2 IV and CV mode with Vout version 2019-12-20 12:13:22 +08:00
royluo 02185083f5 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-12-20 12:06:34 +08:00
royluo aeca114c5f IV and CV mode with Vin version
(add ReadVout)
2019-12-20 12:04:59 +08:00
Benny Liu 7b4f2b5828 update BOARD_KUMA & BOARD_MINO calibration data. 2019-12-20 12:04:16 +08:00
YiChin 7b075f40a3 BOARD_KUMA & BOARD_MINO calibration data 2019-12-19 15:55:00 +08:00
yichin 6c68c67f0e annotation test CVcurve use led 2019-12-19 12:50:43 +08:00
Benny Liu fd9f0ef321 upload BOARD_BIGBROTHER calibration data 2019-12-17 19:01:30 +08:00
yichin cb44628316 Fucking Benny use my branch to calibrate 2019-12-17 16:23:07 +08:00
weiting2 63fd8cf1df flush notify buffer, cycle number should be 0x00, not 0xFF 2019-12-13 14:57:30 +08:00
Benny Liu cc39131466 don't care 2019-12-13 14:23:34 +08:00
Benny Liu e71e064846 Merge branch 'Elite_OBJ_Version' of https://gitlab.com/bioproscientific/bioprocc2650 into Elite_OBJ_Version 2019-12-13 11:22:34 +08:00
Benny Liu 1356a8c8af calibration usage 2019-12-13 11:22:16 +08:00
weiting2 d9b6340f23 reset ADC gain and DAC when press "Stop" button 2019-12-12 12:26:38 +08:00
weiting2 2709baf8e8 flush notify buffer after stop 2019-12-11 15:59:30 +08:00
weiting2 046fae3617 flush notify buffer before start 2019-12-11 15:58:59 +08:00
YiChin 688868fb48 flush notify buffer before start 2019-12-11 14:29:26 +08:00
weiting2 5967b6ebc6 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-12-11 13:22:41 +08:00
weiting2 d9e9a2102e flush timestamp register before start PeriodicEvent 2019-12-11 13:22:26 +08:00
105042004 065517a7cc test CV curve 2019-12-06 18:09:13 +08:00
105042004 0691725819 test CV curve 2019-12-06 17:34:04 +08:00
105042004 5954a965dc test CVcurve use led 2019-12-06 16:28:59 +08:00
105042004 788aca30ef test CV curve 2019-12-06 16:01:01 +08:00
weiting2 bda30b15b5 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-12-06 10:25:37 +08:00
weiting2 32523d6f88 fix ADC level 2019-12-06 10:25:20 +08:00
Benny Liu 300707871e Merge branch 'Elite_OBJ_Version' of https://gitlab.com/bioproscientific/bioprocc2650 into Elite_OBJ_Version 2019-12-03 15:35:17 +08:00
Benny Liu b21bdf57be calibration data for board KELLY 2019-12-03 15:35:08 +08:00
105042004 3067a5eafe CV test 2019-11-29 19:06:29 +08:00
105042004 ec4e48725c CV test 2019-11-29 18:54:16 +08:00
105042004 8322623699 test CV 2019-11-29 18:34:32 +08:00
105042004 c588d4d377 test CV curve 2019-11-29 18:21:40 +08:00
105042004 9e23b67e03 CV curve add VinVout switch 2019-11-29 17:40:37 +08:00
weiting2 0d4f77d25a add comment for CC mode 2019-11-28 19:09:51 +08:00
YiChin 0a16b06c78 11/28 NCKU version
[IV] return Vin
[CC] after reach Vmax/min, Iset = 0
2019-11-28 11:10:26 +08:00
weiting2 c6b6ff420d [CC] after Vin reach Vmax/min, Vout=VMax 2019-11-27 21:38:48 +08:00
YiChin 221c301739 CC Mode should add a DONE flag 2019-11-27 21:33:09 +08:00
weiting2 5355e584a3 fix CC stop condition 2019-11-27 19:19:25 +08:00
weiting2 9fa2c0eb1a fixup! This is a stable version. 11/28 sell to NCKU with CC mode IV mode return Vin 2019-11-27 19:12:44 +08:00
weiting2 03a1e5a633 fixup! This is a stable version. 11/28 sell to NCKU with CC mode IV mode return Vin 2019-11-27 18:58:27 +08:00
weiting2 968150e9b7 fixup! This is a stable version. 11/28 sell to NCKU with CC mode IV mode return Vin 2019-11-27 18:53:33 +08:00
weiting2 ef7484569d Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-11-27 17:25:43 +08:00
weiting2 9cc483da5a This is a stable version.
11/28 sell to NCKU with CC mode
IV mode return Vin
2019-11-27 17:22:54 +08:00
weiting2 eb9609da00 [CC] use INS.VoltLimit store CC mode limit volt 2019-11-27 17:20:35 +08:00
weiting2 ea5c79cd77 [CC] use INS.VoltLimit store CC mode limit volt 2019-11-27 17:02:54 +08:00
weiting2 4d4a0f5ce3 [CC] use INS.VoltLimit store CC mode limit volt 2019-11-27 16:39:15 +08:00
weiting2 cbeef5d00b [CC] use INS.VoltLimit store CC mode limit volt 2019-11-27 16:21:59 +08:00
weiting2 433e9d27ec [CC] use INS.VoltLimit store CC mode limit volt 2019-11-27 16:14:26 +08:00
weiting2 1e039a988a [CC] what's wrong 2019-11-27 15:48:05 +08:00
weiting2 393051bfec [IV] default output Volt is Vin instead of Vout 2019-11-27 14:03:47 +08:00
weiting2 d0b51aef7a Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-11-27 12:47:02 +08:00
YiChin c5e6739632 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-11-27 12:45:57 +08:00
YiChin b91fdc6d3f delete neu 2019-11-27 12:45:25 +08:00
weiting2 d62b879a17 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-11-27 12:42:27 +08:00
weiting2 31306ee2a9 [IV] default output Volt is Vin instead of Vout 2019-11-27 10:32:50 +08:00
Benny Liu 0346e37e50 calibration data of various boards 2019-11-26 18:52:14 +08:00
weiting2 f004c60964 [IV] default output Volt is Vin instead of Vout 2019-11-26 15:55:41 +08:00
YiChin 61c7827d93 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-11-22 17:52:20 +08:00
105042004 4fcb7594d7 test 2019-11-22 17:51:45 +08:00
YiChin 4d71181d78 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-11-22 17:43:35 +08:00
105042004 ed5e6d82fb test IV 2019-11-22 17:43:09 +08:00
YiChin efc23e1393 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-11-22 17:35:33 +08:00
105042004 d8ce4418ae test realV 2019-11-22 17:26:30 +08:00
YiChin fc5cebe638 Merge branch 'Elite_OBJ_Version' of C:\ti with conflicts. 2019-11-22 17:22:32 +08:00
105042004 fb7811559b test IV curve 2019-11-22 17:01:23 +08:00
YiChin a2e7049aa6 test IV Vinout 2019-11-22 16:55:09 +08:00
105042004 f9e6fa7ad0 IV curve add Vin Vout select 2019-11-22 13:02:34 +08:00
Benny Liu e89dbd2f5c calibration data 2019-11-20 18:39:20 +08:00
Benny Liu 0b59913870 calibration data 2019-11-19 18:35:14 +08:00
YiChin d2e11c947a [RT] fix Vout value 2019-11-19 15:28:19 +08:00
weiting2 8c6968ec05 [CC] using new IUC 2019-11-18 16:28:23 +08:00
weiting2 b864235e5c Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-11-18 15:08:44 +08:00
YiChin bd15523916 Every thing well done 2019-11-18 15:08:09 +08:00
YiChin 2f61a9ce99 [CV] auto gain solved 2019-11-18 14:40:10 +08:00
YiChin ed2edccbc1 [CV] auto gain not solve yet 2019-11-18 14:28:11 +08:00
weiting2 59dc27dfda [CV] Try AutoGain 2019-11-18 14:21:30 +08:00
YiChin 1f1b20f92f steptime = 0.5sec bug fix 2019-11-18 14:12:52 +08:00
weiting2 9a511e0fc1 [CV] Try AutoGain 2019-11-18 12:02:53 +08:00
YiChin dff4082ea9 [CV] try to fix auto 2019-11-18 11:36:33 +08:00
YiChin a4e62ac39e [IV] Auto gain work 2019-11-18 11:11:23 +08:00
YiChin e119cfceb8 [IV] Auto gain work 2019-11-18 10:55:03 +08:00
YiChin 308d1c6ef3 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteIVCurve.h
2019-11-18 09:53:17 +08:00
weiting2 89cd606529 [IV] Try AutoGain 2019-11-18 09:50:03 +08:00
YiChin 0ed0c08878 [IV] AutoGain would block reading volt, WHY 2019-11-16 12:31:13 +08:00
weiting2 f1a3c290e9 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-11-16 10:32:54 +08:00
weiting2 47af16a2e2 [IV] Try AutoGain 2019-11-16 10:32:35 +08:00
105042004 3f885decac add measurevolt for PS 2019-11-15 14:10:26 +08:00
weiting2 fb58112ba7 [IV] three-wire stable version 2019-11-14 18:25:21 +08:00
weiting2 9928f5281f [IV] read Vin origin data 2019-11-14 18:02:19 +08:00
weiting2 cf2944f651 [IV] read Vin origin data 2019-11-14 17:16:51 +08:00
weiting2 5cfdec63e2 [IV] read Vin origin data 2019-11-14 16:53:35 +08:00
weiting2 5defc984c2 [IV] read Vin origin data 2019-11-14 16:44:52 +08:00
weiting2 a0f7eff938 [IV] read Vin origin data 2019-11-14 16:19:44 +08:00
weiting2 31a2dd0891 [IV] read Vin origin data 2019-11-14 16:14:47 +08:00
YiChin 67b9a5be85 [IV] notify no data whyyyyyy 2019-11-14 16:12:14 +08:00
weiting2 837bd99e86 [IV] read Vin origin data 2019-11-14 15:59:20 +08:00
YiChin 507386a231 error fix 2019-11-14 15:54:14 +08:00
YiChin 11b155070d add wood/dirt star 2019-11-14 15:47:47 +08:00
YiChin 91a9a315e4 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteITCurve.h
2019-11-14 15:46:46 +08:00
weiting2 85e2f6cf9d [IV] try to report Vin 2019-11-14 15:45:07 +08:00
YiChin f3301069ef [IV] todo : fix auto gain 2019-11-14 13:47:33 +08:00
YiChin 7c1f558687 [IV] todo : fix auto gain 2019-11-14 12:58:14 +08:00
weiting2 448a81bdf7 [IV] try to solve auto gain 2019-11-14 11:53:20 +08:00
YiChin 2712a2fa73 error fix 2019-11-14 10:26:41 +08:00
weiting2 8151053d08 [IV] Vo = Vo - I*100R 2019-11-14 10:13:56 +08:00
weiting2 5e8f0af363 [CC] delete old code
[CCC] add CCC mode
2019-11-13 13:22:49 +08:00
YiChin 006d1c26b3 stable version fix Iin error 2019-11-13 11:38:33 +08:00
YiChin 46f080e642 stable version VERY NICE 2019-11-13 11:25:35 +08:00
YiChin 6088b102f8 stable version CC mode must autogain 2019-11-12 20:55:06 +08:00
YiChin 7a59623930 CC mode GAIN_10K work fine? 2019-11-11 17:53:02 +08:00
weiting2 4789a32fd4 [CC] Do not use auto gain in CC mode 2019-11-11 17:23:44 +08:00
weiting2 4b6bea5f41 test ADC gain instruction 2019-11-11 16:25:00 +08:00
weiting2 da2b97dcf1 NotifyReady not done
TODO: Vmax, Vmin in CC
2019-11-11 14:18:39 +08:00
YiChin 6aee724a7c NotifyReady flag can not work?! 2019-11-11 13:57:45 +08:00
weiting2 f1765d957c comment some useless function 2019-11-11 13:44:30 +08:00
YiChin 19e760f9cc NotifyReady flag can not work?! 2019-11-11 13:31:55 +08:00
weiting2 04c7e8d640 [headstage] add NotifyReady flag 2019-11-11 12:39:21 +08:00
weiting2 813ef50bf5 [headstage] add NotifyReady flag 2019-11-11 11:32:04 +08:00
YiChin 8bc43f1bb0 [CC] This is a stable version 2019-11-11 11:06:55 +08:00
weiting2 50acc23eb1 [CC mode] read Vin 2019-11-11 10:52:21 +08:00
YiChin a26bad68a6 [CC] everything well, return Vin works ^^ 2019-11-11 10:46:13 +08:00
weiting2 f5796e8ac5 [CC mode] read Vin 2019-11-11 10:26:13 +08:00
YiChin c862e6790f [CC] everything well, NEED RETURN VIN 2019-11-08 17:38:55 +08:00
YiChin fb43ec6ac3 [CC] Vin + V_(Iin-GND) = battery V 2019-11-08 16:09:09 +08:00
weiting2 e1aa33e6cb [CC mode] read Vin 2019-11-08 13:34:32 +08:00
YiChin fb3060a220 [VT, IT] default sample rate 100
[CC] notify rate 10
2019-11-08 13:09:07 +08:00
weiting2 be40ac25dc [CC mode] read Vin 2019-11-08 12:44:39 +08:00
YiChin 5a29b161ac [CC mode] return Vin has trouble 2019-11-08 11:24:56 +08:00
weiting2 caee6602a8 add potential state mode 2019-11-07 15:15:50 +08:00
weiting2 12c4908881 [CC mode] Vmax, Vmin
[headstage] flag, counter init function
2019-11-07 14:30:26 +08:00
YiChin cb0b0fafd0 [CC mode] return Vout - I*R 2019-11-07 10:58:57 +08:00
YiChin 633b3424e1 CC mode can work with little error 2019-11-06 20:24:46 +08:00
weiting2 c75a147392 CC mode return Vin 2019-11-06 12:17:41 +08:00
YiChin 1e71de284c try to return Vin 2019-11-06 12:11:44 +08:00
weiting2 3bfadb0ea5 CC mode notify gone 2019-11-06 11:15:12 +08:00
YiChin a22a1aa656 Vout bug solved; no notify in CC 2019-11-06 11:05:22 +08:00
weiting2 ac8f1af1cc try fix Vout mode bug 2019-11-06 10:30:20 +08:00
YiChin 42b5edd2bf find error 2019-11-06 10:14:25 +08:00
weiting2 cafa70e740 try fix Vout mode bug 2019-11-06 10:01:58 +08:00
alan576 7ecc6063ac [CCMode] TODO list :VMax & VMin 2019-11-05 23:57:27 +08:00
alan576 1c5e586bd9 [CCMode] return Vin instead of VOut 2019-11-05 23:55:47 +08:00
alan576 9861067a17 [CCMode] check IUC-Measure value (step value) 2019-11-05 23:46:44 +08:00
alan576 295abacf7c Add notify counter 2019-11-05 23:40:56 +08:00
YiChin 6b5dfcc12a James test CCmode 2019-11-05 19:23:35 +08:00
weiting2 8aab5b5aab IV/CV mode current auto gain problem 2019-11-05 18:51:07 +08:00
YiChin 776e40b639 James test CCmode 2019-11-05 18:39:46 +08:00
weiting2 a97909625d IV/CV mode current auto gain problem 2019-11-05 17:18:37 +08:00
YiChin 259170af20 James test CCmode 2019-11-05 17:05:28 +08:00
YiChin b929433eef James test CCmode 2019-11-05 11:52:59 +08:00
weiting2 b166235c21 IV/CV mode current auto gain problem 2019-11-05 10:26:19 +08:00
YiChin 37ad0160d0 IV/CV auto gain should more smooth 2019-11-04 18:23:31 +08:00
weiting2 d40891396d IV/CV mode current auto gain problem 2019-11-04 17:21:29 +08:00
weiting2 4f31028d1a VO free WMD bug 2019-11-04 17:19:35 +08:00
weiting2 8727b7d2eb try to fix IV mode 2019-11-04 17:09:32 +08:00
weiting2 39e012de64 try to fix IV mode 2019-11-04 16:54:41 +08:00
weiting2 48e566dea4 try to fix IV mode 2019-11-04 13:27:44 +08:00
weiting2 3f617786ef try to fix IV mode 2019-11-04 12:11:13 +08:00
YiChin 080ca80f2b IV/CV has an auto gain prob 2019-11-04 11:47:16 +08:00
weiting2 4875bb271a try to fix IV mode 2019-11-04 11:43:31 +08:00
YiChin b0ac5bb6e6 IV/CV has an auto gain prob 2019-11-04 11:25:09 +08:00
YiChin 8b6a402d47 error fix 2019-11-04 10:11:56 +08:00
weiting2 aefb2cffbb Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-11-04 09:44:21 +08:00
weiting2 6934d858fe free WMD and NULL it 2019-11-04 09:44:07 +08:00
YiChin bc28dedc64 IVmode stop and call reset() 2019-11-01 19:30:30 +08:00
105042004 92b81cb47f check limit 2019-11-01 18:47:01 +08:00
105042004 e9b5414ab0 set _LimitVlaue to 1e5 2019-11-01 18:28:06 +08:00
YiChin d3f6a6521a fix ITmode bug 2019-11-01 18:23:58 +08:00
105042004 13efb6c32a add limit to IVmode 2019-11-01 17:35:04 +08:00
YiChin 18e4cac845 all mode can work 2019-11-01 14:07:04 +08:00
YiChin f6a474e537 error fix 2019-11-01 12:17:28 +08:00
weiting2 311bbdd809 test CCMode 2019-11-01 12:05:25 +08:00
weiting2 e47cf7c3db test CCMode 2019-11-01 11:57:09 +08:00
YiChin b27718a30f error fix 2019-11-01 11:46:12 +08:00
YiChin be79bec5e0 error fix 2019-11-01 11:28:14 +08:00
weiting2 a551eb1143 delete Set & Get QQQ 2019-11-01 11:21:03 +08:00
weiting2 ddc51481b8 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-11-01 10:16:23 +08:00
weiting2 d8a567c607 WHY VStop so many problem?!!!!! 2019-11-01 10:16:07 +08:00
YiChin 776d8074b1 what's wrong with IV->SetVStop ? 2019-10-31 19:24:24 +08:00
YiChin e0f937be45 what's wrong with IV->SetVStop ? 2019-10-31 18:23:40 +08:00
weiting2 2d7bbb74aa WHY VStop so many problem?!!!!! 2019-10-31 18:02:20 +08:00
weiting2 03367a76cf set init value by SetValue fxn 2019-10-31 17:40:45 +08:00
YiChin 8fffec3116 debug Set & Get Fxn in IV 2019-10-31 16:46:16 +08:00
weiting2 d7210e3b5a set init value by SetValue fxn 2019-10-31 16:41:57 +08:00
weiting2 82834f30b0 remove static in union 2019-10-31 16:10:06 +08:00
weiting2 50fbaa5bc7 remove static in union 2019-10-31 16:02:51 +08:00
weiting2 696f6447dc debug IVMode DAC out 2019-10-31 15:51:39 +08:00
weiting2 60734c69b4 debug IVMode DAC out 2019-10-31 15:37:30 +08:00
weiting2 ddf22de09b Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-10-31 14:22:48 +08:00
weiting2 e169ed1d44 check IV init 2019-10-31 14:22:37 +08:00
YiChin 55759938da Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-10-31 13:47:06 +08:00
YiChin 45de2e6825 do not free WM 2019-10-31 13:46:54 +08:00
weiting2 4c0e7e2149 IT support both auto/non-auto mode 2019-10-31 13:46:15 +08:00
weiting2 b63989ca78 remember to free memory 2019-10-31 11:26:33 +08:00
weiting2 c2df81dd3b remember to free memory 2019-10-31 11:26:23 +08:00
YiChin 7d6a0ce845 error fix 2019-10-31 11:16:29 +08:00
weiting2 2c9105eb0a remember to free memory 2019-10-31 10:44:06 +08:00
weiting2 0d705b7d28 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-10-30 19:03:17 +08:00
weiting2 266e597e19 add CCMode in OOC struct 2019-10-30 19:02:58 +08:00
105042004 92d49c1f93 change CV IV curve function 2019-10-30 19:00:54 +08:00
weiting2 c40adb3b64 add CCMode in OOC struct 2019-10-30 18:49:01 +08:00
weiting2 44e5f54c50 using union 2019-10-30 16:50:20 +08:00
weiting2 c642325859 using union 2019-10-30 16:35:57 +08:00
weiting2 c3adc55aec using union 2019-10-30 16:24:21 +08:00
weiting2 8700625d69 using union 2019-10-30 16:18:35 +08:00
weiting2 bc4dcfbe7d using union 2019-10-30 16:17:06 +08:00
weiting2 43170a4282 using union 2019-10-30 16:14:22 +08:00
weiting2 3652e19a3d using union 2019-10-30 16:03:27 +08:00
weiting2 36e6a47472 using union 2019-10-30 15:31:18 +08:00
weiting2 c71c55ecf1 using union 2019-10-30 14:48:00 +08:00
weiting2 57a5b2b4f5 Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-10-30 14:38:48 +08:00
weiting2 0da311941b malloc only once 2019-10-30 14:38:27 +08:00
105042004 7965a4cc1d rewrite small error 2019-10-30 14:32:18 +08:00
105042004 551f9de36b add LIMIT to IV mode 2019-10-30 14:29:34 +08:00
weiting2 fa8f0202e9 malloc only once 2019-10-30 12:23:08 +08:00
YiChin ee35c54dec should be stable 2019-10-29 14:58:24 +08:00
weiting2 031b98a6d5 VT/IT/VOut using OOC struct 2019-10-29 14:54:40 +08:00
weiting2 82ab990f0b VT/IT/VOut using OOC struct 2019-10-29 14:19:11 +08:00
weiting2 38774d9201 VT/IT/VOut using OOC struct 2019-10-29 14:14:34 +08:00
YiChin 6845963c8b should be stable 2019-10-29 12:30:28 +08:00
YiChin 4e4ce66318 bug fix 2019-10-29 12:26:26 +08:00
YiChin 6fe44a536f bug fix 2019-10-29 12:14:20 +08:00
YiChin 07272963bf bug fix 2019-10-29 12:14:04 +08:00
weiting2 80dbc64452 VT/IT/VOut using OOC struct 2019-10-29 12:04:49 +08:00
weiting2 3a8c5d843a VT/IT/VOut using OOC struct 2019-10-29 11:58:50 +08:00
weiting2 bf4baa8200 VT/IT/VOut using OOC struct 2019-10-29 11:53:34 +08:00
YiChin bf2b1b9d3e error fix 2019-10-29 11:52:22 +08:00
weiting2 03391b4fb3 VT/IT/VOut using OOC struct with unknown error 2019-10-29 11:43:33 +08:00
YiChin 9040e85dbb error fix 2019-10-29 11:39:23 +08:00
YiChin 85021a88b0 error fix 2019-10-29 11:34:55 +08:00
weiting2 a5df1c227e VT/IT/VOut using OOC struct 2019-10-29 11:18:16 +08:00
weiting2 8213d9fb19 VT/IT/VOut using OOC struct 2019-10-29 11:01:57 +08:00
YiChin 14c424571a Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version 2019-10-29 09:57:26 +08:00
YiChin 8a94a57843 error fix 2019-10-29 09:56:50 +08:00
weiting2 a58f787253 VT/IT using OOC struct 2019-10-28 19:00:09 +08:00
weiting2 6c839b22d9 VT/IT using OOC struct 2019-10-28 17:53:49 +08:00
YiChin c086de7cf4 OOC compile pass 2019-10-28 17:31:25 +08:00
YiChin 3c5f4d9bb4 OOC error fix 2019-10-28 16:51:48 +08:00
weiting2 f3037c7959 OOC struct 2019-10-28 16:09:33 +08:00
YiChin 5a519d5fb5 OOC error fix 2019-10-28 16:07:06 +08:00
weiting2 a16543ee57 OOC struct 2019-10-28 12:41:59 +08:00
YiChin 9d281ce999 error fix 2019-10-28 12:06:44 +08:00
weiting2 d97b3ad6b0 OOC struct 2019-10-28 11:59:03 +08:00
YiChin cad1763981 error fix 2019-10-28 11:52:05 +08:00
weiting2 092c02940d OOC struct 2019-10-28 11:20:44 +08:00
weiting2 0a19abd0e8 first attempt to pointer of pointer 2019-10-24 12:10:08 +08:00
YiChin 284cfe6d05 double pointer attempt 2019-10-24 11:52:34 +08:00
weiting2 3298b6226b first attempt to pointer of pointer 2019-10-24 11:48:19 +08:00
YiChin dfcaf2d908 double pointer attempt 2019-10-24 11:45:00 +08:00
weiting2 d517318a67 first attempt to pointer of pointer 2019-10-24 11:36:59 +08:00
weiting2 d0aa520329 Merge branch 'Elite_master' of https://gitlab.com/bioproscientific/bioprocc2650 into Elite_master 2019-10-24 11:02:41 +08:00
weiting2 9a875b8459 first attempt to pointer of pointer 2019-10-24 10:59:19 +08:00
YiChin 73ac2f5c90 should be a stable version 2019-10-24 10:17:24 +08:00
YiChin efcb1132de auto gain seems done
need more test
2019-10-23 18:42:17 +08:00
YiChin 7492ed161d auto gain prob 2019-10-23 17:05:25 +08:00
YiChin ae7ec2e5ce auto gain prob 2019-10-23 16:42:28 +08:00
weiting2 63fde4bdbc TODO: IV CV add Imax 2019-10-23 14:04:35 +08:00
YiChin 32ccb8838f add water star data 2019-10-23 11:14:00 +08:00
YiChin 5b6fd53830 CV underflow done? 2019-10-23 10:42:53 +08:00
YiChin 86eef98b13 CV still underflow, implement auto gain on IV CV IT RT 2019-10-22 18:15:35 +08:00
YiChin 3fdbfcf39f CV still underflow 2019-10-22 15:25:41 +08:00
weiting2 847ea9f3c0 IV underflow 2019-10-22 14:56:01 +08:00
weiting2 25bd5b5ebe auto gain 2019-10-22 14:27:27 +08:00
YiChin 335fe6a9a4 IV CV still underflow 2019-10-22 12:28:48 +08:00
YiChin 6a0480613c fix CC mode feedback bug 2019-10-22 11:55:16 +08:00
YiChin 300fb9a44c fix IV CV underflow if Vfinal = -5V 2019-10-22 11:41:38 +08:00
weiting2 4fac2aa380 update board 21 2019-10-22 10:11:44 +08:00
YiChin d2ab4c1fe8 RT done, UI should X1e5 for every resister value 2019-10-21 19:01:24 +08:00
YiChin 6048e10ab7 RT done, UI should X1e5 for every resister value 2019-10-21 18:28:00 +08:00
weiting2 6bd94e3f73 gain switch in RT mode 2019-10-21 17:52:22 +08:00
YiChin fc302d4c75 should modify DAC usercode 2019-10-21 16:53:49 +08:00
weiting2 26a35a1446 gain switch in RT mode 2019-10-21 14:45:53 +08:00
YiChin 8f2eda7281 The least gain can not witch to max gain in one step 2019-10-21 12:20:44 +08:00
weiting2 e26a97a32f Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-21 11:38:49 +08:00
weiting2 5bdb0b04da gain switch in one cycle, debug 2019-10-21 11:38:31 +08:00
YiChin 8f8407601e error fix 2019-10-21 11:31:47 +08:00
YiChin 4c6dbcf98d error fix 2019-10-21 11:26:40 +08:00
weiting2 20ccd5de56 gain switch in one cycle 2019-10-21 11:24:59 +08:00
weiting2 3c3ad8ccc7 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteITCurve.h
2019-10-21 11:21:42 +08:00
weiting2 1030d6625b TODO: gain switch in one cycle 2019-10-21 11:20:46 +08:00
weiting2 326f3eb6b6 LED shows ADC gain state 2019-10-21 10:57:26 +08:00
YiChin 9dd7228eb5 clean warning 2019-10-21 10:51:13 +08:00
weiting2 59ac6b9909 add ReadCurrent() 2019-10-21 10:37:33 +08:00
YiChin e24ce8e5d5 auto gain done 2019-10-21 10:26:52 +08:00
weiting2 8720300bfc small-mid range gain switch test 2019-10-21 10:11:10 +08:00
weiting2 23fc75a236 small-mid range gain switch test 2019-10-18 18:06:13 +08:00
weiting2 80c25267cb all range auto scale 2019-10-18 17:49:31 +08:00
YiChin 81d1aff615 maybe auto gain should read data after circuit stable 2019-10-18 16:27:00 +08:00
weiting2 3221fe6492 largest and mid gain switch, considering negative current 2019-10-18 16:07:22 +08:00
weiting2 4ca7d5b681 try easy auto-scale ADC gain 2019-10-18 15:55:23 +08:00
weiting2 49677aa5b1 try easy auto-scale ADC gain 2019-10-18 15:30:46 +08:00
YiChin bbfef99a65 maybe auto gain should read data after circuit stable 2019-10-18 15:12:20 +08:00
weiting2 05f11fd147 try easy auto-scale ADC gain 2019-10-18 14:26:40 +08:00
YiChin f0aedf786d CC mode done 2019-10-17 18:15:37 +08:00
weiting2 a12146a479 CC mode bug fix 2019-10-17 16:26:55 +08:00
weiting2 410bef2e23 CC mode bug fix 2019-10-17 16:03:15 +08:00
YiChin 17c6a506cb error fix 2019-10-17 15:42:38 +08:00
weiting2 0b9c945aee change IUC and CC mode BT instruction 2019-10-17 15:08:31 +08:00
YiChin 53ef219d6e [CC] battery test perfect, should add +- current in UI 2019-10-17 11:38:53 +08:00
YiChin a14b2480db [CC] battery test perfect, should add +- current in UI 2019-10-17 11:11:25 +08:00
YiChin 89368d5352 CC mode mA done 2019-10-16 17:36:48 +08:00
YiChin f7903a0a31 CC mode earth 2019-10-16 17:03:24 +08:00
YiChin 56f42d21c5 CC mode earth 2019-10-16 17:01:15 +08:00
YiChin 52a8baad08 CC mode mA 2019-10-16 15:01:05 +08:00
YiChin 7acdbf6e78 [CC] seems done 2019-10-16 14:10:10 +08:00
YiChin 393394be6f [CC] seems done 2019-10-16 12:25:30 +08:00
YiChin b7f305e378 [CC] discharge fine, charge doesn't work 2019-10-16 11:50:26 +08:00
weiting2 cad8a78164 check IUC-Measure difference 2019-10-16 10:48:27 +08:00
YiChin 0c4ebcac79 [CC] discharge fine, charge doesn't work 2019-10-16 10:41:17 +08:00
YiChin e700657d5d [CC] discharge fine, charge doesn't work 2019-10-15 18:16:17 +08:00
YiChin ea9fb92d53 [CC] discharge fine, charge doesn't work 2019-10-15 18:12:18 +08:00
YiChin ba215c7ca9 pointer->value compare error 2019-10-15 16:54:48 +08:00
YiChin 564dc6e266 test cc mode notify 2019-10-15 15:43:13 +08:00
weiting2 86a2e54694 trans IUC current update 2019-10-15 14:21:57 +08:00
YiChin 358950bec0 CC mode read, done 2019-10-15 12:17:53 +08:00
weiting2 de2cb269b7 check measure current 2019-10-14 18:42:24 +08:00
YiChin 151e829973 test IUC 2019-10-14 17:50:35 +08:00
YiChin 19121b55a7 test IUC 2019-10-14 17:34:25 +08:00
alan 31f03582a3 check notify 2019-10-14 17:27:10 +08:00
alan 0859f6da6d check notify 2019-10-14 17:12:27 +08:00
YiChin 120b7086e5 USA demo version 2019-10-14 10:05:43 +08:00
YiChin d393872d8c [CV] done 2019-10-10 17:28:29 +08:00
YiChin 3ab9afdcd3 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-10 17:27:25 +08:00
YiChin 8812b4c103 [CV] done 2019-10-10 17:27:00 +08:00
Benny Liu 4cccced7ac calibration data for European 2019-10-09 18:40:09 +08:00
alan 7b3d342be6 [CV] Test turn back measure current 2019-10-09 16:50:26 +08:00
alan 97409c88c3 [IV][IT][VT][RT][Vout] work fine
[CV] turn direction has an offset bug
2019-10-08 19:01:03 +08:00
Benny Liu 1d675d9d78 calibration data 2019-10-08 18:57:00 +08:00
Benny Liu 1774a255d8 Merge branch 'Elite_ZTcurve' of https://gitlab.com/bioproscientific/bioprocc2650 into Elite_ZTcurve 2019-10-08 18:48:34 +08:00
Benny Liu 1863016b63 calibration data of various boards 2019-10-08 18:48:24 +08:00
YiChin 1e89a540a1 macro CAPS 2019-10-08 18:00:57 +08:00
alan 5daa67e054 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-08 17:56:23 +08:00
alan 05ce7f7f44 [IV][CV] get sample after wait 0.1 sec 2019-10-08 17:56:08 +08:00
YiChin 9391c700a1 macro CAPS 2019-10-08 16:38:27 +08:00
YiChin 16c4ecf9f2 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-08 16:34:58 +08:00
alan 7280f76fae [Test] CC mode Vout = Iconstant 2019-10-08 16:33:52 +08:00
YiChin 3a5d40a5d9 kelly macro CAPS 2019-10-08 11:56:22 +08:00
alan 40dd596fef CV mode debug 2019-10-08 10:15:59 +08:00
YiChin 56b240b101 CC mode can read current and set IUC correctly 2019-10-07 18:21:42 +08:00
alan bf36103499 test CCmode output Volt 2019-10-07 16:39:20 +08:00
YiChin 477144dc24 delete gain switch LED 2019-10-05 14:31:26 +08:00
alan 0aa45cfedc Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-05 14:12:41 +08:00
alan 4691345831 test CCmode output Volt 2019-10-05 14:12:22 +08:00
Benny Liu 8445f8c263 board BAY_BAY calibration data 2019-10-05 12:09:52 +08:00
Benny Liu 7176f91a3f fix error 2019-10-05 11:32:58 +08:00
Benny Liu e37065ce91 board Kelly calibration data 2019-10-05 11:29:46 +08:00
YiChin 2537b76256 error fix 2019-10-05 10:47:47 +08:00
alan 59e275c997 test switch ADC gain 2019-10-05 10:07:56 +08:00
105042004 bfe61896e8 BAYBAY Kwlly Iin callibration 2019-10-04 19:13:43 +08:00
alan 0ad8b13db2 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-04 16:42:26 +08:00
alan 3c8abc04a8 ADC test WITHOUT avg 2019-10-04 16:42:08 +08:00
Benny Liu a48cf75c90 Merge branch 'Elite_ZTcurve' of https://gitlab.com/bioproscientific/bioprocc2650 into Elite_ZTcurve 2019-10-04 15:22:34 +08:00
alan 4f7017d5b2 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-04 15:16:58 +08:00
alan 79f0d57161 ADC test with avg 2019-10-04 15:16:42 +08:00
Benny Liu d76e8e6f3f Merge branch 'Elite_ZTcurve' of https://gitlab.com/bioproscientific/bioprocc2650 into Elite_ZTcurve 2019-10-04 15:08:43 +08:00
Benny Liu b6147c1fe5 fish_vet calibration data 2019-10-04 15:08:32 +08:00
YiChin 4bbd92127a Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-04 15:03:31 +08:00
YiChin 337c2aef8d add CV curve 2019-10-04 15:03:11 +08:00
alan e943d22a5f Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-04 14:47:27 +08:00
alan bceb8b9134 ADC test with avg 2019-10-04 14:47:09 +08:00
YiChin 14adc8a768 10/4 demo version 2019-10-04 14:00:21 +08:00
YiChin 7c44ad2272 10/6 demo version 2019-10-04 11:22:07 +08:00
alan c8272dd455 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-04 09:51:34 +08:00
YiChin cb2aa2126b 10/6 demo version 2019-10-03 18:35:55 +08:00
YiChin f74a412611 10/6 demo version 2019-10-03 18:18:23 +08:00
YiChin f0b92f8578 ADD 517 CORRECTION DATA 2019-10-03 18:14:15 +08:00
YiChin e7cae7dc21 10/6 demo version 2019-10-03 16:49:57 +08:00
YiChin 1c41bd7a45 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-03 12:58:31 +08:00
YiChin a671a4916d 10/6 demo version 2019-10-03 12:57:18 +08:00
alan 15ea1488c9 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-10-02 18:27:06 +08:00
Benny Liu f92dd743ef triceratops calibration data 2019-10-02 18:03:19 +08:00
alan eddbe3980a 10/6 demo version 2019-10-02 17:49:06 +08:00
Benny Liu b27df1489b Merge branch 'Elite_ZTcurve' of https://gitlab.com/bioproscientific/bioprocc2650 into Elite_ZTcurve 2019-10-02 17:46:35 +08:00
YiChin dc3f2ee046 10/6 demo version 2019-10-02 16:47:43 +08:00
YiChin ba7f03daeb 10/6 demo version 2019-10-02 16:19:14 +08:00
YiChin 079500faff 10/6 demo version 2019-10-02 16:13:21 +08:00
YiChin ce0defe5e9 RT mode demo prepare 2019-10-02 15:40:53 +08:00
alan 7b1bcd5147 Elite 1.4-re CCmode test read current 2019-10-02 14:01:34 +08:00
alan 787eb5dce1 Elite 1.4-re CCmode test read current 2019-10-02 12:04:45 +08:00
YiChin 9d73fab37e CC MDOE error fix 2019-10-02 11:31:39 +08:00
alan 6a833aabee Elite 1.4-re CCmode test read current 2019-10-01 18:42:42 +08:00
alan e40d0896b8 Elite 1.4-re CCmode test read current 2019-10-01 17:56:47 +08:00
alan c265eb0118 Elite 1.4-re CCmode test read current 2019-10-01 17:41:38 +08:00
alan cead3b0b5c Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h
2019-10-01 17:22:56 +08:00
alan 238c09befd Elite 1.4-re CCmode test read current 2019-10-01 17:22:18 +08:00
YiChin de1867d523 CC MDOE error fix 2019-10-01 17:19:06 +08:00
YiChin 906e02e265 CC MDOE error fix 2019-10-01 16:47:14 +08:00
Benny Liu 307308825e time test 2019-10-01 16:24:30 +08:00
YiChin aaf166d187 CC MDOE error fix 2019-10-01 15:59:39 +08:00
YiChin 38ff1f8c2b CC MDOE error fix 2019-10-01 15:12:18 +08:00
YiChin 82f58b3255 CC MDOE error fix 2019-10-01 14:40:35 +08:00
alan 31d22f02e1 Elite 1.4-re CCmode test read current 2019-10-01 14:28:43 +08:00
alan ff1f517af5 Elite 1.4-re CCmode test read current 2019-10-01 09:53:10 +08:00
alan fb340fbec6 Elite 1.4-re CCmode test 2019-09-30 17:40:55 +08:00
YiChin e208bfd4d9 CC MDOE error fix 2019-09-30 16:33:57 +08:00
alan b9f4967a23 Elite 1.4-re CCmode test 2019-09-30 16:12:10 +08:00
YiChin 539a388ec4 CC MDOE error fix 2019-09-30 16:10:02 +08:00
alan f770ba8783 Elite 1.4-re CCmode test 2019-09-30 15:37:16 +08:00
alan 6d2ef3e106 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-09-30 15:19:49 +08:00
alan e483c58f10 Elite 1.4-re CCmode test 2019-09-30 15:19:28 +08:00
YiChin b07c10bb53 CC MDOE error fix 2019-09-30 15:13:50 +08:00
alan bb10a463dc Elite 1.4-re CCmode test 2019-09-30 14:58:46 +08:00
YiChin 93e0db98fc CC MDOE error fix 2019-09-30 14:40:36 +08:00
YiChin 51fc4553a3 CC MDOE error fix 2019-09-30 14:31:15 +08:00
alan 5184fe76e7 Elite 1.4-re CCmode test 2019-09-30 14:26:45 +08:00
alan ee264a6f18 Elite 1.4-re CCmode test 2019-09-27 18:05:24 +08:00
YiChin d290201085 CC MDOE 2019-09-27 17:51:45 +08:00
alan 5ab5bdc301 Elite 1.4-re CCmode test 2019-09-27 17:37:10 +08:00
alan de995e2cec Elite 1.4-re CCmode test 2019-09-27 17:31:46 +08:00
alan 81fb68264c Elite 1.4-re CCmode test 2019-09-27 17:01:40 +08:00
alan b05a245cf4 Elite 1.4-re CCmode test 2019-09-27 16:35:22 +08:00
alan f3376a2ab3 Elite 1.4-re CCmode test 2019-09-27 15:25:22 +08:00
alan 48faeeaf1d Elite 1.4-re CCmode test 2019-09-27 15:11:57 +08:00
alan 5560899c94 Elite 1.4-re CCmode test 2019-09-27 14:41:31 +08:00
YiChin 85e7b34da1 CC MDOE 2019-09-27 13:08:57 +08:00
YiChin 013a2b9ede CC MDOE 2019-09-27 12:52:56 +08:00
alan e984572847 Elite 1.4-re CCmode test 2019-09-27 11:09:38 +08:00
alan 591c01bb98 Elite 1.4-re CCmode test 2019-09-27 10:49:14 +08:00
alan 7b053c506e Elite 1.4-re CCmode test 2019-09-27 10:48:22 +08:00
alan e8fcdc18da Merge remote-tracking branch 'remotes/origin/Elite_GPTimer' into Elite_ZTcurve 2019-09-27 10:41:34 +08:00
alan b65ff2383a Elite 1.4-re gptimer test 2019-09-26 18:05:28 +08:00
alan b69e9017bf Elite 1.4-re gptimer test 2019-09-26 17:07:59 +08:00
YiChin 09a40e1912 turn on/off with new clock done 2019-09-26 16:45:46 +08:00
alan 6fa630e6e4 Elite 1.4-re gptimer test 2019-09-26 16:03:48 +08:00
alan 95d3c0bbc4 Elite 1.4-re gptimer test 2019-09-26 15:45:19 +08:00
YiChin 9bf2ab20a8 gptimer_open has no bug 2019-09-26 15:35:22 +08:00
alan 15a10b2405 Elite 1.4-re gptimer test 2019-09-26 15:20:27 +08:00
YiChin a4093cdc70 gptimer_open has a bug 2019-09-26 15:08:53 +08:00
alan 8713d743e1 Elite 1.4-re gptimer test 2019-09-26 15:03:55 +08:00
YiChin 4d3129782e gptimer_open has a bug 2019-09-26 14:46:52 +08:00
alan 53ed3f7d6c Elite 1.4-re gptimer test 2019-09-26 12:17:42 +08:00
alan 91d68e665b Elite 1.4-re gptimer test 2019-09-26 11:32:03 +08:00
alan 0bc606c3a8 Elite 1.4-re gptimer test 2019-09-26 11:12:28 +08:00
alan d19b709324 Elite 1.4-re gptimer test 2019-09-26 11:11:40 +08:00
alan 74742ca45b Elite 1.4-re gptimer test 2019-09-26 11:10:05 +08:00
YiChin 2678b0c02f smallZ-T curve 2019-09-26 11:06:55 +08:00
alan 5576c071c5 Elite 1.4-re gptimer test 2019-09-26 10:52:01 +08:00
alan 27c51a6c54 Elite 1.4-re gptimer test 2019-09-26 10:43:02 +08:00
alan 98c4a62130 Elite 1.4-re genius correction test 2019-09-25 12:18:03 +08:00
alan 7bf8620baf Elite 1.4-re genius correction test 2019-09-25 12:11:33 +08:00
alan 1f742b24df Elite 1.4-re try compile gptimer 2019-09-25 11:59:50 +08:00
Benny Liu 3ac1d77651 Genius calibration data 2019-09-25 11:59:13 +08:00
YiChin ae74c4e5cd fix error 2019-09-25 11:36:48 +08:00
alan 434be00a44 Elite 1.4-re try compile gptimer 2019-09-25 11:26:28 +08:00
Benny Liu 0b365f098d Elite Genius board calibration data 2019-09-25 10:30:39 +08:00
YiChin 54e1aab5fc RT class leader 2019-09-24 18:50:37 +08:00
alan 76c8b49553 Elite 1.4-re RT mode 2019-09-23 18:36:56 +08:00
YiChin 085d51adcf RT class leader 2019-09-23 18:33:46 +08:00
alan 0b75801ed6 Elite 1.4-re RT mode 2019-09-23 18:01:45 +08:00
alan eb712ed4bb Elite 1.4-re RT mode 2019-09-23 17:55:52 +08:00
alan c6f6f4c8f7 Elite 1.4-re RT mode 2019-09-23 17:25:14 +08:00
alan ab8c29021d Elite 1.4-re RT mode 2019-09-23 16:48:50 +08:00
alan 62961eeaa4 Elite 1.4-re RT mode 2019-09-23 16:39:35 +08:00
alan b32c3048d7 Elite 1.4-re RT mode 2019-09-23 16:33:38 +08:00
alan bc18b12227 Elite 1.4-re RT mode 2019-09-23 16:09:48 +08:00
YiChin 28734c52a4 RT class leader 2019-09-23 16:03:03 +08:00
alan cd38d00496 Elite 1.4-re RT mode 2019-09-23 15:51:54 +08:00
alan e613ae4542 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-09-23 15:28:43 +08:00
YiChin 4439a83382 RT class leader 2019-09-23 15:20:56 +08:00
YiChin 64ef6657be RT class leader 2019-09-23 10:24:00 +08:00
alan 35760ace39 Elite 1.4-re RT mode 2019-09-20 18:29:42 +08:00
alan 72e6e9acae Elite 1.4-re RT mode 2019-09-20 18:25:21 +08:00
alan eecc7236ad Elite 1.4-re RT mode 2019-09-20 15:12:03 +08:00
alan bdb280c029 Elite 1.4-re RT mode 2019-09-20 14:01:30 +08:00
YiChin 77b1259bf3 bug fix 2019-09-20 11:36:06 +08:00
YiChin 6b9ffacb89 bug fix 2019-09-19 18:58:04 +08:00
YiChin 523a98cf8a bug fix 2019-09-19 16:57:34 +08:00
YiChin 98db6a0390 bug fix 2019-09-19 11:05:53 +08:00
YiChin 164d5209eb bug fix 2019-09-19 10:29:52 +08:00
alan 4b8a1960dd Elite 1.4-re RT mode 2019-09-18 17:17:00 +08:00
alan 2e25a129d6 Elite 1.4-re RT mode 2019-09-18 12:24:18 +08:00
YiChin 3fc2ccbc6a ZT should work 2019-09-18 11:37:24 +08:00
YiChin 78853da803 ZT should work 2019-09-17 18:38:10 +08:00
YiChin 4668654d3c ZT should work 2019-09-17 12:07:09 +08:00
YiChin 55503b209b ZT clean buf has a bug 2019-09-17 10:53:24 +08:00
alan 0fdd8bf693 Elite 1.4-re RT mode with 4 level (small resister 2019-09-16 18:45:41 +08:00
YiChin a6459e4302 ZT clean buf has a bug 2019-09-16 18:40:23 +08:00
YiChin b256a61876 CC studio is a FUCKING stupid IDE, F U C K 2019-09-16 18:01:25 +08:00
alan a59c70f75b Elite 1.4-re RT mode with 4 level (small resister 2019-09-16 17:49:29 +08:00
YiChin 59f608a4d0 bug fix 2019-09-16 17:45:58 +08:00
YiChin 70543a2bd5 bug fix 2019-09-16 15:14:07 +08:00
YiChin 7743b6ef62 bug fix 2019-09-16 12:17:43 +08:00
alan a7f3120fb9 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-09-16 12:09:40 +08:00
alan 16525b0d19 Elite 1.4-re RT mode with 4 level (small resister 2019-09-16 12:09:21 +08:00
YiChin c96b9db716 using long long in correction 2019-09-12 10:20:12 +08:00
YiChin a8bdface95 using long long in correction 2019-09-11 12:13:25 +08:00
YiChin ea8bf21ffd using long long in correction 2019-09-11 11:41:52 +08:00
YiChin 24efe9d896 using long long in correction 2019-09-11 11:41:23 +08:00
alan 3ae0520f39 Elite 1.4-re test ZT_curve branch 2019-09-11 10:06:48 +08:00
alan 035ca66237 Elite 1.4-re debug VT 2019-09-05 17:20:44 +08:00
alan 66fd1a5f2f Elite 1.4-re debug VT 2019-09-05 12:23:11 +08:00
alan ba4a082834 Elite 1.4-re debug VT 2019-09-05 12:16:23 +08:00
alan ac7b4e8ac3 Elite 1.4-re debug VT 2019-09-05 12:07:29 +08:00
alan 7e79b2e12c Elite 1.4-re debug VT 2019-09-05 11:45:20 +08:00
YiChin 0da686a78b add new correction data 2019-09-05 11:20:59 +08:00
alan 474e3cb8d9 Elite 1.4-re IV avg out at steptime-1 2019-09-05 10:35:49 +08:00
alan e649bd9a25 Elite 1.4-re RT comment 2019-09-05 10:26:44 +08:00
alan 1f5bf25d16 Elite 1.4-re Vorigin Vfinal use usercode 2019-09-04 18:52:49 +08:00
alan 14cc86bce1 Elite 1.4-re Vorigin Vfinal use usercode 2019-09-04 18:43:41 +08:00
alan 5f636db5ed Elite 1.4-re fix function pointer error (*self) 2019-09-04 14:58:41 +08:00
alan 72c84deb85 Elite 1.4-re fix function pointer error (*self) 2019-09-04 14:51:16 +08:00
alan a0cc1cf228 Elite 1.4-re fix function pointer error (*self) 2019-09-04 14:35:01 +08:00
alan 41b35655a6 Elite 1.4-re fix function pointer error 2019-09-04 14:25:10 +08:00
YiChin 68169aed0d fix error 2019-09-04 14:09:21 +08:00
alan 645b971b6b Elite 1.4-re fix function pointer error 2019-09-04 13:55:32 +08:00
YiChin f669739b4e fix error 2019-09-04 13:01:34 +08:00
alan 9f5912c649 Elite 1.4-re IUC compare with real I 2019-09-04 12:55:19 +08:00
alan 8dac9ea12c Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-09-04 12:48:21 +08:00
alan 9f2e6547d2 Elite 1.4-re IUC compare with real I 2019-09-04 12:47:56 +08:00
YiChin 164be3061d Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-09-04 12:44:52 +08:00
YiChin f4acbf75d8 fix error 2019-09-04 12:44:22 +08:00
alan a3f710f398 Elite 1.4-re IUC compare with real I 2019-09-04 12:25:37 +08:00
alan fdd9ee173c Elite 1.4-re IUC compare with real I 2019-09-04 12:07:41 +08:00
alan 5c581869da Elite 1.4-re IUC compare with real I 2019-09-04 12:07:06 +08:00
alan f1bb7e6217 Elite 1.4-re add function pointer 2019-09-04 11:16:02 +08:00
alan bc553c66af Elite 1.4-re step time macro 2019-09-03 18:21:18 +08:00
alan 2bb80a06ed Elite 1.4-re merge with IVtest branch 2019-09-03 18:19:59 +08:00
alan d44dd996a7 Elite 1.4-re merge with IVtest branch 2019-09-03 18:16:32 +08:00
alan 36de918cfc Elite 1.4-re IUC to real nA/pA 2019-09-03 18:14:25 +08:00
alan 4b45002129 Elite 1.4-re fix error 2019-09-03 17:11:16 +08:00
alan 2d23da34c2 Elite 1.4-re split every function into .h file 2019-09-03 17:03:23 +08:00
alan ff58ec8a1e Elite 1.4-re split every function into .h file 2019-09-03 17:01:46 +08:00
alan 6ae419b537 Elite 1.4-re add CCmode 2019-09-03 16:22:08 +08:00
alan 96350c19c2 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-09-03 12:39:07 +08:00
alan ab52989e0e Elite 1.4-re add CCmode 2019-09-03 12:38:49 +08:00
alan 035f01fb0a Elite 1.4-re add CCmode 2019-09-03 11:41:30 +08:00
alan e235fd3adf Elite 1.4-re add CCmode 2019-09-03 11:23:21 +08:00
105042004 272d0e423d fix Impedance_Calculate() 2019-09-03 11:11:37 +08:00
alan e227b395f9 Elite 1.4-re add CCmode 2019-09-02 18:50:59 +08:00
YiChin 91d8d1a4d0 add ZTcurve impedance calculation function 2019-08-30 18:16:14 +08:00
alan c5543e777a Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-08-30 15:05:37 +08:00
alan ddfcd11fb4 Elite 1.4-re ZT_plot not finish yet 2019-08-30 15:05:19 +08:00
YiChin 03ef7ef734 fix error 2019-08-30 12:34:17 +08:00
alan 4d84788f51 Elite 1.4-re fix error 2019-08-30 12:15:15 +08:00
YiChin 6d48245d82 fix error 2019-08-30 12:08:31 +08:00
YiChin a2070d1073 Merge remote-tracking branch 'origin/Elite_ZTcurve' into Elite_ZTcurve 2019-08-30 11:52:39 +08:00
YiChin 40bb5b8e0a fix error 2019-08-30 11:49:45 +08:00
alan ac3bee4609 Elite 1.4-re fix error 2019-08-30 11:40:29 +08:00
alan 4166c2721c Elite 1.4-re add (instruction, LED, reset...).h file 2019-08-30 11:26:47 +08:00
alan 8455fe9422 Elite 1.4-re stepcode to DAC code 2019-08-29 17:11:55 +08:00
alan ed3a24a9c9 Elite 1.4-re stepcode to DAC code 2019-08-29 17:04:31 +08:00
alan d93464e970 Elite 1.4-re step reset value = 1mV 2019-08-29 16:57:22 +08:00
105042004 0909855fbb fix 10e3 2019-08-29 16:52:16 +08:00
alan dc32d4fb13 Elite 1.4-re delete 1.3 DACout function 2019-08-29 16:15:36 +08:00
alan 36e0be6f9b Elite 1.4-re FXN_GEN type VS bitwise priority? 2019-08-29 16:09:39 +08:00
105042004 ea5355f413 fix CHAO I correction 2019-08-29 15:09:21 +08:00
105042004 27960395de Merge branch 'Elite_IVtest' of https://gitlab.com/bioproscientific/bioprocc2650 into Elite_IVtest 2019-08-29 14:33:26 +08:00
105042004 cdbcb85640 add CHAO I DAC correction code 2019-08-29 14:32:54 +08:00
alan db2d8e4217 Elite 1.4-re clean warning 2019-08-29 12:38:33 +08:00
alan 1b9aedf7a0 Elite 1.4-re clean warning 2019-08-29 12:24:40 +08:00
alan 1cba7efeeb Elite 1.4-re interrupt function 2019-08-29 12:20:21 +08:00
alan ec7e721fcc Elite 1.4-re reformat 2019-08-29 12:16:28 +08:00
YiChin dcfb390243 fix format bug 2019-08-29 12:03:00 +08:00
alan 2cd7161694 Elite 1.4-re have a format bug 2019-08-29 11:58:14 +08:00
105042004 a84ec8c438 fix IV curve 2019-08-29 11:43:46 +08:00
105042004 33805dd480 fix IV curve 2019-08-29 11:41:53 +08:00
alan a033919d47 Elite 1.4-re IV mode with LED hint 2019-08-29 11:30:09 +08:00
alan 72674329bc Elite 1.4-re DAC control and IV mode notify 2019-08-29 11:07:56 +08:00
alan 6d690d80da Merge remote-tracking branch 'origin/Elite_IVtest' into Elite_IVtest
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h
2019-08-29 11:07:49 +08:00
alan e607ae50e1 Elite 1.4-re DAC control and IV mode notify 2019-08-29 11:05:12 +08:00
105042004 750c13ee00 test IV current 2019-08-29 10:54:37 +08:00
105042004 b66a5c1cc5 test IV current 2019-08-29 10:45:46 +08:00
105042004 732ef11d7f test IV current 2019-08-29 10:38:10 +08:00
105042004 1187ead2cf test IV current 2019-08-29 10:31:28 +08:00
105042004 c6ddc19fdc fix average 2019-08-28 18:53:30 +08:00
105042004 e864d8fc10 fix average 2019-08-28 18:52:23 +08:00
YiChin 3a0d730c11 push 2019-08-28 16:36:29 +08:00
alan 773b9f5e48 Elite 1.4-re move include "XXX.h" 2019-08-28 16:26:38 +08:00
alan 3218b3a531 Elite 1.4-re move include "XXX.h" 2019-08-28 16:19:24 +08:00
alan 658ed58412 Elite 1.4-re IV-current avg has a bug; move include "XXX.h" 2019-08-28 16:13:19 +08:00
105042004 9d288dee41 fix IV notify 2019-08-28 14:40:56 +08:00
105042004 e975789be4 fix IV notify 2019-08-28 14:40:44 +08:00
105042004 bf2ef89a7f fix correction data init 2019-08-28 14:10:29 +08:00
105042004 f81aa9a47b fix correction_data 2019-08-28 13:02:03 +08:00
alan 2a82ac65e2 Elite 1.4-re correction struct 2019-08-28 12:45:24 +08:00
105042004 6a506898a8 fix correction_data init 2019-08-28 12:26:45 +08:00
105042004 8606e0ca9d fix Correction data 2019-08-28 12:10:46 +08:00
105042004 5951d1c9e2 switch to chao i 2019-08-28 11:54:01 +08:00
105042004 e741d1b252 Merge branch 'Elite_IVtest' of https://gitlab.com/bioproscientific/bioprocc2650 into Elite_IVtest 2019-08-28 11:53:19 +08:00
105042004 f85d687a77 add DAC correction data 2019-08-28 11:52:54 +08:00
alan 142b006c63 Elite 1.4-re use old format notify 2019-08-28 11:42:15 +08:00
alan 5e59e60b4e Merge remote-tracking branch 'origin/Elite_IVtest' into Elite_IVtest 2019-08-28 11:36:29 +08:00
105042004 f678680f1d push 2019-08-28 11:36:09 +08:00
105042004 0de37ed924 merge 2019-08-28 11:30:53 +08:00
105042004 5f2b3c55bb arrange correction data 2019-08-28 11:22:42 +08:00
alan 4a37fa8668 Elite 1.4-re write notify comment 2019-08-28 10:49:49 +08:00
alan f7f5e550c9 Elite 1.4-re notify include mode & gain infomation 2019-08-28 10:48:50 +08:00
alan 24db728a6c Elite 1.4-re move DAC correction to correction.h 2019-08-28 10:37:36 +08:00
alan 1f2ddc7829 Elite 1.4-re ADC gain macro 2019-08-28 10:36:35 +08:00
alan 77d22be8fa Elite 1.4-re notify format 2019-08-28 10:32:08 +08:00
alan 691bd9a10f Merge remote-tracking branch 'origin/Elite_IVtest' into Elite_IVtest 2019-08-28 10:09:59 +08:00
alan f5165cc78b Elite 1.4-re Correction array 2019-08-28 10:09:47 +08:00
105042004 6cb687d8b6 IV curve count current average 2019-08-28 02:34:13 +08:00
alan 80dd042021 Merge remote-tracking branch 'origin/Elite_IVtest' into Elite_IVtest 2019-08-27 17:59:24 +08:00
alan 3b43cd1e74 Elite 1.4-re Correction array 2019-08-27 17:59:07 +08:00
105042004 289b0ad94c change to chao i 2019-08-27 17:12:58 +08:00
105042004 e1469d96d8 delete current 2019-08-27 17:01:37 +08:00
105042004 93f106dc30 push chao i 2019-08-27 16:36:03 +08:00
105042004 73913197df push 2019-08-27 16:33:51 +08:00
105042004 4ec017a68f add tri correction 2019-08-27 16:33:42 +08:00
105042004 284891f73a Merge branch 'Elite_IVtest' of https://gitlab.com/bioproscientific/bioprocc2650 into Elite_IVtest 2019-08-27 14:08:27 +08:00
105042004 5a1b69d29b 29 21 ADC volt correction 2019-08-27 14:06:47 +08:00
Benny Liu 0699a7edf7 fix 2019-08-26 15:02:18 +08:00
Benny Liu 14c21694ec fix 2019-08-26 12:22:26 +08:00
Benny Liu 5f95225d00 auto shifting tesst 2019-08-26 12:08:37 +08:00
Benny Liu c1b25aa3ef update calibration data 2019-08-26 10:37:40 +08:00
105042004 237f6a820c move DAC reset parameter 2019-08-23 16:21:32 +08:00
105042004 7ba3aa560b move IV current average 2019-08-23 16:03:52 +08:00
105042004 405b599562 push 2019-08-23 15:01:32 +08:00
105042004 1dae858671 fix 2019-08-23 14:54:05 +08:00
105042004 aee139e154 push 2019-08-23 14:23:56 +08:00
105042004 b80f977e16 fix ADC current samplerate 2019-08-23 14:13:12 +08:00
105042004 e6e8b255ba Merge branch 'Elite_IVtest' of https://gitlab.com/s880782002/bioprocc2650 into Elite_IVtest 2019-08-23 11:17:40 +08:00
105042004 0aca212f53 commit 2019-08-23 11:17:28 +08:00
alan 7f64e9b9c7 Elite 1.4-re clock with event mask 2019-08-23 11:16:51 +08:00
alan 8953c51f9a Elite 1.4-re AVG notify current & V 2019-08-23 10:48:38 +08:00
105042004 72d97ad288 Elite change IV curve samplerate to average 2019-08-23 10:26:50 +08:00
105042004 43cb1a278b change iv curve sample rate 2019-08-22 18:09:59 +08:00
105042004 ccc1becc87 push 2019-08-22 11:34:46 +08:00
105042004 8b55122225 fix IV curve/instruction 2019-08-22 11:18:29 +08:00
alan 776fe53178 Elite 1.4-re periodic event flag 2019-08-21 10:24:19 +08:00
alan 003b115067 Elite 1.4-re ADC w/r delay time 2019-08-21 09:57:56 +08:00
alan bcf682e116 Elite 1.4-re clock callback 2019-08-21 09:50:34 +08:00
alan ad4fab1aa6 Elite 1.4-re clock callback 2019-08-21 00:18:25 +08:00
alan 80d89e7b87 Elite 1.4-re IT fix display output V 2019-08-20 23:55:19 +08:00
alan 46bbbc8ac7 Elite 1.4-re IT fix display output V 2019-08-20 23:22:04 +08:00
alan cd43385573 Elite 1.4-re IT fix display output V 2019-08-20 23:14:15 +08:00
YiChin 63b4c19d67 ADC Gain level instructino 2019-08-20 22:50:53 +08:00
YiChin 837055cc29 ADC Gain level instructino 2019-08-20 22:05:04 +08:00
alan 053718f7f2 Elite 1.4-re IT over/under flow check 2019-08-20 21:49:34 +08:00
Benny Liu 9d18f7c67f manual shift 2019-08-20 21:34:48 +08:00
YiChin f32ac10e94 ADC Gain level instructino 2019-08-20 21:22:09 +08:00
alan aaa3f62f62 Elite 1.4-re try to fix IV plot 2019-08-20 21:01:07 +08:00
alan c68f34a48a Elite 1.4-re try to fix IV plot 2019-08-20 20:37:14 +08:00
alan c39075eff8 Elite 1.4-re try to fix IV plot 2019-08-20 20:03:18 +08:00
YiChin 53c28fed5d Elite 1.4-re try to DAC 2019-08-20 19:24:08 +08:00
YiChin 112e177928 Elite 1.4-re try to DAC 2019-08-20 19:14:15 +08:00
105042004 449201e3ea change steptime 2019-08-20 18:48:05 +08:00
105042004 c7c9e75c17 test steptime 2019-08-20 18:40:00 +08:00
105042004 2bdbe91c7e test steptime 2019-08-20 18:27:55 +08:00
YiChin 58c3f8fd22 Elite 1.4-re try to DAC 2019-08-20 17:11:03 +08:00
YiChin ad7063eea2 Elite 1.4-re try to DAC 2019-08-20 16:35:10 +08:00
YiChin 34b3524533 Elite 1.4-re try to DAC 2019-08-20 16:33:53 +08:00
YiChin f63d991df4 Elite 1.4-re try to fix IV zero Notify problem 2019-08-20 15:24:30 +08:00
YiChin 10a640bac6 Merge remote-tracking branch 'origin/Elite_14re_demo' into Elite_14re_demo 2019-08-20 15:15:14 +08:00
YiChin e4bd49e6ae Elite 1.4-re try to fix IV zero Notify problem 2019-08-20 15:13:58 +08:00
Benny Liu c14d4a9f6b don't care 2019-08-20 15:13:29 +08:00
YiChin 596897ccd7 Merge remote-tracking branch 'origin/Elite_14re_demo' into Elite_14re_demo
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h
2019-08-20 14:39:58 +08:00
YiChin b304f03a7a Elite 1.4-re try to fix IV zero Notify problem 2019-08-20 14:39:13 +08:00
105042004 2c9f467939 push 2019-08-20 14:37:37 +08:00
105042004 31f6c9d43c fix DAC correction 2019-08-20 14:36:50 +08:00
Benny Liu 91e5f2f43f error fix 2019-08-20 14:35:37 +08:00
Benny Liu f4f5c18a95 Merge branch 'Elite_14re_demo' of https://gitlab.com/s880782002/bioprocc2650 into Elite_14re_demo 2019-08-20 14:33:00 +08:00
alan 08b1bd4ce6 Merge remote-tracking branch 'origin/Elite_14re_demo' into Elite_14re_demo
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDAC.h
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h
2019-08-20 14:32:28 +08:00
Benny Liu 61934cee51 Merge branch 'Elite_14re_demo' of https://gitlab.com/s880782002/bioprocc2650 into Elite_14re_demo 2019-08-20 14:32:18 +08:00
Benny Liu ae560e8923 Gain Boundary for CHAO-I 2019-08-20 14:31:29 +08:00
alan d0f1cb5db0 Elite 1.4-re try to fix IV plot 2019-08-20 14:31:02 +08:00
YiChin 18b1279fe6 Merge remote-tracking branch 'origin/Elite_14re_demo' into Elite_14re_demo 2019-08-20 14:06:38 +08:00
YiChin dd541ef1d0 Elite 1.4-re try to fix IV zero Notify problem 2019-08-20 14:05:55 +08:00
Benny Liu d3c3135775 add calibration data for CHAO-I. 2019-08-20 14:04:07 +08:00
alan 317305dbcd Elite 1.4-re try to fix IV plot 2019-08-20 13:48:18 +08:00
105042004 d889aee9df gix bug 2019-08-20 13:32:38 +08:00
105042004 0d2ef231d7 fix CV curve function 2019-08-20 11:16:37 +08:00
105042004 52036a6c4b merge 2019-08-20 11:04:33 +08:00
105042004 fc44b2be44 add Notify_IV( ) 2019-08-20 11:03:27 +08:00
alan 48fcbe8de8 Elite 1.4-re move ADC overflow to correction.h 2019-08-20 10:48:55 +08:00
alan 8a2bb2a8a4 Elite 1.4-re fix reset (but failed) 2019-08-20 10:32:44 +08:00
YiChin 37480a0c6e Elite 1.4-re add correction comment of #0 board 2019-08-20 10:26:45 +08:00
YiChin 332b49de31 Elite 1.4-re LED 2019-08-19 19:14:16 +08:00
YiChin 3fa9abecd9 Merge remote-tracking branch 'origin/Elite_14re_demo' into Elite_14re_demo
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h
2019-08-19 18:03:56 +08:00
YiChin 25c964ee37 Elite 1.4-re LED 2019-08-19 18:02:39 +08:00
105042004 5b471539e9 push 2019-08-19 18:01:43 +08:00
105042004 1739a4ebd2 Merge branch 'Elite_14re_demo' of https://gitlab.com/s880782002/bioprocc2650 into Elite_14re_demo 2019-08-19 17:43:49 +08:00
105042004 dfde53e893 adjust clock 2019-08-19 17:43:35 +08:00
YiChin a9066d91fc Elite 1.4-re LED 2019-08-19 17:43:16 +08:00
105042004 e3aff9e394 Merge branch 'Elite_14re_demo' of https://gitlab.com/s880782002/bioprocc2650 into Elite_14re_demo 2019-08-19 16:37:44 +08:00
105042004 68ea183e52 test samperate 2019-08-19 16:37:20 +08:00
alan 78bafd54f3 Elite 1.4-re ADC auto switch 2019-08-19 16:07:20 +08:00
YiChin 429ccd3254 Elite 1.4-re LED 2019-08-19 15:53:10 +08:00
YiChin 4d181df5b8 Merge remote-tracking branch 'origin/Elite_14re_demo' into Elite_14re_demo 2019-08-19 15:32:53 +08:00
YiChin e8d8b7730e Elite 1.4-re LED 2019-08-19 15:32:40 +08:00
105042004 04e649ce0b merge 2019-08-19 15:31:02 +08:00
105042004 b54d1c3b2b Elite 1.4 adjust steptime 2019-08-19 15:28:41 +08:00
105042004 ec58058e00 Elite 1.4 adjust sampling rate 2019-08-19 15:24:58 +08:00
alan a8bc5a22d5 Elite 1.4-re push 2019-08-19 15:00:24 +08:00
alan ddf5a59ee9 Elite 1.4-re push 2019-08-19 14:59:56 +08:00
alan 19ed1b1444 Merge remote-tracking branch 'origin/Elite_14re_demo' into Elite_14re_demo 2019-08-19 14:56:44 +08:00
alan 0c08992214 Elite 1.4-re push 2019-08-19 14:56:27 +08:00
105042004 c48f570877 Elite 1.4 adjust samplerate_counter 2019-08-19 14:56:14 +08:00
105042004 95dc465f45 fix samplerate 2019-08-19 14:44:30 +08:00
105042004 65b49cdd11 fix EliteADCControl 2019-08-19 14:40:47 +08:00
105042004 a18cabfa33 fix EliteADCControl 2019-08-19 14:40:17 +08:00
105042004 9d86f9f1f9 fix 2019-08-19 14:34:15 +08:00
105042004 adca6987b4 Elite 1.4 move IT_plot() 2019-08-19 14:25:40 +08:00
105042004 cf5d09d0d1 fix bug 2019-08-19 14:07:55 +08:00
105042004 b4075c14fd Elite 1.4 fix sample rate 2019-08-19 14:00:31 +08:00
105042004 06717ad552 merge 2019-08-19 12:51:32 +08:00
105042004 e4b4b3e0e5 Elite1.4 Seperate DAC and ADC / add Sampling rate 2019-08-19 12:48:22 +08:00
alan e51a0adf12 Elite 1.4-re error fix 2019-08-19 12:29:00 +08:00
YiChin 3bdba2ad71 Elite 1.4-re error fix 2019-08-19 11:48:09 +08:00
alan 89e7935cd6 Elite 1.4-re error fix 2019-08-19 11:30:34 +08:00
YiChin 935e3fea4d Elite 1.4-re error fix 2019-08-19 11:24:09 +08:00
YiChin e1f4c20fd7 Elite 1.4-re error fix 2019-08-19 11:11:18 +08:00
alan 226c822fcf Elite 1.4-re clock 0.05s ->0.01s | samplerate 2019-08-19 11:09:42 +08:00
alan 7905d25c2f Merge remote-tracking branch 'origin/Elite_14re_demo' into Elite_14re_demo
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteADC.h
2019-08-19 10:57:23 +08:00
alan 941d508859 Elite 1.4-re clock 0.05s ->0.01s | samplerate 2019-08-19 10:56:23 +08:00
alan 2230a78ad1 Elite 1.4-re clock 0.05s ->0.01s | samplerate 2019-08-19 10:50:40 +08:00
Benny Liu 95ec664c9c Merge branch 'Elite_14re_demo' of https://gitlab.com/s880782002/bioprocc2650 into Elite_14re_demo 2019-08-19 10:46:55 +08:00
Benny Liu ef894ae441 calibration coefficient value 2019-08-19 10:46:34 +08:00
YiChin f887abbf66 Elite 1.4-re new world 2019-08-19 10:30:03 +08:00
alan d51b9839c2 Elite 1.4-re clock 0.05s ->0.01s 2019-08-16 19:09:11 +08:00
alan fb08b5638d Elite 1.4-re clock 0.05s ->0.01s 2019-08-16 19:03:54 +08:00
alan c09ec1b3e1 Elite 1.4-re clock 0.05s ->0.01s 2019-08-16 18:47:50 +08:00
alan b77104baa8 Elite 1.4-re clock 0.05s ->0.01s 2019-08-16 18:34:37 +08:00
alan 60beceb0a4 Elite 1.4-re clock 0.05s ->0.01s 2019-08-16 18:12:43 +08:00
alan 36810bbf53 Merge remote-tracking branch 'origin/Elite_14re_demo' into Elite_14re_demo 2019-08-16 18:07:14 +08:00
alan 5f62559811 Elite 1.4-re clock 0.05s ->0.01s 2019-08-16 18:07:01 +08:00
Benny Liu bb521437db auto shift bug fix 2019-08-16 17:56:14 +08:00
Benny Liu c31bbef8f5 auto shift 2019-08-16 17:47:16 +08:00
Benny Liu ca5203848d DAC output voltage correction 2019-08-16 17:01:59 +08:00
Benny Liu b6f8ddd041 auto shift 2019-08-16 16:47:09 +08:00
alan 1e834cfb45 Elite 1.4-re ADC current correction 2019-08-16 16:40:09 +08:00
alan e93ac78ccd Elite 1.4-re ADC current correction 2019-08-16 14:23:02 +08:00
YiChin 8a375019f1 Elite 1.4-re error fix 2019-08-16 14:20:50 +08:00
YiChin 3cda19e2d2 Elite 1.4-re error fix 2019-08-16 13:40:24 +08:00
YiChin 95169d0885 Merge remote-tracking branch 'origin/elite_tempbranch' into elite_tempbranch 2019-08-16 12:28:45 +08:00
YiChin 96c3b0725b Elite 1.4-re error fix 2019-08-16 12:28:19 +08:00
alan b29eef912d Elite 1.4-re ADC current correction 2019-08-16 12:26:53 +08:00
YiChin 7790621b3c Elite 1.4-re error fix 2019-08-16 11:51:59 +08:00
YiChin adf96c3055 Elite 1.4-re error fix 2019-08-16 11:18:25 +08:00
YiChin a99ced845c Elite 1.4-re error fix 2019-08-16 11:01:02 +08:00
YiChin be6681a0fd Merge remote-tracking branch 'origin/elite_tempbranch' into elite_tempbranch 2019-08-16 10:17:01 +08:00
alan fbcb1f8ddd Elite 1.4-re ADC volt correction 2019-08-16 10:16:13 +08:00
YiChin 61cb5a9eed Elite 1.4-re error fix 2019-08-15 18:46:23 +08:00
alan 64d32a6386 Merge remote-tracking branch 'origin/elite_tempbranch' into elite_tempbranch 2019-08-15 18:44:33 +08:00
alan 50e47e75a1 Elite 1.4-re ADC volt correction 2019-08-15 18:44:21 +08:00
YiChin 21b7e081e7 Elite 1.4-re error fix 2019-08-15 18:38:34 +08:00
alan e53403d11b Elite 1.4-re ADC volt correction 2019-08-15 18:31:38 +08:00
alan 6ef19dfbdc Elite 1.4-re ADC volt correction 2019-08-15 17:52:32 +08:00
alan 1c601e57a4 Elite 1.4-re new notify.h 2019-08-15 17:42:13 +08:00
YiChin 346ff4db00 Elite 1.4-re error fix 2019-08-15 17:24:34 +08:00
alan 6900a6f3be Elite 1.4-re new notify.h 2019-08-15 17:00:57 +08:00
YiChin 08c3c19219 Elite 1.4-re error fix 2019-08-15 16:55:29 +08:00
alan 828d5301e7 Elite 1.4-re VT function test 2019-08-15 16:39:09 +08:00
alan 4ffbcba8cf Elite 1.4-re VT function test 2019-08-15 16:32:39 +08:00
alan 0290a178ee Elite 1.4-re ADC correction using CIS 2019-08-15 15:53:40 +08:00
YiChin 4723ec9d5b fix instruction length 2019-08-15 12:05:23 +08:00
YiChin 4b908677a9 compile pass 2019-08-15 11:37:28 +08:00
105042004 24b7699520 test width period 2019-08-15 11:24:00 +08:00
105042004 6a2bba3119 test period width 2019-08-15 11:23:36 +08:00
alan 4a2af94b31 Elite 1.4-re DAC correction 2019-08-14 19:22:48 +08:00
alan 77719e3713 Elite 1.4-re DAC correction 2019-08-14 19:15:44 +08:00
alan 94776b0171 Merge remote-tracking branch 'origin/elite_tempbranch' into elite_tempbranch
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h
2019-08-14 19:13:26 +08:00
alan 5c4c08fc97 Elite 1.4-re ADC test 2019-08-14 19:11:57 +08:00
YiChin 1d58fe359b Elite 1.4-re LED modify 2019-08-14 18:10:53 +08:00
105042004 a50849882e test pulse period pulse width 2019-08-14 11:56:41 +08:00
105042004 89a474f509 test pulse width 2019-08-14 11:06:51 +08:00
105042004 4cc1d01c6a update DPV curve fix CV curve overflow 2019-08-14 10:29:24 +08:00
105042004 703d6bcb69 test DPV 2019-08-14 09:58:20 +08:00
105042004 a0cf6389aa test DPV 2019-08-13 18:28:21 +08:00
105042004 7cf77afab3 fix bug 2019-08-13 18:16:01 +08:00
105042004 ec36764750 test DPV 2019-08-13 18:05:20 +08:00
105042004 e1186901e9 test DPV curve 2019-08-13 17:54:39 +08:00
105042004 82d1b90542 test DPV amplitude 2019-08-13 17:47:23 +08:00
105042004 1c2b3ac07c test DPV step 2019-08-13 17:42:11 +08:00
105042004 5d545d6acf test DPV 2019-08-13 17:37:09 +08:00
105042004 abacf8b977 test DPV curve 2019-08-13 17:23:26 +08:00
105042004 e7fb10be20 kill 10V 2019-08-13 17:12:46 +08:00
105042004 9eac85a5d3 test DPV 2019-08-13 16:29:25 +08:00
105042004 c2a4d4ddac test DPV 2019-08-13 15:31:38 +08:00
105042004 c64b19bbb4 test DPV 2019-08-13 15:09:42 +08:00
105042004 f8569c15bc test Amplitude 2019-08-13 14:52:50 +08:00
105042004 1b0d50eeaf test DPV 2019-08-13 14:43:12 +08:00
105042004 e681c0a2b0 test 2019-08-13 14:35:42 +08:00
105042004 6dcb7173d5 test 2019-08-13 14:35:29 +08:00
105042004 ee8165d4b9 test 2019-08-13 14:28:27 +08:00
105042004 0539ffbd23 test 2019-08-13 14:17:11 +08:00
105042004 4bc2364e07 test 2019-08-13 14:04:10 +08:00
105042004 fbff4b2985 test amplitude 2019-08-13 12:58:53 +08:00
105042004 6031a35461 update step amplitide width 2019-08-13 12:24:51 +08:00
105042004 b55b521d06 test 2019-08-13 11:58:02 +08:00
105042004 8303c80326 test DPV 2019-08-13 11:50:53 +08:00
105042004 1a196b20da test DPV 2019-08-13 11:50:29 +08:00
105042004 aa2e813fb1 update CV curve DPV curve SWV curve 2019-08-13 11:07:13 +08:00
105042004 92ef9e44d6 fix 2019-08-08 18:07:41 +08:00
105042004 d840e63ac1 test DPV curve 2019-08-08 17:58:48 +08:00
105042004 345bbf7f21 fix 2019-08-08 17:17:23 +08:00
105042004 e728e0b520 fix bug 2019-08-08 16:50:13 +08:00
105042004 be70e455d7 update CV curve DPV curve 2019-08-08 16:23:17 +08:00
105042004 7a92fe8f86 debug CV curve 2019-08-08 14:47:39 +08:00
105042004 bbcda86272 test CV curve 2019-08-08 14:38:17 +08:00
105042004 148b3a4bd3 change step 2019-08-08 14:28:23 +08:00
105042004 dc0267427f test 2019-08-08 13:59:00 +08:00
105042004 fa71a8535d test 2019-08-08 13:50:39 +08:00
105042004 15d7e94082 test 2019-08-08 13:36:18 +08:00
105042004 d571d1ea98 test 2019-08-08 12:58:04 +08:00
105042004 ca2cef61a4 test 2019-08-08 12:45:25 +08:00
105042004 5957b60680 fix CV curve 2019-08-08 12:31:04 +08:00
105042004 37e9931c5a test IV cuve 2019-08-08 11:58:22 +08:00
105042004 837e9f4029 fix CV curve 2019-08-08 11:41:14 +08:00
105042004 020746027d test step 2019-08-08 11:05:23 +08:00
105042004 f170f9ab0d fix 2019-08-08 10:52:15 +08:00
105042004 44bab26192 fix bug 2019-08-08 10:34:48 +08:00
105042004 042b15f787 fix bug 2019-08-08 10:11:54 +08:00
105042004 4d95438e20 update CVcurve DPVcurve SWVcurve 2019-08-07 22:32:58 +08:00
105042004 94fd12b436 push 2019-08-07 12:29:42 +08:00
105042004 d9d12321b7 push 2019-08-07 12:23:20 +08:00
105042004 73ab6505ca test CV curve 2 2019-08-07 12:19:59 +08:00
105042004 7f1cd7437c test CV curve 2019-08-07 12:17:33 +08:00
Benny Liu 0e40bc0deb Merge branch 'elite_tempbranch' of https://gitlab.com/s880782002/bioprocc2650 into elite_tempbranch 2019-08-07 11:17:31 +08:00
Benny Liu 51a46e0f4d shift gear 2019-08-07 11:15:01 +08:00
105042004 9ffe4e2965 test CV curve 2019-08-07 11:07:15 +08:00
105042004 d4551a83e6 test CV curve 2019-08-07 10:56:24 +08:00
105042004 fbd4699246 test12 2019-08-06 18:13:47 +08:00
105042004 bfc8242ee6 test11 2019-08-06 17:56:52 +08:00
105042004 68598cc9d0 test10 2019-08-06 17:41:58 +08:00
105042004 c87ff74add test9 2019-08-06 17:15:18 +08:00
105042004 fcb9ca34a1 test8 2019-08-06 16:36:28 +08:00
105042004 43e19870b2 test7 2019-08-06 16:07:30 +08:00
105042004 365b272e91 test6 2019-08-06 15:28:57 +08:00
105042004 56ad82e481 test6 2019-08-06 15:18:02 +08:00
105042004 110940e898 test5 2019-08-06 15:12:02 +08:00
105042004 f58557d785 test4 2019-08-06 13:56:13 +08:00
105042004 5a0d3e5026 test 3 2019-08-06 13:44:14 +08:00
105042004 357e30d8af test CV curve 2019-08-06 13:26:20 +08:00
105042004 c3b633a207 test CV curve 2019-08-06 13:20:51 +08:00
105042004 daef46eecc update CV curve 2019-08-06 12:47:45 +08:00
105042004 140add3754 change reset 2019-08-06 12:20:31 +08:00
105042004 540a6a3d2a update CVcurve 2019-08-06 11:47:10 +08:00
105042004 a7e337cf96 add DPV & fix bug 2019-08-01 11:52:03 +08:00
105042004 a6cf807b08 fix errors 2019-08-01 11:19:43 +08:00
105042004 b87b5c4f2f add DPV 2019-08-01 10:40:37 +08:00
105042004 cb1497d434 add CVcurve 2019-07-30 16:50:01 +08:00
105042004 01d104c81c Merge remote-tracking branch 'origin/elite_memory' into elite_tempbranch 2019-07-30 10:44:54 +08:00
alan d716f396b4 Elite 1.4 DAC output fxn 2019-07-30 10:08:29 +08:00
YiChin c683e0261c Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-26 15:28:49 +08:00
YiChin 4d1ed89e40 Elite 1.4 ADC test 2019-07-26 15:26:39 +08:00
alan 7769de7174 Elite 1.4 ADC test 2019-07-26 11:58:39 +08:00
alan 99a2fb27df Elite 1.4 ADC test 2019-07-26 11:26:45 +08:00
alan 45f96605d9 Elite 1.4 ADC test 2019-07-26 10:35:35 +08:00
alan fb7b75b02d Elite 1.4 ADC test 2019-07-26 09:51:52 +08:00
YiChin 101c03b19e Elite 1.4 ADC test 2019-07-26 09:11:43 +08:00
alan 17fa54c979 Elite 1.4 I2C test 2019-07-26 09:03:43 +08:00
alan 35f610001f Elite 1.4 I2C test 2019-07-25 18:33:13 +08:00
alan 1f57e7d2de Elite 1.4 I2C test 2019-07-25 17:57:15 +08:00
alan 3fad139bc5 Elite 1.4 I2C test 2019-07-25 17:30:26 +08:00
alan ba3888f523 Elite 1.4 I2C test 2019-07-25 15:42:17 +08:00
alan 9751ef2529 Elite 1.4 ADC test 2019-07-25 14:59:09 +08:00
alan b69b46a78c Elite 1.4 ADC test 2019-07-25 14:50:17 +08:00
YiChin 88979fe511 Elite 1.4 ADC test 2019-07-25 14:26:51 +08:00
105042004 7d2fc57b77 add comment 2019-07-25 12:13:05 +08:00
105042004 71c30babea add comment 2019-07-25 12:11:16 +08:00
alan c4996a3e2d Elite 1.4 ADC test 2019-07-25 09:47:14 +08:00
YiChin 7a71bbb995 Elite 1.4 DAC test 2019-07-24 18:32:27 +08:00
YiChin 45b00acc8b Elite 1.4 DAC test 2019-07-24 18:08:49 +08:00
YiChin 0728f77d31 Elite 1.4 DAC test 2019-07-24 17:28:53 +08:00
YiChin 3c2bec7d02 Elite 1.4 DAC test 2019-07-24 17:21:10 +08:00
alan bf1669c0f0 Elite 1.4 DAC test 2019-07-24 16:34:27 +08:00
YiChin b1e17a1115 Elite 1.4 DAC test 2019-07-24 16:26:25 +08:00
alan 3814e51585 Elite 1.4 DAC test 2019-07-24 16:10:15 +08:00
YiChin f7f5c3abc6 Elite 1.4 DAC test 2019-07-24 14:57:40 +08:00
YiChin 9cac8694c0 Elite 1.4 I2C test 2019-07-24 14:11:21 +08:00
YiChin e63af33723 Elite 1.4 I2C test 2019-07-24 11:53:26 +08:00
YiChin fcbda78a46 Elite 1.4 I2C test 2019-07-24 11:49:20 +08:00
YiChin e7cdc676cf Elite 1.4 I2C test 2019-07-24 11:39:55 +08:00
YiChin c2bd1e9780 Elite 1.4 test 2019-07-24 10:35:58 +08:00
YiChin 2fab159ba8 Elite 1.4 test 2019-07-24 09:56:48 +08:00
YiChin 1e41629f49 I2C PIN 2019-07-23 17:34:50 +08:00
YiChin 18c32c7e64 I2C PIN 2019-07-23 14:27:39 +08:00
YiChin e8aac9bd81 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-23 13:34:03 +08:00
YiChin 263ba0581b I2C PIN 2019-07-23 13:33:34 +08:00
alan db943ee144 memory elite I2C 2019-07-23 13:32:30 +08:00
alan afb3da7942 memory elite I2C 2019-07-23 12:54:49 +08:00
alan 34fe7564ba memory elite I2C 2019-07-23 12:35:02 +08:00
alan eef87b3881 memory elite I2C 2019-07-23 12:25:13 +08:00
YiChin d606b2c7e9 I2C PIN 2019-07-23 11:11:45 +08:00
YiChin 495aa8bbc5 I2C PIN 2019-07-22 17:13:27 +08:00
alan f12185f853 memory elite I2C 2019-07-22 17:03:49 +08:00
alan a2d3ac3138 memory elite I2C 2019-07-22 15:22:43 +08:00
alan e4d34f886a memory elite I2C 2019-07-22 15:13:09 +08:00
alan ca946c1cd1 memory elite I2C 2019-07-19 09:20:29 +08:00
alan 26737e0a11 Merge remote-tracking branch 'origin/elite_memory' into elite_memory
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteI2C.h
2019-07-19 09:19:59 +08:00
alan576 fc86bc9dd3 I2C write 2019-07-18 22:37:30 +08:00
alan c115de0bf0 memory elite I2C 2019-07-18 18:43:58 +08:00
alan da9e8493b7 memory elite I2C 2019-07-18 18:38:18 +08:00
alan 02a94ff271 memory elite 2019-07-18 18:34:09 +08:00
YiChin 7a06c05343 I2C PIN 2019-07-18 17:49:02 +08:00
alan 16eafe918a memory elite 2019-07-18 16:57:06 +08:00
YiChin 397cc1c50c I2C PIN 2019-07-18 16:51:03 +08:00
YiChin d8ac537fba I2C PIN 2019-07-18 16:28:50 +08:00
alan dbe5257f3a memory elite 2019-07-18 13:55:20 +08:00
alan 7437c17f84 memory elite 2019-07-18 12:19:27 +08:00
YiChin 520e710aae I2C PIN 2019-07-18 11:55:48 +08:00
YiChin 49888e73bb Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-18 11:28:41 +08:00
alan 78db3a0122 memory elite 2019-07-18 11:28:03 +08:00
YiChin cad6f00f2d Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-18 11:21:42 +08:00
alan 0139bfa17d memory elite 2019-07-18 11:21:03 +08:00
YiChin fa87ba98c5 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-18 11:15:46 +08:00
alan f296b7a2c4 memory elite 2019-07-18 11:15:04 +08:00
alan c41e366758 memory elite 2019-07-18 11:10:22 +08:00
alan c241a1ea16 memory elite 2019-07-18 11:07:34 +08:00
YiChin 0bc9f8f4e3 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-18 10:39:45 +08:00
alan 55a35e662c memory elite 2019-07-18 10:39:17 +08:00
YiChin d386613e55 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-18 10:36:09 +08:00
alan e8b365c966 memory elite 2019-07-18 10:34:50 +08:00
YiChin e8a6546e54 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-18 10:33:24 +08:00
alan 10bf24e490 memory elite 2019-07-18 10:32:54 +08:00
YiChin ad4d0fcf0a Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-18 10:30:02 +08:00
alan f4a339d55e memory elite 2019-07-18 10:29:33 +08:00
YiChin 74c0d60b2f Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-18 10:12:22 +08:00
alan 5e56c37511 memory elite 2019-07-18 10:10:14 +08:00
YiChin 5a5d934a46 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-17 18:50:32 +08:00
alan ddc606a9bd memory elite 2019-07-17 18:48:14 +08:00
YiChin 70ee55c5a0 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-17 18:44:05 +08:00
alan 8179ce47d1 memory elite 2019-07-17 18:42:36 +08:00
YiChin a6e240cd52 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-17 18:11:09 +08:00
alan dc87af411a memory elite 2019-07-17 18:09:32 +08:00
YiChin c1363da184 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-17 17:45:55 +08:00
alan 58970cb3c3 memory elite 2019-07-17 17:44:54 +08:00
alan fc83f4f227 memory elite 2019-07-17 17:34:05 +08:00
YiChin f16bbccd69 I2C PIN 2019-07-17 15:31:33 +08:00
YiChin b0430fc05e I2C PIN 2019-07-17 15:27:58 +08:00
YiChin 754d07a06c Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-17 15:27:22 +08:00
alan 05fa80faa2 memory elite 2019-07-17 15:22:28 +08:00
alan 3fa823b193 memory elite 2019-07-17 15:21:54 +08:00
YiChin 3b661d6dc2 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-17 15:16:11 +08:00
alan 9c7b9e44a1 memory elite 2019-07-17 15:14:43 +08:00
YiChin b30c3108b7 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-17 14:10:43 +08:00
alan 1bc1a4e982 memory elite 2019-07-17 14:09:12 +08:00
YiChin d36f5c3b38 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-17 14:00:34 +08:00
alan 8427271eb0 memory elite 2019-07-17 13:59:08 +08:00
YiChin 01a2c6e8cd Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-17 13:50:11 +08:00
alan 409ca3dd06 memory elite 2019-07-17 13:48:41 +08:00
YiChin 80f3b65c83 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-17 13:43:25 +08:00
alan f6269fd244 memory elite 2019-07-17 13:41:35 +08:00
YiChin 9f02fee658 Merge remote-tracking branch 'origin/elite_memory' into elite_memory 2019-07-17 13:37:01 +08:00
YiChin 92a76e834f I2C PIN 2019-07-17 13:34:55 +08:00
alan 28b8b8ce9d memory elite 2019-07-17 13:34:41 +08:00
alan b0ef493774 memory elite 2019-07-17 12:27:54 +08:00
alan 01c11fabec memory elite 2019-07-17 12:18:53 +08:00
alan 6a57a8b107 memory elite 2019-07-17 10:49:15 +08:00
alan 64c24bf496 memory elite 2019-07-16 18:47:38 +08:00
alan ceab949ff1 memory elite 2019-07-16 18:33:55 +08:00
alan 7be310f4e7 memory elite 2019-07-16 18:26:27 +08:00
alan d64dff8e04 memory elite 2019-07-16 18:23:15 +08:00
alan ec55140718 memory elite 2019-07-16 18:11:06 +08:00
alan 69b32f6a1c memory elite 2019-07-16 18:10:17 +08:00
alan 38cd245907 memory elite 2019-07-16 18:06:28 +08:00
alan c1ced5f9ff LED brightness 2019-07-10 14:44:38 +08:00
alan cc437b89e9 disable 10V 2019-07-05 18:20:05 +08:00
YiChin 794c74c629 I2C PIN 2019-07-03 14:42:30 +08:00
YiChin 83db25142d I2C PIN 2019-07-03 14:27:38 +08:00
alan c4484d3cc1 I2C PIN assign 2019-07-03 14:09:08 +08:00
alan f9a5d8b093 Merge remote-tracking branch 'origin/elite_zm/master' into elite_zm/master 2019-07-03 14:06:01 +08:00
alan 5b3c3f40e6 I2C delete wrong PIN 2019-07-03 14:05:47 +08:00
YiChin 8f2e2d5465 I2C PIN 2019-07-03 14:03:46 +08:00
YiChin 8e182ceb29 I2C 2019-07-03 13:40:47 +08:00
alan fc10503cdd I2C test 2019-07-03 12:15:48 +08:00
alan a2296d1822 I2C test 2019-07-03 12:14:52 +08:00
YiChin 66b57372cb I2C 2019-07-03 11:39:01 +08:00
alan 1e5299034f I2C test 2019-07-03 11:28:41 +08:00
alan 82afe90a60 I2C test 2019-07-03 11:28:29 +08:00
YiChin a0ca72082e I2C 2019-07-03 11:07:22 +08:00
alan 22e52e46ff I2C test 2019-07-03 10:55:28 +08:00
alan 20820648ad I2C test 2019-07-03 10:32:30 +08:00
alan f41790fff2 I2C test 2019-07-03 10:27:36 +08:00
alan fe4977c08d do nothing 2019-07-02 10:16:42 +08:00
YiChin e12dd54f2a delete warning 2019-07-01 11:52:41 +08:00
alan 7d4de8c0bc cyclic volt 2019-07-01 11:45:50 +08:00
alan 2bd5a3849f cyclic V 2019-06-28 18:36:03 +08:00
YiChin 0e7b9462c1 Merge remote-tracking branch 'origin/elite_zm/master' into elite_zm/master 2019-06-28 11:12:02 +08:00
alan b14d4da555 read current 2019-06-28 11:11:04 +08:00
YiChin b61647e504 read current 2019-06-27 15:55:04 +08:00
YiChin 728ce5b19d read current 2019-06-27 11:36:30 +08:00
alan d11b9cdbe2 read current 2019-06-27 10:46:23 +08:00
YiChin 149e092181 read current 2019-06-27 10:34:48 +08:00
YiChin f5de72ad41 read current 2019-06-27 10:16:36 +08:00
YiChin 6fa2d4310b Merge remote-tracking branch 'origin/elite_zm/master' into elite_zm/master 2019-06-27 10:06:32 +08:00
alan eb76f57688 read current 2019-06-27 10:03:22 +08:00
YiChin 096bb72eb1 read current 2019-06-26 15:24:51 +08:00
YiChin 10407d1529 read current 2019-06-26 11:27:43 +08:00
alan ae67ac3355 read current 2019-06-26 10:56:17 +08:00
YiChin 5eba8169c6 read current 2019-06-26 10:45:16 +08:00
alan e299a6e01d read current 2019-06-26 09:33:34 +08:00
YiChin 3ea4c0a147 read current 2019-06-26 08:46:19 +08:00
YiChin 8b1cee29b1 read current 2019-06-25 17:40:17 +08:00
alan c8cac98df6 read volt 2019-06-25 12:14:21 +08:00
alan e0f811c706 read volt 2019-06-24 17:03:05 +08:00
alan 7254bd8c07 read volt 2019-06-24 16:02:27 +08:00
YiChin c8b527c99a read current 2019-06-24 15:57:37 +08:00
alan 629088602a choose current-read channel 2019-06-24 15:01:48 +08:00
YiChin bdc1e1bf9e read current 2019-06-24 14:55:00 +08:00
YiChin e88368e4f5 stable turnon have 10v 2019-06-24 11:13:02 +08:00
alan df40ab38bc VT IT function 2019-06-24 09:51:47 +08:00
alan a115eb69d0 VT IT function 2019-06-24 09:50:30 +08:00
alan 57f84f4ebd VT IT function 2019-06-21 15:49:27 +08:00
alan 2cf42f3f66 VT IT function 2019-06-21 13:31:54 +08:00
alan 6d585f6a74 VT IT function 2019-06-21 12:26:08 +08:00
alan 7525795ac8 VT IT function 2019-06-21 12:00:46 +08:00
alan ba66c00010 VT IT function 2019-06-21 11:01:32 +08:00
alan 7a9f66a1ae VT IT function 2019-06-20 17:33:42 +08:00
alan 488d955fcd VT IT function 2019-06-20 17:27:21 +08:00
alan 4064fc3396 VT IT function 2019-06-20 12:14:09 +08:00
alan b731bd2faf decode AIN0 & 1 2019-06-19 17:33:17 +08:00
alan 1d5e6feafe decode AIN0 & 1 2019-06-19 17:15:16 +08:00
alan 12e00174d2 Merge remote-tracking branch 'origin/elite_zm/master' into elite_zm/master 2019-06-19 16:57:38 +08:00
alan a381517458 turn on 10v 2019-06-19 16:57:15 +08:00
YiChin 54611577ba ADC check 2019-06-19 16:01:47 +08:00
alan 450572ad8f Merge remote-tracking branch 'origin/elite_zm/master' into elite_zm/master 2019-06-19 15:44:57 +08:00
alan 877adc39df turn on 10v 2019-06-19 15:44:35 +08:00
alan 9feb2ea1e6 turn on 10v 2019-06-19 15:43:59 +08:00
YiChin afc7ae2cb5 ADC check 2019-06-18 18:02:09 +08:00
YiChin 4d7ce9fba4 ADC check 2019-06-18 17:59:00 +08:00
alan 6254b23b3a BT format 2019-06-18 17:53:20 +08:00
alan 9ac6c643b3 BT format 2019-06-18 16:28:46 +08:00
alan e7d7e6993d delay before read ADCrxbuf 2019-06-17 16:02:38 +08:00
alan b2393e88fa delay before read ADCrxbuf 2019-06-17 15:44:31 +08:00
alan 57738442d7 decode ADC data 2019-06-17 10:06:57 +08:00
alan 2126e2ffa6 decode ADC data 2019-06-14 17:39:59 +08:00
alan 0ed4a20505 decode ADC data 2019-06-13 18:52:17 +08:00
alan a3c00d0a6e decode ADC data 2019-06-13 18:03:59 +08:00
alan 1f00996142 decode ADC data 2019-06-13 17:54:00 +08:00
YiChin 56093efb5a ADC check 2019-06-13 17:46:00 +08:00
alan e0c7786752 auto enable 10v test 2019-06-13 15:44:24 +08:00
YiChin 8ba667bbb8 auto enable 10v 2019-06-13 15:36:47 +08:00
alan 7661d230f1 decode ADC 2019-06-13 14:33:05 +08:00
alan 577eaaef56 decode ADC 2019-06-13 13:50:11 +08:00
alan b64719acea delay enable_10v 2019-06-11 15:37:04 +08:00
YiChin 7e6050e721 bug fix 2019-06-11 15:28:24 +08:00
alan ca3c31d7f5 LED brightness 2019-06-06 09:58:43 +08:00
YiChin c89e493e67 bug fix 2019-06-05 15:39:16 +08:00
alan a856cdc7d2 decode ADC V & I 2019-06-05 15:35:17 +08:00
alan 76cdf969a5 decode ADC V & I 2019-06-05 12:34:59 +08:00
alan 48c85a4389 decode ADC V & I 2019-06-05 12:25:29 +08:00
alan 992bc26ff1 enable 10v 2019-06-04 17:54:21 +08:00
alan b5aa10a8b5 enable 10v 2019-06-04 17:40:26 +08:00
alan b5eec41f36 DAC reset parameter 2019-06-04 14:26:19 +08:00
alan 2fb8faefbd DAC reset parameter 2019-06-04 14:18:43 +08:00
alan bcd144d265 IV curve full function 2019-06-04 11:57:50 +08:00
alan be1e961c2e IV curve full function 2019-06-04 11:40:28 +08:00
alan 6832bdfff6 notify format 2019-06-03 18:41:39 +08:00
alan 98aeea5f76 notify format 2019-06-03 18:38:21 +08:00
YiChin 85ff9dc965 bug fix 2019-06-03 17:09:37 +08:00
alan c650618e48 Merge remote-tracking branch 'origin/elite_zm/master' into elite_zm/master 2019-06-03 15:53:36 +08:00
alan 882d87e522 decode ADC 2019-06-03 15:22:22 +08:00
YiChin 80a7847e67 bug fix 2019-06-03 12:30:33 +08:00
alan 86f2a3b7f1 decode ADC 2019-06-03 12:25:59 +08:00
alan a735a613d6 decode ADC 2019-06-03 12:04:04 +08:00
alan 666725a5f0 decode ADC 2019-06-03 11:16:50 +08:00
YiChin 89fb479591 bug fix 2019-06-03 10:24:53 +08:00
YiChin 5c7dc68e12 bug fix 2019-05-31 17:14:33 +08:00
alan 8a5afab22f decode ADC 2019-05-31 17:09:15 +08:00
alan 589357b800 decode ADC 2019-05-31 17:05:37 +08:00
alan 3ea2f423cc decode ADC 2019-05-31 15:14:01 +08:00
alan 150187c1f5 decode ADC 2019-05-31 14:35:28 +08:00
YiChin ac1f2524f4 Merge remote-tracking branch 'origin/elite_zm/master' into elite_zm/master 2019-05-31 14:23:09 +08:00
YiChin 72a000f0ff bug fix 2019-05-31 14:22:34 +08:00
alan 89b8f3fbdf decode ADC 2019-05-31 14:19:54 +08:00
alan 2518fac529 decode ADC 2019-05-31 12:25:22 +08:00
alan 447913d970 elite launch pad 2019-05-30 18:26:52 +08:00
64 changed files with 7852 additions and 1647 deletions
Executable
+39
View File
@@ -0,0 +1,39 @@
#!/bin/bash
#path=$(pwd)
#folder=$($path | awk -F"/" '{$NF}')
folder=$(basename "$(pwd)")
if [ "$folder" == "bioprocc2650" ]; then
year=$(date +%-y)
month=$(date +%-m)
day=$(date +%-d)
hour=$(date +%-H)
minute=$(date +%-M)
hash=$(git rev-parse HEAD)
branch=$(git rev-parse --abbrev-ref HEAD)
sed -i "5c #define VERSION_DATE_YEAR ${year}"\
./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
sed -i "6c #define VERSION_DATE_MONTH ${month}"\
./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
sed -i "7c #define VERSION_DATE_DAY ${day}"\
./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
sed -i "8c #define VERSION_DATE_HOUR ${hour}"\
./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
sed -i "9c #define VERSION_DATE_MINUTE ${minute}"\
./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
sed -i "13c #define VERSION_HASH ${hash}"\
./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
sed -i "14c #define VERSION_GIT_BRANCH ${branch}"\
./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
#cat ./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
fi
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<configurations XML_version="1.2" id="configurations_0">
<configuration XML_version="1.2" id="configuration_0">
<instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
<connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe">
<instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
<property Type="choicelist" Value="2" id="The Converter Usage">
<choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
<property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
<choice Name="Overclock with user specified value" value="unused">
<property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
</choice>
</property>
<property Type="choicelist" Value="5" id="The Target Scan Format"/>
</choice>
</property>
<platform XML_version="1.2" id="platform_0">
<instance XML_version="1.2" desc="CC2640F128" href="devices/cc2640f128.xml" id="CC2640F128" xml="cc2640f128.xml" xmlpath="devices"/>
</platform>
</connection>
</configuration>
</configurations>
@@ -0,0 +1,9 @@
The 'targetConfigs' folder contains target-configuration (.ccxml) files, automatically generated based
on the device and connection settings specified in your project on the Properties > General page.
Please note that in automatic target-configuration management, changes to the project's device and/or
connection settings will either modify an existing or generate a new target-configuration file. Thus,
if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
you may create your own target-configuration file for this project and manage it manually. You can
always switch back to automatic target-configuration management by checking the "Manage the project's
target-configuration automatically" checkbox on the project's Properties > General page.
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<configurations XML_version="1.2" id="configurations_0">
<configuration XML_version="1.2" id="configuration_0">
<instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
<connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe">
<instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
<property Type="choicelist" Value="2" id="The Converter Usage">
<choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
<property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
<choice Name="Overclock with user specified value" value="unused">
<property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
</choice>
</property>
<property Type="choicelist" Value="5" id="The Target Scan Format"/>
</choice>
</property>
<platform XML_version="1.2" id="platform_0">
<instance XML_version="1.2" desc="CC2640F128" href="devices/cc2640f128.xml" id="CC2640F128" xml="cc2640f128.xml" xmlpath="devices"/>
</platform>
</connection>
</configuration>
</configurations>
@@ -0,0 +1,9 @@
The 'targetConfigs' folder contains target-configuration (.ccxml) files, automatically generated based
on the device and connection settings specified in your project on the Properties > General page.
Please note that in automatic target-configuration management, changes to the project's device and/or
connection settings will either modify an existing or generate a new target-configuration file. Thus,
if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
you may create your own target-configuration file for this project and manage it manually. You can
always switch back to automatic target-configuration management by checking the "Manage the project's
target-configuration automatically" checkbox on the project's Properties > General page.
@@ -9,6 +9,6 @@
<linkerCommandFile value="cc26x0f128.cmd"/>
<rts value="libc.a"/>
<createSlaveProjects value=""/>
<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
<isTargetManual value="false"/>
</projectOptions>
@@ -18,8 +18,8 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out" prebuildStep="">
<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137." name="/" resourcePath="">
<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.1908313898" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.386599542">
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.836926385" 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.122716742" 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.1735152675" 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.1517137938" 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.1013466299" 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.396590895" 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.262043189" 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.254163999" 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.381645511" 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.1216668029" 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.1214157007" 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.468937421" 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.1137328477" 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.1789637681" 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.2082096800" 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.1554315956" 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.1848633962" 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.480730772" 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.178571272" 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.338764900" 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.1956079968" 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.2028584467" 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.2035192044" 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.1517879760" 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.1697794062" 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.201373433" 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.386599542" 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.1224573433" 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.948723823" 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.1985734106" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1743500897" 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.541343209" 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="&quot;${ProjName}.map&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1091211742" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1479599481" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
<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.1291624254" 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.1592780619" 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.1218213371" 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.776879740" 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.131905523" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1323842668" 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.1293587957" 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.1830409084" 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.269002188" 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.2047351004" 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="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.254835397" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1848192295" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
<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.1441212378" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.870893049" 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.1008247221" 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.1456819213" 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.1587885823" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1887629154" 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.380082739" 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.1123991861" 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.781131062" 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.2139588547" 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.1692895039" 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.1555119371" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.571281110" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.205178830" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1097777495" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.744121344" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.165807018" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.391961861" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
</tool>
</toolChain>
</folderInfo>
@@ -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">
@@ -16,11 +16,11 @@ BIOS_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa
TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
INCS = $(BIOS_INC) $(TARGET_INC) --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272" -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/
INCS = $(BIOS_INC) $(TARGET_INC) --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272" -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/
CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq
CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armar rq
DEL = C:/ti/xdctools_3_32_02_25_core/packages/../bin/rm -f
CP = C:/ti/xdctools_3_32_02_25_core/packages/../bin/cp -f
@@ -9,6 +9,6 @@
<linkerCommandFile value="cc26x0f128.cmd"/>
<rts value="libc.a"/>
<createSlaveProjects value=""/>
<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
<isTargetManual value="false"/>
</projectOptions>
@@ -15,8 +15,8 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1209999684" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postannouncebuildStep="" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;${TOOLS_BLE}/frontier/frontier.exe ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd" preannouncebuildStep="" prebuildStep="&quot;${TOOLS_BLE}/lib_search/lib_search.exe&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1209999684." name="/" resourcePath="">
<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.929750171" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1008890994">
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1479696404" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.958553711" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.2088015050">
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.2112506999" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
@@ -26,17 +26,17 @@
<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
<listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.201372544" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1951196199" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.20903631" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1176131016" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.647279085" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1443871767" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.227818129" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.784155377" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.494285153" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.581550859" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1288777730" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.101349069" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.572884961" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.50794417" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.783335843" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.341974501" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.274225680" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.529764162" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1837039616" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1393115220" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.2112471580" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.152832201" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/cc26xx/stack"/>
<listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
@@ -60,7 +60,7 @@
<listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.986125825" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1361895403" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
<listOptionValue builtIn="false" value="CC26XX"/>
<listOptionValue builtIn="false" value="POWER_SAVING"/>
<listOptionValue builtIn="false" value="CC26XXWARE"/>
@@ -81,60 +81,60 @@
<listOptionValue builtIn="false" value="xTESTMODES"/>
<listOptionValue builtIn="false" value="xTEST_BLEBOARD"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.372638078" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.201347726" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1555958931" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1144396572" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
<listOptionValue builtIn="false" value="48"/>
<listOptionValue builtIn="false" value="16004"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.73314177" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1546809951" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
<listOptionValue builtIn="false" value="225"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1126279750" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1492280006" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.538453952" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.12083718" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1432753391" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1345637669" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
</option>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.313905687" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1129729173" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.156783227" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.538375181" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1884548091" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.682104615" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.662317863" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.728508440" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
</tool>
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1008890994" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1873600405" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.1359172875" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1355177509" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.829303802" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1078356909" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.2088015050" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1079333148" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.1347544490" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.136883143" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1510359183" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1331488920" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
<listOptionValue builtIn="false" value="libc.a"/>
<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"/>
<listOptionValue builtIn="false" value="${ROM}/ble_rom_releases/04242014/ble_rom_patch.symbols"/>
<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1707930214" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1835383942" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.59164041" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.821225577" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
<listOptionValue builtIn="false" value="16002-D"/>
<listOptionValue builtIn="false" value="10247-D"/>
<listOptionValue builtIn="false" value="10325-D"/>
<listOptionValue builtIn="false" value="10229-D"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.11567165" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1727810233" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1385277262" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.1153340314" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT" value="startup_entry" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.450995330" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1827942626" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1279238428" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.526125450" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.581803256" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1390204935" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1601082213" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.351715800" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.90863272" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT" value="startup_entry" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1779672459" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1701763005" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.687564793" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.1056923280" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.73723664" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
</tool>
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.947560992" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1295209583" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.110293046" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1122561921" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1766088709" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.494132983" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.1603693219" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1153492005" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
</tool>
</toolChain>
</folderInfo>
@@ -12,6 +12,7 @@
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_stack}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/simple_peripheral_cc2650em_stack"/>
</listAttribute>
@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<configurations XML_version="1.2" id="configurations_0">
<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
<instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
<connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
<instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
<property Type="choicelist" Value="2" id="The Converter Usage">
<choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
<property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
<choice Name="Overclock with user specified value" value="unused">
<property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
</choice>
</property>
<property Type="choicelist" Value="5" id="The Target Scan Format"/>
<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
<instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
<connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
<instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
<property Type="choicelist" Value="1" id="Power Selection">
<choice Name="Probe supplied power" value="1">
<property Type="stringfield" Value="3.3" id="Voltage Level"/>
</choice>
</property>
<property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
<property Type="choicelist" Value="4" id="SWD Mode Settings">
<choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
<property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
</choice>
</property>
<platform XML_version="1.2" id="platform_0">
@@ -16,7 +16,7 @@
# sources were generated) is:
# C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\host_test\ccs\config\src
#
GEN_SRC_DIR ?= ../../config/src
GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/host_test/ccs/config/src
ifeq (,$(wildcard $(GEN_SRC_DIR)))
$(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
@@ -16,11 +16,11 @@ BIOS_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa
TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
INCS = $(BIOS_INC) $(TARGET_INC) --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/cc2650" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/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/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272" -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/
INCS = $(BIOS_INC) $(TARGET_INC) --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/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/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272" -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/
CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq
CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/include
ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/include
AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.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
@@ -16,7 +16,7 @@
# sources were generated) is:
# C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\config\src
#
GEN_SRC_DIR ?= ../../config/src
GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/src
ifeq (,$(wildcard $(GEN_SRC_DIR)))
$(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
@@ -80,8 +80,7 @@ const PIN_Config BoardGpioInitTable[] = {
Board_UART_TX | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL, /* UART TX */
Board_SRDY | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL, /* SRDY */
Board_MRDY | PIN_INPUT_EN | PIN_PULLDOWN, /* MRDY */
Board_SPI1_MOSI | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
Board_SPI1_CLK | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
PIN_TERMINATE
};
@@ -191,71 +190,6 @@ const UDMACC26XX_Config UDMACC26XX_config[] = {
* ============================= UDMA end =====================================
*/
/*
* ========================== SPI DMA begin ===================================
*/
/* Place into subsections to allow the TI linker to remove items properly */
#if defined(__TI_COMPILER_VERSION__)
#pragma DATA_SECTION(SPI_config, ".const:SPI_config")
#pragma DATA_SECTION(spiCC26XXDMAHWAttrs, ".const:spiCC26XXDMAHWAttrs")
#endif
/* Include drivers */
#include <ti/drivers/spi/SPICC26XXDMA.h>
/* SPI objects */
SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
/* SPI configuration structure, describing which pins are to be used */
const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_SPICOUNT] = {
{
.baseAddr = SSI0_BASE,
.intNum = INT_SSI0_COMB,
.intPriority = ~0,
.swiPriority = 0,
.powerMngrId = PowerCC26XX_PERIPH_SSI0,
.defaultTxBufValue = 0,
.rxChannelBitMask = 1<<UDMA_CHAN_SSI0_RX,
.txChannelBitMask = 1<<UDMA_CHAN_SSI0_TX,
.mosiPin = Board_SPI0_MOSI,
.misoPin = Board_SPI0_MISO,
.clkPin = Board_SPI0_CLK,
.csnPin = Board_SPI0_CS
},
{
.baseAddr = SSI1_BASE,
.intNum = INT_SSI1_COMB,
.intPriority = ~0,
.swiPriority = 0,
.powerMngrId = PowerCC26XX_PERIPH_SSI1,
.defaultTxBufValue = 0,
.rxChannelBitMask = 1<<UDMA_CHAN_SSI1_RX,
.txChannelBitMask = 1<<UDMA_CHAN_SSI1_TX,
.mosiPin = Board_SPI1_MOSI,
.misoPin = Board_SPI1_MISO,
.clkPin = Board_SPI1_CLK,
.csnPin = Board_SPI1_CS
},
};
/* SPI configuration structure */
const SPI_Config SPI_config[] = {
{
.fxnTablePtr = &SPICC26XXDMA_fxnTable,
.object = &spiCC26XXDMAObjects[0],
.hwAttrs = &spiCC26XXDMAHWAttrs[0]
},
{
.fxnTablePtr = &SPICC26XXDMA_fxnTable,
.object = &spiCC26XXDMAObjects[1],
.hwAttrs = &spiCC26XXDMAHWAttrs[1]
},
{NULL, NULL, NULL}
};
/*
* ========================== SPI DMA end =====================================
*/
/*
* ========================== Crypto begin ====================================
@@ -145,16 +145,11 @@ extern const PIN_Config BoardGpioInitTable[];
#define Board_UART_TX Board_BP_UART_Rx /* RXD */
#define Board_UART_RX Board_BP_UART_Tx /* TXD */
/* SPI Board */
#define Board_SPI0_MISO DIO0
#define Board_SPI0_MOSI DIO1
#define Board_SPI0_CLK DIO3
#define Board_SPI0_CS PIN_UNASSIGNED
#define Board_SPI1_MISO PIN_UNASSIGNED
#define Board_SPI1_MOSI DIO8
#define Board_SPI1_CLK DIO9
#define Board_SPI1_CS PIN_UNASSIGNED
//#define Board_SPI0_MISO PIN_UNASSIGNED
//#define Board_SPI0_MOSI PIN_UNASSIGNED
/* Power Management Board */
#define Board_SRDY Board_BP_Pin_J2_19
@@ -214,16 +209,7 @@ typedef enum BOOSTXL_CC2650MA_CryptoName {
} BOOSTXL_CC2650MA_CryptoName;
/*!
* @def BOOSTXL_CC2650MA_SPIName
* @brief Enum of SPI names on the CC2650 Booster Pack
*/
typedef enum BOOSTXL_CC2650MA_SPIName {
BOOSTXL_CC2650MA_SPI0 = 0,
BOOSTXL_CC2650MA_SPI1 = 1,
BOOSTXL_CC2650MA_SPICOUNT
} BOOSTXL_CC2650MA_SPIName;
/*!
* @def BOOSTXL_CC2650MA_TRNGName
@@ -91,11 +91,10 @@ extern const PIN_Config BoardGpioInitTable[];
#define Board_SPI1_MISO PIN_UNASSIGNED
#define Board_SPI1_MOSI IOID_8 /* LED_MOSI */
#define Board_SPI1_CLK IOID_9 /* LED_CLK */
#define Board_SPI1_CSN PIN_UNASSIGNED
/* I2C */
#define Board_I2C0_SCL0 IOID_4
#define Board_I2C0_SDA0 IOID_5
/* SPI */
#define Board_SPI_FLASH_CS IOID_20
@@ -0,0 +1,286 @@
#ifndef EliteADC
#define EliteADC
#include "Elite_PIN.h"
#include "EliteSPI.h"
#include "EliteNotify.h"
// Elite ADC macro
// ADC command, Elite will use these cmd to control ADC
#define CMD_CURRENT_MEASURE 0xC5
#define CMD_VOLT_MEASURE 0xD5
#define CMD_DAC_MEASURE 0xE5
#define CMD_BATTERY_MEASURE 0xF1
// controller command, these are command from control box
#define ADC_CH_CURRENT 0x00
#define ADC_CH_VOLT 0x01
#define ADC_CH_DAC 0x02
#define ADC_CH_BAT 0x03
static void ADC_write(uint8_t ADCin) {
/*
* This function can only define [15]~[8] through ADCin
* [7]~[0] should always be 0b11101011
*
* [15] : SS, 0 = no effect, 1 = start work, default 0b0
* [14]~[12] : MUX[2:0], default 0b000
* [11]~[9] : PGA[2:0], default 0b010 = FSR is ±2.048
* [8] : mode, 0 = continuous, 1 = one shot, default 0b1 (Power-down and single-shot mode )
*
* [7]~[5] : data rate, default 0b100 = 128 SPS
* [4] : Temperature? default 0b0 = ADC mode
* [3] : Pullup enable, default 0b1 = Pullup resistor enabled
* [2]~[1] : NOP, default 0b01
* [0] : reserved, default 0b1
*
*/
// spi_ADC_txbuf[0] = 0b00000101;
for(int i=0 ; i<SPI_ADC_SIZE ; i++){
spi_ADC_txbuf[i] = 0;
spi_ADC_rxbuf[i] = 0;
}
spi_ADC_txbuf[0] = ADCin;
spi_ADC_txbuf[1] = 0b11101011;
ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
}
static void ADC_read(uint8_t *ADCdata){
for(int i=0 ; i<SPI_ADC_SIZE ; i++){
spi_ADC_txbuf[i] = 0;
spi_ADC_rxbuf[i] = 0;
}
ADC_SPI(SPI_ADC_SIZE, spi_ADC_txbuf, ADCdata);
}
static void ADCGainControl(uint8_t ADCLevel){
if(ADCLevel == 0){
// ADC gain level = 0, using 200K resister
PIN_setOutputValue(pin_handle, Turnon10K, 0);
PIN_setOutputValue(pin_handle, Turnon200R, 0);
}
else if(ADCLevel == 1){
// ADC gain level = 1, using 10K resister
PIN_setOutputValue(pin_handle, Turnon10K, 1);
PIN_setOutputValue(pin_handle, Turnon200R, 0);
}
else if(ADCLevel == 2){
// ADC gain level = 2, using 200R resister
PIN_setOutputValue(pin_handle, Turnon10K, 0);
PIN_setOutputValue(pin_handle, Turnon200R, 1);
}
else if(ADCLevel == 3){
// ADC gain level = 0, auto gain (using 200R resister)
PIN_setOutputValue(pin_handle, Turnon10K, 0);
PIN_setOutputValue(pin_handle, Turnon200R, 1);
}
else{
// default using 200R resister
PIN_setOutputValue(pin_handle, Turnon10K, 0);
PIN_setOutputValue(pin_handle, Turnon200R, 1);
}
}
static void ADCChannelSelect(uint8_t ADCChannel){
// set ADC parameter
// 0xC1~F1 = reading AIN0~AIN3. Using FSR+-6V, resolution = 187.5uV
// 0xC5~F5 = reading AIN0~AIN3. Using FSR+-2V, resolution = 62.5 uV
switch(ADCChannel){
// AINp is AIN0; AINn is GND
// measure AIN0, which is a current measure
case ADC_CH_CURRENT :{
ADC_write(CMD_CURRENT_MEASURE);
break;
}
// AINp is AIN1; AINn is GND
// AIN1, which is a volt measure
case ADC_CH_VOLT :{
ADC_write(CMD_VOLT_MEASURE);
break;
}
// AINp is AIN2; AINn is GND
// AIN2, measure DAC voltage (Note that this is NOT DAC real output value!!)
case ADC_CH_DAC :{
ADC_write(CMD_DAC_MEASURE);
break;
}
// measure battery volt
case ADC_CH_BAT :{
ADC_write(CMD_BATTERY_MEASURE);
break;
}
default :{
break;
}
}
}
static void ReadVolt(uint8_t *buf){
// Read data twice since the first data we get is previous data
ADCChannelSelect(ADC_CH_VOLT);
ADC_read(buf);
ADCChannelSelect(ADC_CH_VOLT);
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);
ADC_read(buf);
ADCChannelSelect(ADC_CH_DAC);
ADC_read(buf);
}
static void ReadCurrent(uint8_t *buf){
// Read data twice since the first data we get is previous data
ADCGainControl(INSTRUCTION.ADCGainLevel);
ADCChannelSelect(ADC_CH_CURRENT);
ADC_read(buf);
ADCChannelSelect(ADC_CH_CURRENT);
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);
ADC_read(buf);
ADCChannelSelect(ADC_CH_BAT);
ADC_read(buf);
}
// theoretical boundary <20, 10~500, >100 (uA)
//#define GAIN_SMALL_BOUNDARY 40000 // 40 uA = 40,000,000 pA
//#define GAIN_MID_BOUNDARY1 20000 // 20 uA = 20,000,000 pA
//#define GAIN_MID_BOUNDARY2 400000 // 400 uA = 400,000,000 pA
//#define GAIN_LARGE_BOUNDARY 200000 // 200 uA = 200,000 nA
//#define GAIN_SMALL_BOUNDARY 8000 // 8 uA = 8,000,000 pA
//#define GAIN_MID_BOUNDARY1 3000 // 3 uA = 3,000,000 pA
//#define GAIN_MID_BOUNDARY2 90000 // 90 uA = 90,000,000 pA
//#define GAIN_LARGE_BOUNDARY 70000 // 70 uA = 70,000 nA
/* for Elite1.4-re which 6.3kohm replaced by 10kohm */
// theoretical boundary <40, 30~1350, >1000 (uA)
#define GAIN_SMALL_BOUNDARY 40000 // 40 uA = 40,000,000 pA
#define GAIN_MID_BOUNDARY1 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;
}
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){
// switch to small range current
if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
GAIN_200K_counter++;
if(GAIN_200K_counter > 5){
INSTRUCTION.ADCGainLevel = GAIN_200K;
GAIN_200K_counter = 0;
}
}else{
GAIN_10K_counter++;
if(GAIN_10K_counter > 5){
INSTRUCTION.ADCGainLevel = GAIN_10K;
GAIN_10K_counter = 0;
}
}
}else{
if(GAIN_200K_counter > 0){
GAIN_200K_counter--;
}
if(GAIN_10K_counter > 0){
GAIN_10K_counter--;
}
}
}
else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
// switch to large range current
if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
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){
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){
// switch to mid range current
if(Real_Current > GAIN_SMALL_BOUNDARY || Real_Current < -1*GAIN_SMALL_BOUNDARY){
// switch to large range current
if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
GAIN_200R_counter++;
if(GAIN_200R_counter > 5){
INSTRUCTION.ADCGainLevel = GAIN_200R;
GAIN_200R_counter = 0;
}
}else{
GAIN_10K_counter++;
if(GAIN_10K_counter > 5){
INSTRUCTION.ADCGainLevel = GAIN_10K;
GAIN_10K_counter = 0;
}
}
}else{
if(GAIN_200R_counter > 0){
GAIN_200R_counter--;
}
if(GAIN_10K_counter > 0){
GAIN_10K_counter--;
}
}
}
}
#define ReadADCVolt(x) ((x==0)? ReadVoutVolt(spi_ADC_rxbuf) : ReadVolt(spi_ADC_rxbuf))
#endif
@@ -0,0 +1,32 @@
#ifndef ELITECCC
#define ELITECCC
#include "EliteCCMode.h"
// XXX : should we reset DAC output after STOP?
static void CCModeReverseCurrent(CCCMode *CCC){
if(CCC->StandBy){
if(CT.StandByCounter == CCC->StandByTime){
CCC->StandBy = false;
CT.StandByCounter = 0;
}
else{
CT.StandByCounter ++;
}
}
else{
// reverse charge/discharge
if(CCC->BatteryV == CCC->VMax){
CCC->StandBy = true;
CCC->value = CCC->DischargeCurrent;
}
else if(CCC->BatteryV == CCC->VMin){
CCC->StandBy = true;
CCC->value = CCC->ChargeCurrent;
}
}
}
#endif
@@ -0,0 +1,320 @@
#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){
static uint8_t VoltCurrentSwitch = 0;
CCModeDACEnable = 1; // This flag will control DAC working
// decode ADC value and put it into notify buffer
// Use 5-th measure value as real-measure value
// because some value in the begin are garbage
if(VoltCurrentSwitch < 5){
ReadCurrent(spi_ADC_rxbuf);
VoltCurrentSwitch ++;
}
else if(VoltCurrentSwitch == 5){
// read current
if(INSTRUCTION.AutoGainEnable){
CC->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
}
else{
ReadCurrent(spi_ADC_rxbuf);
CC->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
}
VoltCurrentSwitch ++;
}
else if(VoltCurrentSwitch <10){
// read volt
ReadVolt(spi_ADC_rxbuf);
VoltCurrentSwitch++;
}
else if(VoltCurrentSwitch == 10){
/** read battery voltage **/
ReadVolt(spi_ADC_rxbuf);
CC->BatteryV = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
// if Iin have a offset if current !=0
CC->BatteryV = CC->BatteryV - (CC->value - CC_ZERO_POINT)*10/1e5; // I_set * 10R = V_Iin2GND (mA * ohm)
VoltCurrentSwitch++;
// NotifyReady = true;
}
else{
VoltCurrentSwitch = 0;
}
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;
}
static int32_t CCModeVoltOut(CCMode *CC){
int32_t IUCCurrent = 0;
if(!CCModeDACEnable){
// DAC should not work now
return 0;
}
IUCCurrent = CC->_Transform2RealnA( (struct CCModePara *) CC);
CCModeDACControl(CC, IUCCurrent - CC->_MeasureData);
CCModeDACEnable = 0;
return CC->_MeasureData;
}
static void CCModeDACControl(CCMode *CC, int32_t IUC_Measure_Difference){
int32_t step;
if(IUC_Measure_Difference < 300 && IUC_Measure_Difference > -300){
step = 0;
}
else if( CC->Charge && CC->BatteryV >= ( (int32_t) (CC->VMax - DAC_ZERO)/5 ) ){
CC->value = 0;
step = (IUC_Measure_Difference > 0) ? 1:-1;
}
else if( (!CC->Charge) && CC->BatteryV <= ( (int32_t) (CC->VMin - DAC_ZERO)/5 ) ){
// Ignore VMin condition
if(CC->Done < 25000){
CC->Done ++;
step = (IUC_Measure_Difference > 0) ? 2:-2;
}
// after ignore few second, active VMin condition
else{
CC->value = 0;
step = (IUC_Measure_Difference > 0) ? 1:-1;
}
}
else{
step = (IUC_Measure_Difference > 0) ? 1:-1;
}
// over/under flow
if( (INSTRUCTION.VoltConstant + step) > MAX_DAC_UC || (INSTRUCTION.VoltConstant + step) < MIN_DAC_UC ){
if(step > 0){
INSTRUCTION.VoltConstant = (INSTRUCTION.VoltConstant + MAX_DAC_UC)/2;
}
else{
INSTRUCTION.VoltConstant = (INSTRUCTION.VoltConstant + MIN_DAC_UC)/2;
}
}
else{
INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + step;
}
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
// step = CC->Done;
// NotifyImpedance[0] = (uint8_t) (step >> 24);
// NotifyImpedance[1] = (uint8_t) ((step & 0x00FF0000) >> 16);
// NotifyImpedance[2] = (uint8_t) ((step & 0x0000FF00) >> 8);
// NotifyImpedance[3] = (uint8_t) (step & 0x000000FF);
}
/* Transform setting CC into IUC
*
* User code in CC mode : 0 ~ 3000000
* Real current value : -15.00000 ~ 15.00000 mA
* => user code = 1500000 mapping to 0.00000 mA
*/
static void CCCurrent2IUC(CCMode *CC){
int32_t CurrentValue = 0;
CC->value = INSTRUCTION.ConstantCurrent;
CurrentValue = CC->value - CC_ZERO_POINT;
}
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
@@ -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
@@ -0,0 +1,305 @@
#ifndef ELITECV
#define ELITECV
static uint16_t SWVCurve(WorkMode *WorkModeData) {
static uint8_t counter;
static uint16_t outputV;
static uint16_t Volt;
static bool direction_up;
// reset origin volt at the begin
if (DACReset) {
Volt = INSTRUCTION.VoltOrigin;
outputV = INSTRUCTION.VoltOrigin;
if (INSTRUCTION.VoltOrigin < INSTRUCTION.VoltFinal)
direction_up = true;
else
direction_up = false;
counter = 1;
DACReset = false;
}
if (counter == 2 * PulseWidth)
counter = 1;
else
counter++;
// output a certain volt
outputV = Volt;
DAC_outputV(outputV);
// VoltValue = (ramp1*16 + ramp0/16) * 3.05;
// check if we reach the final volt
if ((outputV >= INSTRUCTION.VoltFinal && direction_up) || (outputV <= INSTRUCTION.VoltFinal && !direction_up)) {
PeriodicEvent = false;
DACReset = true;
}
// prepare the next output volt
if (direction_up) {
if (counter == PulseWidth)
Volt = Volt + Amplitude;
else if (counter == 2 * PulseWidth)
Volt = Volt - (Amplitude - INSTRUCTION.Step);
else
Volt = Volt;
} else {
if (counter == PulseWidth)
Volt = Volt - Amplitude;
else if (counter == 2 * PulseWidth)
Volt = Volt + (Amplitude - INSTRUCTION.Step);
else
Volt = Volt;
}
return outputV;
}
static uint16_t DPVCurve(WorkMode *WorkModeData) {
static uint8_t counter;
static uint16_t Volt1;
static uint16_t Volt2;
static uint16_t outputV;
static bool direction_up;
// reset origin volt at the begin
if (DACReset) {
if (INSTRUCTION.VoltOrigin < INSTRUCTION.VoltFinal)
direction_up = true;
else
direction_up = false;
Volt1 = INSTRUCTION.VoltOrigin;
if (direction_up)
Volt2 = INSTRUCTION.VoltOrigin + Amplitude;
else
Volt2 = INSTRUCTION.VoltOrigin - Amplitude;
counter = 1;
DACReset = false;
}
if (counter == PulsePeriod)
counter = 1;
else
counter++;
// output a certain volt
if (counter <= (PulsePeriod - PulseWidth)) {
outputV = Volt1;
DAC_outputV(Volt1);
} else {
outputV = Volt2;
DAC_outputV(Volt2);
}
// VoltValue = (ramp1*16 + ramp0/16) * 3.05;
// check if we reach the final volt
if (((outputV >= INSTRUCTION.VoltFinal) && direction_up) || ((outputV <= INSTRUCTION.VoltFinal) && !direction_up)) {
PeriodicEvent = false;
DACReset = true;
}
// check overflow/underflow and prepare for next output
if (direction_up) {
if (Volt1 + INSTRUCTION.Step < Volt1)
Volt1 = 0xffff;
else
Volt1 = Volt1 + INSTRUCTION.Step;
if (Volt2 + INSTRUCTION.Step < Volt2)
Volt2 = 0xffff;
else
Volt2 = Volt2 + INSTRUCTION.Step;
} else {
if (Volt1 - INSTRUCTION.Step > Volt1)
Volt1 = 0x0000;
else
Volt1 = Volt1 - INSTRUCTION.Step;
if (Volt2 - INSTRUCTION.Step > Volt2)
Volt2 = 0x0000;
else
Volt2 = Volt2 - INSTRUCTION.Step;
}
if (counter + 1 <= (PulsePeriod - PulseWidth)) {
return Volt1;
} else {
return Volt2;
}
}
static uint16_t CVCurve(CVMode *CV) {
static uint16_t DACOutCode;
//firstADCdata=true,when min<x<max,cyclenumber--
return DACOutCode;
}
static void CV_Plot(CVMode *CV){
/**********************************************
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){
CV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
AutoGainChange(CV->_MeasureData);
}else{
ReadCurrent(spi_ADC_rxbuf);
CV->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
}
InputNotify(NOTIFY_CURRENT, CV->_MeasureData);
// 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 == 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;
}
}
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
@@ -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
@@ -0,0 +1,65 @@
#ifndef EliteDAC
#define EliteDAC
static bool DACReset;
//#ifdef ELITE_VERSION_1_3
//#define DACOUT 0x30
//
//static void DAC_outputV(uint16_t voltLV) {
// // C = command, X = don't care, D = data
// // CCCC XXXX = command
// // DDDD DDDD = v1
// // DDDD XXXX = v2
//
// uint8_t v1, v2 = 0;
// v1 = (uint8_t) (voltLV >> 4) & 0xFF;
// v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
//
// spi_DACtxbuf[0] = command;
// spi_DACtxbuf[1] = v1;
// spi_DACtxbuf[2] = v2;
// for (int i = 3; i < SPI_DAC_SIZE; i++) {
// spi_DACtxbuf[i] = 0;
// }
//
// DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
//}
//#endif
#ifdef ELITE_VERSION_1_4
#define DACCLS 0x02
#define DACOUT 0x31
static uint16_t DAC_outputV(uint16_t voltLV) {
// C = command, X = don't care, D = data
// CCCC CCCC = command
// DDDD DDDD = v1
// DDDD DDDD = v2
// command
// 0x02 = clear
// 0x31 = output voltage
uint8_t v1, v2 = 0;
v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
v2 = (uint8_t) (voltLV & 0x00FF);
spi_DACtxbuf[0] = DACOUT;
spi_DACtxbuf[1] = v1;
spi_DACtxbuf[2] = v2;
DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
return voltLV;
}
#endif
static int32_t User2Real(uint16_t UserCode){
/* transfer usercode to real voltage value (mV) */
return (int32_t)((UserCode - 25000) / 5);
}
#endif
@@ -0,0 +1,43 @@
#ifndef ELITE_FLAG_CT_INIT
#define ELITE_FLAG_CT_INIT
static void InitCT(){
CT.SampleRate_counter = 1;
CT.StepTimeCounter = 1;
CT.NotifyCounter = 1;
CT.StandByCounter = 0;
}
static void 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;
}
#endif
@@ -0,0 +1,38 @@
/* Copyright (c) 2019. BioPro. Scientific.
*/
#ifndef HEADSTAGE_GPTIMER_H
#define HEADSTAGE_GPTIMER_H
#include <Board.h>
#include <ti/drivers/timer/GPTimerCC26XX.h>
#include <ti/sysbios/BIOS.h>
#include <xdc/runtime/Types.h>
#define EVT_PERIODIC_GPTIMER EVT_PERIODIC_0
static GPTimerCC26XX_Handle gptimer_handle;
static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask);
#define elite_gptimer_start() GPTimerCC26XX_start(gptimer_handle)
#define elite_gptimer_stop() GPTimerCC26XX_stop(gptimer_handle)
#define elite_gptimer_close() GPTimerCC26XX_close(gptimer_handle)
#define CLOCK_FREQ 4800 // clock freq = 0.1 ms
#define elite_gptimer_open() \
do { \
GPTimerCC26XX_Params params; \
GPTimerCC26XX_Params_init(&params); \
params.width = GPT_CONFIG_16BIT; \
params.mode = GPT_MODE_PERIODIC_DOWN; \
params.debugStallMode = GPTimerCC26XX_DEBUG_STALL_OFF; \
gptimer_handle = GPTimerCC26XX_open(Board_GPTIMER0A, &params); \
Types_FreqHz freq; \
BIOS_getCpuFreq(&freq); \
GPTimerCC26XX_Value loadVal = freq.lo / 1000 - 1; /*47999*/ \
GPTimerCC26XX_setLoadValue(gptimer_handle, loadVal); \
GPTimerCC26XX_setLoadValue(gptimer_handle, CLOCK_FREQ); /* 0.1 ms*/ \
GPTimerCC26XX_registerInterrupt(gptimer_handle, elite_gptimer_callback, GPT_INT_TIMEOUT); \
} while (0)
#endif // HEADSTAGE_GPTIMER_H
@@ -0,0 +1,95 @@
#ifndef ELITE_I2C
#define ELITE_I2C
/*
* Read I2C example in
* http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/tirtos/2_14_02_22/
* exports/tirtos_full_2_14_02_22/docs/doxygen/html/_i2_c_c_c26_x_x_8h.html
*
*/
#include <ti/drivers/I2C.h>
#include <ti/drivers/Power.h>
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
// I2C
static I2C_Handle I2Chandle;
static I2C_Params I2Cparams;
static I2C_Transaction i2cTrans;
#define I2CBufSize 4
static uint8_t I2CtxBuf[I2CBufSize]; // Transmit buffer
static uint8_t I2CrxBuf[I2CBufSize]; // Receive buffer
bool transferDone = false;
static void I2CCallbackFunction(I2C_Handle handle, I2C_Transaction *msg, bool transfer) {
if(transfer){
transferDone = true;
}
}
static void I2Cinit(){
I2C_init();
// Configure I2C parameters.
I2C_Params_init(&I2Cparams);
I2Cparams.transferMode = I2C_MODE_CALLBACK;
I2Cparams.transferCallbackFxn = I2CCallbackFunction;
I2Cparams.bitRate = I2C_100kHz;
// Initialize master I2C transaction structure
i2cTrans.writeCount = I2CBufSize;
i2cTrans.writeBuf = I2CtxBuf;
i2cTrans.readCount = I2CBufSize;
i2cTrans.readBuf = I2CrxBuf;
i2cTrans.slaveAddress = 0xA0;
for(int i=0 ; i<10 ; i++){
I2CtxBuf[i] = 0;
I2CrxBuf[i] = 0;
}
// Open I2C
I2Chandle = I2C_open(Board_I2C, &I2Cparams);
}
#define WriteMem 0b10100001
#define ReadMem 0b10100000
static void I2CWrite(uint8_t addr, uint8_t data){
for(int i=0 ; i<I2CBufSize ; i++){
I2CtxBuf[i] = 0;
I2CrxBuf[i] = 0;
}
I2CtxBuf[0] = WriteMem;
I2CtxBuf[1] = addr;
I2CtxBuf[2] = data;
// I2Chandle = I2C_open(Board_I2C, &I2Cparams);
I2C_transfer(I2Chandle, &i2cTrans);
// I2C_close(I2Chandle);
}
static void I2CRead(uint8_t addr){
for(int i=0 ; i<I2CBufSize ; i++){
I2CtxBuf[i] = 0;
I2CrxBuf[i] = 0;
}
I2CtxBuf[0] = ReadMem;
I2CtxBuf[1] = addr;
// I2Chandle = I2C_open(Board_I2C, &I2Cparams);
I2C_transfer(I2Chandle, &i2cTrans);
// I2C_close(I2Chandle);
}
#endif // ELITE_I2C
@@ -0,0 +1,30 @@
#ifndef ELITEIT
#define ELITEIT
static void IT_Plot(ITMode *IT) {
static uint8_t ADCSwitch = 0;
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 if(ADCSwitch == 1){ /**read Iin**/
ReadCurrent(spi_ADC_rxbuf);
ADCSwitch++;
}
else if(ADCSwitch == 2){ /**read Iin**/
ReadCurrent(spi_ADC_rxbuf);
ADCSwitch = 0;
}
}
#endif
@@ -0,0 +1,176 @@
#ifndef ELITEIV
#define ELITEIV
#define Vset INSTRUCTION.Vset
static uint16_t VoltScan(WorkMode *WorkModeData) {
uint16_t Voltage;
if (INSTRUCTION.VoltOrigin == INSTRUCTION.VoltFinal) {
Voltage = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
DAC_outputV(Voltage);
PeriodicEvent = false;
return Voltage;
} else if (INSTRUCTION.eliteFxn == SQUARE_WAVE_VOLTAMMETRY) {
Voltage = SWVCurve(WorkModeData);
} else if (INSTRUCTION.eliteFxn == DIFFERENTIAL_PULSE_VOLTAMMETRY) {
Voltage = DPVCurve(WorkModeData);
} else if (INSTRUCTION.eliteFxn == CV_CURVE) {
Voltage = CVCurve(WorkModeData->CV);
}
// IV plot mode
else {
Voltage = OneWayVoltScan();
}
return Voltage;
}
static uint16_t OneWayVoltScan() {
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);
if ((INSTRUCTION.eliteFxn == IV_CURVE)||(INSTRUCTION.eliteFxn == CV_CURVE)||(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)){
int32_t RealV;
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;
if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
// read current
if(INSTRUCTION.AutoGainEnable){
IV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
AutoGainChange(IV->_MeasureData);
}else{
ReadCurrent(spi_ADC_rxbuf);
IV->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
}
InputNotify(NOTIFY_CURRENT, IV->_MeasureData);
// read Volt
if(IV->_VoVi_Switch == 0x01){
ReadVolt(spi_ADC_rxbuf);
}else if(IV->_VoVi_Switch == 0x00){
ReadVoutVolt(spi_ADC_rxbuf);
}
VoltCurrentSwitch++;
}
else if(VoltCurrentSwitch == 1){ /**read Vin**/
// read Volt
if(IV->_VoVi_Switch == 0x01){
ReadVolt(spi_ADC_rxbuf);
}else if(IV->_VoVi_Switch == 0x00){
ReadVoutVolt(spi_ADC_rxbuf);
}
VoltCurrentSwitch++;
}
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;
}
}
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
@@ -0,0 +1,161 @@
#ifndef ELITEINSTRUCTION
#define ELITEINSTRUCTION
/** ADC gain level **/
#define GAIN_200K 0x00 // largest gain
#define GAIN_10K 0x01
#define GAIN_200R 0x02 // the least gain
#define GAIN_AUTO 0x03
/** Resister meter **/
#define RESISTER_METER_SMALL 0x00
#define RESISTER_METER_MIDDLE1 0x01
#define RESISTER_METER_MIDDLE2 0x02
#define RESISTER_METER_LARGE 0x03
/** CC mode parameter **/
// CurrentLV
#define CURRENT_LV_NA 0x00
#define CURRENT_LV_UA 0x01
#define CURRENT_LV_MA 0x02
/* DAC reset parameter */
#define DAC_ZERO 25000
#define DAC_POS_MAX 0x0000
#define DAC_NEG_MAX 0xFFFF
// Step time macro
#define STEPTIME_HALF_SEC 5000
#define STEPTIME_ONE_SEC 10000
#define STEPTIME_TWO_SEC 20000
/*==============================
==== headstage instruction ====
=============================*/
struct HEADSTAGE_INSTRUCTION {
/** chip ID */
uint8_t chip_id;
/** Sample rate **/
// SampleRate = SampleRateTable[SampleRateIndex]
uint8_t SampleRateIndex;
uint32_t SampleRate;
/** DAC parameter **/
// volt san parameter
uint16_t VoltOrigin;
uint16_t VoltFinal;
uint32_t Step;
uint16_t StepTime;
// constant volt
// which is used in CC mode as VMax and VMin
uint16_t VoltConstant;
/** ADC parameter **/
uint8_t ADCGainLevel;
uint8_t AutoGainEnable;
/** Notify parameter **/
uint32_t NotifyRate;
/** Constant Current Parameter **/
// Charge is a bool; true => current > 0, vice versa
uint8_t Charge;
int32_t ConstantCurrent;
uint16_t VoltLimit;
/** Resister Measure **/
uint8_t ResisterMeter;
// elite function
uint8_t eliteFxn;
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};
/*********************************************************************
* @fn InitEliteInstruction
*
* @brief Init all INSTRUCTION variable.
*
* @param None.
*
* @return None.
*/
static void InitEliteInstruction(){
INSTRUCTION.chip_id = 0;
INSTRUCTION.SampleRateIndex = 1;
INSTRUCTION.SampleRate = 100;
INSTRUCTION.VoltOrigin = DAC_ZERO;
INSTRUCTION.VoltFinal = DAC_ZERO;
INSTRUCTION.Step = 0x0005; // 0x0005 = 1mV
INSTRUCTION.StepTime = STEPTIME_ONE_SEC; // about 0.5 sec
INSTRUCTION.VoltConstant = DAC_ZERO; // is about 0V
INSTRUCTION.ADCGainLevel = GAIN_AUTO;
INSTRUCTION.AutoGainEnable = 1;
INSTRUCTION.NotifyRate = STEPTIME_ONE_SEC/10;
INSTRUCTION.ResisterMeter = RESISTER_METER_LARGE;
INSTRUCTION.Charge = 1;
INSTRUCTION.ConstantCurrent = 0x00000000;
INSTRUCTION.VoltLimit = 0x0000;
INSTRUCTION.eliteFxn = 0; // default is a null event
INSTRUCTION.CycleNumber = 0;
INSTRUCTION.VoVi_Switch = 0x01; //VoVi_Switch == 0 => user see Vo / VoVi_Switch == 1 => user see Vi
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;
}
/*********************************************************************
* @fn GetInstructionParameter
*
* @brief Get Constant Current mode parameter.
*
* @param ins - instruction including current value and unit
*
* @return None.
*/
static void GetInstructionParameter(uint8 *ins){
// CurrentLV=0 => unit is nA
// CurrentLV=1 => unit is uA
// CurrentLV=2 => unit is mA
// INSTRUCTION.CurrentLV = (*ins);
// ConstantCurrentRange=0 => current value is 0~499
// ConstantCurrentRange=1 => current value is 500~999
// INSTRUCTION.ConstantCurrentRange = (*ins) & 0x0F;
// ConstantCurrent divide ConstantCurrentRange into 50000 count (thus each count is 0.01)
// e.g. 485.7 uA can be represent by
// CurrentLV = 1 (unit is uA)
// ConstantCurrentRange = 0 (current range is 0~499)
// ConstantCurrent = 48570
INSTRUCTION.ConstantCurrent = (uint32_t) (*(ins+1))<<24 | (uint32_t) (*(ins+2))<<16 | (uint32_t) (*(ins+3))<<8 | (uint32_t) (*(ins+4));
}
#endif
@@ -0,0 +1,78 @@
#ifndef ELITEKEYDETECT
#define ELITEKEYDETECT
#define CLOCK_ONE_SECOND 10000
static bool TurnOnElite(uint8_t key) {
static uint16_t TurnOnCounter = 0;
if (key == 0) {
// press 1 sec, power on LED
if (TurnOnCounter >= CLOCK_ONE_SECOND) {
headstage_battery_volt();
uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
if( bat < 768 && bat > 20){
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);
return false;
}
}
static void EliteKeyPress(uint8_t key) {
static uint16_t ShutDownCounter = 0;
static uint8_t OriginEliteFxn = 0;
if (key == 0) {
// key = 0 if press
// press key => bight LED
if (ShutDownCounter == CLOCK_ONE_SECOND) {
KeyWorkModeLED();
}
// press 3~4 sec, shutdown 2650
else if (ShutDownCounter > (CLOCK_ONE_SECOND*3) ) {
LED_color(DARKLED, 0xFF, 0xFF, 0x00);
PIN_setOutputValue(pin_handle, enable_5v, 0); // disable 5V
}
ShutDownCounter ++;
} else {
if (OriginEliteFxn == INSTRUCTION.eliteFxn) { // old function == currunt instruction
if (ShutDownCounter != 0) {
// dark LED
WorkModeLED();
ShutDownCounter = 0;
}
} else { // old function != currunt instruction
OriginEliteFxn = INSTRUCTION.eliteFxn;
if (ShutDownCounter != 0) {
ShutDownCounter = 0;
}
// dark mode LED
WorkModeLED();
}
}
}
static void TurnOn10V() {
If10Von = true;
PIN_setOutputValue(pin_handle, enable_10v, 1);
CPUdelay(8000);
}
#endif
@@ -0,0 +1,151 @@
#ifndef ELITELED
#define ELITELED
#define DARKLED 0xE1
#define LIGHTLED 0xE8
static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue);
#define LEDPowerON() LED_color(DARKLED, 0x00, 0xFA, 0x00)
#define WORKLED() LED_color(0xE2, 0x00, 0x40, 0x40)
#define KEYLED() LED_color(LIGHTLED, 0xF0, 0xA0, 0x00)
static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
spi_LEDtxbuf[0] = 0x0000;
spi_LEDtxbuf[1] = 0x0000;
for (int i = 2; i < SPI_LED_SIZE - 2; i += 2) {
spi_LEDtxbuf[i] = 0xE000 | ((uint16_t)bright << 8) | blue;
spi_LEDtxbuf[i + 1] = ((uint16_t)green << 8) | red;
}
spi_LEDtxbuf[SPI_LED_SIZE - 2] = 0xffff;
spi_LEDtxbuf[SPI_LED_SIZE - 1] = 0xffff;
LED_SPI(SPI_LED_SIZE, spi_LEDtxbuf, spi_LEDrxbuf);
}
static void WorkModeLED() {
switch (INSTRUCTION.eliteFxn) {
case IV_CURVE: {
WORKLED();
break;
}
case CV_CURVE: {
WORKLED();
break;
}
case DIFFERENTIAL_PULSE_VOLTAMMETRY: {
WORKLED();
break;
}
case SQUARE_WAVE_VOLTAMMETRY: {
WORKLED();
break;
}
case VOLT_OUTPUT: {
WORKLED();
break;
}
case ZT_CURVE: {
WORKLED();
break;
}
case VT_CURVE: {
WORKLED();
break;
}
case IT_CURVE: {
WORKLED();
break;
}
case CONSTANT_CURRENT:{
// WORKLED();
LED_color(0xE2, 0x00, 0x00, 0xAA);
break;
}
case VIS_RST: {
LEDPowerON();
break;
}
case ADC_TEST: {
WORKLED();
break;
}
case CYCLIC_VOLTAMMETRY: {
WORKLED();
break;
}
case LINEAR_SWEEP_VOLTAMMETRY: {
WORKLED();
break;
}
case CONSTANT_VSCAN: {
WORKLED();
break;
}
// case READ_VOUT_VALUE: {
// WORKLED();
// break;
// }
default: {
LEDPowerON();
break;
}
}
}
static void KeyWorkModeLED() {
KEYLED();
/*
switch(INSTRUCTION.eliteFxn){
case IV_CURVE:{
LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
break;
}
case CV_CURVE:{
LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
break;
}
case DIFFERENTIAL_PULSE_VOLTAMMETRY:{
LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
break;
}
case SQUARE_WAVE_VOLTAMMETRY:{
LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
break;
}
case VOLT_OUTPUT:{
LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
break;
}
case ZT_CURVE:{
LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
break;
}
case VT_CURVE:{
LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
break;
}
case IT_CURVE:{
LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
break;
}
case VIS_RST:{
LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
break;
}
case ADC_TEST:{
LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
break;
}
default:{
LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
break;
}
}
*/
}
#endif
@@ -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
@@ -0,0 +1,191 @@
#ifndef ELITENOTIFY
#define ELITENOTIFY
#include "headstage.h"
/**
* notify data buffer.
* the length equals to the characteristic 4 which value is 20 bytes.
*
*/
#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.
*/
static size_t not_buf_offset = NOT_BUF_OFFSET_INIT;
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 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 ******************************** //
/*
* Notify format
*
*
| | 1 | 2 | 3 |
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2
-----------------------------------------------------------------
| header |
| current |
| voltage or impedance |
| mode & gain |
| time stamp |
| cycle number |
mode & gain
this byte include Elite working mode and ADC gain level
we use "(mode & 0xF0) | (gain & 0x0F)" to encode these two information
cycle number
for cyclic voltammetry use, we save it as channel number.
0xFF
* header = device ID
* I = current (0.001nA), V = voltage (mV),
* Z = impedance (k ohm), T = time (ms)
*
*
*/
// ********* End New Format Notify ***************************************** //
/*
* Notify format
*
*
| | 1 | 2 | 3 |
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2
-----------------------------------------------------------------
| header |
| current |
| voltage |
| impedance |
| time stamp |
| cycle number |
cycle number
for cyclic voltammetry use, we save it as channel number.
0xFF
* header = device ID
* I = current (0.001nA), V = voltage (mV),
* Z = impedance (k ohm), T = time (ms)
*
*
*/
static void SendNotify() {
not_buf[0] = INSTRUCTION.chip_id;
for (int i = 0; i < 4; i++) {
not_buf[i + 1] = NotifyCurrent[i];
not_buf[i + 5] = NotifyVolt[i];
not_buf[i + 9] = NotifyImpedance[i];
}
// 1 Timestamp = 32 usec; 31 Timestamp ~= 1 msec
not_time_stamp = (Timestamp_get32()) / 31; // msec
not_buf[13] = not_time_stamp & 0xff;
not_buf[14] = (not_time_stamp >> 8) & 0xff;
not_buf[15] = (not_time_stamp >> 16) & 0xff;
not_buf[16] = (not_time_stamp >> 24) & 0xff;
// cyclic voltametry cycle number
not_buf[17] = (NotifyCycleNumber >> 8) & 0xff;
not_buf[18] = NotifyCycleNumber & 0xff;
SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
}
static void FlushNotify(){
not_buf[0] = INSTRUCTION.chip_id;
for (int i = 0; i < 4; i++) {
not_buf[i + 1] = 0;
not_buf[i + 5] = 0;
not_buf[i + 9] = 0;
NotifyCurrent[i] = 0;
NotifyVolt[i] = 0;
NotifyImpedance[i] = 0;
}
// 1 Timestamp = 32 usec; 31 Timestamp ~= 1 msec
not_time_stamp = 0; // msec
not_buf[13] = not_time_stamp & 0xff;
not_buf[14] = (not_time_stamp >> 8) & 0xff;
not_buf[15] = (not_time_stamp >> 16) & 0xff;
not_buf[16] = (not_time_stamp >> 24) & 0xff;
// cyclic voltametry cycle number
not_buf[17] = 0x00;
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
@@ -0,0 +1,22 @@
#ifndef ELITERVout
#define ELITERVout
static void RVout_Plot(RVoutMode *RVout) {
// ADC gain is don't care when measuring voltage
INSTRUCTION.ADCGainLevel = GAIN_200R;
ADCGainControl(INSTRUCTION.ADCGainLevel);
// read ADC VoutVolt
ReadVoutVolt(spi_ADC_rxbuf);
// decode ADC value and put it into notify buffer
RVout->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
NotifyVolt[0] = (uint8_t) (RVout->_MeasureData >> 24);
NotifyVolt[1] = (uint8_t) ((RVout->_MeasureData & 0x00FF0000) >> 16);
NotifyVolt[2] = (uint8_t) ((RVout->_MeasureData & 0x0000FF00) >> 8);
NotifyVolt[3] = (uint8_t) (RVout->_MeasureData & 0x000000FF);
}
#endif
@@ -0,0 +1,126 @@
#ifndef ELITERESET
#define ELITERESET
static void reset() {
InitFlag();
InitCT();
InitGPT();
// IV/CV mode reset
DiscardIVFirstData = 0;
avg_number = 0;
ADCRealCurrent_long = 0;
ADCGainControl(INSTRUCTION.ADCGainLevel);
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
if (INSTRUCTION.eliteFxn == CONSTANT_CURRENT){
INSTRUCTION.eliteFxn = 0;
}
LEDPowerON();
for (int i = 0; i < BLE_INS_BUFF_SIZE; i++) {
ins_buf[i] = 0;
}
for (int i = 0; i < SPI_LED_SIZE; i++) {
spi_LEDtxbuf[i] = 0;
spi_LEDrxbuf[i] = 0;
}
for (int i = 0; i < SPI_DAC_SIZE; i++) {
spi_DACtxbuf[i] = 0;
spi_rxbuf[i] = 0;
}
for (int i = 0; i < SPI_ADC_SIZE; i++) {
spi_ADC_txbuf[i] = 0;
spi_ADC_rxbuf[i] = 0;
}
for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++) {
not_buf[i] = 0;
}
PIN_setOutputValue(pin_handle, ADC_CS, 1); // ADC_CS HIGH
PIN_setOutputValue(pin_handle, DAC_CS, 1); // DAC_CS HIGH
CPUdelay(1600);
}
static void Eliteinterrupt() {
InitFlag();
InitCT();
InitGPT();
// IV/CV mode reset
DiscardIVFirstData = 0;
avg_number = 0;
ADCRealCurrent_long = 0;
ADCGainControl(GAIN_AUTO);
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
LEDPowerON();
for (int i = 0; i < BLE_INS_BUFF_SIZE; i++) {
ins_buf[i] = 0;
}
for (int i = 0; i < SPI_LED_SIZE; i++) {
spi_LEDtxbuf[i] = 0;
spi_LEDrxbuf[i] = 0;
}
for (int i = 0; i < SPI_DAC_SIZE; i++) {
spi_DACtxbuf[i] = 0;
spi_rxbuf[i] = 0;
}
for (int i = 0; i < SPI_ADC_SIZE; i++) {
spi_ADC_txbuf[i] = 0;
spi_ADC_rxbuf[i] = 0;
}
for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++) {
not_buf[i] = 0;
}
PIN_setOutputValue(pin_handle, ADC_CS, 1); // ADC_CS HIGH
PIN_setOutputValue(pin_handle, DAC_CS, 1); // DAC_CS HIGH
CPUdelay(8000);
}
static void CleanBuffer() {
InitFlag();
InitEliteInstruction();
InitCT();
InitGPT();
DiscardIVFirstData = 0;
avg_number = 0;
ADCRealCurrent_long = 0;
for (int i = 0; i < SPI_LED_SIZE; i++) {
spi_LEDtxbuf[i] = 0;
spi_LEDrxbuf[i] = 0;
}
for (int i = 0; i < SPI_DAC_SIZE; i++) {
spi_DACtxbuf[i] = 0;
spi_rxbuf[i] = 0;
}
for (int i = 0; i < SPI_ADC_SIZE; i++) {
spi_ADC_txbuf[i] = 0;
spi_ADC_rxbuf[i] = 0;
}
for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++) {
not_buf[i] = 0;
}
PIN_setOutputValue(pin_handle, ADC_CS, 1); // ADC_CS HIGH
PIN_setOutputValue(pin_handle, DAC_CS, 1); // DAC_CS HIGH
CPUdelay(8000);
}
#endif
@@ -0,0 +1,88 @@
#ifndef ELITE_SPI
#define ELITE_SPI
/*
* Read SPI example in
* http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/tirtos/2_14_02_22/
* exports/tirtos_full_2_14_02_22/docs/doxygen/html/_s_p_i_c_c26_x_x_d_m_a_8h.html
*/
#include <Board.h>
#include <ti/drivers/SPI.h>
#include <ti/drivers/dma/UDMACC26XX.h>
#include <ti/drivers/spi/SPICC26XXDMA.h>
#include "Elite_PIN.h"
/* application use SPI parameters and buffers */
#define SPI_LED_SIZE 28
#define SPI_DAC_SIZE 3
#define SPI_ADC_SIZE 4
static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
static uint16_t spi_LEDrxbuf[SPI_LED_SIZE] = {0};
static uint8_t spi_DACtxbuf[SPI_DAC_SIZE] = {0};
static uint8_t spi_rxbuf[SPI_DAC_SIZE] = {0};
static uint8_t spi_ADC_txbuf[SPI_ADC_SIZE] = {0};
static uint8_t spi_ADC_rxbuf[SPI_ADC_SIZE] = {0};
/* system use SPI parameters */
static SPI_Handle spiHandle0 = NULL; // SPI0 = LED
static SPI_Handle spiHandle1 = NULL; // SPI1 = ADC +DAC
static SPI_Params spiParams0;
static SPI_Params spiParams1;
static SPI_Transaction LED_transaction;
static SPI_Transaction ADC_DAC_transaction;
static void Elite_SPI_init(){
SPI_init();
SPI_Params_init(&spiParams0);
spiParams0.bitRate = 2000; // 12k
spiParams0.mode = SPI_MASTER;
spiParams0.dataSize = 16;
spiParams0.frameFormat = SPI_POL0_PHA1;
spiHandle0 = SPI_open(Board_SPI0, &spiParams0); // LED SPI
SPI_Params_init(&spiParams1);
spiParams1.bitRate = 1000000; // 1M
spiParams1.mode = SPI_MASTER;
spiParams1.dataSize = 8;
spiParams1.frameFormat = SPI_POL0_PHA1;
spiHandle1 = SPI_open(Board_SPI1, &spiParams1); // ADC DAC SPI
}
static void LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
LED_transaction.count = length;
LED_transaction.txBuf = spi_txbuf;
LED_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle0, &LED_transaction);
}
static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
ADC_DAC_transaction.count = length;
ADC_DAC_transaction.txBuf = spi_txbuf;
ADC_DAC_transaction.rxBuf = spi_rxbuf;
PIN_setOutputValue(pin_handle, DAC_CS, 1); // DAC_CS HIGH
PIN_setOutputValue(pin_handle, ADC_CS, 0); // ADC_CS LOW
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
PIN_setOutputValue(pin_handle, ADC_CS, 1); // ADC_CS HIGH
}
static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
ADC_DAC_transaction.count = length;
ADC_DAC_transaction.txBuf = spi_txbuf;
ADC_DAC_transaction.rxBuf = spi_rxbuf;
PIN_setOutputValue(pin_handle, ADC_CS, 1); // ADC_CS HIGH
PIN_setOutputValue(pin_handle, DAC_CS, 0); // DAC_CS LOW
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
PIN_setOutputValue(pin_handle, DAC_CS, 1); // DAC_CS HIGH
}
#endif // ELITE_SPI
@@ -0,0 +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);
static uint8_t ADCSwitch = 0;
int32_t VoltData;
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;
}
}
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
@@ -0,0 +1,608 @@
#ifndef ELITE_WORK_DATA
#define ELITE_WORK_DATA
#include "EliteInstruction.h"
static bool Free_Work_Mode = false;
typedef void (*InitWorkData) ();
/***** Template of Measure and VoltOut parameter *****/
#define MEASURE \
int32_t _MeasureData; \
uint16_t _VoVi_Switch
/* VoltOut is an UserCode */
/* VOrigin, VStop, Step are all UserCode */
#define VOUT_PARA \
uint16_t _VoltOut; \
uint16_t _VOrigin; \
uint16_t _VStop; \
uint16_t _Step; \
uint16_t _StepTime; \
uint16_t _CycleNumber
/* CC Mode parameter
* @ Measure : measure current value (nA)
* @ Charge : Charge or Discharge
* @ BatteryV : Vin measure battery voltage (mV)
* @ value : constant current setting.
* Current value divide current level into 3,000,001 pieces
* 1,500,000 is zero point; 3,000,000 is 15mA
* Current = (value - 1,500,000)/100,000 mA
* @ Done : Done = false => Ignore Vmin condition;
* Done will be true, if BatteryV <= Vmin last for about 12sec in discharge mode
* @ VMax : voltage upper bound in charge mode
* CC->value will set to zero if BatteryV >= VMax in charge mode
* @ VMin : voltage lower bound in charge mode
* CC->value will set to zero if BatteryV <=> VMin in charge mode
* Note that VMax and VMin are always larger or equal to zero
* @_Transform2RealnA : transform a current user code (IUC) to real current in nA
*/
#define CC_PARA \
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 *)
#define LIMIT \
uint32_t _LimitValue; \
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;
};
struct VoltOutPara{
VOUT_PARA;
};
struct Limit{
LIMIT;
};
struct CCModePara{
CC_PARA;
};
struct CV3ModePara{
CV3_PARA;
};
/***** End of Measure and VoltOut parameter *****/
/**** Limit Mode ****/
//LimitValue
void _SetLimitValue(struct Limit *self, uint32_t LimitValue){
self->_LimitValue = LimitValue;
}
uint32_t _GetLimitValue(struct Limit *self){
return self->_LimitValue;
}
/* VoltOut Mode Data */
typedef struct _VoltOutMode{
uint16_t _Vset;
}VoltOutMode;
VoltOutMode *InitVoltOutMode(){
VoltOutMode *ret = malloc(sizeof(VoltOutMode));
ret->_Vset = INSTRUCTION.VoltConstant;
return ret;
}
/* End of VoltOut Mode Data */
/**** End of VoltOut Only 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{
int32_t _MeasureData;
uint16_t _VoVi_Switch;
int32_t MeasureVolt;
VOUT_PARA;
LIMIT;
int32_t _MeasureBatvolt;
}IVMode;
IVMode *InitIVMode(){
IVMode *ret = malloc(sizeof(IVMode));
ret->_MeasureData = 0;
ret->MeasureVolt = (INSTRUCTION.VoltOrigin - DAC_ZERO)/5;
ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
ret->_VoltOut = DAC_ZERO;
ret->_VOrigin = INSTRUCTION.VoltOrigin;
ret->_VStop = INSTRUCTION.VoltFinal;
ret->_Step = INSTRUCTION.Step;
ret->_StepTime = INSTRUCTION.StepTime;
ret->_CycleNumber = 1;
ret->_MeasureBatvolt = 0;
ret->_LimitValue = 1e5;
ret->SetLimitValue = &_SetLimitValue;
ret->GetLimitValue = &_GetLimitValue;
return ret;
}
/* End of IV Mode Data */
/* CV Mode*/
typedef struct _CVMode{
int32_t _MeasureData;
uint16_t _VoVi_Switch;
int32_t MeasureVolt;
VOUT_PARA;
int32_t _MeasureBatvolt;
}CVMode;
CVMode * InitCVMode(){
CVMode *ret = malloc(sizeof(CVMode));
ret->_MeasureData = (INSTRUCTION.VoltOrigin- DAC_ZERO)/5;
ret->MeasureVolt = 20000;
ret->_VoltOut = DAC_ZERO; // 25000 is DAC_ZERO
ret->_VOrigin = INSTRUCTION.VoltOrigin;
ret->_VStop = INSTRUCTION.VoltFinal;
ret->_Step = INSTRUCTION.Step;
ret->_StepTime = INSTRUCTION.StepTime; // STEPTIME_ONE_SEC
ret->_CycleNumber = INSTRUCTION.CycleNumber;
ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
ret->_MeasureBatvolt = 0;
return ret;
}
/*End of CV Mode*/
/* Const Current Mode */
#define CC_ZERO_POINT 0
#define MAX_DAC_UC 50000
#define MIN_DAC_UC 0
/*********************************************************************
* @struct Constant Current Code
*
* @brief A struct to handle CC mode command
*/
typedef struct _CCMode{
CC_PARA;
}CCMode;
/*********************************************************************
* @fn Transform2RealnA
*
* @brief transform an IUC into real current value in nA.
*
* @param self, which is an IUC
*
* @return an int32_t current value in nA
*/
int32_t _Transform2RealnA(struct CCModePara *self){
int32_t IUCReal;
// self->value : 0 ~ 1500000 (which is 0 ~ 1500000 (10nA) )
if(self->Charge){
IUCReal = (self->value - CC_ZERO_POINT) * 10;
}
else{
IUCReal = -1 * (self->value - CC_ZERO_POINT) * 10;
}
return IUCReal;
}
CCMode * InitCCMode(){
CCMode *ret = malloc(sizeof(CCMode));
ret->_MeasureData = 0;
ret->Charge = INSTRUCTION.Charge;
ret->BatteryV = 0;
ret->Done = 0;
ret->value = INSTRUCTION.ConstantCurrent;
ret->VMax = INSTRUCTION.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;
/* Vmax and Vmin */
// Vmax protect battery charge
// Vmin protect battery discharge, uint = mV
/* Charge/Discharge Current */
int32_t ChargeCurrent;
int32_t DischargeCurrent;
uint8_t CycleNumber;
bool StandBy;
uint32_t StandByTime;
}CCCMode;
CCCMode * InitCCCMode(){
CCCMode *ret = malloc(sizeof(CCCMode));
ret->_MeasureData = 0;
ret->Charge = 1;
ret->BatteryV = 0;
ret->value = CC_ZERO_POINT;
ret->VMax = MAX_DAC_UC; // max DAC UserCode
ret->VMin = MIN_DAC_UC; // min DAC UserCode
ret->ChargeCurrent = 0;
ret->DischargeCurrent = 0;
ret->CycleNumber = 0;
ret->StandBy = false;
ret->StandByTime = 0;
ret->_Transform2RealnA = &_Transform2RealnA;
return ret;
}
/* End of Cycle CC Mode */
/** Potential State Mode **/
typedef struct _PS{
// measure
int32_t _MeasureData;
uint16_t _VoVi_Switch;
int32_t ReferenceVolt;
int32_t _MeasureVolt;
VOUT_PARA;
}PSMode;
PSMode *InitPSMode(){
PSMode *ret = malloc(sizeof(PSMode));
ret->_MeasureData = 0;
ret->ReferenceVolt = 0;
ret->_MeasureVolt = INSTRUCTION.VoltOrigin;
ret->_VoltOut = DAC_ZERO; // 25000 is DAC_ZERO
ret->_VOrigin = INSTRUCTION.VoltOrigin;
ret->_VStop = INSTRUCTION.VoltFinal;
ret->_Step = INSTRUCTION.Step;
ret->_StepTime = INSTRUCTION.StepTime; // STEPTIME_ONE_SEC
ret->_CycleNumber = INSTRUCTION.CycleNumber;
return ret;
}
/** End of Potential State Mode **/
/* 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{
// Output Only
VoltOutMode *VO;
// Measure only
ITMode *IT;
VTMode *VT;
// Measure + Output
RTMode *RT;
IVMode *IV;
CVMode *CV;
CCMode *CC;
CV3Mode *CV3;
LSVMode *LSV;
CVSCANMode *CVSCAN;
PSMode *PS;
// CCCMode *CCC;
//test mode
RVoutMode *RVout;
}WorkMode;
WorkMode *CreateWorkMode(){
WorkMode *ret = malloc(sizeof(WorkMode));
return ret;
}
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 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;
default:
WM->VT = InitVTMode();
break;
}
}
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);
WM->IV = NULL;
}
break;
case CV_CURVE:
if(WM->CV != NULL){
free(WM->CV);
WM->CV = NULL;
}
break;
case CONSTANT_CURRENT:
if(WM->CC != NULL){
free(WM->CC);
WM->CC = NULL;
}
break;
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);
// WM->CCC = NULL;
// }
// break;
default:
if(WM->VT != NULL){
free(WM->VT);
WM->VT = NULL;
}
break;
}
}
#endif
@@ -0,0 +1,84 @@
#ifndef ELITEZT
#define ELITEZT
// output a certain voltage e.g. 2v
// and measure the input voltage
// => calculate the resister
// change the output voltage step
// => get a R-T curve (with resolution = 1 sample/volt step )
static int32_t RTInputVoltData(uint16_t VoVi_Switch, RTMode *RT);
static void ZT_Plot(RTMode *RT) {
static uint8_t ADCSwitch = 0;
int32_t VoltData;
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 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);
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 ;
// }
InputNotify(NOTIFY_VOLT, VoltData);
InputNotify(NOTIFY_CURRENT, RT->_MeasureCurrent);
InputNotify(NOTIFY_IMPEDANCE, resister_32);
/* Elite 100 = 100R
Elite 1000 = 1KR
Elite 10000 = 10KR
Elite 100000 = 100KR
Elite 1000000 = 1MR
*/
}
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
@@ -0,0 +1,190 @@
#ifndef Elite_PIN
#define Elite_PIN
#include <ti/drivers/pin/PINCC26XX.h>
#include <Board.h>
#include <ti/drivers/PIN.h>
/* SPI Board */
#define Board_SPI0_MISO PIN_UNASSIGNED
#define Board_SPI0_MOSI IOID_1
#define Board_SPI0_CLK IOID_0
#define Board_SPI0_CS PIN_UNASSIGNED
#define Board_SPI1_MISO IOID_3
#define Board_SPI1_MOSI IOID_2
#define Board_SPI1_CLK IOID_4
#define Board_SPI1_CS PIN_UNASSIGNED
#define ADC_CS IOID_8
#define DAC_CS IOID_9
#define Turnon200R IOID_5
#define Turnon10K IOID_6
/* I2C */
#ifdef ELITE_VERSION_1_4
#define Board_I2C0_SCL0 IOID_7
#define Board_I2C0_SDA0 IOID_14
#endif
#define shutdown_6994 IOID_10
#define switch_on IOID_11
#define power_enable IOID_12
#define extreme_waste_of_current IOID_13
PIN_Handle pin_handle;
static PIN_State ZM_rst;
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
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,
switch_on | PIN_INPUT_EN | PIN_PULLDOWN,
PIN_TERMINATE
};
/*!
* @def BOOSTXL_CC2650MA_SPIName
* @brief Enum of SPI names on the CC2650 Booster Pack
*/
typedef enum BOOSTXL_CC2650MA_SPIName {
BOOSTXL_CC2650MA_SPI0 = 0,
BOOSTXL_CC2650MA_SPI1 = 1,
BOOSTXL_CC2650MA_SPICOUNT
} BOOSTXL_CC2650MA_SPIName;
/*
* ========================== SPI DMA begin ===================================
*/
/* Place into subsections to allow the TI linker to remove items properly */
#if defined(__TI_COMPILER_VERSION__)
#pragma DATA_SECTION(SPI_config, ".const:SPI_config")
#pragma DATA_SECTION(spiCC26XXDMAHWAttrs, ".const:spiCC26XXDMAHWAttrs")
#endif
/* Include drivers */
#include <ti/drivers/spi/SPICC26XXDMA.h>
/* SPI objects */
SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
/* SPI configuration structure, describing which pins are to be used */
const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_SPICOUNT] = {
{
.baseAddr = SSI0_BASE,
.intNum = INT_SSI0_COMB,
.intPriority = ~0,
.swiPriority = 0,
.powerMngrId = PowerCC26XX_PERIPH_SSI0,
.defaultTxBufValue = 0,
.rxChannelBitMask = 1<<UDMA_CHAN_SSI0_RX,
.txChannelBitMask = 1<<UDMA_CHAN_SSI0_TX,
.mosiPin = Board_SPI0_MOSI,
.misoPin = Board_SPI0_MISO,
.clkPin = Board_SPI0_CLK,
.csnPin = Board_SPI0_CS
},
{
.baseAddr = SSI1_BASE,
.intNum = INT_SSI1_COMB,
.intPriority = ~0,
.swiPriority = 0,
.powerMngrId = PowerCC26XX_PERIPH_SSI1,
.defaultTxBufValue = 0,
.rxChannelBitMask = 1<<UDMA_CHAN_SSI1_RX,
.txChannelBitMask = 1<<UDMA_CHAN_SSI1_TX,
.mosiPin = Board_SPI1_MOSI,
.misoPin = Board_SPI1_MISO,
.clkPin = Board_SPI1_CLK,
.csnPin = Board_SPI1_CS
},
};
/* SPI configuration structure */
const SPI_Config SPI_config[] = {
{
.fxnTablePtr = &SPICC26XXDMA_fxnTable,
.object = &spiCC26XXDMAObjects[0],
.hwAttrs = &spiCC26XXDMAHWAttrs[0]
},
{
.fxnTablePtr = &SPICC26XXDMA_fxnTable,
.object = &spiCC26XXDMAObjects[1],
.hwAttrs = &spiCC26XXDMAHWAttrs[1]
},
{NULL, NULL, NULL}
};
/*
* ========================== SPI DMA end =====================================
*/
/*
* ============================= I2C Begin=====================================
*/
#ifdef ELITE_VERSION_1_4
/* Generic I2C instance identifiers */
#define Board_I2C CC2650_MA_I2C0
/*!
* @def CC2650_LAUNCHXL_I2CName
* @brief Enum of I2C names on the CC2650 dev board
*/
typedef enum CC2650_MA_I2CName {
CC2650_MA_I2C0 = 0,
CC2650_MA_I2CCOUNT
} CC2650_MA_I2CName;
/* Place into subsections to allow the TI linker to remove items properly */
#if defined(__TI_COMPILER_VERSION__)
#pragma DATA_SECTION(I2C_config, ".const:I2C_config")
#pragma DATA_SECTION(i2cCC26xxHWAttrs, ".const:i2cCC26xxHWAttrs")
#endif
/* Include drivers */
#include <ti/drivers/i2c/I2CCC26XX.h>
/* I2C objects */
I2CCC26XX_Object i2cCC26xxObjects[CC2650_MA_I2CCOUNT];
/* I2C configuration structure, describing which pins are to be used */
const I2CCC26XX_HWAttrsV1 i2cCC26xxHWAttrs[CC2650_MA_I2CCOUNT] = {
{
.baseAddr = I2C0_BASE,
.powerMngrId = PowerCC26XX_PERIPH_I2C0,
.intNum = INT_I2C_IRQ,
.intPriority = ~0,
.swiPriority = 0,
.sdaPin = Board_I2C0_SDA0,
.sclPin = Board_I2C0_SCL0,
}
};
/* I2C configuration structure */
const I2C_Config I2C_config[] = {
{
.fxnTablePtr = &I2CCC26XX_fxnTable,
.object = &i2cCC26xxObjects[0],
.hwAttrs = &i2cCC26xxHWAttrs[0]
},
{NULL, NULL, NULL}
};
/*
* ========================== I2C end =========================================
*/
#endif
#endif
@@ -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
@@ -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
@@ -0,0 +1,15 @@
#ifndef VERSION_DATE
#define VERSION_DATE
#define VERSION_DATE_YEAR 20
#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 8808490caa465cc94d14896de28763a5e5c4672b
#define VERSION_GIT_BRANCH Elite_OBJ_0.2mv
#endif
@@ -102,6 +102,7 @@
#include "simple_peripheral.h"
#include "EliteGPTimer.h"
#include "headstage.h"
#if defined(USE_FPGA) || defined(DEBUG_SW_TRACE)
@@ -150,7 +151,7 @@
// Whether to enable automatic parameter update request when a connection is
// formed
#define DEFAULT_ENABLE_UPDATE_REQUEST GAPROLE_LINK_PARAM_UPDATE_INITIATE_BOTH_PARAMS // in throughput peripheral , this is false
#define DEFAULT_ENABLE_UPDATE_REQUEST GAPROLE_LINK_PARAM_UPDATE_INITIATE_BOTH_PARAMS // in throughput peripheral , this is false
// in throughput project , the periodic event will repeat every 102ms
@@ -172,23 +173,22 @@
// Internal Events for RTOS application
#ifndef RTOSPARA
#define RTOSPARA
#define SBP_STATE_CHANGE_EVT 0x0001
#define SBP_CHAR_CHANGE_EVT 0x0002
#define SBP_PERIODIC_EVT 0x0004
#define SBP_CONN_EVT_END_EVT 0x0008
#define SBP_KEY_CHANGE_EVT 0x0010
#define SBP_STATE_CHANGE_EVT 0x0001
#define SBP_CHAR_CHANGE_EVT 0x0002
#define SBP_PERIODIC_EVT 0x0004
#define SBP_CONN_EVT_END_EVT 0x0008
#define SBP_KEY_CHANGE_EVT 0x0010
#endif
// data length extension parameter
#define APP_SUGGESTED_PDU_SIZE 251
#define APP_SUGGESTED_TX_TIME 2120
#define APP_SUGGESTED_TX_TIME 2120
#define DLE_MAX_PDU_SIZE 251
#define DLE_MAX_TX_TIME 2120
#define DLE_MAX_TX_TIME 2120
#define DEFAULT_PDU_SIZE 27
#define DEFAULT_TX_TIME 328
#define DEFAULT_TX_TIME 328
// GATT notification don't need authenticated link
#define GATT_NO_AUTHENTICATION
@@ -272,8 +272,8 @@ static gattMsgEvent_t *pAttRsp = NULL;
static uint8_t rspTxRetry = 0;
// Vars to keep track of active packet length settings
static uint16_t txOctets = DEFAULT_PDU_SIZE;
static uint16_t txTime = DEFAULT_TX_TIME;
// static uint16_t txOctets = DEFAULT_PDU_SIZE;
// static uint16_t txTime = DEFAULT_TX_TIME;
/*********************************************************************
* LOCAL FUNCTIONS
@@ -368,7 +368,7 @@ void SimpleBLEPeripheral_createTask(void) {
*
* @return None.
*/
// Clock instances for internal periodic events.
// Clock instances for internal periodic events.
static void SimpleBLEPeripheral_clockHandler(UArg arg);
// Minimum connection interval (units of 1.25ms, 8=10ms) if automatic
@@ -376,7 +376,7 @@ static void SimpleBLEPeripheral_clockHandler(UArg arg);
//#define DEFAULT_DESIRED_MIN_CONN_INTERVAL 80
// How often to perform periodic event (in msec)
#define SBP_PERIODIC_EVT_PERIOD 42 // 802 ~= 1 sec
#define SBP_PERIODIC_EVT_PERIOD 10 // 802 ~= 1 sec
static void SimpleBLEPeripheral_init(void) {
// ******************************************************************
@@ -386,7 +386,6 @@ static void SimpleBLEPeripheral_init(void) {
// so that the application can send and receive messages.
ICall_registerApp(&selfEntity, &semaphore);
#ifdef USE_RCOSC
RCOSC_enableCalibration();
#endif // USE_RCOSC
@@ -437,7 +436,7 @@ static void SimpleBLEPeripheral_init(void) {
GAPRole_SetParameter(GAPROLE_ADVERT_ENABLED, sizeof(uint8_t), &initialAdvertEnable);
GAPRole_SetParameter(GAPROLE_ADVERT_OFF_TIME, sizeof(uint16_t), &advertOffTime);
// GAPRole_SetParameter(GAPROLE_SCAN_RSP_DATA, sizeof(SCAN_RESP_DATA), SCAN_RESP_DATA);
// GAPRole_SetParameter(GAPROLE_SCAN_RSP_DATA, sizeof(SCAN_RESP_DATA), SCAN_RESP_DATA);
GAPRole_SetParameter(GAPROLE_ADVERT_DATA, sizeof(advertData), advertData);
GAPRole_SetParameter(GAPROLE_PARAM_UPDATE_ENABLE, sizeof(uint8_t), &enableUpdateRequest);
@@ -448,7 +447,7 @@ static void SimpleBLEPeripheral_init(void) {
}
// Set the GAP Characteristics
// GGS_SetParameter(GGS_DEVICE_NAME_ATT, sizeof(DEVICE_NAME), DEVICE_NAME);
// GGS_SetParameter(GGS_DEVICE_NAME_ATT, sizeof(DEVICE_NAME), DEVICE_NAME);
// Set advertising interval
{
@@ -529,6 +528,8 @@ static void SimpleBLEPeripheral_init(void) {
HCI_LE_ReadMaxDataLenCmd();
}
#include "EliteWorkData.h"
/*********************************************************************
* @fn SimpleBLEPeripheral_taskFxn
*
@@ -538,46 +539,49 @@ static void SimpleBLEPeripheral_init(void) {
*
* @return None.
*/
//static Clock_Struct detectKeyClock;
//static void detectKey_clockHandler(UArg arg);
// static Clock_Struct detectKeyClock;
// static void detectKey_clockHandler(UArg arg);
static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
#define CLOCK_ONE_SECOND 10000
// Initialize application
SimpleBLEPeripheral_init();
headstage_init_device_info();
// headstage_gptimer_init();
LED_spi_init();
ZM_spi_init();
ZM_init();
DAC_init();
Elite_SPI_init();
WorkMode *WorkModeData = CreateWorkMode();
uint8_t key = 0;
uint8_t counter6994 = 0;
bool EliteOn = 0;
bool Wake6994 = true;
uint8_t key = 0;
uint16_t counter6994 = 0;
bool EliteOn = 0;
Util_constructClock(&periodicClock, SimpleBLEPeripheral_clockHandler, SBP_PERIODIC_EVT_PERIOD, 0, false, SBP_PERIODIC_EVT);
Util_startClock(&periodicClock);
// init DAC, set output ~= 0 V
DAC_outputV(Usercode_Correction_to_DAC(25000));
elite_gptimer_start();
// Application main loops
for (;;) {
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
// message is queued to the message receive queue of the thread or when
// ICall_signal() function is called onto the semaphore.
ICall_Errno errno = ICall_wait(ICALL_TIMEOUT_FOREVER);
ICall_Errno errno = ICall_wait(ICALL_TIMEOUT_FOREVER); // let errno wait for infinite time, if periodicClock time up then execute below code
if (errno == ICALL_ERRNO_SUCCESS) {
ICall_EntityID dest;
ICall_ServiceEnum src;
ICall_HciExtEvt * pMsg = NULL;
if (ICall_fetchServiceMsg(&src, &dest, (void **)&pMsg) == ICALL_ERRNO_SUCCESS) {
if (ICall_fetchServiceMsg(&src, &dest, (void **)&pMsg) == ICALL_ERRNO_SUCCESS) { // if successfully retreived a meaasage from who?
uint8 safeToDealloc = TRUE;
if ((src == ICALL_SERVICE_CLASS_BLE) && (dest == selfEntity)) {
if ((src == ICALL_SERVICE_CLASS_BLE) && (dest == selfEntity)) { // src: source id who sent the massage; dest: entity id of the destination of the massage
ICall_Stack_Event *pEvt = (ICall_Stack_Event *)pMsg;
// Check for BLE stack events first
@@ -595,67 +599,86 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
if (pMsg && safeToDealloc) {
ICall_freeMsg(pMsg);
}
}
// If RTOS queue is not empty, process app message.
while (!Queue_empty(appMsgQueue)){
// If RTOS queue is not empty, process app message. //RTOS is the OS on Elite
while (!Queue_empty(appMsgQueue)) {
sbpEvt_t *pMsg = (sbpEvt_t *)Util_dequeueMsg(appMsgQueue);
if (pMsg) {
// Process message.
// LED_color(0xf8, 0xfa, 0xfa, 0x0a); // orange LED
// LED_color(0xf8, 0xfa, 0xfa, 0x0a); // orange LED
SimpleBLEPeripheral_processAppMsg(pMsg);
// Free the space from the message.
ICall_free(pMsg);
}
}
if(!PeriodicEvent){
Util_startClock(&periodicClock);
}
if(events & SBP_PERIODIC_EVT){
events &= ~SBP_PERIODIC_EVT;
if (!PeriodicEvent) { // if there is no periodic event
key = PIN_getInputValue(switch_on);
if(EliteOn){
if(Wake6994 < 35){
counter6994 ++;
}
else if(Wake6994 == 35){
PIN_setOutputValue(pin_handle, shutdown_6994, 0); // OFF = 1 => turn off 6994
Wake6994 ++;
if (EliteOn) {
if (counter6994 < CLOCK_ONE_SECOND/2) { // counter6994 enable a IC after 35 counts
counter6994++;
} else if (counter6994 == CLOCK_ONE_SECOND/2) {
PIN_setOutputValue(pin_handle, shutdown_6994, 1); // OFF = 1 => turn off 6994
counter6994++;
}
EliteKeyPress(key);
}
else{
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();
ADCGainControl(INSTRUCTION.ADCGainLevel);
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
Free_Work_Mode = false;
}
} else {
EliteOn = TurnOnElite(key);
}
}
else{
Util_startClock(&periodicClock);
if(PeriodicCounter >= StepTime){
SimpleBLEPeripheral_performPeriodicTask();
PeriodicCounter = 0;
else { // if there is periodic event
if(InitPeriodicEvent){
InitWorkMode(WorkModeData);
InitPeriodicEvent = false;
}
// Perform periodic application task
SimpleBLEPeripheral_performPeriodicTask(WorkModeData);
key = PIN_getInputValue(switch_on);
EliteKeyPress(key);
PeriodicCounter ++;
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);
@@ -689,30 +712,30 @@ static uint8_t SimpleBLEPeripheral_processStackMsg(ICall_Hdr *pMsg) {
uint8_t safeToDealloc = TRUE;
switch (pMsg->event) {
case GATT_MSG_EVENT:
// Process GATT message
safeToDealloc = SimpleBLEPeripheral_processGATTMsg((gattMsgEvent_t *)pMsg);
break;
case GATT_MSG_EVENT:
// Process GATT message
safeToDealloc = SimpleBLEPeripheral_processGATTMsg((gattMsgEvent_t *)pMsg);
break;
case HCI_GAP_EVENT_EVENT: {
// Process HCI message
switch (pMsg->status) {
case HCI_COMMAND_COMPLETE_EVENT_CODE:
// Process HCI Command Complete Event
break;
case HCI_BLE_HARDWARE_ERROR_EVENT_CODE: {
AssertHandler(HAL_ASSERT_CAUSE_HARDWARE_ERROR, 0);
break;
}
default:
break;
}
case HCI_GAP_EVENT_EVENT: {
// Process HCI message
switch (pMsg->status) {
case HCI_COMMAND_COMPLETE_EVENT_CODE:
// Process HCI Command Complete Event
break;
}
case HCI_BLE_HARDWARE_ERROR_EVENT_CODE: {
AssertHandler(HAL_ASSERT_CAUSE_HARDWARE_ERROR, 0);
break;
}
default:
// do nothing
break;
}
break;
}
default:
// do nothing
break;
}
return (safeToDealloc);
@@ -825,23 +848,22 @@ static void SimpleBLEPeripheral_freeAttRsp(uint8_t status) {
* @return None.
*/
static void SimpleBLEPeripheral_processAppMsg(sbpEvt_t *pMsg) {
// LED_color(0xFA, 0xF0, 0x00, 0xE0);
// LED_color(0xFA, 0xF0, 0x00, 0xE0);
switch (pMsg->hdr.event) {
case SBP_STATE_CHANGE_EVT:
SimpleBLEPeripheral_processStateChangeEvt((gaprole_States_t)pMsg->hdr.state);
break;
case SBP_STATE_CHANGE_EVT:
SimpleBLEPeripheral_processStateChangeEvt((gaprole_States_t)pMsg->hdr.state);
break;
case SBP_CHAR_CHANGE_EVT:
// headstage_instruction_update_handle(pMsg->hdr.state);
// LED_color(0xE6, 0xFF, 0xFA, 0x0A);
ZM_instruction_update_handle(pMsg->hdr.state);
case SBP_CHAR_CHANGE_EVT:
// headstage_instruction_update_handle(pMsg->hdr.state);
// LED_color(0xE6, 0xFF, 0xFA, 0x0A);
ZM_instruction_update_handle(pMsg->hdr.state);
break;
break;
default:
// Do nothing.
break;
default:
// Do nothing.
break;
}
}
@@ -86,7 +86,7 @@ extern "C"
// Length of Characteristic 5 in bytes
#define SIMPLEPROFILE_CHAR5_LEN 5
#define SIMPLEPROFILE_CHAR4_LEN 20
#define SIMPLEPROFILE_CHAR3_LEN 12
#define SIMPLEPROFILE_CHAR3_LEN 20
#define SIMPLEPROFILE_CHAR2_LEN 20
/*********************************************************************
+91
View File
@@ -0,0 +1,91 @@
#!/bin/bash
#input="./Elite_test.txt"
input="D:/Elite/Calibration_data/$1.txt"
output="./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h"
#variable
declare -i current_line=79
declare -i col_index=0
declare -i row_index=0
#declare -i coeff=1
#declare -i offset=0
declare -i current_gain=0
#declare -i vin_gain=0
#declare -i vout_gain=0
MAC="MAC"
#constant
declare -i ADC_CURRENT_GAIN_NUMBER=3
declare -i ADC_VOLTAGE_GAIN_NUMBER=1
declare -i DAC_GAIN_NUMBER=1
while read -r line; do
for word in $line; do
# get device MAC
if [ $row_index -eq 0 ] && [ $col_index -eq 1 ];then
MAC=$word
sed -i "${current_line} i {" "$output"
sed -i "${current_line} i \\\n#ifdef BOARD_${MAC}" "$output"
sed -i 's/:/_/g' "$output"
current_line=$current_line+3
fi
#get ADC current cali data
declare -i Iin_range=2+$ADC_CURRENT_GAIN_NUMBER
if [ $row_index -gt 1 ] && [ $row_index -lt $Iin_range ];then
if [ $col_index -eq 1 ];then
sed -i "${current_line} i \\\t.ADC_current[${current_gain}].coeff = ($word)," "$output"
current_line=$current_line+1
elif [ $col_index -eq 2 ];then
sed -i "${current_line} i \\\t.ADC_current[${current_gain}].offset = ($word)," "$output"
current_line=$current_line+1
if [ $current_gain -lt 2 ];then
current_gain=$current_gain+1
else
current_gain=0
fi
fi
#get DAC Vout cali data
declare -i Vout_range=$Iin_range+$DAC_GAIN_NUMBER
elif [ $row_index -gt 1 ] && [ $row_index -lt $Vout_range ];then
if [ $col_index -eq 1 ];then
sed -i "${current_line} i \\\t.Usercode2DAC.coeff = ($word)," "$output"
current_line=$current_line+1
elif [ $col_index -eq 2 ];then
sed -i "${current_line} i \\\t.Usercode2DAC.offset = ($word)," "$output"
current_line=$current_line+1
fi
#get ADC Vin cali data
declare -i Vin_range=$Vout_range+$ADC_VOLTAGE_GAIN_NUMBER
elif [ $row_index -gt 1 ] && [ $row_index -lt $Vin_range ];then
if [ $col_index -eq 1 ];then
sed -i "${current_line} i \\\t.ADC_volt.coeff = ($word)," "$output"
current_line=$current_line+1
elif [ $col_index -eq 2 ];then
sed -i "${current_line} i \\\t.ADC_volt.offset = ($word)," "$output"
current_line=$current_line+1
fi
fi
#update index
if [ $col_index -lt 2 ];then
col_index=$col_index+1
else
col_index=0
row_index=$row_index+1
fi
done
done < $input
sed -i "${current_line} i };" "$output"
current_line=$current_line+1
sed -i "${current_line} i #endif" "$output"