Compare commits

...

465 Commits

Author SHA1 Message Date
YiChin 6fae1f65a1 fix bug 2019-11-15 17:15:29 +08:00
YiChin 34355a1a4a fix bug 2019-11-15 17:01:03 +08:00
105042004 2e4a260e17 update PSCurve 2019-11-15 16:09:28 +08:00
105042004 c3f19359f1 temp save 2019-11-15 14:25:24 +08:00
105042004 bb28a594f3 temp save 2019-11-15 14:07:14 +08:00
105042004 8216bb7a70 temp save 2019-11-15 13:54:46 +08:00
105042004 ef920851db add PSCurve 2019-11-08 22:24:16 +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
alan 4a37fa8668 Elite 1.4-re write notify comment 2019-08-28 10:49:49 +08:00
29 changed files with 3396 additions and 1341 deletions
@@ -16,7 +16,7 @@
# sources were generated) is:
# C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\config\src
#
GEN_SRC_DIR ?= ../../config/src
GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/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")
@@ -1,12 +1,12 @@
XOPTS = -I"C:/ti/xdctools_3_32_02_25_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
XOPTS = -I"C:/ti/xdctools_3_32_00_06_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
vpath % C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
vpath %.c C:/ti/xdctools_3_32_02_25_core/packages/
vpath %.c C:/ti/xdctools_3_32_00_06_core/packages/
CCOPTS = --endian=little -mv7M3 --abi=eabi -q -ms --opt_for_speed=0 --program_level_compile -o3 -g --optimize_with_debug -Dti_sysbios_knl_Task_minimizeLatency__D=FALSE -Dti_sysbios_family_arm_cc26xx_Boot_driverlibVersion=2 -Dti_sysbios_knl_Clock_stopCheckNext__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_enableException__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_disablePriority__D=32U -Dti_sysbios_family_arm_m3_Hwi_numSparseInterrupts__D=0U
XDC_ROOT = C:/ti/xdctools_3_32_02_25_core/packages/
XDC_ROOT = C:/ti/xdctools_3_32_00_06_core/packages/
BIOS_ROOT = C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
@@ -16,14 +16,14 @@ BIOS_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa
TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
INCS = $(BIOS_INC) $(TARGET_INC) --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.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/
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/
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
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
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
DEL = C:/ti/xdctools_3_32_00_06_core/packages/../bin/rm -f
CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f
define RM
$(if $(wildcard $1),$(DEL) $1,:)
@@ -76,6 +76,11 @@ static void ADCGainControl(uint8_t ADCLevel){
PIN_setOutputValue(pin_handle, Turnon10K, 0);
PIN_setOutputValue(pin_handle, Turnon100R, 1);
}
else if(ADCLevel == 3){
// ADC gain level = 0, auto gain (using 200R resister)
PIN_setOutputValue(pin_handle, Turnon10K, 0);
PIN_setOutputValue(pin_handle, Turnon100R, 0);
}
else{
// default using 200R resister
PIN_setOutputValue(pin_handle, Turnon10K, 0);
@@ -121,4 +126,102 @@ static void ADCChannelSelect(uint8_t ADCChannel){
}
}
static void ReadVolt(uint8_t *buf){
// Read data twice since the first data we get is previous data
ADCChannelSelect(ADC_CH_VOLT);
CPUdelay(10);
ADC_read(buf);
ADCChannelSelect(ADC_CH_VOLT);
CPUdelay(10);
ADC_read(buf);
}
static void ReadCurrent(uint8_t *buf){
// Read data twice since the first data we get is previous data
ADCGainControl(INSTRUCTION.ADCGainLevel);
ADCChannelSelect(ADC_CH_CURRENT);
CPUdelay(10);
ADC_read(buf);
ADCChannelSelect(ADC_CH_CURRENT);
CPUdelay(10);
ADC_read(buf);
}
// theoretical boundary <20, 10~500, >100 (uA)
#define GAIN_SMALL_BOUNDARY 40000 // 40 uA = 40,000,000 pA
#define GAIN_MID_BOUNDARY1 20000 // 20 uA = 20,000,000 pA
#define GAIN_MID_BOUNDARY2 400000 // 400 uA = 400,000,000 pA
#define GAIN_LARGE_BOUNDARY 200000 // 200 uA = 200,000 nA
static int32_t AutoGainReadCurrent(uint8_t *buf){
int32_t Real_Current = 0;
if(INSTRUCTION.ADCGainLevel == GAIN_AUTO){
INSTRUCTION.ADCGainLevel = GAIN_200R;
// LED_color(DARKLED, 0x00, 0x00, 0xFF);
}
if(INSTRUCTION.ADCGainLevel == GAIN_200R){
ReadCurrent(spi_ADC_rxbuf);
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
// switch to mid range current
if(Real_Current < GAIN_LARGE_BOUNDARY && Real_Current > -1*GAIN_LARGE_BOUNDARY){
INSTRUCTION.ADCGainLevel = GAIN_10K;
ReadCurrent(spi_ADC_rxbuf);
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
// LED_color(DARKLED, 0x00, 0xFF, 0x00);
// // switch to small range current
// if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
// INSTRUCTION.ADCGainLevel = GAIN_200K;
// ReadCurrent(spi_ADC_rxbuf);
// Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
// LED_color(DARKLED, 0xFF, 0x00, 0x00);
// }
}
}
else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
ReadCurrent(spi_ADC_rxbuf);
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
// switch to large range current
if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
INSTRUCTION.ADCGainLevel = GAIN_200R;
ReadCurrent(spi_ADC_rxbuf);
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
// LED_color(DARKLED, 0x00, 0x00, 0xFF);
}
// switch to small range current
else if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
INSTRUCTION.ADCGainLevel = GAIN_200K;
ReadCurrent(spi_ADC_rxbuf);
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
// LED_color(DARKLED, 0xFF, 0x00, 0x00);
}
}
else if(INSTRUCTION.ADCGainLevel == GAIN_200K){
ReadCurrent(spi_ADC_rxbuf);
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
// switch to mid range current
if(Real_Current > GAIN_SMALL_BOUNDARY || Real_Current < -1*GAIN_SMALL_BOUNDARY){
INSTRUCTION.ADCGainLevel = GAIN_10K;
ReadCurrent(spi_ADC_rxbuf);
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
// LED_color(DARKLED, 0x00, 0xFF, 0x00);
// switch to large range current
// if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
// INSTRUCTION.ADCGainLevel = GAIN_200R;
// ReadCurrent(spi_ADC_rxbuf);
// Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
// }
}
}
return Real_Current;
}
#endif
@@ -0,0 +1,209 @@
#ifndef ELITECCMODE
#define ELITECCMODE
static void CCModeDACControl(int32_t IUC_Measure_Difference);
static int32_t CCModeReadCurrent(CCMode *CC){
static bool IVSwitch = false;
CCModeDACEnable = 1; // This flag will control DAC working
// set current value and ADC gain level
CCCurrent2IUC(CC);
// decode ADC value and put it into notify buffer
if(IVSwitch){
IVSwitch = false;
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);
}
}
else{
IVSwitch = true;
/** read battery voltage **/
// read ADC volt
ReadVolt(spi_ADC_rxbuf);
// decode ADC value and put it into notify buffer
CC->BatteryV = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
}
NotifyCurrent[0] = (uint8_t) (CC->_MeasureData >> 24);
NotifyCurrent[1] = (uint8_t) ((CC->_MeasureData & 0x00FF0000) >> 16);
NotifyCurrent[2] = (uint8_t) ((CC->_MeasureData & 0x0000FF00) >> 8);
NotifyCurrent[3] = (uint8_t) (CC->_MeasureData & 0x000000FF);
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 MeasureCurrent = 0, IUCCurrent = 0, ADCRealVolt = 0;
if(!CCModeDACEnable){
// DAC should not work now
return 0;
}
IUCCurrent = CC->_Transform2RealnA(CC);
MeasureCurrent = CC->_MeasureData;
CCModeDACControl(IUCCurrent - MeasureCurrent);
// NotifyCurrent[0] = (uint8_t) (IUCCurrent >> 24);
// NotifyCurrent[1] = (uint8_t) ((IUCCurrent & 0x00FF0000) >> 16);
// NotifyCurrent[2] = (uint8_t) ((IUCCurrent & 0x0000FF00) >> 8);
// NotifyCurrent[3] = (uint8_t) (IUCCurrent & 0x000000FF);
//
// NotifyImpedance[0] = (uint8_t) (MeasureCurrent >> 24);
// NotifyImpedance[1] = (uint8_t) ((MeasureCurrent & 0x00FF0000) >> 16);
// NotifyImpedance[2] = (uint8_t) ((MeasureCurrent & 0x0000FF00) >> 8);
// NotifyImpedance[3] = (uint8_t) (MeasureCurrent & 0x000000FF);
// DACCode2Real2Notify(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
// if(IUCCurrent > 1000){
// ADCRealVolt = 2*(INSTRUCTION.VoltConstant - 25000)/10 - IUCCurrent*200/1e6;
// }
// else{
// ADCRealVolt = 2*(INSTRUCTION.VoltConstant - 25000)/10 - IUCCurrent*200/1e7;
// }
CCModeDACEnable = 0;
return MeasureCurrent;
}
static void CCModeDACControl(int32_t IUC_Measure_Difference){
int32_t step;
if(IUC_Measure_Difference < 100 && IUC_Measure_Difference > -100){
step = (IUC_Measure_Difference > 0) ? 1:-1;
}
else if(IUC_Measure_Difference < 1000 && IUC_Measure_Difference > -1000){
step = IUC_Measure_Difference / 100;
}
else if(IUC_Measure_Difference < 10000 && IUC_Measure_Difference > -10000){
step = IUC_Measure_Difference / 1000;
}
else{
step = IUC_Measure_Difference / 1e4;
}
// 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));
// NotifyCurrent[0] = (uint8_t) ( step >> 24);
// NotifyCurrent[1] = (uint8_t) (( step & 0x00FF0000) >> 16);
// NotifyCurrent[2] = (uint8_t) (( step & 0x0000FF00) >> 8);
// NotifyCurrent[3] = (uint8_t) ( step & 0x000000FF);
}
// XXX : should we reset DAC output after STOP?
static void CCModeReverseCurrent(CCMode *CC){
if(CC->StandBy){
if(CT.StandByCounter == CC->StandByTime){
CC->StandBy = false;
CT.StandByCounter = 0;
}
else{
CT.StandByCounter ++;
}
}
else{
// reverse charge/discharge
if(CC->BatteryV == CC->VMax){
CC->StandBy = true;
CC->value = CC->DischargeCurrent;
}
else if(CC->BatteryV == CC->VMin){
CC->StandBy = true;
CC->value = CC->ChargeCurrent;
}
}
}
/* 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;
/* set ADC level */
// largest current
if (CurrentValue > 10000 || CurrentValue < -10000){
CC->lv = GAIN_200R;
}
// mid range current
else if (CurrentValue > 1000 || CurrentValue < -1000){
CC->lv = GAIN_10K;
}
// least range current
else{
CC->lv = GAIN_200K;
}
}
/*********************************************************************
* @fn Transform2RealnA
*
* @brief transform an IUC into real current value in nA.
*
* @param self, which is an IUC
*
* @return an int32_t current value in nA
*/
//static int32_t _Transform2RealnA(CCMode *self){
// int32_t IUCReal;
//
// // self->value : 0 ~ 3000000 (which is -1500000 ~ 1500000 (10nA) )
// IUCReal = (self->value - CC_ZERO_POINT) * 10;
// return IUCReal;
//}
//
//static void SetMeasureCurrent(CCMode *self, int32_t current){
// self->_MeasureCurrent = current;
//}
//
//static int32_t GetMeasureCurrent(CCMode *self){
// return self->_MeasureCurrent;
//}
//static CURRENT_USER_CODE *InitCurrentUserCode(){
// CCMode *CurrentUserCode = malloc(sizeof(CCMode));
// CurrentUserCode->value = CC_ZERO_POINT;
// CurrentUserCode->lv = GAIN_AUTO;
// CurrentUserCode->Vmax = MAX_DAC_UC; // max DAC UserCode
// CurrentUserCode->Vmin = MIN_DAC_UC; // min DAC UserCode
// CurrentUserCode-> _MeasureData = 0;
// CurrentUserCode->_Transform2RealnA = &_Transform2RealnA;
// CurrentUserCode->SetMeasureData = &SetMeasureCurrent;
// CurrentUserCode->GetMeasureData = &GetMeasureCurrent;
// return CurrentUserCode;
//}
#endif
@@ -0,0 +1,245 @@
#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;
static bool direction_up; // direction_up = true, if Vfinal > Vorigin
static bool current_direction_up; // current_direction_up = true, Vstep => positive. vice versa
// reset origin volt at the begin
if (DACReset) {
DACUserCode = CV->_VOrigin;
if (INSTRUCTION.VoltFinal > CV->_VOrigin) {
direction_up = true;
current_direction_up = true;
} else {
direction_up = false;
current_direction_up = false;
}
DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
DAC_outputV(DACOutCode); // output VOLT_ORIGIN
DACReset = false;
return DACOutCode;
}
if (CT.StepTimeCounter == CV->_StepTime) {
// Decide next direction
if (direction_up) {
if (DACUserCode >= CV->_VStop) {
current_direction_up = false; // problem occurs when origin == 0000 final == ffff!!!!!!
} else if (DACUserCode <= CV->_VOrigin) {
current_direction_up = true;
if (CV->_CycleNumber == 0) {
PeriodicEvent = false; // periodic event end
DACReset = true;
}
CV->_CycleNumber--;
}
} else {
if (DACUserCode <= CV->_VStop) {
current_direction_up = true; // problem occurs when origin == 0000 final == ffff!!!!!!
} else if (DACUserCode >= CV->_VOrigin) {
current_direction_up = false;
if (CV->_CycleNumber == 0) {
PeriodicEvent = false; // periodic event end
DACReset = true;
}
CV->_CycleNumber--;
}
}
// Next output voltage
if (direction_up) {
if (current_direction_up) {
// DACUserCode overflow ?
if (DACUserCode + CV->_Step < DACUserCode) {
DACUserCode = CV->_VStop;
}
else if (DACUserCode + CV->_Step > CV->_VStop) {
DACUserCode =CV->_VStop;
}
else {
DACUserCode = DACUserCode + CV->_Step;
}
}
else {
// DACUserCode underflow ?
if (DACUserCode - CV->_Step > DACUserCode || DACUserCode > 60000) {
DACUserCode = CV->_VOrigin;
}
// reach Vorigin ?
else if (DACUserCode - CV->_Step < CV->_VOrigin) {
DACUserCode = CV->_VOrigin;
}
else {
DACUserCode = DACUserCode - CV->_Step;
}
}
}
else {
if (current_direction_up) {
if (DACUserCode + CV->_Step < DACUserCode) {
DACUserCode = CV->_VOrigin;
}
else if (DACUserCode + CV->_Step > CV->_VOrigin) {
DACUserCode = CV->_VOrigin;
}
else {
DACUserCode = DACUserCode + CV->_Step;
}
}
else {
if (DACUserCode - CV->_Step > DACUserCode || DACUserCode > 60000) {
DACUserCode = CV->_VStop ;
}
else if (DACUserCode - CV->_Step < CV->_VStop) {
DACUserCode = CV->_VStop;
}
else {
DACUserCode = DACUserCode - CV->_Step;
}
}
}
DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
DAC_outputV(DACOutCode);
}
return DACOutCode;
}
#endif
@@ -2,41 +2,38 @@
#ifndef EliteDAC
#define EliteDAC
static bool DACreset = true;
/* DAC reset parameter */
#define DACzero 0x85B2
#define DACposMax 0x0000
#define DACnegMax 0xFFFF
static bool DACReset;
#ifdef ELITE_VERSION_1_3
#define DACOUT 0x30
static void DAC_outputV(uint16_t voltLV) {
// C = command, X = don't care, D = data
// CCCC XXXX = command
// DDDD DDDD = v1
// DDDD XXXX = v2
uint8_t v1, v2 = 0;
v1 = (uint8_t) (voltLV >> 4) & 0xFF;
v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
spi_DACtxbuf[0] = command;
spi_DACtxbuf[1] = v1;
spi_DACtxbuf[2] = v2;
for (int i = 3; i < SPI_DAC_SIZE; i++) {
spi_DACtxbuf[i] = 0;
}
DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
}
#endif
//#ifdef ELITE_VERSION_1_3
//#define DACOUT 0x30
//
//static void DAC_outputV(uint16_t voltLV) {
// // C = command, X = don't care, D = data
// // CCCC XXXX = command
// // DDDD DDDD = v1
// // DDDD XXXX = v2
//
// uint8_t v1, v2 = 0;
// v1 = (uint8_t) (voltLV >> 4) & 0xFF;
// v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
//
// spi_DACtxbuf[0] = command;
// spi_DACtxbuf[1] = v1;
// spi_DACtxbuf[2] = v2;
// for (int i = 3; i < SPI_DAC_SIZE; i++) {
// spi_DACtxbuf[i] = 0;
// }
//
// DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
//}
//#endif
#ifdef ELITE_VERSION_1_4
#define DACCLS 0x02
#define DACOUT 0x31
static void DAC_outputV(uint16_t voltLV) {
static uint16_t DAC_outputV(uint16_t voltLV) {
// C = command, X = don't care, D = data
// CCCC CCCC = command
// DDDD DDDD = v1
@@ -55,8 +52,14 @@ static void DAC_outputV(uint16_t voltLV) {
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)*2)/10;
}
#endif
@@ -1,30 +1,10 @@
#ifndef EliteCorrection
#define EliteCorrection
#include "EliteDAC.h"
#include "EliteADC.h"
/* DAC reset parameter */
#define DACzero 0x85A2
#define DACposMax 0x0000
#define DACnegMax 0xFFFF
typedef struct _formula{
int32_t coeff = 0;
int32_t offset = 0;
}Formula;
typedef struct _correction{
Formula ADC_volt = 0;
Formula ADC_current[3] = 0;
uint32_t Gain0Boundary[2] = {0, 0};
uint32_t Gain1BoundARY[2] = {0, 0};
}Correction_data;
/*
* Correction Array include all the correction coeff and offset
@@ -34,175 +14,727 @@ typedef struct _correction{
* code is the code we read from ADC buffer
*
* ADC measure Voltage
* Correction[0] = ADC Volt coeff
* Correction[1] = ADC Volt offset => RealVolt = Correction[0] * code + Correction[1]
* RealVolt = Correction.ADC_volt.coeff * code + Correction.ADC_volt.offset
*
* ADC measure Current
* Correctino[2] = ADC gain_lv0 coeff
* Correction[3] = ADC gain_lv0 offset => RealCurrent = Correction[2] * code + Correction[3]
* Correctino[4] = ADC gain_lv1 coeff
* Correction[5] = ADC gain_lv1 offset => RealCurrent = Correction[4] * code + Correction[5]
* Correctino[6] = ADC gain_lv2 coeff
* Correction[7] = ADC gain_lv2 offset => RealCurrent = Correction[6] * code + Correction[7]
* ADCGain: 0 => 200k, 1 => 10k, 2 => 200R
* RealCurrent = Correction.ADC_current[ADCGain].coeff * code + Correction.ADC_current[ADCGain].offset
*
* DAC output Voltage
* Correction[8] = DAC coeff
* Correction[9] = DAC offset => RealVolt = Correction[8] * DACcode + Correction[9]
* RealVolt = Correction.DAC2RealV.coeff * DACcode + Correction.DAC2RealV.offset
*
* Usercode to DACcode
* DACcode = Correction.Usercode2DAC.coeff * code + Correction.Usercode2DAC.offset
*
*/
#define BORAD_Chao_I
#ifdef BORAD_CLASS_LEADER
static Correction_data Correction;
Correction.ADC_volt.coeff = (-629);
Correction.ADC_volt.offset = 15447740;
#define BOARD_EARTH
Correction.ADC_current_200k.coeff = 3056;
Correction.ADC_current_200k.offset = -74771591;
typedef struct _formula{
Correction.ADC_current_10K.coeff = 65461;
Correction.ADC_current_10K.offset = -1601786957;
long long coeff;
long long offset;
Correction.ADC_current_200R.coeff = 3369;
Correction.ADC_current_200R.offset = -82598293;
}Formula;
Correction.Gain0Boundary[0] = 0x5F75;
Correction.Gain0Boundary[1] = 0x5FB2;
struct _correction{
Correction.Gain1Boundary[0] = 0x5999;
Correction.Gain1Boundary[1] = 0x6589;
Formula ADC_volt;
Formula ADC_current[3];
Formula DAC2RealV;
Formula Usercode2DAC;
uint16_t Gain0Boundary[2];
uint16_t Gain1Boundary[4];
uint16_t Gain2Boundary[2];
} Correction =
#ifdef BOARD_CLASS_LEADER
{
.ADC_volt.coeff = (-6292889),
.ADC_volt.offset = 103042367157,
.ADC_current[0].coeff = 310073435,
.ADC_current[0].offset = -5059684947850,
.ADC_current[1].coeff = 655940088,
.ADC_current[1].offset = -10703396200801,
.ADC_current[2].coeff = 31129894,
.ADC_current[2].offset = -507980196120,
.DAC2RealV.coeff = (-18959656),
.DAC2RealV.offset = 565743281498,
.Usercode2DAC.coeff = (-10517325),
.Usercode2DAC.offset = 561574831511,
.Gain0Boundary[0] = 0x5F75,
.Gain0Boundary[1] = 0x5FB2,
.Gain1Boundary[0] = 0x5999,
.Gain1Boundary[1] = 0x6589
};
#endif
#ifdef BORAD_TRICERATOPS
static Correction_data Correction;
{
.ADC_volt.coeff = (-6259045),
.ADC_volt.offset = 150606390230,
Correction.ADC_volt.coeff = (-626);
Correction.ADC_volt.offset = 15065046;
.ADC_current[0].coeff = 30675739,
.ADC_current[0].offset = (-736666253953),
Correction.ADC_current_200k.coeff = 0;
Correction.ADC_current_200k.offset = 0;
.ADC_current[1].coeff = 749057318,
.ADC_current[1].offset = (-17984432358007),
Correction.ADC_current_10K.coeff = 0;
Correction.ADC_current_10K.offset = 0;
.ADC_current[2].coeff = 31242587,
.ADC_current[2].offset = (-750184492407),
Correction.ADC_current_200R.coeff = 0;
Correction.ADC_current_200R.offset = 0;
.DAC2RealV.coeff = (-18909689),
.DAC2RealV.offset = 644251481046,
Correction.Gain0Boundary[0] = 0;
Correction.Gain0Boundary[1] = 0;
.Usercode2DAC.coeff = (-10576588),
.Usercode2DAC.offset = 605113842000,
Correction.Gain1Boundary[0] = 0;
Correction.Gain1Boundary[1] = 0;
.Gain0Boundary[0] = 0x5DAA,
.Gain0Boundary[1] = 0x5DF2,
.Gain1Boundary[0] = 0x57E8,
.Gain1Boundary[1] = 0x63B1
};
#endif
#ifdef BORAD_Chao_I
static Correction_data Correction;
#ifdef BORAD_CHAO_I
{
.ADC_volt.coeff = (-6278082),
.ADC_volt.offset = 151228681410,
Correction.ADC_volt.coeff = (-627);
Correction.ADC_volt.offset = 15122868;
.ADC_current[0].coeff = 30908391,
.ADC_current[0].offset = (-741477595514),
Correction.ADC_current_200k.coeff = 3091;
Correction.ADC_current_200k.offset = (-74147760);
.ADC_current[1].coeff = 661271310,
.ADC_current[1].offset = (-15864495597969),
Correction.ADC_current_10K.coeff = 66127;
Correction.ADC_current_10K.offset = (-1586449560);
.ADC_current[2].coeff = 31183513,
.ADC_current[2].offset = (-748178468530),
Correction.ADC_current_200R.coeff = 3118;
Correction.ADC_current_200R.offset = (74817847);
.DAC2RealV.coeff = (-18975108),
.DAC2RealV.offset = 644442607989,
Correction.Gain0Boundary[0] = 0x5D96;
Correction.Gain0Boundary[1] = 0x5DD9;
.Usercode2DAC.coeff = (-10540121),
.Usercode2DAC.offset = 603128277368,
Correction.Gain1Boundary[0] = 0x57CD;
Correction.Gain1Boundary[1] = 0x639F;
.Gain0Boundary[0] = 0x5D96,
.Gain0Boundary[1] = 0x5DD9,
.Gain1Boundary[0] = 0x57CD,
.Gain1Boundary[1] = 0x639F
};
#endif
#ifdef BOARD_TWENTY_ONE
static Correction_data Correction;
{
.ADC_volt.coeff = (-6258074),
.ADC_volt.offset = 152210580945,
Correction.ADC_volt.coeff = (-625);
Correction.ADC_volt.offset = 15221058;
.ADC_current[0].coeff = 30022512,
.ADC_current[0].offset = -729552647201,
Correction.ADC_current[0].coeff = 3002;
Correction.ADC_current[0].offset = -72955265;
.ADC_current[1].coeff = 658398533,
.ADC_current[1].offset = -16001498741131,
Correction.ADC_current[1].coeff = 65840;
Correction.ADC_current[1].offset = -1600149874;
.ADC_current[2].coeff = 30908351000,
.ADC_current[2].offset = -746548614824000,
Correction.ADC_current[2].coeff = 3090;
Correction.ADC_current[2].offset = -75102578;
.DAC2RealV.coeff = (-19007867),
.DAC2RealV.offset = 646316924837,
Correction.Gain0Boundary[0] = 0x5ECD;
Correction.Gain0Boundary[1] = 0x5F0D;
.Usercode2DAC.coeff = (-10521952),
.Usercode2DAC.offset = 603074812599,
Correction.Gain1Boundary[0] = 0x5900;
Correction.Gain1Boundary[1] = 0x64DD;
.Gain0Boundary[0] = 0x5ECD,
.Gain0Boundary[1] = 0x5F0D,
.Gain1Boundary[0] = 0x5900,
.Gain1Boundary[1] = 0x64DD
};
#endif
#ifdef BOARD_JOHN_CENA
{
.ADC_volt.coeff = (-6286465),
.ADC_volt.offset = 151630618248,
.ADC_current[0].coeff = 30960625,
.ADC_current[0].offset = -747979808432,
.ADC_current[1].coeff = 652738209,
.ADC_current[1].offset = -15767733896990,
.ADC_current[2].coeff = 30959456,
.ADC_current[2].offset = -748026885843,
.DAC2RealV.coeff = (-18880478),
.DAC2RealV.offset = 629012735316,
.Usercode2DAC.coeff = (-10592952),
.Usercode2DAC.offset = 604535526400,
.Gain0Boundary[0] = 0x7653, // 20 uA
.Gain0Boundary[1] = 0x4504, // -20 uA
.Gain1Boundary[0] = 0x7C69, // 500 uA
.Gain1Boundary[1] = 0x405D, // -500 uA
.Gain1Boundary[2] = 0x5F4A, // 10 uA
.Gain1Boundary[3] = 0x5D7D, // -10 uA
.Gain2Boundary[0] = 0x5EC2, // 300 uA
.Gain2Boundary[1] = 0x5E01, // -300 uA
//.Gain0SupportRange =
//.Gain1SupportRange[0] =
//.Gain1SupportRange[1] =
//.Gain2SupportRange =
};
#endif
#ifdef BOARD_GENIUS
{
.ADC_volt.coeff = (-6236652),
.ADC_volt.offset = 101533279052,
.ADC_current[0].coeff = 31094976,
.ADC_current[0].offset = (-507114075439),
.ADC_current[1].coeff = 31218018,
.ADC_current[1].offset = (-508593562044),
.ADC_current[2].coeff = 557826631,
.ADC_current[2].offset = (-9088752534070),
.DAC2RealV.coeff = (-18990774),
.DAC2RealV.offset = 570886531263,
.Usercode2DAC.coeff = (-10605006),
.Usercode2DAC.offset = 566878948150,
.Gain0Boundary[0] = 0x5D96,
.Gain0Boundary[1] = 0x5DD9,
.Gain1Boundary[0] = 0x57CD,
.Gain1Boundary[1] = 0x639F
};
#endif
#ifdef BOARD_DA_SHUN
{
.ADC_volt.coeff = (-6280824),
.ADC_volt.offset = 151787055168,
.ADC_current[0].coeff = 25109217,
.ADC_current[0].offset = (-606888506534),
.ADC_current[1].coeff = 657619639,
.ADC_current[1].offset = (-15894373245404),
.ADC_current[2].coeff = 31040178,
.ADC_current[2].offset = (-750263570000),
.DAC2RealV.coeff = (-18975834),
.DAC2RealV.offset = 647359124391,
.Usercode2DAC.coeff = (-10539718),
.Usercode2DAC.offset = 604829309500,
.Gain0Boundary[0] = 0x5E2F,
.Gain0Boundary[1] = 0x5E96,
.Gain1Boundary[0] = 0x5878,
.Gain1Boundary[1] = 0x645A
};
#endif
#ifdef BOARD_CHIEN_YU
{
.ADC_volt.coeff = (-6279056),
.ADC_volt.offset = 150985844279,
.ADC_current[0].coeff = 31788227 ,
.ADC_current[0].offset = (-765340735866),
.ADC_current[1].coeff = 657619858,
.ADC_current[1].offset = (-15835988865283),
.ADC_current[2].coeff = 31116362,
.ADC_current[2].offset = (-749402214847),
.DAC2RealV.coeff = (-18935149),
.DAC2RealV.offset = 643063752893,
.Usercode2DAC.coeff = (-10567567),
.Usercode2DAC.offset = 603991718526,
.Gain0Boundary[0] = 0x5DE5,
.Gain0Boundary[1] = 0x5E30,
.Gain1Boundary[0] = 0x5820,
.Gain1Boundary[1] = 0x6408
};
#endif
#ifdef BOARD_LITTLE_STAR
{
.ADC_volt.coeff = (-6224192),
.ADC_volt.offset = 101472884698,
.ADC_current[0].coeff = 31293602,
.ADC_current[0].offset = (-510187416959),
.ADC_current[1].coeff = 655130048,
.ADC_current[1].offset = (-10680093830418),
.ADC_current[2].coeff = 31450484,
.ADC_current[2].offset = (-512697942950),
.DAC2RealV.coeff = (-18690126),
.DAC2RealV.offset = 564319610294 ,
.Usercode2DAC.coeff = (-10524846),
.Usercode2DAC.offset = 561713962333,
.Gain0Boundary[0] = 0x5E2F,
.Gain0Boundary[1] = 0x5E96,
.Gain1Boundary[0] = 0x5878,
.Gain1Boundary[1] = 0x645A
};
#endif
#ifdef BOARD_517
{
.ADC_volt.coeff = (-6244769),
.ADC_volt.offset = 101714685687,
.ADC_current[0].coeff = 30919726,
.ADC_current[0].offset = (-503489101786),
.ADC_current[1].coeff = 654824495,
.ADC_current[1].offset = (-10660542778914),
.ADC_current[2].coeff = 31376265,
.ADC_current[2].offset = (-510797752348),
.DAC2RealV.coeff = (-18690126),
.DAC2RealV.offset = 564319610294 ,
.Usercode2DAC.coeff = (-10500774),
.Usercode2DAC.offset = 560779455904,
.Gain0Boundary[0] = 0x5E2F,
.Gain0Boundary[1] = 0x5E96,
.Gain1Boundary[0] = 0x5878,
.Gain1Boundary[1] = 0x645A
};
#endif
#ifdef BOARD_FISH_VET
{
.ADC_volt.coeff = (-6243954),
.ADC_volt.offset = 101956814341,
.ADC_current[0].coeff = 6208753,
.ADC_current[0].offset = (-101076436901),
.ADC_current[1].coeff = 68760643,
.ADC_current[1].offset = (-1123221851971),
.ADC_current[2].coeff = 61882330000,
.ADC_current[2].offset = (-10103859661590),
.DAC2RealV.coeff = (-18690126),
.DAC2RealV.offset = 564319610294,
.Usercode2DAC.coeff = (-10517326),
.Usercode2DAC.offset = 561574831512,
.Gain0Boundary[0] = 0x5E2F,
.Gain0Boundary[1] = 0x5E96,
.Gain1Boundary[0] = 0x5878,
.Gain1Boundary[1] = 0x645A
};
#endif
#ifdef BOARD_KELLY
{
.ADC_volt.coeff = (-6238112),
.ADC_volt.offset = 101628014509,
.ADC_current[0].coeff = 6087943,
.ADC_current[0].offset = (-99768174580),
.ADC_current[1].coeff = 68915156,
.ADC_current[1].offset = (-1121470119188),
.ADC_current[2].coeff = 61800515,
.ADC_current[2].offset = (-1006755993534),
.DAC2RealV.coeff = (-18690126),
.DAC2RealV.offset = 564319610294,
.Usercode2DAC.coeff = (-10528309),
.Usercode2DAC.offset = 561035476688,
.Gain0Boundary[0] = 0x5E2F,
.Gain0Boundary[1] = 0x5E96,
.Gain1Boundary[0] = 0x5878,
.Gain1Boundary[1] = 0x645A
};
#endif
#ifdef BOARD_BAY_BAY
{
.ADC_volt.coeff = (-6223734),
.ADC_volt.offset = 101647006833,
.ADC_current[0].coeff = 31039179,
.ADC_current[0].offset = (-506383432096),
.ADC_current[1].coeff = 647940355,
.ADC_current[1].offset = (-10611041889224),
.ADC_current[2].coeff = 31094976,
.ADC_current[2].offset = (-507114075439),
.DAC2RealV.coeff = (-18690126),
.DAC2RealV.offset = 564319610294,
.Usercode2DAC.coeff = (-10541677),
.Usercode2DAC.offset = 562208801371,
.Gain0Boundary[0] = 0x5E2F,
.Gain0Boundary[1] = 0x5E96,
.Gain1Boundary[0] = 0x5878,
.Gain1Boundary[1] = 0x645A
};
#endif
#ifdef BOARD_MEOWMI
{
.ADC_volt.coeff = (-6265015),
.ADC_volt.offset = 101843650153,
.ADC_current[0].coeff = 62522034,
.ADC_current[0].offset = (-1016702373525),
.ADC_current[1].coeff = 31613132,
.ADC_current[1].offset = (-514033175600),
.ADC_current[2].coeff = 565897139,
.ADC_current[2].offset = (-9201204539440),
.DAC2RealV.coeff = (-18990774),
.DAC2RealV.offset = 570886531263,
.Usercode2DAC.coeff = (-10541427),
.Usercode2DAC.offset = 562159124753,
.Gain0Boundary[0] = 0x5D96,
.Gain0Boundary[1] = 0x5DD9,
.Gain1Boundary[0] = 0x57CD,
.Gain1Boundary[1] = 0x639F
};
#endif
#ifdef BOARD_EUROPEAN
{
.ADC_volt.coeff = (-6264190),
.ADC_volt.offset = 101683809669,
.ADC_current[0].coeff = 31301451,
.ADC_current[0].offset = (-508301866021),
.ADC_current[1].coeff = 656423459,
.ADC_current[1].offset = (-10660544072862),
.ADC_current[2].coeff = 31414514000,
.ADC_current[2].offset = (-510185549182000),
.DAC2RealV.coeff = (-18990774),
.DAC2RealV.offset = 570886531263,
.Usercode2DAC.coeff = (-10513774),
.Usercode2DAC.offset = 559795292677,
.Gain0Boundary[0] = 0x5D96,
.Gain0Boundary[1] = 0x5DD9,
.Gain1Boundary[0] = 0x57CD,
.Gain1Boundary[1] = 0x639F
};
#endif
#ifdef BOARD_EARTH
{
.ADC_volt.coeff = (-6256660),
.ADC_volt.offset = 101658275678,
.ADC_current[0].coeff = 31271240,
.ADC_current[0].offset = (-508496329863),
.ADC_current[1].coeff = 659931818,
.ADC_current[1].offset = (-10729666444387),
.ADC_current[2].coeff = 31485559000,
.ADC_current[2].offset = (-511907957163000),
.DAC2RealV.coeff = (-19047143),
.DAC2RealV.offset = 565935714286,
.Usercode2DAC.coeff = (-10500262),
.Usercode2DAC.offset = 559630236100,
.Gain0Boundary[0] = 0x5D96,
.Gain0Boundary[1] = 0x5DD9,
.Gain1Boundary[0] = 0x57CD,
.Gain1Boundary[1] = 0x639F
};
#endif
#ifdef BOARD_WATER_STAR
{
.ADC_volt.coeff = (-6259808),
.ADC_volt.offset = 102009860128,
.ADC_current[0].coeff = 31335917,
.ADC_current[0].offset = (-511426612252),
.ADC_current[1].coeff = 658172815,
.ADC_current[1].offset = (-10738251896209),
.ADC_current[2].coeff = 31482687000,
.ADC_current[2].offset = (-513650531545000),
.DAC2RealV.coeff = (-10548297),
.DAC2RealV.offset = 562611756757,
.Usercode2DAC.coeff = (-10500262),
.Usercode2DAC.offset = 559630236100,
.Gain0Boundary[0] = 0x5D96,
.Gain0Boundary[1] = 0x5DD9,
.Gain1Boundary[0] = 0x57CD,
.Gain1Boundary[1] = 0x639F
};
#endif
#ifdef BOARD_MARS
{
.ADC_volt.coeff = (-6270623),
.ADC_volt.offset = 102383421553,
.ADC_current[0].coeff = 31187022,
.ADC_current[0].offset = (-509159321195),
.ADC_current[1].coeff = 655981611,
.ADC_current[1].offset = (-10709717111320),
.ADC_current[2].coeff = 31256968,
.ADC_current[2].offset = (-510275213115),
.DAC2RealV.coeff = (-18937347),
.DAC2RealV.offset = 568558163265,
.Usercode2DAC.coeff = (-10561141),
.Usercode2DAC.offset = 564249134291,
.Gain0Boundary[0] = 0x5D96,
.Gain0Boundary[1] = 0x5DD9,
.Gain1Boundary[0] = 0x57CD,
.Gain1Boundary[1] = 0x639F
};
#endif
#ifdef BOARD_VENUS
{
.ADC_volt.coeff = (-6268996),
.ADC_volt.offset = 102204055818,
.ADC_current[0].coeff = 31131930,
.ADC_current[0].offset = (-507382432547),
.ADC_current[1].coeff = 654620883,
.ADC_current[1].offset = (-10668953588943),
.ADC_current[2].coeff = 31245260000,
.ADC_current[2].offset = (-509181085054000),
.DAC2RealV.coeff = (-19009388),
.DAC2RealV.offset = 567032653061,
.Usercode2DAC.coeff = (-10521117),
.Usercode2DAC.offset = 561308254899,
.Gain0Boundary[0] = 0x5D96,
.Gain0Boundary[1] = 0x5DD9,
.Gain1Boundary[0] = 0x57CD,
.Gain1Boundary[1] = 0x639F
};
#endif
#ifdef BOARD_MERCURY
{
.ADC_volt.coeff = (-6259808),
.ADC_volt.offset = 102009860128,
.ADC_current[0].coeff = 31335917,
.ADC_current[0].offset = (-511426612252),
.ADC_current[1].coeff = 658172815,
.ADC_current[1].offset = (-10738251896209),
.ADC_current[2].coeff = 31482687000,
.ADC_current[2].offset = (-513650531545000),
.DAC2RealV.coeff = (-19009388),
.DAC2RealV.offset = 567032653061,
.Usercode2DAC.coeff = (-10548297),
.Usercode2DAC.offset = 562611756757,
.Gain0Boundary[0] = 0x5D96,
.Gain0Boundary[1] = 0x5DD9,
.Gain1Boundary[0] = 0x57CD,
.Gain1Boundary[1] = 0x639F
};
#endif
// this function turn ADC measure value (0xXXXX) into real voltage
// unit should be mV
static int32_t DecodeADCVolt(uint16_t ADC_measure){
int32_t ADCRealVolt = 0;
long long ADCRealVolt = 0;
ADCRealVolt = (Correction.ADC_volt.coeff * ADC_measure + Correction.ADC_volt.offset);
ADCRealVolt = ADCRealVolt / 1000;
return ADCRealVolt;
ADCRealVolt = ADCRealVolt / 1e7;
return (int32_t) (ADCRealVolt);
}
// this function turn ADC measure value (0xXXXX) into real current
// unit should be pA
/* Decode ADC current for twenty-one */
static int32_t DecodeADCCurrent(uint8_t ADCGain, uint16_t ADC_measure){
int32_t ADCRealCurrent = 0;
int32_t coeff[3] = {0}, offset[3] = {0};
long long ADCRealCurrent = 0;
ADCRealCurrent = (Correction.ADC_current[ADCGain].coeff * ADC_measure + Correction.ADC_current[ADCGain].offset)/1000;
return ADCRealCurrent;
ADCRealCurrent = (Correction.ADC_current[ADCGain].coeff * ADC_measure + Correction.ADC_current[ADCGain].offset)/1e7;
// Current unit is pA;
// If ADCGain is GAIN_200R unit is nA
return (int32_t) (ADCRealCurrent);
}
static int32_t DecodeResister(uint8_t ADCGainLevel, uint16_t CurrentMeasure, uint16_t VoltMeasure){
long long ADCRealCurrent=0, ADCRealVolt=0;
int32_t resister_32;
// get measure current
ADCRealCurrent = (Correction.ADC_current[ADCGainLevel].coeff * CurrentMeasure + Correction.ADC_current[ADCGainLevel].offset)/1e7;
// get measure volt
// This step is necessary, if the measure resister !>> 10 ohm
ADCRealVolt = (Correction.ADC_volt.coeff * VoltMeasure + Correction.ADC_volt.offset);
ADCRealVolt = ADCRealVolt / 1e4;
// if (INSTRUCTION.ADCGainLevel == GAIN_200R){
resister_32 = (int32_t) ((ADCRealVolt) / (ADCRealCurrent/1e3)); // nV / uA = mV
// }
// else{
// resister_32 = (int32_t) ((ADCRealVolt) / (ADCRealCurrent/1e6)); // nV / uA = mV
// }
int32_t volt_32 = (int32_t) (ADCRealVolt);
int32_t current_32 = (int32_t) (ADCRealCurrent);
NotifyVolt[0] = (uint8_t) (volt_32 >> 24);
NotifyVolt[1] = (uint8_t) ((volt_32 & 0x00FF0000) >> 16);
NotifyVolt[2] = (uint8_t) ((volt_32 & 0x0000FF00) >> 8);
NotifyVolt[3] = (uint8_t) (volt_32 & 0x000000FF);
NotifyCurrent[0] = (uint8_t) (current_32 >> 24);
NotifyCurrent[1] = (uint8_t) ((current_32 & 0x00FF0000) >> 16);
NotifyCurrent[2] = (uint8_t) ((current_32 & 0x0000FF00) >> 8);
NotifyCurrent[3] = (uint8_t) (current_32 & 0x000000FF);
NotifyImpedance[0] = (uint8_t) (resister_32 >> 24);
NotifyImpedance[1] = (uint8_t) ((resister_32 & 0x00FF0000) >> 16);
NotifyImpedance[2] = (uint8_t) ((resister_32 & 0x0000FF00) >> 8);
NotifyImpedance[3] = (uint8_t) (resister_32 & 0x000000FF);
return resister_32;
}
// Decode ADC measure value (could be a volt or current) and put it into notify buffer
static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_raw){
uint16_t ADC_measure = (uint16_t) (ADC_raw[0] << 8) | (uint16_t) (ADC_raw[1]);
int32_t ADCRealVolt = 0, ret = 0;
int32_t ADCRealVolt = 0, ret = 0, ADCRealCurrent = 0;
// return real volt to controller
if(ADCChannel == ADC_CH_VOLT){
ADCRealVolt = DecodeADCVolt(ADC_measure);
NotifyVolt[0] = (uint8_t) (ADCRealVolt >> 24);
NotifyVolt[1] = (uint8_t) ((ADCRealVolt & 0x00FF0000) >> 16);
NotifyVolt[2] = (uint8_t) ((ADCRealVolt & 0x0000FF00) >> 8);
NotifyVolt[3] = (uint8_t) (ADCRealVolt & 0x000000FF);
ret = ADCRealVolt;
}
// return real current to controller
else if(ADCChannel == ADC_CH_CURRENT){
if (INSTRUCTION.eliteFxn == IVCurve) {
ADCRealCurrent += DecodeADCCurrent(ADCGain, ADC_measure);
if ((SampleRate_counter % 10) == 0) {
ADCRealCurrent = ADCRealCurrent / 10;
if (avg_number > 2) { // to discard the first 20 current sample data
ADCRealCurrent_avg = (ADCRealCurrent + ADCRealCurrent_avg*(avg_number - 3)) / (avg_number - 2);
if ( (INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE)) {
// wait 0.1 sec until circuit stable => discard first data means wait 0.1 sec
if(DiscardIVFirstData){
DiscardIVFirstData ++;
DecodeADCCurrent(ADCGain, ADC_measure);
ret = DecodeADCCurrent(ADCGain, ADC_measure);
// DiscardIVFirstData :1,2; discard two data
// DiscardIVFirstData = 0; recording data
if(DiscardIVFirstData == 3){
DiscardIVFirstData = 0;
}
avg_number ++;
ADCRealCurrent = 0;
return ret;
}
if (StepTimeCounter == StepTime - 1) {
NotifyCurrent[0] = (uint8_t) (ADCRealCurrent_avg >> 24);
NotifyCurrent[1] = (uint8_t) ((ADCRealCurrent_avg & 0x00FF0000) >> 16);
NotifyCurrent[2] = (uint8_t) ((ADCRealCurrent_avg & 0x0000FF00) >> 8);
NotifyCurrent[3] = (uint8_t) (ADCRealCurrent_avg & 0x000000FF);
avg_number = 1;
ADCRealCurrent_avg = 0;
// return a real time current (used for deciding auto gain)
ret = DecodeADCCurrent(ADCGain, ADC_measure);
ADCRealCurrent_long = ADCRealCurrent_long + ret;
avg_number ++;
if (CT.StepTimeCounter == INSTRUCTION.StepTime - 1) {
DiscardIVFirstData = 1;
ADCRealCurrent_long = ADCRealCurrent_long / avg_number;
NotifyCurrent[0] = (uint8_t) (ADCRealCurrent_long >> 24);
NotifyCurrent[1] = (uint8_t) ((ADCRealCurrent_long & 0x00FF0000) >> 16);
NotifyCurrent[2] = (uint8_t) ((ADCRealCurrent_long & 0x0000FF00) >> 8);
NotifyCurrent[3] = (uint8_t) (ADCRealCurrent_long & 0x000000FF);
avg_number = 0;
ADCRealCurrent_long = 0;
int32_t G = ADCGain;
NotifyImpedance[0] = (uint8_t) (G >> 24);
NotifyImpedance[1] = (uint8_t) ((G & 0x00FF0000) >> 16);
NotifyImpedance[2] = (uint8_t) ((G & 0x0000FF00) >> 8);
NotifyImpedance[3] = (uint8_t) (G & 0x000000FF);
}
}
// IT curve
else {
ADCRealCurrent = DecodeADCCurrent(ADCGain, ADC_measure);
NotifyCurrent[0] = (uint8_t) (ADCRealCurrent >> 24);
@@ -211,7 +743,6 @@ static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_
NotifyCurrent[3] = (uint8_t) (ADCRealCurrent & 0x000000FF);
ret = ADCRealCurrent;
}
}
else{
@@ -256,35 +787,29 @@ static void ADC_overflow(uint8_t gain, uint8_t *rawdata){
// User will enter -5V~+5V in UI.
// websever and controler use 0~50000 represent -5~+5V
// this function should turn 0~50000 into DACcode which output the exactly voltage user want
static uint16_t Usercode_Correction_to_DAC(uint16_t usercode)
{
// DACcode to real_voltage correction function
//DACcode = -1.0548523(usercode) + 60597.718
int32_t usercode_32;
long long usercode_32;
uint16_t DACcode = 0;
int32_t coeff = (-1054), offset = 60597718;
usercode_32 = (int32_t)(usercode);
usercode_32 = (long long)(usercode);
DACcode = (uint16_t) ((coeff * usercode_32 + offset)/1000);
DACcode = (uint16_t) ((Correction.Usercode2DAC.coeff * usercode_32 + Correction.Usercode2DAC.offset)/1e7);
return DACcode;
}
static int32_t DAC_to_realV(uint16_t DACcode)
{
//volt = (DAC -6.4893275)/(-0.0001896)
int32_t RealV = 0;
int32_t volt_32 = 0;
int32_t coeff = (-1896), offset = 64893275;//*10e7
long long usercode_32;
volt_32 = DACcode;
// RealV = (volt_32 - offset) / coeff;
RealV = (-1896) * volt_32 + offset;
RealV = RealV / 10e3; //(mV)
usercode_32 = ((DACcode * 1e7) - Correction.Usercode2DAC.offset) / Correction.Usercode2DAC.coeff;
RealV = (int32_t) (usercode_32 / 5) - 5000;
// return mV
return RealV;
}
@@ -0,0 +1,21 @@
#ifndef ELITE_FLAG_CT_INIT
#define ELITE_FLAG_CT_INIT
static void InitCT(){
CT.SampleRate_counter = 1;
CT.StepTimeCounter = 1;
CT.NotifyCounter = 1;
CT.StandByCounter = 0;
}
static void InitFlag(){
PeriodicEvent = false; // is there an PeriodicEvent?
InitPeriodicEvent = true; // need to create a WorkModeData?
DACReset = true;
CCModeDACEnable = 0; // to make sure DAC work after ADC
Free_Work_Mode = true; // Free(WorkModeData)
// 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 4000 // 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,78 @@
#ifndef ELITEIT
#define ELITEIT
#define absolute(a) ((a<0)? -a:a)
//static int32_t IT_Plot() {
// // read ADC current
// int32_t Real_Current = 0;
// ADCGainControl(INSTRUCTION.ADCGainLevel);
// ADCChannelSelect(ADC_CH_CURRENT);
// CPUdelay(10);
// ADC_read(spi_ADC_rxbuf);
//
// // check if ADC over/under flow
// // let the output saturate if over/under flow
//// ADC_overflow(INSTRUCTION.ADCGainLevel, spi_ADC_rxbuf);
//
// // decode ADC value and put it into notify buffer
// Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
//
// return Real_Current;
//}
static int32_t IT_Plot(WorkMode *WorkModeData) {
switch (INSTRUCTION.eliteFxn) {
case IV_CURVE:{
#define CURRENT_MODE WorkModeData->IV
break;
}
case CV_CURVE:{
#define CURRENT_MODE WorkModeData->CV
break;
}
case IT_CURVE:{
#define CURRENT_MODE WorkModeData->IT
break;
}
case POTENTIAL_STATE:{
#define CURRENT_MODE WorkModeData->PS
}
default: {
#define CURRENT_MODE WorkModeData->IV
break;
}
}
// read ADC current
int32_t Real_Current = 0;
if(INSTRUCTION.AutoGainEnable){
Real_Current = AutoGainReadCurrent(spi_ADC_rxbuf);
}
else{
ReadCurrent(spi_ADC_rxbuf);
Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
}
// IT->SetMeasureData((struct Measure *) IT, Real_Current);
// Real_Current = IT->GetMeasureData((struct Measure *) IT);
CURRENT_MODE->_MeasureData = Real_Current;
// if(INSTRUCTION.eliteFxn == IV_CURVE){
// if(absolute(Real_Current) > CURRENT_MODE->_LimitValue){
//// PeriodicEvent = false; //Real current exceed expected limit value, force stop
//// DACReset = true;
// reset();
// }
// }
return Real_Current;
}
#endif
@@ -0,0 +1,142 @@
#ifndef ELITEIV
#define ELITEIV
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);
} else if (INSTRUCTION.eliteFxn == POTENTIAL_STATE ) {
Voltage = PSCurve(WorkModeData->PS);
}
// IV plot mode
else {
Voltage = OneWayVoltScan(WorkModeData->IV);
}
return Voltage;
}
static uint16_t OneWayVoltScan(IVMode *IV) {
static uint16_t DACOutCode;
// reset origin volt at the begin
if (DACReset) {
// DACUserCode = IV->GetVOrigin((struct VoltOutPara *) IV);
DACUserCode = IV->_VOrigin;
DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
DACReset = false;
// output VOLT_ORIGIN
DAC_outputV(DACOutCode);
return DACOutCode;
}
if (CT.StepTimeCounter == IV->_StepTime){
if (IV->_VOrigin < IV->_VStop) {
// output the next output volt
DACUserCode = DACUserCode + IV->_Step;
DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
DAC_outputV(DACOutCode);
// end IV task if we reach INSTRUCTION.VoltFinal
if (DACUserCode >= IV->_VStop) {
PeriodicEvent = false;
DACReset = true;
}
} else {
DACUserCode = DACUserCode - IV->_Step;
// check if DACUserCode underflow
if(DACUserCode >= 60000){
// LED_color(DARKLED, 0xFF, 0x00, 0x00);
DACUserCode = IV->_VStop;
}
// int32_t DACUC = DACUserCode;
// NotifyImpedance[0] = (uint8_t) (DACUC >> 24);
// NotifyImpedance[1] = (uint8_t) ((DACUC & 0x00FF0000) >> 16);
// NotifyImpedance[2] = (uint8_t) ((DACUC & 0x0000FF00) >> 8);
// NotifyImpedance[3] = (uint8_t) (DACUC & 0x000000FF);
// output the next output volt
DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
DAC_outputV(DACOutCode);
// // end IV task if we reach INSTRUCTION.VoltFinal
// if (DACUserCode <= IV->_VStop){
// PeriodicEvent = false;
// DACReset = true;
// // reset();
}
}
return DACOutCode;
}
static void IV_Plot(IVMode *IV) {
static uint8_t VoltCurrentSwitch = 0;
uint16_t ADC_measure = 0;
if(VoltCurrentSwitch < 5){
ReadCurrent(spi_ADC_rxbuf);
VoltCurrentSwitch ++;
}
else if(VoltCurrentSwitch == 5){
// read current
ReadCurrent(spi_ADC_rxbuf);
ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
IV->_MeasureData = DecodeADCCurrent(INSTRUCTION.ADCGainLevel, ADC_measure);
VoltCurrentSwitch ++;
}
else if(VoltCurrentSwitch <9){
// read volt
ReadVolt(spi_ADC_rxbuf);
VoltCurrentSwitch++;
}
else if(VoltCurrentSwitch == 9){
/** read battery voltage **/
ReadVolt(spi_ADC_rxbuf);
ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
IV->MeasureVolt = DecodeADCVolt(ADC_measure);
VoltCurrentSwitch++;
}
else{
VoltCurrentSwitch = 0;
}
NotifyCurrent[0] = (uint8_t) (IV->_MeasureData >> 24);
NotifyCurrent[1] = (uint8_t) ((IV->_MeasureData & 0x00FF0000) >> 16);
NotifyCurrent[2] = (uint8_t) ((IV->_MeasureData & 0x0000FF00) >> 8);
NotifyCurrent[3] = (uint8_t) (IV->_MeasureData & 0x000000FF);
NotifyVolt[0] = (uint8_t) (IV->MeasureVolt >> 24);
NotifyVolt[1] = (uint8_t) ((IV->MeasureVolt & 0x00FF0000) >> 16);
NotifyVolt[2] = (uint8_t) ((IV->MeasureVolt & 0x0000FF00) >> 8);
NotifyVolt[3] = (uint8_t) (IV->MeasureVolt & 0x000000FF);
if (IV->_VOrigin < IV->_VStop) {
if(IV->MeasureVolt >= (IV->_VStop - DAC_ZERO)/5){
PeriodicEvent = false;
DACReset = true;
}
}
else{
if(IV->MeasureVolt <= (IV->_VStop - DAC_ZERO)/5){
PeriodicEvent = false;
DACReset = true;
}
}
}
#endif
@@ -0,0 +1,130 @@
#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;
uint16_t Step;
uint16_t StepTime;
// constant volt
uint16_t VoltConstant;
/** ADC parameter **/
uint8_t ADCGainLevel;
uint8_t AutoGainEnable;
/** Notify parameter **/
uint16_t NotifyRate;
/** Constant Current Parameter **/
int32_t ConstantCurrent;
/** Resister Measure **/
uint8_t ResisterMeter;
// elite function
uint8_t eliteFxn;
uint8_t CycleNumber;
} 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_HALF_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.ConstantCurrent = 0x00000000;
INSTRUCTION.eliteFxn = 0; // default is a null event
INSTRUCTION.CycleNumber = 0;
}
/*********************************************************************
* @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,70 @@
#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) {
PIN_setOutputValue(pin_handle, enable_5v, 1); // enable 5V
TurnOn10V();
LEDPowerON();
return true;
} else {
TurnOnCounter++;
return false;
}
} else {
TurnOnCounter = 0;
PIN_setOutputValue(pin_handle, enable_5v, 0); // enable 5V
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,134 @@
#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();
break;
}
case VIS_RST: {
LEDPowerON();
break;
}
case ADC_TEST: {
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
@@ -30,6 +30,37 @@ static uint8_t NotifyImpedance[4] = {0};
*/
static uint32_t notify_counter = 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
@@ -55,6 +86,27 @@ static uint32_t notify_counter = 0;
*
*
*/
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] = INSTRUCTION.CycleNumber;
SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
}
#endif
@@ -0,0 +1,175 @@
#ifndef ELITEPS
#define ELITEPS
static uint16_t PSCurve(PSMode *PS) {
static uint16_t DACOutCode;
static uint16_t DAC_ControlVolt;
static bool direction_up; // direction_up = true, if Vfinal > Vorigin
static bool current_direction_up; // current_direction_up = true, Vstep => positive. vice versa
// reset origin volt at the begin
if (DACReset) {
PS->_ControlVolt = PS->_VOrigin;
if (INSTRUCTION.VoltFinal > PS->_VOrigin) {
direction_up = true;
current_direction_up = true;
} else {
direction_up = false;
current_direction_up = false;
}
DACOutCode = Usercode_Correction_to_DAC(PS->_ControlVolt);
DAC_outputV(DACOutCode); // output VOLT_ORIGIN
DACReset = false;
return DACOutCode;
}
if (CT.StepTimeCounter == PS->_StepTime) {
// Decide next direction
if (direction_up) {
if (PS->_ControlVolt >= PS->_VStop) {
current_direction_up = false; // problem occurs when origin == 0000 final == ffff!!!!!!
} else if (PS->_ControlVolt <= PS->_VOrigin) {
current_direction_up = true;
if (PS->_CycleNumber == 0) {
PeriodicEvent = false; // periodic event end
DACReset = true;
}
PS->_CycleNumber--;
}
} else {
if (PS->_ControlVolt <= PS->_VStop) {
current_direction_up = true; // problem occurs when origin == 0000 final == ffff!!!!!!
} else if (PS->_ControlVolt >= PS->_VOrigin) {
current_direction_up = false;
if (PS->_CycleNumber == 0) {
PeriodicEvent = false; // periodic event end
DACReset = true;
}
PS->_CycleNumber--;
}
}
// Next output voltage
if (direction_up) {
if (current_direction_up) {
// PS->_ControlVolt overflow ?
if (PS->_ControlVolt + PS->_Step < PS->_ControlVolt) {
PS->_ControlVolt = PS->_VStop;
}
else if (PS->_ControlVolt + PS->_Step > PS->_VStop) {
PS->_ControlVolt =PS->_VStop;
}
else {
PS->_ControlVolt = PS->_ControlVolt + PS->_Step;
}
}
else {
// PS->_ControlVolt underflow ?
if (PS->_ControlVolt - PS->_Step > PS->_ControlVolt || PS->_ControlVolt > 60000) {
PS->_ControlVolt = PS->_VOrigin;
}
// reach Vorigin ?
else if (PS->_ControlVolt - PS->_Step < PS->_VOrigin) {
PS->_ControlVolt = PS->_VOrigin;
}
else {
PS->_ControlVolt = PS->_ControlVolt - PS->_Step;
}
}
}
else {
if (current_direction_up) {
if (PS->_ControlVolt + PS->_Step < PS->_ControlVolt) {
PS->_ControlVolt = PS->_VOrigin;
}
else if (PS->_ControlVolt + PS->_Step > PS->_VOrigin) {
PS->_ControlVolt = PS->_VOrigin;
}
else {
PS->_ControlVolt = PS->_ControlVolt + PS->_Step;
}
}
else {
if (PS->_ControlVolt - PS->_Step > PS->_ControlVolt || PS->_ControlVolt > 60000) {
PS->_ControlVolt = PS->_VStop ;
}
else if (PS->_ControlVolt - PS->_Step < PS->_VStop) {
PS->_ControlVolt = PS->_VStop;
}
else {
PS->_ControlVolt = PS->_ControlVolt - PS->_Step;
}
}
}
DACOutCode = PS->_MeasureVolt - PS->_ControlVolt;
DACOutCode = Usercode_Correction_to_DAC(DACOutCode);
DAC_outputV(DACOutCode);
}
DAC_ControlVolt = Usercode_Correction_to_DAC(PS->_ControlVolt);
return DAC_ControlVolt;
}
static void PS_Plot(PSMode* PS){
static uint8_t VoltCurrentSwitch = 0;
uint16_t ADC_measure = 0;
if(VoltCurrentSwitch < 5){
ReadCurrent(spi_ADC_rxbuf);
VoltCurrentSwitch ++;
}
else if(VoltCurrentSwitch == 5){
// read current
ReadCurrent(spi_ADC_rxbuf);
ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
PS->_MeasureData = DecodeADCCurrent(INSTRUCTION.ADCGainLevel, ADC_measure);
VoltCurrentSwitch ++;
}
else if(VoltCurrentSwitch <9){
// read volt
ReadVolt(spi_ADC_rxbuf);
VoltCurrentSwitch++;
}
else if(VoltCurrentSwitch == 9){
/** read battery voltage **/
ReadVolt(spi_ADC_rxbuf);
ADC_measure = (uint16_t) (spi_ADC_rxbuf[0] << 8) | (uint16_t) (spi_ADC_rxbuf[1]);
PS->_MeasureVolt = DecodeADCVolt(ADC_measure);
VoltCurrentSwitch++;
}
else{
VoltCurrentSwitch = 0;
}
NotifyCurrent[0] = (uint8_t) (PS->_MeasureData >> 24);
NotifyCurrent[1] = (uint8_t) ((PS->_MeasureData & 0x00FF0000) >> 16);
NotifyCurrent[2] = (uint8_t) ((PS->_MeasureData & 0x0000FF00) >> 8);
NotifyCurrent[3] = (uint8_t) (PS->_MeasureData & 0x000000FF);
// NotifyVolt[0] = (uint8_t) (PS->_MeasureVolt >> 24);
// NotifyVolt[1] = (uint8_t) ((PS->_MeasureVolt & 0x00FF0000) >> 16);
// NotifyVolt[2] = (uint8_t) ((PS->_MeasureVolt & 0x0000FF00) >> 8);
// NotifyVolt[3] = (uint8_t) (PS->_MeasureVolt & 0x000000FF);
// if (PS->_VOrigin < PS->_VStop) {
// if(PS->MeasureVolt >= (PS->_VStop - DAC_ZERO)/5){
// PeriodicEvent = false;
// DACReset = true;
// }
// }
// else{
// if(PS->MeasureVolt <= (PS->_VStop - DAC_ZERO)/5){
// PeriodicEvent = false;
// DACReset = true;
// }
// }
}
#endif
@@ -0,0 +1,123 @@
#ifndef ELITERESET
#define ELITERESET
static void reset() {
InitFlag();
InitCT();
// IV/CV mode reset
DiscardIVFirstData = 0;
avg_number = 0;
ADCRealCurrent_long = 0;
ADCGainControl(INSTRUCTION.ADCGainLevel);
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
if (INSTRUCTION.eliteFxn == CONSTANT_CURRENT){
INSTRUCTION.eliteFxn = 0;
}
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();
// IV/CV mode reset
DiscardIVFirstData = 0;
avg_number = 0;
ADCRealCurrent_long = 0;
// ADCGainControl(INSTRUCTION.ADCGainLevel);
// 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();
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,22 @@
#ifndef ELITEVT
#define ELITEVT
static void VT_Plot(VTMode *VT) {
// ADC gain is don't care when measuring voltage
uint8_t ADCGain = 0;
// read ADC volt
ReadVolt(spi_ADC_rxbuf);
// decode ADC value and put it into notify buffer
VT->SetMeasureData((struct Measure *) VT, DecodeADCValue(ADCGain, ADC_CH_VOLT, spi_ADC_rxbuf));
int32_t ADCRealVolt = VT->GetMeasureData((struct Measure *) VT);
NotifyVolt[0] = (uint8_t) (ADCRealVolt >> 24);
NotifyVolt[1] = (uint8_t) ((ADCRealVolt & 0x00FF0000) >> 16);
NotifyVolt[2] = (uint8_t) ((ADCRealVolt & 0x0000FF00) >> 8);
NotifyVolt[3] = (uint8_t) (ADCRealVolt & 0x000000FF);
}
#endif
@@ -0,0 +1,586 @@
/**
*
* struct WorkMode{
* // Measure Only
* ITMode;
* VTMode;
*
* // Measure + VoltOut
* RTMode;
* IVMode;
* CVMode;
*
* // Volt out only
* VOutMode
* }
*
* -------------------------------
* // Measure Only
* struct ITMode{
* MeasureData
* SetMeasureData()
* GetMeasureData()
* }
*
* -------------------------------
* // VoltOut parameter
* stuct VOutMode{
* Vout_UC
* VoltOrigin
* Vstop;
* Step;
* StepTime;
* CycleNumber;
* }
*
*/
#ifndef ELITE_WORK_DATA
#define ELITE_WORK_DATA
#include "EliteInstruction.h"
#define IV_CURVE 0b00010000
#define CV_CURVE 0b00100000
#define VOLT_OUTPUT 0b00110000
#define ZT_CURVE 0b01000000
#define VT_CURVE 0b01010000
#define IT_CURVE 0b01100000
#define SET_SAMPLE_RATE 0b01110000
#define SET_ADC_GAIN 0b10000000
#define DIFFERENTIAL_PULSE_VOLTAMMETRY 0b10100000
#define SQUARE_WAVE_VOLTAMMETRY 0b10110000
#define POTENTIAL_STATE 0b11000000
#define CONSTANT_CURRENT 0b11010000
#define SET_RESISTER_LEVEL 0b11100000
static bool Free_Work_Mode = false;
typedef void (*InitWorkData) ();
/***** Template of Measure and VoltOut parameter *****/
#define MEASURE \
int32_t _MeasureData; \
void (*SetMeasureData) (struct Measure *, int32_t); \
int32_t (*GetMeasureData) (struct Measure *)
/* VoltOut is an UserCode */
/* VOrigin, VStop, Step are all UserCode */
#define VOUT_PARA \
uint16_t _VoltOut; \
uint16_t _VOrigin; \
uint16_t _VStop; \
uint16_t _Step; \
uint16_t _StepTime; \
uint16_t _CycleNumber
// void (*SetVoltOut) (struct VoltOutPara *, uint16_t); \
// uint16_t (*GetVoltOut) (struct VoltOutPara *); \
// void (*SetVOrigin) (struct VoltOutPara *, uint16_t); \
// uint16_t (*GetVOrigin) (struct VoltOutPara *); \
// void (*SetVStop) (struct VoltOutPara *, uint16_t); \
// uint16_t (*GetVStop) (struct VoltOutPara *); \
// void (*SetStep) (struct VoltOutPara *, uint16_t); \
// uint16_t (*GetStep) (struct VoltOutPara *); \
// void (*SetStepTime) (struct VoltOutPara *, uint16_t); \
// uint16_t (*GetStepTime) (struct VoltOutPara *); \
// void (*SetCycleNumber) (struct VoltOutPara *, uint16_t); \
// uint16_t (*GetCycleNumber) (struct VoltOutPara *)
#define LIMIT \
uint32_t _LimitValue; \
void (*SetLimitValue) (struct Limit *, uint32_t); \
uint32_t (*GetLimitValue) (struct Limit*)
struct Measure{
MEASURE;
};
struct VoltOutPara{
VOUT_PARA;
};
struct Limit{
LIMIT;
};
/***** End of Measure and VoltOut parameter *****/
/***** Measure Only Mode *****/
void _SetMeasureData(struct Measure *self, int32_t Data){
self->_MeasureData = Data;
}
int32_t _GetMeasureData(struct Measure *self){
return self->_MeasureData;
}
/**** Limit Mode ****/
//LimitValue
void _SetLimitValue(struct Limit *self, uint32_t LimitValue){
self->_LimitValue = LimitValue;
}
uint32_t _GetLimitValue(struct Limit *self){
return self->_LimitValue;
}
/* IT Mode Data */
typedef struct _ITMode{
MEASURE;
LIMIT;
}ITMode;
ITMode * InitITMode(){
ITMode *ret = malloc(sizeof(ITMode));
ret->_MeasureData = 0;
ret->SetMeasureData = &_SetMeasureData;
ret->GetMeasureData = &_GetMeasureData;
ret->_LimitValue = 0;
ret->SetLimitValue = &_SetLimitValue;
ret->GetLimitValue = &_GetLimitValue;
return ret;
}
/* End of IT Mode Data */
/* VT Mode Data */
typedef struct _VTMode{
MEASURE;
}VTMode;
VTMode * InitVTMode(){
VTMode *ret = malloc(sizeof(VTMode));
ret->_MeasureData = 0;
ret->SetMeasureData = &_SetMeasureData;
ret->GetMeasureData = &_GetMeasureData;
return ret;
}
/* End of VT Mode Data */
/***** End of Measure Only Mode *****/
/**** VoltOut Only Mode ****/
// VoltOut
void _SetVoltOut(struct VoltOutPara *self, uint16_t VoltOut){
self->_VoltOut = VoltOut;
}
uint16_t _GetVoltOut(struct VoltOutPara *self){
return self->_VoltOut;
}
// VOrigin
void _SetVOrigin(struct VoltOutPara *self, uint16_t VOrigin){
self->_VOrigin = VOrigin;
}
uint16_t _GetVOrigin(struct VoltOutPara *self){
return self->_VOrigin;
}
// VStop
void _SetVStop(struct VoltOutPara *self, uint16_t VStop){
self->_VStop = VStop;
}
uint16_t _GetVStop(struct VoltOutPara *self){
return self->_VStop;
}
// Step
void _SetStep(struct VoltOutPara *self, uint16_t Step){
self->_Step = Step;
}
uint16_t _GetStep(struct VoltOutPara *self){
return self->_Step;
}
// StepTime
void _SetStepTime(struct VoltOutPara *self, uint16_t StepTime){
self->_StepTime = StepTime;
}
uint16_t _GetStepTime(struct VoltOutPara *self){
return self->_StepTime;
}
// CycleNumber
void _SetCycleNumber(struct VoltOutPara *self, uint16_t CycleNumber){
self->_CycleNumber = CycleNumber;
}
uint16_t _GetCycleNumber(struct VoltOutPara *self){
return self->_CycleNumber;
}
/* VoltOut Mode Data */
typedef struct _VoltOutMode{
VOUT_PARA;
}VoltOutMode;
VoltOutMode *InitVoltOutMode(){
VoltOutMode *ret = malloc(sizeof(VoltOutMode));
ret->_VoltOut = INSTRUCTION.VoltConstant; // 25000 is DAC_ZERO
ret->_VOrigin = DAC_ZERO;
ret->_VStop = DAC_ZERO;
ret->_Step = 0;
ret->_StepTime = 10000; // STEPTIME_ONE_SEC
ret->_CycleNumber = 1;
// ret->SetVoltOut = &_SetVoltOut;
// ret->GetVoltOut = &_GetVoltOut;
// ret->SetVOrigin = &_SetVOrigin;
// ret->GetVOrigin = &_GetVOrigin;
// ret->SetVStop = &_SetVStop;
// ret->GetVStop = &_GetVStop;
// ret->SetStep = &_SetStep;
// ret->GetStep = &_GetStep;
// ret->SetStepTime = &_SetStepTime;
// ret->GetStepTime = &_GetStepTime;
// ret->SetCycleNumber = &_SetCycleNumber;
// ret->GetCycleNumber = &_GetCycleNumber;
return ret;
}
/* End of VoltOut Mode Data */
/**** End of VoltOut Only Mode ****/
/**** Measure + VoltOut Mode ****/
/* IV Mode Data */
typedef struct _IVMode{
MEASURE;
int32_t MeasureVolt;
VOUT_PARA;
LIMIT;
}IVMode;
IVMode *InitIVMode(){
IVMode *ret = malloc(sizeof(IVMode));
ret->_MeasureData = 0;
ret->SetMeasureData = &_SetMeasureData;
ret->GetMeasureData = &_GetMeasureData;
ret->MeasureVolt = 0;
ret->_VoltOut = DAC_ZERO;
ret->_VOrigin = INSTRUCTION.VoltOrigin;
ret->_VStop = INSTRUCTION.VoltFinal;
ret->_Step = INSTRUCTION.Step;
ret->_StepTime = INSTRUCTION.StepTime;
ret->_CycleNumber = 1;
// ret->SetVoltOut = &_SetVoltOut;
// ret->GetVoltOut = &_GetVoltOut;
// ret->SetVOrigin = &_SetVOrigin;
// ret->GetVOrigin = &_GetVOrigin;
// ret->SetVStop = &_SetVStop;
// ret->GetVStop = &_GetVStop;
// ret->SetStep = &_SetStep;
// ret->GetStep = &_GetStep;
// ret->SetStepTime = &_SetStepTime;
// ret->GetStepTime = &_GetStepTime;
// ret->SetCycleNumber = &_SetCycleNumber;
// ret->GetCycleNumber = &_GetCycleNumber;
ret->_LimitValue = 1e5;
ret->SetLimitValue = &_SetLimitValue;
ret->GetLimitValue = &_GetLimitValue;
return ret;
}
/* End of IV Mode Data */
/* RT Mode Data */
typedef struct _RTMode{
MEASURE;
VOUT_PARA;
}RTMode;
RTMode * InitRTMode(){
RTMode *ret = malloc(sizeof(RTMode));
ret->_MeasureData = 0;
ret->SetMeasureData = &_SetMeasureData;
ret->GetMeasureData = &_GetMeasureData;
ret->_VoltOut = DAC_ZERO; // 25000 is DAC_ZERO
ret->_VOrigin = DAC_ZERO;
ret->_VStop = DAC_ZERO;
ret->_Step = 0;
ret->_StepTime = 10000; // STEPTIME_ONE_SEC
ret->_CycleNumber = 1;
// ret->SetVoltOut = &_SetVoltOut;
// ret->GetVoltOut = &_GetVoltOut;
// ret->SetVOrigin = &_SetVOrigin;
// ret->GetVOrigin = &_GetVOrigin;
// ret->SetVStop = &_SetVStop;
// ret->GetVStop = &_GetVStop;
// ret->SetStep = &_SetStep;
// ret->GetStep = &_GetStep;
// ret->SetStepTime = &_SetStepTime;
// ret->GetStepTime = &_GetStepTime;
// ret->SetCycleNumber = &_SetCycleNumber;
// ret->GetCycleNumber = &_GetCycleNumber;
return ret;
}
/* End of RT Mode Data */
/* CV Mode*/
typedef struct _CVMode{
MEASURE;
VOUT_PARA;
}CVMode;
CVMode * InitCVMode(){
CVMode *ret = malloc(sizeof(CVMode));
ret->_MeasureData = 0;
ret->SetMeasureData = &_SetMeasureData;
ret->GetMeasureData = &_GetMeasureData;
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->SetVoltOut = &_SetVoltOut;
// ret->GetVoltOut = &_GetVoltOut;
// ret->SetVOrigin = &_SetVOrigin;
// ret->GetVOrigin = &_GetVOrigin;
// ret->SetVStop = &_SetVStop;
// ret->GetVStop = &_GetVStop;
// ret->SetStep = &_SetStep;
// ret->GetStep = &_GetStep;
// ret->SetStepTime = &_SetStepTime;
// ret->GetStepTime = &_GetStepTime;
// ret->SetCycleNumber = &_SetCycleNumber;
// ret->GetCycleNumber = &_GetCycleNumber;
return ret;
}
/*End of CV Mode*/
/* Const Current Mode */
#define CC_ZERO_POINT 1500000
#define MAX_DAC_UC 50000
#define MIN_DAC_UC 0
#define CURRENT_LV_ONE 1
#define CURRENT_LV_ZERO 0
/*********************************************************************
* @struct Constant Current Code
*
* @brief A struct to handle CC mode command
*/
typedef struct _CCMode{
// measure value
MEASURE; // current
int32_t BatteryV;
/** Experience Setting **/
/** current value **/
// current value divide current level into 3,000,001 pieces
// 1,500,000 is zero point
int32_t value;
/** ADC level range: 0-2 **/
// constant current value will decide ADC gain level
// if |1500000 - value| > 10000 (+-100 uA) => lv = GAIN_200R
// else if |1500000 - valule| > 1000 (+-10 uA) => lv = GAIN_10K
// else lv = GAIN_200K
uint8_t lv;
/* Vmax and Vmin */
// Vmax protect battery charge
// Vmin protect battery discharge
// uint = mV
uint16_t VMax;
uint16_t VMin;
/* Charge/Discharge Current */
int32_t ChargeCurrent;
int32_t DischargeCurrent;
uint8_t CycleNumber;
bool StandBy;
uint32_t StandByTime;
/** transform a current user code (IUC) to real current in nA **/
int32_t (*_Transform2RealnA)(struct _CCMode *);
}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(CCMode *self){
int32_t IUCReal;
// self->value : 0 ~ 3000000 (which is -1500000 ~ 1500000 (10nA) )
IUCReal = (self->value - CC_ZERO_POINT) * 10;
return IUCReal;
}
CCMode * InitCCMode(){
CCMode *ret = malloc(sizeof(CCMode));
ret->_MeasureData = 0;
ret->SetMeasureData = &_SetMeasureData;
ret->GetMeasureData = &_GetMeasureData;
ret->BatteryV = 0;
ret->value = CC_ZERO_POINT;
ret->lv = INSTRUCTION.ADCGainLevel;
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 Const Current Mode Mode*/
/** Potential State Mode **/
typedef struct _PS{
// measure
MEASURE; // circuit current
int16_t _ControlVolt;
int32_t _MeasureVolt;
VOUT_PARA;
}PSMode;
PSMode *InitPSMode(){
PSMode *ret = malloc(sizeof(PSMode));
ret->_MeasureData = 0;
ret->SetMeasureData = &_SetMeasureData;
ret->GetMeasureData = &_GetMeasureData;
ret->_ControlVolt = INSTRUCTION.VoltOrigin;
ret->_MeasureVolt = INSTRUCTION.VoltOrigin;
ret->_VoltOut = DAC_ZERO; // 25000 is DAC_ZERO
ret->_VOrigin = INSTRUCTION.VoltOrigin;
ret->_VStop = INSTRUCTION.VoltFinal;
ret->_Step = INSTRUCTION.Step;
ret->_StepTime = INSTRUCTION.StepTime; // STEPTIME_ONE_SEC
ret->_CycleNumber = INSTRUCTION.CycleNumber;
return ret;
}
/** End of Potential State Mode **/
typedef union _WorkMode{
// Measure only
ITMode *IT;
VTMode *VT;
// Output Only
VoltOutMode *VO;
// Measure + Output
IVMode *IV;
CVMode *CV;
RTMode *RT;
CCMode *CC;
PSMode *PS;
}WorkMode;
WorkMode *CreateWorkMode(){
WorkMode *ret = malloc(sizeof(WorkMode));
return ret;
}
void InitWorkMode(WorkMode *WM){
switch(INSTRUCTION.eliteFxn){
case IV_CURVE:
WM->IV = InitIVMode();
break;
case CV_CURVE:
WM->CV = InitCVMode();
break;
case VOLT_OUTPUT:
WM->VO = InitVoltOutMode();
break;
case ZT_CURVE:
WM->RT = InitRTMode();
break;
case VT_CURVE:
WM->VT = InitVTMode();
break;
case IT_CURVE:
WM->IT = InitITMode();
break;
case CONSTANT_CURRENT:
WM->CC = InitCCMode();
break;
case POTENTIAL_STATE:
WM->PS = InitPSMode();
break;
default:
WM->VT = InitVTMode();
break;
}
}
void FreeWorkMode(WorkMode *WM){
switch(INSTRUCTION.eliteFxn){
case IV_CURVE:
if(WM->IV != NULL){
free(WM->IV);
WM->IV = NULL;
}
break;
case CV_CURVE:
if(WM->CV != NULL){
free(WM->CV);
WM->CV = NULL;
}
break;
case VOLT_OUTPUT:
if(WM->VO != NULL){
free(WM->VO);
WM->VO = NULL;
}
break;
case ZT_CURVE:
if(WM->RT != NULL){
free(WM->RT);
WM->RT = NULL;
}
break;
case VT_CURVE:
if(WM->VT != NULL){
free(WM->VT);
WM->VT = NULL;
}
break;
case IT_CURVE:
if(WM->IT != NULL){
free(WM->IT);
WM->IT = NULL;
}
break;
case CONSTANT_CURRENT:
if(WM->CC != NULL){
free(WM->CC);
WM->CC = NULL;
}
break;
case POTENTIAL_STATE:
if(WM->PS != NULL){
free(WM->PS);
WM->PS = NULL;
}
break;
default:
if(WM->IV != NULL){
free(WM->IV);
WM->IV = NULL;
}
break;
}
// free(WM);
}
#endif
@@ -0,0 +1,108 @@
#ifndef ELITEZT
#define ELITEZT
static void ZT_notify(int32_t impedance);
// output a certain voltage e.g. 2v
// and measure the input voltage
// => calculate the resister
// change the output voltage step
// => get a R-T curve (with resolution = 1 sample/volt step )
static void ZT_Plot(RTMode *RT) {
// int32_t Real_Resister = 0;
static uint16_t CurrentMeasure=0, VoltMeasure=0;
uint8_t SPICurrent[SPI_ADC_SIZE]={0}, SPIVolt[SPI_ADC_SIZE]={0};
static uint8_t VoltCurrentSwitch = 0;
int32_t volt_32 = 0;
int32_t current_32 = 0;
int32_t resister_32 = 0;
if(INSTRUCTION.AutoGainEnable){
current_32 = AutoGainReadCurrent(SPICurrent);
}
else{
ReadCurrent(spi_ADC_rxbuf);
current_32 = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
}
volt_32 = User2Real(INSTRUCTION.VoltConstant)*1e4;
// ReadVolt(SPIVolt);
// VoltMeasure = (uint16_t) (SPIVolt[0] << 8) | (uint16_t) (SPIVolt[1]);
// volt_32 = DecodeADCVolt(VoltMeasure)*1e4;
resister_32 = volt_32 / current_32;
NotifyVolt[0] = (uint8_t) (volt_32 >> 24);
NotifyVolt[1] = (uint8_t) ((volt_32 & 0x00FF0000) >> 16);
NotifyVolt[2] = (uint8_t) ((volt_32 & 0x0000FF00) >> 8);
NotifyVolt[3] = (uint8_t) (volt_32 & 0x000000FF);
NotifyCurrent[0] = (uint8_t) (current_32 >> 24);
NotifyCurrent[1] = (uint8_t) ((current_32 & 0x00FF0000) >> 16);
NotifyCurrent[2] = (uint8_t) ((current_32 & 0x0000FF00) >> 8);
NotifyCurrent[3] = (uint8_t) (current_32 & 0x000000FF);
NotifyImpedance[0] = (uint8_t) (resister_32 >> 24);
NotifyImpedance[1] = (uint8_t) ((resister_32 & 0x00FF0000) >> 16);
NotifyImpedance[2] = (uint8_t) ((resister_32 & 0x0000FF00) >> 8);
NotifyImpedance[3] = (uint8_t) (resister_32 & 0x000000FF);
// set ADC GAIN
// if(INSTRUCTION.ResisterMeter == RESISTER_METER_LARGE){
// INSTRUCTION.ADCGainLevel = GAIN_200R;
// }
// else if(INSTRUCTION.ResisterMeter == RESISTER_METER_MIDDLE2){
// INSTRUCTION.ADCGainLevel = GAIN_200R;
// }
// else if(INSTRUCTION.ResisterMeter == RESISTER_METER_MIDDLE1){
// INSTRUCTION.ADCGainLevel = GAIN_10K;
// }
// else{
// INSTRUCTION.ADCGainLevel = GAIN_200K;
// }
// ADCGainControl(INSTRUCTION.ADCGainLevel);
// Use 9-th measure value as real-measure value
// because some value in the begin are garbage
// if(VoltCurrentSwitch < 9){
// ADCChannelSelect(ADC_CH_CURRENT);
// CPUdelay(10);
// ADC_read(SPICurrent);
// VoltCurrentSwitch ++;
// }
// else if(VoltCurrentSwitch == 9){
// // read current
// ADCChannelSelect(ADC_CH_CURRENT);
// CPUdelay(10);
// ADC_read(SPICurrent);
// CurrentMeasure = (uint16_t) (SPICurrent[0] << 8) | (uint16_t) (SPICurrent[1]);
// VoltCurrentSwitch ++;
// }
// else if(VoltCurrentSwitch <18){
// // read volt
// ADCChannelSelect(ADC_CH_VOLT);
// CPUdelay(10);
// ADC_read(SPIVolt);
// VoltCurrentSwitch++;
// }
// else if(VoltCurrentSwitch == 18){
// // read volt
// ADCChannelSelect(ADC_CH_VOLT);
// CPUdelay(10);
// ADC_read(SPIVolt);
// VoltMeasure = (uint16_t) (SPIVolt[0] << 8) | (uint16_t) (SPIVolt[1]);
// VoltCurrentSwitch++;
// }
// else{
// VoltCurrentSwitch = 0;
// }
// decode ADC value and put it into notify buffer
// DecodeResister(INSTRUCTION.ADCGainLevel, CurrentMeasure, VoltMeasure);
// Real_Resister = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
}
#endif
@@ -190,14 +190,14 @@ MUX
PGA
programmable gain amplifier configuration
(Full Scale Range = FSR)
000 = FSR is 6.144 V
001 = FSR is 4.096 V
010 = FSR is 2.048 V (default)
011 = FSR is 1.024 V
100 = FSR is 0.512 V
101 = FSR is 0.256 V
110 = FSR is 0.256 V
111 = FSR is 0.256 V
000 = FSR is 6.144 V
001 = FSR is 4.096 V
010 = FSR is 2.048 V (default)
011 = FSR is 1.024 V
100 = FSR is 0.512 V
101 = FSR is 0.256 V
110 = FSR is 0.256 V
111 = FSR is 0.256 V
M
ADC operating mode
@@ -402,21 +402,12 @@ characteristic change event
#endif // ICALL_EVENTS
#include <ti/sysbios/hal/Hwi.h>
#include <ti/sysbios/knl/Queue.h>
#include "EliteADC.h"
#include "EliteDAC.h"
#include "EliteSPI.h"
#include "Elite_PIN.h"
#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)
#ifdef ELITE_VERSION_1_4
#include "EliteI2C.h"
#endif
#ifdef USE_ICALL
#include <icall.h>
#else
@@ -426,11 +417,11 @@ static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue);
// 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
static Clock_Struct periodicClock;
@@ -440,6 +431,7 @@ static Clock_Struct periodicClock;
#include "simple_gatt_profile.h"
static bool PeriodicEvent = false;
static bool InitPeriodicEvent = true;
static ICall_Semaphore semaphore;
static uint16_t events;
@@ -500,60 +492,6 @@ static uint8 channel_table[CHANNEL_COUNT] = {0};
*/
static int8 channel_pointer = -1;
static uint8_t not_buf[BLE_DAT_BUFF_SIZE] = {0};
/*==============================
==== headstage instruction ====
=============================*/
struct HEADSTAGE_INSTRUCTION {
/** chip ID */
uint8_t chip_id;
/** RATE. ADC clock/sampling rate value*/
uint32_t adc_clock_rate;
/** CS **/
uint8_t chip_select;
// ADC
/** SS **/
uint8_t single_short;
/** MUX **/
uint8_t multi_config;
/** PGA **/
uint8_t gain_amp_config;
/** M **/
uint8_t operating_mode;
/** DR **/
uint8_t adc_data_rate;
uint8_t temp_sensor;
uint8_t pullup_R_enable;
uint8_t no_operation;
uint8_t reserved;
// LED
uint8_t global;
uint8_t blue;
uint8_t green;
uint8_t red;
// elite function
uint8_t eliteFxn;
uint8_t CycleNumber;
} INSTRUCTION = {0};
/*=====================================
==== headstage function prototype ====
@@ -599,8 +537,9 @@ static void ADCGainControl(uint8_t ADCLevel);
static void ADCChannelSelect(uint8_t ADCChannel);
static int32_t DecodeADCVolt(uint16_t ADC_measure);
static int32_t DecodeADCCurrent(uint8_t ADCGain, uint16_t ADC_measure);
static void Impedance_Calculate(uint16_t Voltage, int32_t Current);
static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_raw);
static void ADC_overflow(uint8_t gain, uint8_t *rawdata);
static void ADC_overflow(uint8_t gain, uint8_t *rawdata);
// DAC function
static uint16_t Usercode_Correction_to_DAC(uint16_t usercode);
@@ -640,47 +579,43 @@ static void set_update_instruction_callback(update_instruction_callback_type cal
#define VIS_SHIFT_100R 0b10000000
// real instruction
#define IVCurve 0b00010000
#define CyclicVoltammetry 0b00100000
#define fxnGen 0b00110000
#define ZTCurve 0b01000000
#define VTCurve 0b01010000
#define ITCurve 0b01100000
#define SetSampleRate 0b01110000
#define SetADCGain 0b10000000
#define DifferentialPulseVoltammetry 0b10100000
#define SquareWaveVoltammetry 0b10110000
#define PotentialState 0b11000000
#define IV_CURVE 0b00010000
#define CV_CURVE 0b00100000
#define VOLT_OUTPUT 0b00110000
#define ZT_CURVE 0b01000000
#define VT_CURVE 0b01010000
#define IT_CURVE 0b01100000
#define SET_SAMPLE_RATE 0b01110000
#define SET_ADC_GAIN 0b10000000
#define DIFFERENTIAL_PULSE_VOLTAMMETRY 0b10100000
#define SQUARE_WAVE_VOLTAMMETRY 0b10110000
#define POTENTIAL_STATE 0b11000000
#define CONSTANT_CURRENT 0b11010000
#define SET_RESISTER_LEVEL 0b11100000
// CIS instruction
// test instruction
#define ADCTEST 0b10010000
#define ADC_TEST 0b10010000
// DAC and ADC function
static void DAC_outputV(uint16_t voltLV);
static uint16_t DAC_outputV(uint16_t voltLV);
static int32_t DAC_to_realV(uint16_t DACcode);
// input parameter
static uint16_t VoltOrigin = DACzero;
static uint16_t VoltFinal = DACposMax;
static uint16_t Step = 0x009E; // 10 => 0xA0 ~= 30.5 mv
static uint16_t DACUserCode = 0x0000;
static uint16_t SampleRateTable[6] = {1, 10, 100, 500, 1000, 10000}; // 1 =>100 Hz, 10000=>0.01 Hz
static uint16_t SampleRate = 1;
static uint16_t SampleRate_counter = 1;
static uint32_t SampleRateTable[6] = {100, 1000, 10000, 50000, 100000, 1000000}; // 1 =>100 Hz, 10000=>0.01 Hz
// record value for IV curve to calculate average current
static int16_t avg_number = 1;
static int32_t ADCRealCurrent = 0;
static int32_t ADCRealCurrent_avg = 0;
static uint8_t DiscardIVFirstData = 1;
static uint16_t avg_number = 0;
static long long ADCRealCurrent_long = 0;
#define GAIN_200K 0x00
#define GAIN_10K 0x01
#define GAIN_200R 0x02
#define GAIN_AUTO 0x03
static uint8_t ADCGainLevel = GAIN_200K;
// Constant Current Mode function
static uint8_t CCModeDACEnable = 0;
static int32_t CCModeReadCurrent();
static int32_t CCModeVoltOut();
static void CCCurrent2IUC();
// for DPVCurve SWVCurve
static uint16_t Amplitude;
@@ -689,32 +624,43 @@ static uint16_t PulseWidth_16;
static uint8_t PulsePeriod;
static uint16_t PulsePeriod_16;
static uint8_t StepTime = 20; // 0x30 = 2'd48 ~= 2 second, 24 = 0x18 = 1 sec
static uint16_t StepTime_16 = 0;
static uint8_t StepTimeCounter = 1;
struct _CT{
uint32_t SampleRate_counter;
uint16_t StepTimeCounter;
uint16_t NotifyCounter;
uint32_t StandByCounter;
}CT = {0};
static void InitFlag();
static void InitCT();
#include "EliteWorkData.h"
// real instruction fxn
static uint16_t VoltScan(); // used in I-V and cyclic
static void Notify_IV(uint16_t Voltage); // send notify voltage after VoltScan()
static uint16_t VoltScan(WorkMode *WorkModeData); // used in I-V and cyclic
static void DACCode2Real2Notify(uint16_t DACcode); // send notify voltage after VoltScan()
//static void VOLT_OUTPUT();
static void ZT_Plot(RTMode *RT);
static void VT_Plot(VTMode *VT);
static void IV_Plot(IVMode *IV);
static void PS_Plot(PSMode *PS);
static int32_t IT_Plot(WorkMode *WorkModeData);
static void fxn_Gen();
static void ZT_plot(uint16_t outV, uint16_t inV);
static void VT_Plot();
static int32_t IT_Plot();
// the following fxn do the same thing
// IVCurve_T is called if Vorigin > Vfinal, vice versa
static uint16_t OldDAC2UserCode(uint16_t OldDAC);
static uint16_t StepCode2DACcode(uint16_t StepCode);
static uint8_t OldStep2NewStep(uint8_t OldStep);
static uint8_t OldStep2NewStepTime(uint8_t StepTime);
static uint16_t OldStep2NewStepTime(uint8_t StepTime);
static uint8_t IVdone = 0;
static uint16_t IVCurve_T();
static uint16_t IVCurve_T2();
static uint16_t OneWayVoltScan(IVMode *IV);
static void ramp_test();
static uint16_t DPVCurve();
static uint16_t CVCurve();
static uint16_t SWVCurve();
static uint16_t DPVCurve(WorkMode *WorkModeData);
static uint16_t CVCurve(CVMode *CV);
static uint16_t SWVCurve(WorkMode *WorkModeData);
static uint16_t PSCurve(PSMode *PS);
static void reset();
static void Eliteinterrupt();
@@ -725,6 +671,32 @@ static void SendNotify();
static bool If10Von = false;
static void TurnOn10V();
#include "EliteInstruction.h"
#include "EliteADC.h"
#include "EliteDAC.h"
#include "EliteSPI.h"
#include "Elite_PIN.h"
#ifdef ELITE_VERSION_1_4
#include "EliteI2C.h"
#endif
#include "EliteDeviceCorrection.h"
#include "EliteNotify.h"
#include "EliteFlagCTInit.h"
#include "EliteReset.h"
#include "EliteLED.h"
#include "EliteKeyDetect.h"
#include "EliteCCMode.h"
#include "EliteIVCurve.h"
#include "EliteCVCurve.h"
#include "ElitePSCurve.h"
#include "EliteITCurve.h"
#include "EliteVTCurve.h"
#include "EliteZTCurve.h"
#include "impedance_meter.h"
// update instruction for Z meter
static void update_ZM_instruction(uint8 *ins) {
uint8_t ins_type = ins[0] & 0b11110000;
@@ -732,9 +704,7 @@ static void update_ZM_instruction(uint8 *ins) {
INSTRUCTION.chip_id = chip_ID;
uint8_t oper = ins[1] & 0xF0; // this is don't care in RIS
uint8_t data_length = ins[1] & 0x0F;
DACreset = true;
// uint8_t data_length = ins[1] & 0x0F;
if (!If10Von) {
// TurnOn10V();
@@ -744,52 +714,53 @@ static void update_ZM_instruction(uint8 *ins) {
/*** These are real instruction ***/
case INS_TYPE_RIS: {
switch (ins[2]) {
case IVCurve: {
CleanBuffer();
INSTRUCTION.eliteFxn = IVCurve;
DACreset = true;
case IV_CURVE: {
// CleanBuffer();
INSTRUCTION.eliteFxn = IV_CURVE;
DACReset = true;
INSTRUCTION.SampleRate = 1000;
if (ins[3] | ins[4]) {
VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
VoltOrigin = Usercode_Correction_to_DAC(VoltOrigin);
INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
// INSTRUCTION.VoltOrigin = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
}
if (ins[5] | ins[6]) {
VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
VoltFinal = Usercode_Correction_to_DAC(VoltFinal);
INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
// INSTRUCTION.VoltFinal = Usercode_Correction_to_DAC(INSTRUCTION.VoltFinal);
}
if (ins[7] | ins[8]) {
Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
Step = Usercode_Correction_to_DAC(Step);
INSTRUCTION.Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
INSTRUCTION.Step = StepCode2DACcode(INSTRUCTION.Step);
}
if (ins[9]) {
StepTime = ins[9];
StepTime = OldStep2NewStepTime(StepTime);
INSTRUCTION.StepTime = ins[9];
INSTRUCTION.StepTime = OldStep2NewStepTime(INSTRUCTION.StepTime);
}
break;
}
case DifferentialPulseVoltammetry: {
CleanBuffer();
INSTRUCTION.eliteFxn = DifferentialPulseVoltammetry;
DACreset = true;
case DIFFERENTIAL_PULSE_VOLTAMMETRY: {
// CleanBuffer();
INSTRUCTION.eliteFxn = DIFFERENTIAL_PULSE_VOLTAMMETRY;
DACReset = true;
if (ins[3] | ins[4]) {
VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
VoltOrigin = Usercode_Correction_to_DAC(VoltOrigin);
INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
INSTRUCTION.VoltOrigin = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
}
if (ins[5] | ins[6]) {
VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
VoltFinal = Usercode_Correction_to_DAC(VoltFinal);
INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
INSTRUCTION.VoltFinal = Usercode_Correction_to_DAC(INSTRUCTION.VoltFinal);
}
if (ins[7] | ins[8]) {
Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
Step = Usercode_Correction_to_DAC(Step);
INSTRUCTION.Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
INSTRUCTION.Step = StepCode2DACcode(INSTRUCTION.Step);
}
if (ins[9]) {
StepTime = ins[9];
StepTime = OldStep2NewStepTime(StepTime);
INSTRUCTION.StepTime = ins[9];
INSTRUCTION.StepTime = OldStep2NewStepTime(INSTRUCTION.StepTime);
}
if (ins[10] | ins[11]) {
Amplitude = ((uint16_t)(ins[10]) << 8) | (uint16_t)(ins[11]);
@@ -804,26 +775,26 @@ static void update_ZM_instruction(uint8 *ins) {
break;
}
case SquareWaveVoltammetry: {
CleanBuffer();
INSTRUCTION.eliteFxn = SquareWaveVoltammetry;
DACreset = true;
case SQUARE_WAVE_VOLTAMMETRY: {
// CleanBuffer();
INSTRUCTION.eliteFxn = SQUARE_WAVE_VOLTAMMETRY;
DACReset = true;
if (ins[3] | ins[4]) {
VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
VoltOrigin = Usercode_Correction_to_DAC(VoltOrigin);
INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
INSTRUCTION.VoltOrigin = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
}
if (ins[5] | ins[6]) {
VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
VoltFinal = Usercode_Correction_to_DAC(VoltFinal);
INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
INSTRUCTION.VoltFinal = Usercode_Correction_to_DAC(INSTRUCTION.VoltFinal);
}
if (ins[7] | ins[8]) {
Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
Step = Usercode_Correction_to_DAC(Step);
INSTRUCTION.Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
INSTRUCTION.Step = StepCode2DACcode(INSTRUCTION.Step);
}
if (ins[9]) {
StepTime = ins[9];
StepTime = OldStep2NewStepTime(StepTime);
INSTRUCTION.StepTime = ins[9];
INSTRUCTION.StepTime = OldStep2NewStepTime(INSTRUCTION.StepTime);
}
if (ins[10] | ins[11]) {
Amplitude = ((uint16_t)(ins[10]) << 8) | (uint16_t)(ins[11]);
@@ -834,28 +805,28 @@ static void update_ZM_instruction(uint8 *ins) {
}
break;
}
case CyclicVoltammetry: {
CleanBuffer();
INSTRUCTION.eliteFxn = CyclicVoltammetry;
DACreset = true;
case CV_CURVE: {
// CleanBuffer();
INSTRUCTION.eliteFxn = CV_CURVE;
DACReset = true;
INSTRUCTION.SampleRate = 1000;
if (ins[3] | ins[4]) {
VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
VoltOrigin = Usercode_Correction_to_DAC(VoltOrigin);
INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
// INSTRUCTION.VoltOrigin = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
}
if (ins[5] | ins[6]) {
VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
VoltFinal = Usercode_Correction_to_DAC(VoltFinal);
INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
// INSTRUCTION.VoltFinal = Usercode_Correction_to_DAC(INSTRUCTION.VoltFinal);
}
if (ins[7] | ins[8]) {
Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
Step = Usercode_Correction_to_DAC(Step);
INSTRUCTION.Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
INSTRUCTION.Step = StepCode2DACcode(INSTRUCTION.Step);
}
if (ins[9]) {
StepTime = ins[9];
StepTime = OldStep2NewStepTime(StepTime);
INSTRUCTION.StepTime = ins[9];
INSTRUCTION.StepTime = OldStep2NewStepTime(INSTRUCTION.StepTime);
}
if (ins[10]) {
INSTRUCTION.CycleNumber = ins[10];
@@ -864,84 +835,136 @@ static void update_ZM_instruction(uint8 *ins) {
break;
}
case fxnGen: {
INSTRUCTION.eliteFxn = fxnGen;
uint16_t volt = 0;
int32_t RealV = 0;
volt = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
// DAC_outputV(DACOUT, volt); //delete 'command' parameter
volt = Usercode_Correction_to_DAC(volt);
DAC_outputV(volt);
// RealV = DAC_to_realV(volt);
case VOLT_OUTPUT: {
INSTRUCTION.eliteFxn = VOLT_OUTPUT;
INSTRUCTION.VoltConstant = ( ((uint16_t)(ins[3])) << 8) | (uint16_t)(ins[4]);
break;
}
// impedance test
case ZTCurve: {
CleanBuffer();
INSTRUCTION.eliteFxn = ZTCurve;
case ZT_CURVE: {
// CleanBuffer();
INSTRUCTION.eliteFxn = ZT_CURVE;
// INSTRUCTION.VoltConstant = ( ((uint16_t)(ins[3])) << 8) | (uint16_t)(ins[4]);
break;
}
case VTCurve: {
CleanBuffer();
INSTRUCTION.eliteFxn = VTCurve;
StepTime = 0x01;
case VT_CURVE: {
// CleanBuffer();
INSTRUCTION.eliteFxn = VT_CURVE;
// SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
// VT_Plot(); // enable 10v = 0
break;
}
case ITCurve: {
CleanBuffer();
INSTRUCTION.eliteFxn = ITCurve;
StepTime = 0x01;
// IT_Plot(); // enable 10v = 1
case IT_CURVE: {
// CleanBuffer();
INSTRUCTION.eliteFxn = IT_CURVE;
// IT_Plot(); // enable 10v = 1
break;
}
case SetSampleRate: {
uint8_t index = 0;
index = ins[3];
SampleRate = SampleRateTable[index];
SampleRate_counter = 1;
case SET_SAMPLE_RATE: {
INSTRUCTION.SampleRateIndex = ins[3];
INSTRUCTION.SampleRate = SampleRateTable[INSTRUCTION.SampleRateIndex];
CT.SampleRate_counter = 1;
break;
}
case PotentialState: {
INSTRUCTION.eliteFxn = PotentialState;
case POTENTIAL_STATE: {
INSTRUCTION.eliteFxn = POTENTIAL_STATE;
DACReset = true;
INSTRUCTION.SampleRate = 1000;
// test
not_buf[0] = ins[3];
not_buf[1] = ins[4];
not_buf[2] = ins[5];
not_buf[3] = ins[6];
// SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
if (ins[3] | ins[4]) {
INSTRUCTION.VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
// INSTRUCTION.VoltOrigin = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
}
if (ins[5] | ins[6]) {
INSTRUCTION.VoltFinal = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
// INSTRUCTION.VoltFinal = Usercode_Correction_to_DAC(INSTRUCTION.VoltFinal);
}
if (ins[7] | ins[8]) {
INSTRUCTION.Step = ((uint16_t)(ins[7]) << 8) | (uint16_t)(ins[8]);
INSTRUCTION.Step = StepCode2DACcode(INSTRUCTION.Step);
}
if (ins[9]) {
INSTRUCTION.StepTime = ins[9];
INSTRUCTION.StepTime = OldStep2NewStepTime(INSTRUCTION.StepTime);
}
if (ins[10]) {
INSTRUCTION.CycleNumber = ins[10];
}
// // test
// not_buf[0] = ins[3];
// not_buf[1] = ins[4];
// not_buf[2] = ins[5];
// not_buf[3] = ins[6];
// SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
break;
}
case SetADCGain: {
ADCGainLevel = ins[3];
case CONSTANT_CURRENT:{
INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
INSTRUCTION.SampleRate = 10;
INSTRUCTION.ConstantCurrent = ( (uint32_t) (ins[3])<<24 | (uint32_t) (ins[4])<<16 | (uint32_t) (ins[5])<<8 | (uint32_t) (ins[6]) );
INSTRUCTION.NotifyRate = 1000;
// GetInstructionParameter(ins+2);
// CCCurrent2IUC();
break;
}
case ADCTEST: {
INSTRUCTION.eliteFxn = ADCTEST;
case SET_ADC_GAIN: {
INSTRUCTION.ADCGainLevel = ins[3];
if(INSTRUCTION.ADCGainLevel != GAIN_AUTO){
INSTRUCTION.AutoGainEnable = 0;
}
else{
INSTRUCTION.AutoGainEnable = 1;
}
// if(INSTRUCTION.ADCGainLevel == GAIN_200R){
// LED_color(DARKLED, 0x0F, 0x00, 0x00);
// }
// else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
// LED_color(DARKLED, 0x0F, 0x00, 0x0F);
// }
// else if(INSTRUCTION.ADCGainLevel == GAIN_200K){
// LED_color(DARKLED, 0x0F, 0x02, 0xFF);
// }
break;
}
case SET_RESISTER_LEVEL:{
INSTRUCTION.ResisterMeter = ins[3];
break;
}
case ADC_TEST: {
INSTRUCTION.eliteFxn = ADC_TEST;
int32_t ADCRealValue = 0;
uint8_t CIS_buf[9] = {0};
ADCGainControl(ins[3]);
ADCChannelSelect(ins[4]);
CPUdelay(1600);
ADC_read(spi_ADC_rxbuf);
// for(int i=0 ; i<10 ; i++){
ADCGainControl(ins[3]);
ADCChannelSelect(ins[4]);
CPUdelay(10);
ADC_read(spi_ADC_rxbuf);
// CPUdelay(10);
//
// ADCValueTemp = ( uint16_t) (spi_ADC_rxbuf[0]) << 8 | (uint16_t) (spi_ADC_rxbuf[1]);
// ADCValueAVG = ADCValueAVG + ADCValueTemp;
// }
// ADCValueAVG = ADCValueAVG / 10;
// ADCValueTemp = (uint16_t) (ADCValueAVG);
CIS_buf[0] = chip_ID;
for (int i = 0; i < 4; i++) {
CIS_buf[i + 1] = spi_ADC_rxbuf[i];
for(int i=0; i<4 ; i++){
CIS_buf[i+1] = spi_ADC_rxbuf[i];
}
// CIS_buf[1] = (uint8_t) ((ADCValueTemp & 0xFF00) >> 8);
// CIS_buf[2] = (uint8_t) (ADCValueTemp & 0x00FF);
// CIS_buf[3] = spi_ADC_rxbuf[2];
// CIS_buf[4] = spi_ADC_rxbuf[3];
// decode ADC measure value
ADCRealValue = DecodeADCValue(ins[3], ins[4], spi_ADC_rxbuf);
@@ -1166,12 +1189,12 @@ static void headstage_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26X
/*=======================================
==== headstage specific declaration ====
======================================*/
#include "EliteDeviceCorrection.h"
#include "EliteNotify.h"
#include "impedance_meter.h"
/*========================
==== gap information ====
p information ====
=======================*/
#ifndef DEVICE_NAME
@@ -102,6 +102,7 @@
#include "simple_peripheral.h"
#include "EliteGPTimer.h"
#include "headstage.h"
#if defined(USE_FPGA) || defined(DEBUG_SW_TRACE)
@@ -527,6 +528,8 @@ static void SimpleBLEPeripheral_init(void) {
HCI_LE_ReadMaxDataLenCmd();
}
#include "EliteWorkData.h"
/*********************************************************************
* @fn SimpleBLEPeripheral_taskFxn
*
@@ -540,20 +543,23 @@ static void SimpleBLEPeripheral_init(void) {
// 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();
ZM_init();
Elite_SPI_init();
WorkMode *WorkModeData = CreateWorkMode();
uint8_t key = 0;
uint8_t counter6994 = 0;
uint16_t counter6994 = 0;
bool EliteOn = 0;
Util_constructClock(&periodicClock, SimpleBLEPeripheral_clockHandler, SBP_PERIODIC_EVT_PERIOD, 0, false, SBP_PERIODIC_EVT); // create a clock clockduration = 42(~=0.01 sec)
Util_startClock(&periodicClock); // start the clock, timeup => call SimpleBLEPeripheral_clockHandler => wake up the device
// init DAC, set output ~= 0 V
DAC_outputV(Usercode_Correction_to_DAC(25000));
elite_gptimer_start();
// Application main loops
for (;;) {
@@ -602,16 +608,16 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
ICall_free(pMsg);
}
}
}
if(events & SBP_PERIODIC_EVT){
events &= ~SBP_PERIODIC_EVT;
if (!PeriodicEvent) { // if there is no periodic event
Util_startClock(&periodicClock); // manually restart the clock
key = PIN_getInputValue(switch_on);
if (EliteOn) {
if (counter6994 < 175) { // counter6994 enable a IC after 35 counts
if (counter6994 < CLOCK_ONE_SECOND/2) { // counter6994 enable a IC after 35 counts
counter6994++;
} else if (counter6994 == 175) {
} else if (counter6994 == CLOCK_ONE_SECOND/2) {
PIN_setOutputValue(pin_handle, shutdown_6994, 1); // OFF = 1 => turn off 6994
// #ifdef ELITE_VERSION_1_4
// SPI_close(spiHandle0);
// I2Cinit();
@@ -621,26 +627,32 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
counter6994++;
}
EliteKeyPress(key);
if(Free_Work_Mode){
FreeWorkMode(WorkModeData);
InitEliteInstruction();
ADCGainControl(INSTRUCTION.ADCGainLevel);
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
Free_Work_Mode = false;
}
} else {
EliteOn = TurnOnElite(key);
}
// if(DAC_reset) DAC_outputV(0x0000); //set DAC to 0v when no periodic event
} else { // if there is periodic event
Util_startClock(&periodicClock); // manually restart the clock
SimpleBLEPeripheral_performPeriodicTask();
}
// if there is periodic event
else {
if(InitPeriodicEvent){
InitWorkMode(WorkModeData);
InitPeriodicEvent = false;
}
// Perform periodic application task
SimpleBLEPeripheral_performPeriodicTask(WorkModeData);
key = PIN_getInputValue(switch_on);
EliteKeyPress(key); // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
}
}
// if(events & SBP_PERIODIC_EVT){
// Util_startClock(&periodicClock);
// events &= ~SBP_PERIODIC_EVT;
// // Perform periodic application task
// SimpleBLEPeripheral_performPeriodicTask();
// }
// if (events & SBP_PERIODIC_EVT)
// {
// events &= ~SBP_PERIODIC_EVT;