Compare commits

...

300 Commits

Author SHA1 Message Date
Benny Liu ced7a357e5 Modify calibration parameter. 2021-12-23 17:18:56 +08:00
Taylor cf21efb331 reset avg_count and unmerge 2021-10-12 17:22:51 +08:00
Taylor 08a758b77e Read 3 times, add test_timer 2021-10-07 13:19:39 +08:00
Taylor 50d0398d5a Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h
2021-10-06 09:56:21 +08:00
Taylor 37c556bcd3 Read start frequency three times 2021-10-06 09:54:16 +08:00
Benny Liu ac14aa1e1e Old UI calibration okay, good!!! 2021-09-30 18:36:55 +08:00
Benny Liu 49f99fb9f6 Modify calibration functions. 2021-09-30 16:00:11 +08:00
Taylor 3553e2c5e3 Read start frequency twice 2021-09-30 14:31:42 +08:00
Taylor d155fab875 Start fixing first data point problem 2021-09-30 12:03:27 +08:00
Taylor 464e80310e Trying new high freq setting 2021-09-29 13:19:42 +08:00
Benny Liu 8b1ee78b63 Use DEV tool to test function, still no no. 2021-09-28 14:13:12 +08:00
Benny Liu 30deffd0a3 Calibration function implement on CS2.0 2021-09-28 13:52:07 +08:00
Taylor c9683added Points per decades from 2 to 10 FIXED 2021-09-24 15:11:28 +08:00
Taylor 37f56b3acd Points per decades from 2 to 10 2021-09-24 10:50:46 +08:00
Taylor c30c735c9a Points per decades from 2 to 10 2021-09-22 17:50:55 +08:00
Taylor f1e1593a9a phase order change 2021-09-17 18:08:04 +08:00
Taylor 6f952b0600 phase order change 2021-09-17 17:05:53 +08:00
Taylor 427a1f8ee8 re-calibrate gain level 3 (a*exp(bx) + c*exp(dx)) 2021-09-17 16:56:37 +08:00
Taylor 0a8c570027 HSRTIA 160k and 20k calibration parameters added 2021-09-16 19:55:54 +08:00
Taylor 6b32b71bfa HSRTIA 5k and 200R calibration parameters added 2021-09-15 22:56:18 +08:00
Taylor 98daa4a268 Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721 2021-09-15 11:48:13 +08:00
Taylor 25b3caa8b5 EFCF CV 2021-09-15 11:47:52 +08:00
Benny Liu 7abe679d8a LPDAC calibration function. 2021-09-14 18:14:42 +08:00
Taylor ed0e856542 dummy cell nono 2021-09-14 14:40:20 +08:00
Taylor cd630d4125 Auto Change Gain size problem 2021-09-13 13:33:33 +08:00
Taylor 39f2847485 repeat last decade fixed 2021-09-13 11:15:29 +08:00
Taylor 13418b6663 looks good good 2021-09-09 15:13:23 +08:00
Taylor 78b6fc9de2 HSTIA_Iin *100 2021-09-09 10:54:26 +08:00
Taylor a27bc9523e Read again if change gain. 2021-09-08 18:44:33 +08:00
Taylor 65679c5974 read HSTIA once 2021-09-08 17:58:31 +08:00
Taylor 8db68f9794 Gain Current Boundary /100 2021-09-08 16:53:59 +08:00
Taylor 8c0d8255a7 Trying AutoChangeGain stuff 2021-09-08 15:00:39 +08:00
Taylor Liao 010c89e862 Adding CaliHSTIA stuff 2021-09-08 10:36:10 +08:00
Taylor Liao 0e27334394 AutoChangeHSRTIA i think it's done 2021-09-05 14:20:19 +08:00
Taylor Liao 8bb4484570 Fixed WAVEGENEN 2021-09-04 12:40:50 +08:00
Taylor Liao eeefd47b44 wtf waveform generator doesn't work 2021-09-04 12:19:44 +08:00
Taylor Liao 04270b85b3 fixed premature wm_get problem 2021-09-03 15:53:07 +08:00
Taylor Liao f6c8e06776 wtf???? 2021-09-03 13:59:27 +08:00
Taylor Liao 9cb791976d wtf 2021-09-03 13:13:17 +08:00
Taylor Liao dba6cde440 Separate into 3 SendCaliValue functions warning fixed 2021-09-03 11:32:58 +08:00
Taylor Liao 312a961f94 Separate into 3 SendCaliValue functions 2021-09-03 11:24:22 +08:00
Taylor Liao 97a344c349 Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteADC.h
2021-09-03 11:13:11 +08:00
Taylor Liao f84a4dab27 7 Sets of Phase calibration parameter ready 2021-09-03 11:12:09 +08:00
Taylor Liao 0afe5f764a Gonna try sending parameters many times 2021-09-03 10:31:40 +08:00
Benny Liu 2d40295688 Use CS2.0 for calibraiton, HSDAC, HSTIA, and LPDAC okay.
LPTIA shift gear no no.
2021-09-02 18:20:40 +08:00
Taylor Liao aeee554ac2 Fixing CV 2021-09-02 16:36:28 +08:00
Benny Liu ed8900c38d Use CS2.0 for calibraiton, LPTIA still no no. 2021-09-02 14:02:50 +08:00
Taylor Liao 9cb1c1d1e7 Fixing CV LPTIA 2021-09-02 13:20:27 +08:00
Taylor Liao b843e05c39 [update] Try DFT IRQ (no no) and EnDFTnADCnWG (good good) 2021-09-02 01:37:23 +08:00
Taylor Liao 4d7f3054b1 [update] PhaseParaA to 2 Bytes 2021-09-01 22:35:27 +08:00
Taylor Liao f57397cb38 CTIA disconnect, cutoff frequency good 2021-09-01 18:17:55 +08:00
Taylor Liao 6159d35cb3 Garbage everything 2021-09-01 12:23:14 +08:00
Taylor Liao 98a14c7ef8 Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721 2021-09-01 10:40:44 +08:00
Taylor Liao 89d7a7b012 CaliTable try 2021-09-01 10:40:29 +08:00
Benny Liu c7a5ead820 Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721 2021-08-31 18:26:08 +08:00
Benny Liu 15fc8d8e42 Use cali_VT_plot for LPTIA calibration. Calibration output still no no. 2021-08-31 18:25:56 +08:00
Taylor Liao be19d969ad Gonna try old switch matrix setting, ie SE0 to GND 2021-08-31 17:30:19 +08:00
Taylor Liao bf38d2f4ea fixing cv auto gain change 2021-08-31 15:38:54 +08:00
Taylor Liao 76de153299 eis cali mask fix 2021-08-31 12:16:32 +08:00
Taylor Liao 1e919a7211 Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721 2021-08-31 11:43:07 +08:00
Taylor Liao c91d1ccf21 eis cali stuff + finishMode slash GainLv 2021-08-31 11:42:43 +08:00
Benny Liu a5dad54034 Still no no, LPTIA gain shift to 200R automatically. 2021-08-31 11:34:45 +08:00
Taylor Liao c9783e48a1 eis cali stuff 2021-08-30 19:24:01 +08:00
Taylor Liao 1051ffd8fc eis cali stuff 2021-08-30 19:17:35 +08:00
Taylor Liao 162048a009 eis cali stuff 2021-08-30 19:14:52 +08:00
Taylor Liao 3f3107e7e0 eis cali stuff 2021-08-30 19:07:58 +08:00
Taylor Liao 839647c2a6 eis cali stuff 2021-08-30 19:05:44 +08:00
Taylor Liao 563ed5f724 eis cali stuff 2021-08-30 18:53:27 +08:00
Taylor Liao ef4eaa6b2d eis cali stuff 2021-08-30 15:52:30 +08:00
Taylor Liao f4df61ec6d V0.1 EIS 2021-08-30 15:47:24 +08:00
Taylor Liao d760414837 testing 40K frequency setting 2021-08-30 15:25:13 +08:00
Taylor Liao 21dfcc8c03 Fix frequency bug 2021-08-30 14:39:28 +08:00
Taylor Liao db7c35c294 Delete comments 2021-08-30 12:16:13 +08:00
Taylor Liao 47c8303c9d all UI options open version 2021-08-30 01:07:28 +08:00
Taylor Liao a9cd19727b Average done 100k to 1Hz good 2021-08-30 01:05:58 +08:00
Taylor Liao 3e067bc1c4 testing 10Hz ~ 0.01Hz 2021-08-27 17:24:52 +08:00
Taylor Liao d7fc95b90b All sinc3 2021-08-27 14:20:55 +08:00
Taylor Liao 883c7759b0 Good 200K to 100Hz 2021-08-27 09:19:13 +08:00
Taylor Liao be0fba2947 GARBAGE SINC2 2021-08-26 19:28:32 +08:00
Taylor Liao f1c03ea972 GARBAGE2 2021-08-26 18:00:49 +08:00
Taylor Liao 837741d3e3 Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721 2021-08-26 17:50:05 +08:00
Taylor Liao 5157a83bbe GARBAGE 2021-08-26 16:17:42 +08:00
Benny Liu 2b2fc8f3ec Modify LPTIA gain control function. 2021-08-26 14:54:58 +08:00
Taylor Liao f552bdacab idk why but it worked! 2021-08-25 23:22:33 +08:00
Taylor Liao 2679cdead2 trying out 1000 ~ 10000 2021-08-24 21:20:42 +08:00
Taylor Liao cfa25627bd trying out 1000 ~ 10000 2021-08-24 21:12:23 +08:00
Taylor Liao 88fd446fef work 2021-08-24 19:27:17 +08:00
Taylor Liao c5f084a93c doesn't work 2021-08-24 19:05:27 +08:00
Taylor Liao 0eb46585d8 work 2021-08-24 19:05:07 +08:00
Taylor Liao 8ff9884301 Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721 2021-08-24 19:03:50 +08:00
Taylor Liao 2054421b78 doesn't work 2021-08-24 19:03:38 +08:00
Benny Liu 45131f3e8d Change to new UI mode. 2021-08-24 16:38:32 +08:00
Benny Liu 61da4e107d LPTIA ADC notify okay; LPTIA gain control function no no, still need to figure out... 2021-08-24 16:37:36 +08:00
Benny Liu daff7d5929 Modify calibration IT_plot function. 2021-08-24 09:36:51 +08:00
Benny Liu 4eaade4d8a Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721 2021-08-24 09:34:29 +08:00
Taylor Liao 54bcb0efe2 100Hz down same data 2021-08-23 19:42:37 +08:00
Taylor Liao e8d10e9e87 last data point deleted 2021-08-23 15:07:00 +08:00
Taylor Liao ce3462b2b3 forward and reverse frequency sweep gives different data wtf 2021-08-23 11:28:30 +08:00
Taylor Liao 0c3af8b70e Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/AD5940.h
2021-08-23 11:27:59 +08:00
Taylor Liao 15cc5a4b82 forward and reverse frequency sweep gives different data wtf 2021-08-23 11:25:35 +08:00
Taylor Liao 7e2e7467bd Version 2 10Hz down get data, but unreasonable from 1.67Hz down. 2021-08-23 08:03:54 +08:00
Taylor Liao 339282d568 Version 2 reverse sweep gets all the data, but same data from 10Hz down 2021-08-22 21:40:58 +08:00
Taylor Liao 780d0afa6a Version 2 getting zeros up to 100Hz, not able to enable SINC2 filter. 2021-08-22 12:45:06 +08:00
Benny Liu 02089810f2 Modify ADC calibration count. 2021-08-20 11:49:42 +08:00
Taylor Liao 18c35e27d0 Version 2 swirl appears and fixed frequency non-ending problem 2021-08-20 10:48:00 +08:00
Taylor Liao ce3b4f50a7 Version 2 swirl appears 2021-08-20 10:36:01 +08:00
Taylor Liao 31c897c9dc Version 2 2021-08-20 10:13:01 +08:00
Taylor Liao 8443648d48 Version 2 2021-08-20 04:30:21 +08:00
Taylor Liao 2d877ea62d stupid stuff, just in case 4 2021-08-19 18:03:47 +08:00
Taylor Liao 37df7d21e3 stupid stuff, just in case 3 2021-08-19 17:15:29 +08:00
Taylor Liao 0e8707bbd1 stupid stuff, just in case 2 2021-08-19 15:47:29 +08:00
Taylor Liao 479a4d6de1 stupid stuff, just in case 2021-08-19 04:11:15 +08:00
Benny Liu dffe29f80d LPDAC function okay. 2021-08-18 18:12:44 +08:00
Taylor Liao 31dff11f6e Sinc3 + Sinc2 setup done 2021-08-16 23:52:15 +08:00
Benny Liu 8f075f477b Add LPDAC and LPTIA calibration function. 2021-08-16 17:11:34 +08:00
Taylor Liao c133fa74c3 Counters Done. It worked, but now it doesn't weird 2021-08-16 14:23:16 +08:00
Taylor Liao 7edcb7517a CalcPeriod CalcDelayTime functions done 2021-08-13 17:16:35 +08:00
Benny Liu 6cb1e18b7a Switch to new UI define 2021-08-12 18:30:25 +08:00
Benny Liu 980aba0010 Switch to new UI define 2021-08-12 18:29:34 +08:00
Taylor Liao c6800f8f4f Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/AD5940.h
2021-08-12 17:50:18 +08:00
Taylor Liao 3ee0945114 Fixed AutoChangeGain 2021-08-12 17:49:06 +08:00
Taylor Liao 09c47df3bb Measured current in nA done 2021-08-12 05:09:23 +08:00
Taylor Liao 5b68f374e7 Magnitude Fixed 2021-08-12 04:39:04 +08:00
Taylor Liao 8d6e639c99 Phase Fixed 2021-08-12 03:34:13 +08:00
Benny Liu 5616203743 Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/AD5940.h
2021-08-10 17:15:27 +08:00
Benny Liu cbd103794c Modify EIS init function. ADC calibration okay. 2021-08-10 17:11:08 +08:00
Taylor Liao a6c980cb0b Fixed Reverse Frequency Spacing (Linear) 2021-08-10 16:37:56 +08:00
Taylor Liao d812b3eea2 Fixed Reverse Frequency Spacing 2021-08-10 14:55:12 +08:00
Taylor Liao 50a9034b38 Cutoff Frequency thing is fixed, I think 2021-08-09 15:39:41 +08:00
Taylor Liao b799ef44cc Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h
2021-08-09 10:14:01 +08:00
Benny Liu 5fc157e66d Add AD5940.h to make it look more tidy.
HSTIA calibration data count increase to 5000.
2021-08-06 15:17:20 +08:00
Benny Liu 7234964ba1 HSTIA_cali_config send twice 2021-08-06 11:59:23 +08:00
Taylor Liao 5a472c1e5b Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721 2021-08-06 11:34:29 +08:00
Benny Liu 9fc5858073 Modify HSTIA gain control function 2021-08-06 11:31:08 +08:00
Taylor Liao f7570eda95 Corrected DFTCON and other AD5940 settings 2021-08-05 16:58:35 +08:00
Taylor Liao 8e5369389f Testing AutoGainChange and Current Calc 2021-08-05 16:38:33 +08:00
Taylor Liao 71c00ac6b3 Log Frequency with Table done 2021-08-05 12:23:01 +08:00
Taylor Liao fa0d47c241 Working on AutoGainChange in putting log scale in a table 2021-08-05 11:14:30 +08:00
Taylor Liao 96d94f79b7 Separate out EIS voltage set to DAC_outputV() 2021-08-04 23:58:15 +08:00
Taylor Liao bd96102ec2 Fix CV Cycle Number 2021-08-04 19:33:44 +08:00
Taylor Liao 79239bd4a7 Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721 2021-08-04 16:50:23 +08:00
Taylor Liao 02e72276aa CV really works on new UI now oh yeah oh yeah 2021-08-04 16:50:10 +08:00
Benny Liu df3b074539 ADC function okay 2021-08-04 16:00:17 +08:00
Taylor Liao 4bf451b64c Works now lol 2021-08-03 20:23:34 +08:00
Taylor Liao d06895e074 CV Mode Doesn't run 2021-08-03 16:51:03 +08:00
Benny Liu e2672cf2b2 Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721 2021-08-02 15:36:56 +08:00
Benny Liu 495fca7e90 HSDAC calibration mode okay. 2021-08-02 15:36:40 +08:00
Taylor Liao 3ef9f32df6 Miss delay function and auto change gain for EIS. fset in log scale and linear 99% done. 2021-08-02 14:55:56 +08:00
Taylor Liao 9ebe9c902f Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721 2021-08-02 14:53:04 +08:00
Taylor Liao 9ea1f6e40d Miss delay function and auto change gain for EIS. fset in log scale and linear 99% done. 2021-08-02 14:52:35 +08:00
Benny Liu 2bc7184d4d Modify Calibration pin configuration. Good Good. 2021-07-30 18:20:10 +08:00
Taylor Liao 27ffda9adf Change all fset to instru.fset 2021-07-29 23:50:03 +08:00
Taylor Liao 1f8b280b2c Fixing HEADSTAGE_INSTRUCTION error 2021-07-29 23:16:41 +08:00
Taylor Liao a6950c2b74 Fix function naming warning 2021-07-28 23:19:08 +08:00
Taylor Liao 5f3e5bbd6b Adding EliteEISMode.h 2021-07-28 22:56:34 +08:00
Taylor Liao d379f0b5f7 Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721
# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteADC.h
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDAC.h
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteSPI.h
2021-07-28 22:46:09 +08:00
Benny Liu 9130c9edc2 Use 4 pin connector to test DAC function. 2021-07-28 16:11:52 +08:00
Benny Liu fb8fdd5d5b Use Amber controller to test calibration function. No No. 2021-07-28 14:46:43 +08:00
Taylor Liao 53305aaec5 warning fixed 2021-07-28 11:23:45 +08:00
Taylor Liao 51e8f8f4fa Missing Dellay and PPD 90% Done 2021-07-28 10:08:15 +08:00
Benny Liu 8c31d345fc Modify AD5904 init function 2021-07-26 17:14:36 +08:00
Taylor Liao 3d00ed87c7 AutoGainChange probably done | Voltage in [5nV] 2021-07-26 15:19:27 +08:00
Taylor Liao aa8023d3a1 ADCDAT reads Iin [nA] 2021-07-22 16:57:11 +08:00
Benny Liu 331fb14342 calibration mode for HSTIA 2021-07-20 12:05:08 +08:00
Taylor Liao 540a53e917 Current surge at -2V 2021-07-20 09:41:02 +08:00
Benny Liu c9d1efa1f7 HSTIA control function. 2021-07-19 14:04:07 +08:00
Taylor Liao 5093fb354f CV3 almost done. Need to fix current surge crossing 0. 2021-07-16 14:50:17 +08:00
Benny Liu 209fd3239e Power Mode control function. 2021-07-16 14:21:56 +08:00
Benny Liu 2bf8a1781b HSDAC calibration mode. 2021-07-14 12:07:57 +08:00
Benny Liu 520e0939f6 add HSDAC gain control function 2021-07-12 17:39:29 +08:00
Taylor Liao 03cef16fd6 Trapezoid Gen Done 2021-07-05 02:28:21 +08:00
Taylor Liao e59a0b76bf Sequencer test and sequencer helpers done 2021-07-04 03:24:17 +08:00
Taylor Liao 247e5e50b7 Mag and phase done, parameters need adjustment 2021-06-25 18:12:54 +08:00
Taylor Liao 495f1e3834 Magnitude and phase shift 95% done 2021-06-24 13:40:52 +08:00
Taylor Liao d0061e7d5c Magnitude and phase shift 95% done 2021-06-24 13:28:54 +08:00
Taylor Liao 8af6af1849 EIS Notify and UI Plotting Done (Data requires adjustment) 2021-06-22 10:31:56 +08:00
Taylor Liao 6f4d8818b5 EIS basic functions work in 1.5 2021-06-18 11:49:39 +08:00
Taylor Liao 75cd2faf91 ESI big moving to 1.5 2021-06-17 16:28:48 +08:00
Roy 12241635a3 [update] update CURVE_CALI_ADC 2021-06-17 12:18:24 +08:00
Roy 18eba87064 [update] update OCP mode & merge vscan_volt 2021-06-17 11:48:18 +08:00
Roy d313f48eaa [update] new OCP mode and centralized notify 2021-06-16 22:32:54 +08:00
Roy 117336020f [update] new Vout_Plot 2021-06-15 14:03:49 +08:00
Roy cf3172f99a [update] update Elite_mode_ADC_DAC file 2021-06-09 14:28:16 +08:00
Roy 8b32a6d2d1 [cali] add BOARD_F08F & E774 & ED21 & EE3A & F010 & EEEF calibration data. 2021-06-07 15:27:44 +08:00
Roy 3e7d3abed7 [update] change to ELITE_PIN_1_5_RE version 2021-05-25 10:12:33 +08:00
Roy 6ac29b48c2 [update] change to ELITE_PIN_1_5_RE 2021-05-25 09:56:56 +08:00
Roy d0d83e6ae6 [cali] add BOARD_C5AF & C6E7 & ED49 calibration data. 2021-05-25 09:36:48 +08:00
Roy 0e181aaa07 [cali] add BOARD_C68B & ED5A & C705 & C6EF calibration data. 2021-05-21 15:32:40 +08:00
Roy a7b0b3965c RT send resister in denomination of mOhm to controller 2021-04-19 10:18:13 +08:00
Roy dbbb44e0d2 new sps on IT.VT.RT.CC.VOUT mode 2021-04-14 09:28:08 +08:00
Roy 156927e8f9 new sps on IT.VT.RT.CC.VOUT mode 2021-04-13 11:31:27 +08:00
Roy daab3bed0b GPtimer CLOCK_FREQ 4800 -> 4769 2021-04-12 09:37:02 +08:00
Roy 7c6d7c68de CC MODE deltaV = 10mV 2021-04-09 16:23:10 +08:00
Roy eff1e4a43e new 1.5re pin (use define) 2021-04-09 10:48:25 +08:00
Roy 9678266e59 fix RT (no 10 ohm) 2021-04-08 14:10:31 +08:00
Roy 6f74dc2c05 datalength extension:60bytes 2021-04-08 11:07:44 +08:00
Roy 910576ac6d datalength extension 200 bytes 2021-03-31 10:19:35 +08:00
Roy 9377dc517f battery < 3V when running mode, don't close elite 2021-03-16 14:25:21 +08:00
Roy e44d3d8e60 adjusted cc value 2021-03-16 11:24:45 +08:00
Roy f5416d5e1f measure battery when run mode 2021-03-15 15:44:47 +08:00
Roy 0d60074697 send mode finish flag 2021-03-12 12:12:24 +08:00
Roy 3c74358634 update notify rate 2021-03-10 17:25:12 +08:00
Roy 398f9977b8 add debug battery func 2021-03-08 10:05:53 +08:00
Roy 89db7e4575 don't measure battery when run mode 2021-03-08 10:01:46 +08:00
Roy 2b99b96f0f don't measure battery when run mode 2021-03-05 12:15:47 +08:00
Roy 1b67c809a9 open highz when finish experiment 2021-03-05 11:55:07 +08:00
Roy 59aac611f6 open highz when finish experiment 2021-03-05 11:31:14 +08:00
Roy 6f5baf38ce open highz when finish experiment 2021-03-05 10:29:20 +08:00
Roy 05f8eb4c51 change vin level when open elite, battery value is right 2021-03-04 11:48:12 +08:00
Roy 9bd536bb68 [update] don't meas battery when no reriodicEvent 2021-01-28 11:06:08 +08:00
Roy 81d9aaab1f [update] organize code 2021-01-28 10:41:45 +08:00
Roy 341c5939ac [update] organize code 2021-01-27 17:45:43 +08:00
Roy c50c0b4dec [update] close highz & set DAC value in pre-treated (100ms) 2021-01-27 15:03:39 +08:00
Roy 1639eddc6d [update] free malloc when change mode 2021-01-26 18:08:27 +08:00
Roy cc50bbc0a4 [update] pulse module 2021-01-26 16:08:24 +08:00
Roy 913d269a32 [update] ca module 2021-01-26 15:44:26 +08:00
Roy 5938d6645f [update] lsv module 2021-01-26 15:33:02 +08:00
Roy 3fda9fff6c [update] cv module 2021-01-26 15:16:30 +08:00
Roy 6f6346ac45 Merge branch 'Elite1.5_dev_module_0125_4' into Elite1.5_dev_module_0125_5 2021-01-26 13:42:36 +08:00
Roy 4ca15b1ec9 [update] open highz when elite int() & reset() 2021-01-26 13:40:38 +08:00
Roy 4c0cdcbfe9 [update] cc module 2021-01-26 12:30:46 +08:00
Roy ccb6939b34 [update] iv_cy module 2021-01-26 11:59:48 +08:00
Roy 27baa87562 [update] iv module 2021-01-26 11:12:00 +08:00
Roy ea862012b8 Merge branch 'Elite1.5_dev_module_0125_3' into Elite1.5_dev_module_0125_4 2021-01-26 10:53:44 +08:00
Roy d8c0d5e420 [update] open highz when elite turn on 2021-01-26 10:45:41 +08:00
Roy 43c606577a [update] rt module 2021-01-26 10:40:05 +08:00
Roy 72a64479d4 [update] vo module 2021-01-25 18:29:35 +08:00
Roy c6b45ecca4 [update] it module 2021-01-25 17:56:09 +08:00
Roy 11d828bfc7 [update] vt module 2021-01-25 17:12:09 +08:00
Roy 79bca317c2 [update] vt module 2021-01-25 17:02:32 +08:00
Roy ea254423d6 [cali] add BOARD_C5CD calibration data. 2021-01-25 10:47:06 +08:00
Roy f151d5a74d [update] fix CC mode 2021-01-25 10:18:40 +08:00
Roy 5cc2d878be [update] fix Vout mode 2021-01-22 18:31:31 +08:00
Roy 18eeeec7cc [update] update cycle 8bit to 16bit 2021-01-22 18:20:08 +08:00
Roy 81d753b5f0 [update] fix RT mode 2021-01-17 17:40:30 +08:00
Roy 0841d08972 [update] fix Vout mode (ok) 2021-01-11 23:35:43 +08:00
Roy de5bb460fc [update] fix WM (not ok) 2021-01-11 00:47:35 +08:00
Roy eb45ca6d81 [update] test struct ok 2021-01-08 18:05:27 +08:00
Roy b0d2697c92 [update] test struct fail 2021-01-08 12:27:28 +08:00
Roy 0dc0b66234 [update] test struct fail 2021-01-08 10:39:49 +08:00
Roy 11da60ab8f test struct 2021-01-08 00:42:28 +08:00
Roy 41c7db8776 [update] test TT-CURVE 2021-01-07 18:22:26 +08:00
Roy 916a8f5dc7 [update] fix Cycle I-V cycle 2021-01-05 11:08:06 +08:00
Roy 25cc8b16fa [update] fix CV3 cycle 2021-01-05 10:31:08 +08:00
Roy 67bf8b67dd [cali] add BOARD_C797 & BOARD_C639 calibration data. 2020-12-31 09:40:38 +08:00
Roy 13dfdbd502 [update] fix problem for change level 2020-12-30 16:36:16 +08:00
Roy e0ae30d40d [update] add dark led fun() 2020-12-29 11:45:09 +08:00
Roy 2c3a0a7ee8 [cali] add BOARD_C615 & BOARD_C78B calibration data. 2020-12-29 10:43:51 +08:00
Benny Liu f1086df363 turn on 6994 shutdown 2020-12-17 12:40:07 +08:00
Roy 6345ee875a [cali] add BOARD_C60C calibration data. 2020-12-16 09:59:21 +08:00
Roy 69061f9afd [cali] add BOARD_C903 calibration data. 2020-12-15 10:00:58 +08:00
Roy 3aecb50b47 [cali] add BOARD_C69F calibration data. 2020-12-14 18:37:01 +08:00
Roy e030578fd8 [update] update headstage version on elite1.5 (0,2,1,6) 2020-12-10 17:16:37 +08:00
Roy c05fefe71c Merge branch 'Elite1.5_developement_testmode1210' into Elite1.5_developement 2020-12-10 17:04:31 +08:00
Roy 177b56e8f9 [update] update pulsemode on elite1.5 2020-12-10 17:03:08 +08:00
Benny Liu aeb7a8afaf cali_count_max = 5000 for smallest Vin and Iin gain 2020-12-10 15:53:35 +08:00
Roy 0edaa77857 [update] match 1.5 ui (cali code) 2020-12-04 11:28:33 +08:00
Roy c656eebcbc [update] align notify (match megafly ui) 2020-11-26 22:48:53 +08:00
Roy e17e78bc18 [update] add Vout boundary (usc) 2020-11-26 16:14:31 +08:00
Benny Liu c3235e985f Change 1.5 Iin measurement range. 2020-11-26 15:48:01 +08:00
Roy 656e0fb485 [cali] update BOARD_C7A1 calibration data. 2020-11-23 12:12:09 +08:00
Roy d3dd5270dd [update] tag controller version 2020-11-23 10:18:46 +08:00
Roy e588b30c8b [update] monitor bat 2020-11-20 14:45:21 +08:00
Roy d3f9aec31c add BOARD_C604 calibration data. 2020-11-20 11:50:17 +08:00
Roy ed617c88c9 [update] remove megafly pin 2020-11-20 11:14:01 +08:00
Roy 0b8f4c2414 Merge branch 'Elite1.5_developement_magafly_1119_1' into Elite1.5_developement 2020-11-20 11:08:51 +08:00
Roy b5449b7404 [update]update pulsefly INSTRUCTION.notifyRate 2020-11-20 11:06:12 +08:00
Roy a3c1241f38 Merge branch 'Elite1.5_calibration' into Elite1.5_developement 2020-11-20 11:01:45 +08:00
Roy bbf60ebfed test periodicEvent 2020-11-19 16:00:51 +08:00
Roy 0e9f40bdd5 Megafly trigger yes yes. 2020-11-19 15:47:07 +08:00
Roy e32897f6b5 [update] Megafly notify check. & Megafly trigger. 2020-11-19 15:40:12 +08:00
Roy 6ee4b47d90 [update]update pulsefly INSTRUCTION.notifyRate 2020-11-18 11:57:53 +08:00
YiChin dac19f62b2 test ok,but T2~T3=0 can't handle 2020-11-16 14:43:50 +08:00
YiChin 8e6d112729 test ok,but T2~T3=0 can't handle 2020-11-16 14:30:27 +08:00
YiChin 9e1dc1e3f4 test ok,but T1~T5=0 can't handle 2020-11-13 18:28:48 +08:00
YiChin 49fb3afc01 test ok,but T1~T5=0 can't handle 2020-11-13 13:30:47 +08:00
YiChin f3b402fce9 test ok 2020-11-12 18:01:32 +08:00
YiChin ef9a38d7fc test not ok(RT not ok) 2020-11-12 17:24:04 +08:00
YiChin 67275a7921 test not ok(RT not ok) 2020-11-12 16:17:15 +08:00
YiChin 0ddaa02414 test not ok 2020-11-12 15:39:44 +08:00
YiChin 96d5735164 test not ok 2020-11-12 14:55:28 +08:00
YiChin ac32fb9c73 test not ok 2020-11-12 12:23:14 +08:00
Benny Liu 9acc242ff6 Add Megafly pin. 2020-11-12 10:22:31 +08:00
YiChin d8a403c410 add BOARD_C771 calibration data. 2020-11-12 10:18:12 +08:00
YiChin f1d0acef23 update pulse mode 2020-11-12 10:16:40 +08:00
YiChin 9811572f47 add pulse mode 2020-11-11 16:44:49 +08:00
YiChin 8753e2ddc6 dont send battery information 2020-10-22 10:38:09 +08:00
YiChin f6167c25ca update SPI hold & take away AutoGainChangeVout() 2020-10-20 18:41:00 +08:00
YiChin cb3894712e take away AutoGainChangeVout() 2020-10-20 18:23:13 +08:00
YiChin 995a47e200 update SPI hold 2020-10-20 17:11:36 +08:00
YiChin cde9096018 update SPI hold 2020-10-20 12:18:29 +08:00
YiChin 6c1bd24b92 update SPI hold 2020-10-19 18:40:35 +08:00
YiChin 0c129bc99b take away bat() 2020-09-25 09:43:39 +08:00
YiChin cbe9bd8211 CV mode foolproof 2020-09-07 17:58:18 +08:00
YiChin 0293647d0c update cali dac mod 2020-09-04 16:32:53 +08:00
YiChin 87d187c3a5 add cali dac mode, need to take away auto change voutgain 2020-09-03 18:30:39 +08:00
YiChin 09fbfd9dda update cali adc mode 2020-09-03 14:49:33 +08:00
YiChin 74ca631309 add cali adc mode 2020-09-02 15:49:49 +08:00
YiChin 03e86e175d add cali mode 9/1 2020-09-01 15:44:42 +08:00
YiChin 1c54525256 update cali code 2020-09-01 13:41:02 +08:00
41 changed files with 7086 additions and 2950 deletions
@@ -34,17 +34,17 @@
<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.277675815" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.277675815" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1593934674" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.632414212" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.632414212" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.154623462" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.974280107" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1783826131" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1536570599" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1895413316" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.322983319" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.1305400753" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1468985930" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.974280107" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1783826131" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1536570599" name="Application binary interface. (--abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1895413316" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.322983319" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.1305400753" name="Speed vs. size trade-offs (--opt_for_speed, -mf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1468985930" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
<listOptionValue builtIn="false" value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\simple_peripheral\cc26xx\app\headstage"/>
<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/cc26xx/app"/>
@@ -70,7 +70,7 @@
<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1897088" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1897088" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
<listOptionValue builtIn="false" value="POWER_SAVING"/>
<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
@@ -86,19 +86,19 @@
<listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
<listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.871011287" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.863089168" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1454248503" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1965115059" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.871011287" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.863089168" name="C Dialect" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1454248503" name="Enable support for GCC extensions (DEPRECATED) (--gcc)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1965115059" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
<listOptionValue builtIn="false" value="48"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1638011093" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1638011093" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
<listOptionValue builtIn="false" value="225"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1920170652" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.2038786257" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.811478344" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1229809338" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1920170652" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.2038786257" name="Emit diagnostic identifier numbers (--display_error_number, -pden)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.811478344" name="Place each function in a separate subsection (--gen_func_subsections, -ms)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1229809338" name="Read options from specified file (--cmd_file, -@)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
@@ -109,48 +109,48 @@
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.463094612" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
</tool>
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1351821865" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.174129193" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.567300083" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1800982811" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1091211742" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1479599481" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.174129193" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.567300083" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1800982811" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1091211742" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1479599481" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
<listOptionValue builtIn="false" value="libc.a"/>
<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
<listOptionValue builtIn="false" value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.672837228" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.672837228" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.544523272" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.544523272" name="Suppress diagnostic &lt;id&gt; (--diag_suppress)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
<listOptionValue builtIn="false" value="10247-D"/>
<listOptionValue builtIn="false" value="16002-D"/>
</option>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1281207998" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.468817864" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1679096029" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.254835397" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1848192295" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1281207998" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.468817864" name="Emit diagnostic identifier numbers (--display_error_number)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1679096029" name="Detailed link information data-base into &lt;file&gt; (--xml_link_info, -xml_link_info)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.254835397" name="Aggressively reduce size of the DWARF information (--compress_dwarf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1848192295" name="Eliminate sections not needed in the executable (--unused_section_elimination)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1999849945" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.25027104" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.888093741" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
</tool>
<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.19288898" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.11734737" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.466140455" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.824070691" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.11734737" name="Specify rom width (--romwidth, -romwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.466140455" name="Specify memory width (--memwidth, -memwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.824070691" name="Output format" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
</tool>
<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1392704063" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.225737408" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.225737408" name="Package repositories (--xdcpath)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_REPOS}"/>
<listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
</option>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.571281110" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.205178830" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1097777495" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.744121344" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.165807018" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.391961861" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.571281110" name="Target (-t)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.205178830" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1097777495" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.744121344" name="Build-profile (-r)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.165807018" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.391961861" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
</tool>
</toolChain>
</folderInfo>
@@ -3,16 +3,20 @@
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10; &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10; &lt;curValue&gt;0&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10; &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10; &lt;curValue&gt;0&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10; &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10; &lt;curValue&gt;0&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10; &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10; &lt;curValue&gt;0&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_app}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/simple_peripheral_cc2650em_app"/>
</listAttribute>
@@ -3,16 +3,20 @@
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10; &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10; &lt;curValue&gt;0&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10; &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10; &lt;curValue&gt;0&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10; &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10; &lt;curValue&gt;0&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10; &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10; &lt;curValue&gt;0&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_stack}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_stack"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_stack}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/simple_peripheral_cc2650em_stack"/>
</listAttribute>
@@ -0,0 +1,247 @@
#ifndef AD5940
#define AD5940
static void AD5940_init(){
select_REG(0x0908);//initiation
w16_REG(0x02C9);
select_REG(0x0C08);
w16_REG(0x206C);
select_REG(0x21F0);
w16_REG(0x0010);
select_REG(0x0410);
w16_REG(0x02C9);
select_REG(0x0A28);
w16_REG(0x0009);
select_REG(0x238C);
w16_REG(0x0104);
select_REG(0x0A04);
w16_REG(0x4859);
select_REG(0x0A04);
w16_REG(0xF27B);
select_REG(0x0A00);
w16_REG(0x8009);
select_REG(0x0A04);
w16_REG(0x4859);
select_REG(0x22F0);
w16_REG(0x0000);
}
static void AD5940_sftreset(){
select_REG(0x0424);
w16_REG(0xA158);
CPUdelay(200);
}
static void AD5940_HWReset(){
PIN_setOutputValue(pin_handle, AD_reset, 0);
CPUdelay(2000); // 200us
PIN_setOutputValue(pin_handle, AD_reset, 1);
CPUdelay(5000); // 500us
}
static void setEIS_EIS (void)
{
select_REG(LPDACCON0); //2128 //DC on
w32_REG(0x00000001); //LPDAC enabled
select_REG(LPDACSW0); //2124 //operation
w32_REG(0b111111); //0b101011
select_REG(HSRTIACON);
w32_REG(0x00000000); //200R //1pF
select_REG(ADCCON); //21A8
w32_REG(0x00000101);
select_REG(DFTCON);
w32_REG(0x00000091);
select_REG(SWCON); //200C
w32_REG(0x00026355); //D5 | P5 | N3 | T6 | T9 0b010 0110 0011 0101 0101
if (instru.ADCGainLv != HSRTIA_GAIN_AUTO) {
instru.AutoGainEnable = 0;
HSTIAGainCtrl(instru.ADCGainLv);
} else {
instru.AutoGainEnable = 1;
instru.ADCGainLv = HSRTIA_200R;
HSTIAGainCtrl(instru.ADCGainLv);
}
DAC_outputV(instru.dcbias + CaliTable.DAC_offset * 200);
SetWGAmp(instru.acamp);
select_REG(0x2000); //2000
w32_REG(0x0031CFC0);
//HIGH POWER MODE
select_REG(0x22F0); //PWMB
w32_REG(0x0000000D); //switch to active high power mode
select_REG(0x0414);
w16_REG(0x0000);
select_REG(0x0420);
w16_REG(0xA815);
select_REG(0x0408); //16bit system clock divider
w16_REG(0x0442); //set divider = 2
select_REG(0x20BC); //HSOSCCON
w32_REG(0x00000000); //switch to 32MHz output
select_REG(0x2044);
w32_REG(0x00000311);
select_REG(0x2010); //HSDACCON
w32_REG(0x0000000E); //DAC gain = 2, > 80 kHz
select_REG(0x238C); //ADCBUFCON
w32_REG(0x005F3D0F); //recommended
SetEISHIGHZ(0);
}
static void setEIS_CV (void)
{
//Clock and Ref
select_REG(0x0414); //CLKSEL
w16_REG(0x0);
select_REG(0x20BC); //HSOSCCON
w32_REG(0x00000004); //16 MHz output
select_REG(0x2180); //BUFSENCON
w32_REG(0x00000037); //0b110110
//Configure LPDAC LPTIA
select_REG(0x2050); //LPREFBUFCON
w32_REG(0x0); //enable lpref and lp 2.5V buffer
select_REG(0x2124); //LPDACSW0
w32_REG(0x0000003E);
select_REG(0x20E4); //LPTIASW0
w32_REG(0x00008034); // SW2 | SW4 | SW5
select_REG(0x20EC); //LPTIACON0
w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
select_REG(0x2128); //LPDACCON0
w32_REG(0x00000001);
//Configure ADC | ADCDAT (0x2074)
select_REG(0x21A8); //ADCCON
w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
select_REG(0x2044); //ADCFILTERCON
w32_REG(0x00002011); // Sinc3 En | SINC3OSR2 | SINC2OSR22
select_REG(0x20D0); //DFTCON
w32_REG(0x00000001); // Sinc2 to DFT | DFTNUM4
//AFE and PWMB
select_REG(0x2000); //AFECON
w32_REG(0x00098780); //ADC on //0b10011000011110000000
select_REG(0x22F0); //PWMB
w32_REG(0x00000005);//fc 50kHz, low power mode
// //Clock and Ref
// select_REG(CLKSEL); //CLKSEL
// w16_REG(0x0);
// select_REG(HSOSCCON); //HSOSCCON
// w32_REG(0x00000004); //16 MHz output
// select_REG(0x2180); //BUFSENCON
// w32_REG(0x00000037); //0b110110
//
// //Configure LPDAC LPTIA
// select_REG(LPREFBUFCON); //LPREFBUFCON
// w32_REG(0x0); //enable lpref and lp 2.5V buffer
// select_REG(LPDACSW0); //LPDACSW0
// w32_REG(0x0000003E);
// select_REG(LPTIASW0); //LPTIASW0
// w32_REG(0x00008034); // SW2 | SW4 | SW5
// select_REG(LPTIACON0); //LPTIACON0
// w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
// select_REG(LPDACCON0); //LPDACCON0
// w32_REG(0x00000001);
//
// //Configure ADC | ADCDAT (0x2074)
// select_REG(ADCCON); //ADCCON
// w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
// select_REG(ADCFILTERCON); //ADCFILTERCON
// w32_REG(0x00014091); //AVR 4 | Sinc3 En | OSR 5
//// w32_REG(0x00012011); //Disable avr | sinc3 enable | osr 2
// select_REG(DFTCON); //DFTCON
// w32_REG(0x00100031); //sinc3 + average input for DFT | DFTNUM 32
//
// //AFE and PMWB
// select_REG(AFECON); //AFECON
// w32_REG(0x00098780); //ADC on //0b10011000011110000000
// select_REG(PMBW); //PMWB
// w32_REG(0x00000005);//fc 50kHz, low power mode
}
static void HS_cali_config (void)
{
select_REG(LPDACCON0); //2128 //DC on
w32_REG(0x00000001); //LPDAC enabled
select_REG(LPDACSW0); //2124 //operation
w32_REG(0b111111); //0b101011
select_REG(DE0RESCON); //20F8 //DE0's gain
w32_REG(0x000000FF);
// select_REG(HSRTIACON);
// w32_REG(0x00000200); //4pF + 200R
select_REG(ADCCON); //21A8
w32_REG(0x00000101);
select_REG(DFTCON); //20D0
w32_REG(0x00000091);
select_REG(SWCON); //200C
w32_REG(0x00026355); //D5 | P5 | N3 | T6 | T9 0b010 0110 0011 0101 0101
// w32_REG(0x00026905); //0b010 0110 1001 0000 0101
select_REG(AFECON); //2000
w32_REG(0x0030CFC0);
//HIGH POWER MODE
select_REG(PMBW); //PMWB
w32_REG(0x0000000D); //switch to active high power mode
select_REG(CLKSEL);
w16_REG(0x0000);
select_REG(CLKCON0KEY);
w16_REG(0xA815);
select_REG(CLKCON0); //16bit system clock divider
w16_REG(0x0442); //set divider = 2
select_REG(HSOSCCON); //HSOSCCON
w32_REG(0x00000000); //switch to 32MHz output
select_REG(ADCFILTERCON); //ADCFILTERCON
w32_REG(0x000000D0); //ADC data rate = 1.6MHz // 2 samples to average
select_REG(HSDACCON); //HSDACCON
w32_REG(0x0000000E); //DAC gain = 2, > 80 kHz
select_REG(ADCBUFCON); //ADCBUFCON
w32_REG(0x005F3D0F); //recommended
}
static void LP_cali_config (void)
{
//Clock and Ref
select_REG(0x0414); //CLKSEL
w16_REG(0x0);
select_REG(0x20BC); //HSOSCCON
w32_REG(0x00000004); //16 MHz output
select_REG(0x2180); //BUFSENCON
w32_REG(0x00000037); //0b110110
//Configure LPDAC LPTIA
select_REG(0x2050); //LPREFBUFCON
w32_REG(0x0); //enable lpref and lp 2.5V buffer
select_REG(0x2124); //LPDACSW0
w32_REG(0x0000003E);
select_REG(0x20E4); //LPTIASW0
w32_REG(0x00008034); // SW2 | SW4 | SW5
select_REG(0x20EC); //LPTIACON0
w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
select_REG(0x2128); //LPDACCON0
w32_REG(0x00000001);
//Configure ADC | ADCDAT (0x2074)
select_REG(0x21A8); //ADCCON
w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
select_REG(0x2044); //ADCFILTERCON
w32_REG(0x00006091); //AVR 4 | Sinc3 En | OSR 2
// w32_REG(0x00012011); //Disable avr | sinc3 enable | osr 2
select_REG(0x20D0); //DFTCON
w32_REG(0x001000C1); //sinc3 + average input for DFT | dftnum max
//AFE and PWMB
select_REG(0x2000); //AFECON
w32_REG(0x00098780); //ADC on //0b10011000011110000000
select_REG(0x22F0); //PWMB
w32_REG(0x00000005);//fc 50kHz, low power mode
}
#endif
@@ -1,217 +1,246 @@
#ifndef Elite15_PIN
#define Elite_15PIN
#include "Elite_PIN.h"
static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow) {
switch (latch_num) {
case LOAD0: {
switch (elite_pin) {
case D0: {
LH.LATCH0[0] = highlow;
break;
}
case D1: {
LH.LATCH0[1] = highlow;
break;
}
case D2: {
LH.LATCH0[2] = highlow;
break;
}
case D3: {
LH.LATCH0[3] = highlow;
break;
}
case D4: {
LH.LATCH0[4] = highlow;
break;
}
case D5: {
LH.LATCH0[5] = highlow;
break;
}
case D6: {
LH.LATCH0[6] = highlow;
break;
}
case D7: {
LH.LATCH0[7] = highlow;
break;
}
default: {
break;
}
}
break;
}
case LOAD1: {
switch (elite_pin) {
case D0: {
LH.LATCH1[0] = highlow;
break;
}
case D1: {
LH.LATCH1[1] = highlow;
break;
}
case D2: {
LH.LATCH1[2] = highlow;
break;
}
case D3: {
LH.LATCH1[3] = highlow;
break;
}
case D4: {
LH.LATCH1[4] = highlow;
break;
}
case D5: {
LH.LATCH1[5] = highlow;
break;
}
case D6: {
LH.LATCH1[6] = highlow;
break;
}
case D7: {
LH.LATCH1[7] = highlow;
break;
}
default: {
break;
}
}
break;
}
case LOAD2: {
switch (elite_pin) {
case D0: {
LH.LATCH2[0] = highlow;
break;
}
case D1: {
LH.LATCH2[1] = highlow;
break;
}
case D2: {
LH.LATCH2[2] = highlow;
break;
}
case D3: {
LH.LATCH2[3] = highlow;
break;
}
case D4: {
LH.LATCH2[4] = highlow;
break;
}
case D5: {
LH.LATCH2[5] = highlow;
break;
}
case D6: {
LH.LATCH2[6] = highlow;
break;
}
case D7: {
LH.LATCH2[7] = highlow;
break;
}
default: {
break;
}
}
break;
}
default: {
break;
}
}
}
static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow) {
if(PeriodicEvent){
ELITE15_SPI_CLOSE();
}
add_elite_pin();
update_latch_status (latch_num, pin_num, highlow);
PIN_setOutputValue(&ZM_rst, latch_num, 1); // Turn on latch
CPUdelay(10);
switch (latch_num) {
case LOAD0: {
// PIN_setOutputValue(&ZM_rst, D0, LH.LATCH0[0]);
// PIN_setOutputValue(&ZM_rst, D1, LH.LATCH0[1]);
// PIN_setOutputValue(&ZM_rst, D2, LH.LATCH0[2]);
// PIN_setOutputValue(&ZM_rst, D3, LH.LATCH0[3]);
PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);
PIN_setOutputValue(pin_handle, D5, LH.LATCH0[5]);
PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);
PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);
break;
}
case LOAD1: {
PIN_setOutputValue(pin_handle, D0, LH.LATCH1[0]);
PIN_setOutputValue(pin_handle, D1, LH.LATCH1[1]);
PIN_setOutputValue(pin_handle, D2, LH.LATCH1[2]);
PIN_setOutputValue(pin_handle, D3, LH.LATCH1[3]);
PIN_setOutputValue(pin_handle, D4, LH.LATCH1[4]);
PIN_setOutputValue(pin_handle, D5, LH.LATCH1[5]);
PIN_setOutputValue(pin_handle, D6, LH.LATCH1[6]);
PIN_setOutputValue(pin_handle, D7, LH.LATCH1[7]);
break;
}
case LOAD2: {
PIN_setOutputValue(pin_handle, D0, LH.LATCH2[0]);
PIN_setOutputValue(pin_handle, D1, LH.LATCH2[1]);
PIN_setOutputValue(pin_handle, D2, LH.LATCH2[2]);
PIN_setOutputValue(pin_handle, D3, LH.LATCH2[3]);
PIN_setOutputValue(pin_handle, D4, LH.LATCH2[4]);
PIN_setOutputValue(pin_handle, D5, LH.LATCH2[5]);
PIN_setOutputValue(pin_handle, D6, LH.LATCH2[6]);
PIN_setOutputValue(pin_handle, D7, LH.LATCH2[7]);
break;
}
default: {
break;
}
}
CPUdelay(10);
PIN_setOutputValue(&ZM_rst, latch_num, 0); // Turn off latch
remove_elite_pin();
if(PeriodicEvent){
ELITE15_SPI_HOLD();
}
}
static void Init_Elite15_PIN () {
InitLH();
add_elite_pin();
PIN_setOutputValue(pin_handle, LOAD0, 1);
PIN_setOutputValue(pin_handle, LOAD1, 1);
PIN_setOutputValue(pin_handle, LOAD2, 1);
CPUdelay(10);
PIN_setOutputValue(pin_handle, D0, 0);
PIN_setOutputValue(pin_handle, D1, 0);
PIN_setOutputValue(pin_handle, D2, 0);
PIN_setOutputValue(pin_handle, D3, 0);
PIN_setOutputValue(pin_handle, D4, 0);
PIN_setOutputValue(pin_handle, D5, 0);
PIN_setOutputValue(pin_handle, D6, 0);
PIN_setOutputValue(pin_handle, D7, 0);
CPUdelay(10);
PIN_setOutputValue(pin_handle, LOAD0, 0);
PIN_setOutputValue(pin_handle, LOAD1, 0);
PIN_setOutputValue(pin_handle, LOAD2, 0);
remove_elite_pin();
}
#endif
//
//#ifndef Elite15_PIN
//#define Elite_15PIN
//
//#include "Elite_PIN.h"
//
//static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow) {
// switch (latch_num) {
// case LOAD0: {
// switch (elite_pin) {
// case D0: {
// LH.LATCH0[0] = highlow;
// break;
// }
// case D1: {
// LH.LATCH0[1] = highlow;
// break;
// }
// case D2: {
// LH.LATCH0[2] = highlow;
// break;
// }
// case D3: {
// LH.LATCH0[3] = highlow;
// break;
// }
// case D4: {
// LH.LATCH0[4] = highlow;
// break;
// }
// case D5: {
// LH.LATCH0[5] = highlow;
// break;
// }
// case D6: {
// LH.LATCH0[6] = highlow;
// break;
// }
// case D7: {
// LH.LATCH0[7] = highlow;
// break;
// }
// default: {
// break;
// }
// }
// break;
// }
// case LOAD1: {
// switch (elite_pin) {
// case D0: {
// LH.LATCH1[0] = highlow;
// break;
// }
// case D1: {
// LH.LATCH1[1] = highlow;
// break;
// }
// case D2: {
// LH.LATCH1[2] = highlow;
// break;
// }
// case D3: {
// LH.LATCH1[3] = highlow;
// break;
// }
// case D4: {
// LH.LATCH1[4] = highlow;
// break;
// }
// case D5: {
// LH.LATCH1[5] = highlow;
// break;
// }
// case D6: {
// LH.LATCH1[6] = highlow;
// break;
// }
// case D7: {
// LH.LATCH1[7] = highlow;
// break;
// }
// default: {
// break;
// }
// }
// break;
// }
// case LOAD2: {
// switch (elite_pin) {
// case D0: {
// LH.LATCH2[0] = highlow;
// break;
// }
// case D1: {
// LH.LATCH2[1] = highlow;
// break;
// }
// case D2: {
// LH.LATCH2[2] = highlow;
// break;
// }
// case D3: {
// LH.LATCH2[3] = highlow;
// break;
// }
// case D4: {
// LH.LATCH2[4] = highlow;
// break;
// }
// case D5: {
// LH.LATCH2[5] = highlow;
// break;
// }
// case D6: {
// LH.LATCH2[6] = highlow;
// break;
// }
// case D7: {
// LH.LATCH2[7] = highlow;
// break;
// }
// default: {
// break;
// }
// }
// break;
// }
// default: {
// break;
// }
// }
//}
//
//static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow) {
// ELITE15_SPI_CLOSE();
// add_elite_pin();
// update_latch_status (latch_num, pin_num, highlow);
//// PIN_setOutputValue(&ZM_rst, latch_num, 1); // Turn on latch
//
// switch (latch_num) {
// case LOAD0: {
//// PIN_setOutputValue(&ZM_rst, D0, LH.LATCH0[0]);
//// PIN_setOutputValue(&ZM_rst, D1, LH.LATCH0[1]);
//// PIN_setOutputValue(&ZM_rst, D2, LH.LATCH0[2]);
//// PIN_setOutputValue(&ZM_rst, D3, LH.LATCH0[3]);
// PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);
// PIN_setOutputValue(pin_handle, D5, LH.LATCH0[5]);
// PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);
// PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);
// break;
// }
// case LOAD1: {
// PIN_setOutputValue(pin_handle, D0, LH.LATCH1[0]);
// PIN_setOutputValue(pin_handle, D1, LH.LATCH1[1]);
// PIN_setOutputValue(pin_handle, D2, LH.LATCH1[2]);
// PIN_setOutputValue(pin_handle, D3, LH.LATCH1[3]);
// PIN_setOutputValue(pin_handle, D4, LH.LATCH1[4]);
// PIN_setOutputValue(pin_handle, D5, LH.LATCH1[5]);
// PIN_setOutputValue(pin_handle, D6, LH.LATCH1[6]);
// PIN_setOutputValue(pin_handle, D7, LH.LATCH1[7]);
// break;
// }
// case LOAD2: {
// PIN_setOutputValue(pin_handle, D0, LH.LATCH2[0]);
// PIN_setOutputValue(pin_handle, D1, LH.LATCH2[1]);
// PIN_setOutputValue(pin_handle, D2, LH.LATCH2[2]);
// PIN_setOutputValue(pin_handle, D3, LH.LATCH2[3]);
// PIN_setOutputValue(pin_handle, D4, LH.LATCH2[4]);
// PIN_setOutputValue(pin_handle, D5, LH.LATCH2[5]);
// PIN_setOutputValue(pin_handle, D6, LH.LATCH2[6]);
// PIN_setOutputValue(pin_handle, D7, LH.LATCH2[7]);
// break;
// }
// default: {
// break;
// }
// }
// PIN_setOutputValue(&ZM_rst, latch_num, 1); // Turn on latch
//// CPUdelay(10);
// PIN_setOutputValue(&ZM_rst, latch_num, 0); // Turn off latch
// remove_elite_pin();
// ELITE15_SPI_HOLD();
//}
//
//static void Init_Elite15_PIN () {
// InitLH();
// add_elite_pin();
//
// PIN_setOutputValue(pin_handle, D0, 0);
// PIN_setOutputValue(pin_handle, D1, 0);
// PIN_setOutputValue(pin_handle, D2, 0);
// PIN_setOutputValue(pin_handle, D3, 0);
// PIN_setOutputValue(pin_handle, D4, 0);
// PIN_setOutputValue(pin_handle, D5, 0);
// PIN_setOutputValue(pin_handle, D6, 0);
// PIN_setOutputValue(pin_handle, D7, 0);
// PIN_setOutputValue(pin_handle, LOAD0, 0);
// PIN_setOutputValue(pin_handle, LOAD1, 1);
// PIN_setOutputValue(pin_handle, LOAD2, 1);
// CPUdelay(10);
// PIN_setOutputValue(pin_handle, LOAD1, 0);
// PIN_setOutputValue(pin_handle, LOAD2, 0);
//
//
// PIN_setOutputValue(pin_handle, D0, 0);
// PIN_setOutputValue(pin_handle, D1, 0);
// PIN_setOutputValue(pin_handle, D2, 0);
// PIN_setOutputValue(pin_handle, D3, 0);
// PIN_setOutputValue(pin_handle, D4, 1);
// PIN_setOutputValue(pin_handle, D5, 1);
// PIN_setOutputValue(pin_handle, D6, 1);
// PIN_setOutputValue(pin_handle, D7, 1);
// CPUdelay(10);
// PIN_setOutputValue(pin_handle, LOAD0, 1);
// PIN_setOutputValue(pin_handle, LOAD0, 0);
//
// remove_elite_pin();
//
//// InitLH();
//// add_elite_pin();
////
//// PIN_setOutputValue(pin_handle, LOAD0, 1);
//// PIN_setOutputValue(pin_handle, LOAD1, 1);
//// PIN_setOutputValue(pin_handle, LOAD2, 1);
//// CPUdelay(10);
//// PIN_setOutputValue(pin_handle, D0, 0);
//// PIN_setOutputValue(pin_handle, D1, 0);
//// PIN_setOutputValue(pin_handle, D2, 0);
//// PIN_setOutputValue(pin_handle, D3, 0);
//// PIN_setOutputValue(pin_handle, D4, 0);
//// PIN_setOutputValue(pin_handle, D5, 0);
//// PIN_setOutputValue(pin_handle, D6, 0);
//// PIN_setOutputValue(pin_handle, D7, 0);
//// CPUdelay(10);
//// PIN_setOutputValue(pin_handle, LOAD0, 0);
//// PIN_setOutputValue(pin_handle, LOAD1, 0);
//// PIN_setOutputValue(pin_handle, LOAD2, 0);
////
//// remove_elite_pin();
//}
//
//
//
//
//#endif
@@ -1,32 +0,0 @@
#ifndef ELITECCC
#define ELITECCC
#include "EliteCCMode.h"
// XXX : should we reset DAC output after STOP?
static void CCModeReverseCurrent(CCCMode *CCC){
if(CCC->StandBy){
if(CT.StandByCounter == CCC->StandByTime){
CCC->StandBy = false;
CT.StandByCounter = 0;
}
else{
CT.StandByCounter ++;
}
}
else{
// reverse charge/discharge
if(CCC->BatteryV == CCC->VMax){
CCC->StandBy = true;
CCC->value = CCC->DischargeCurrent;
}
else if(CCC->BatteryV == CCC->VMin){
CCC->StandBy = true;
CCC->value = CCC->ChargeCurrent;
}
}
}
#endif
@@ -2,8 +2,8 @@
#ifndef ELITECCMODE
#define ELITECCMODE
#define Vset INSTRUCTION.Vset
#define DELTAVOLTMAX 100000
#define Vset instru.Vset
#define DELTAVOLTMAX 2000000 //2000000 = 10mV
/* Transform setting CC into IUC
*
@@ -11,73 +11,67 @@
* Real current value : -15.00000 ~ 15.00000 mA
* => user code = 1500000 mapping to 0.00000 mA
*/
static void CC_Vscan(CCMode *CC){
static int32_t Iin = 0;
static int32_t deltaI = 0;
static int32_t deltaV = 0;
static void cc_vscan(void)
{
struct wm_cc_ctx_t *cc = (struct wm_cc_ctx_t *)wm_get();
struct wm_meas_t *m = &cc->measure;
uint16_t divisionRate;
int32_t deltaI;
int32_t deltaV;
int32_t Iin;
int32_t Vin;
if(vscanReset){
if (vscanReset) {
Vset = 0;
if(CC->_charge == 0){
CC->_Iset *= -1;
if (cc->_charge == 0) {
cc->_Iset = instru.constantCurrent * 200 * (-1);
//[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA];
}
Iin = CC->_measureCurrent * 20; //[50pA] nA => 50pA
deltaI = Iin - CC->_Iset;
Iin = m->_measureCurrent * 20; //[50pA] nA => 50pA
Vin = m->_measureVin * 200; //[5nV]
if(deltaI > 20000000 || deltaI < -20000000){ //1mA
divisionRate = 1000;
}else{
divisionRate = 10;
Vset = Vin + cc->_Iset / 20 ; //[5nV]
if (Vset >= 1100000000) { // 5.5V
Vset = 1100000000;
} else if (Vset <= -1000000000) { //-5V
Vset = -1000000000;
}
}
if (!vscanReset) {
Iin = m->_measureCurrent * 20; //[50pA] nA => 50pA
deltaI = Iin - cc->_Iset;
if (deltaI > 2000000 || deltaI < -2000000) { //100uA
divisionRate = 1;
} else {
divisionRate = 20;
}
deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000 //pV=> 5nV
if(deltaV > DELTAVOLTMAX){ //100000 = 500uV
if (deltaV > DELTAVOLTMAX) { //2000000 = 10mV
deltaV = DELTAVOLTMAX;
}else if(deltaV < (-DELTAVOLTMAX)){
} else if (deltaV < (-DELTAVOLTMAX)) {
deltaV = (-DELTAVOLTMAX);
}
Vset = Vset + deltaV; //[5nV]
if(Vset <= CC->_Vmin){
Vset = CC->_Vmin;
}else if(Vset >= CC->_Vmax){
Vset = CC->_Vmax;
if (Vset >= 1100000000) { // 5.5V
Vset = 1100000000;
} else if (Vset <= -1000000000) { //-5V
Vset = -1000000000;
}
if (Vset <= cc->_Vmin) {
Vset = cc->_Vmin;
} else if (Vset >= cc->_Vmax) {
Vset = cc->_Vmax;
}
}
if(!vscanReset){
Iin = CC->_measureCurrent * 20; //[50pA] nA => 50pA
deltaI = Iin - CC->_Iset;
if(deltaI > 20000000 || deltaI < -20000000){ //1mA
divisionRate = 1000;
}else{
divisionRate = 10;
}
deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000 //pV=> 5nV
if(deltaV > DELTAVOLTMAX){ //100000 = 500uV
deltaV = DELTAVOLTMAX;
}else if(deltaV < (-DELTAVOLTMAX)){
deltaV = (-DELTAVOLTMAX);
}
Vset = Vset + deltaV; //[5nV]
if(Vset <= CC->_Vmin){
Vset = CC->_Vmin;
}else if(Vset >= CC->_Vmax){
Vset = CC->_Vmax;
}
}
// int32_t RealV;
// RealV = (int32_t)(deltaV);
// InputNotify(NOTIFY_IMPEDANCE, RealV);
}
#endif
@@ -1,131 +1,111 @@
#ifndef ELITECV3
#define ELITECV3
#define Vset INSTRUCTION.Vset
#define Vset instru.Vset
static uint16_t CV3Curve(CV3Mode *CV3){
static uint16_t DACOutCode;
static int32_t Vin;
static int32_t Vout;
static int32_t DeltaVout;
static void cv_vscan(void)
{
struct wm_cv_ctx_t *cv = (struct wm_cv_ctx_t *)wm_get();
static bool VminCounter;
static bool VmaxCounter;
Vin = CV3->_measureVin * 200;//[5nV]
if(DACReset){
Vout = Vset + Vin;
DACReset = false;
}else{
DeltaVout = Vset - (Vout - Vin);
Vout = Vout + DeltaVout;
NotifyCycleNumber = (instru.cycleNumber - cv->_cycleNumber + 1);
if (vscanReset) {
VmaxCounter = false;
VminCounter = false;
if (instru.directionInit == 1) {
cv->_direction_up = true;
cv->_current_direction_up = true;
} else {
cv->_direction_up = false;
cv->_current_direction_up = false;
}
// Vstep = x * 20 * N, x=xmV ; N=VscanRate Vstep unit [5nV]/[0.1ms]
if (instru.step <= 10) {
cv->_Vstep = instru.step * instru.VsetRate / 5;
} else {
cv->_Vstep = instru.step / 5 * instru.VsetRate;
}
if (cv->_Vmin == cv->_Vinit) {
VminCounter = true;
}
if (cv->_Vmax == cv->_Vinit) {
VmaxCounter = true;
}
Vset = cv->_Vinit;
}
INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
if (!vscanReset) {
cv->bFirst = false;
if ((instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) ||
(instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2)
) {
if (cv->_current_direction_up) {
Vset = Vset + cv->_Vstep; //* GPT.GptimerMultiple;
} else {
Vset = Vset - cv->_Vstep; //* GPT.GptimerMultiple;
}
int32_t RealV2;
RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
InputNotify(NOTIFY_VOLT, RealV2);
if (instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) {
if (Vset == cv->_Vmin) {
VminCounter = true;
instru.Vinit = instru.Vmin;
cv->_Vinit = cv->_Vmin;
}
} else if (instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2) {
if (Vset == cv->_Vmax) {
VmaxCounter = true;
instru.Vinit = instru.Vmax;
cv->_Vinit = cv->_Vmax;
}
}
} else {
if (Vset >= cv->_Vmax) {
VmaxCounter = true;
} else if (Vset <= cv->_Vmin) {
VminCounter = true;
}
int32_t RealV;
RealV = (int32_t)(Vout / 200);//[1uV]
InputNotify(NOTIFY_IMPEDANCE, RealV);
if (cv->_current_direction_up) {
Vset = Vset + cv->_Vstep;// * GPT.GptimerMultiple;
} else {
Vset = Vset - cv->_Vstep;// * GPT.GptimerMultiple;
}
DAC_outputV(DACOutCode);
return DACOutCode;
}
static void CV3_Vscan(CV3Mode *CV3){
static int16_t VminCounter;
static int16_t VmaxCounter;
static uint16_t CycleCounter;
NotifyCycleNumber = (INSTRUCTION.cycleNumber - CV3->_cycleNumber + 1);
if(vscanReset){
VmaxCounter = 0;
VminCounter = 0;
CycleCounter = 0;
if(INSTRUCTION.directionInit == 1){
CV3->_direction_up = true;
CV3->_current_direction_up = true;
}else{
CV3->_direction_up = false;
CV3->_current_direction_up = false;
}
//Vsetp = x * 20 * N, x=xmV ; N=VscanRate
if(INSTRUCTION.step <= 10){
CV3->_Vstep = INSTRUCTION.step * INSTRUCTION.VsetRate / 5;
}else{
CV3->_Vstep = INSTRUCTION.step / 5 * INSTRUCTION.VsetRate;
}
if(CV3->_Vmin == CV3->_Vinit){
VminCounter = -1;
}
if(CV3->_Vmax == CV3->_Vinit){
VmaxCounter = -1;
}
Vset = CV3->_Vinit;
}
if(!vscanReset){
if (Vset >= CV3->_Vmax){
VmaxCounter++;
}else if (Vset <= CV3->_Vmin){
VminCounter++;
}
if (CV3->_current_direction_up){
Vset = Vset + CV3->_Vstep * GPT.GptimerMultiple;
}else{
Vset = Vset - CV3->_Vstep * GPT.GptimerMultiple;
}
if(VmaxCounter != 0 && VminCounter != 0){
if(VmaxCounter == VminCounter && CV3->_direction_up && CV3->_current_direction_up){
if(CycleCounter != VmaxCounter){
if(Vset >= CV3->_Vinit){
CV3->_cycleNumber--;
CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
if (VmaxCounter && VminCounter) {
if (cv->_direction_up && cv->_current_direction_up) {
if (Vset >= cv->_Vinit) {
cv->_cycleNumber--;
VminCounter = false;
VmaxCounter = false;
}
}
if (!cv->_direction_up && !cv->_current_direction_up) {
if (Vset <= cv->_Vinit) {
cv->_cycleNumber--;
VminCounter = false;
VmaxCounter = false;
}
}
}
if(VmaxCounter == VminCounter && !CV3->_direction_up && !CV3->_current_direction_up){
if(CycleCounter != VmaxCounter){
if(Vset <= CV3->_Vinit){
CV3->_cycleNumber--;
CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
}
}
if (Vset >= cv->_Vmax) {
cv->_current_direction_up = false;
} else if (Vset <= cv->_Vmin) {
cv->_current_direction_up = true;
}
/*stop condition*/
if (cv->_cycleNumber == 0) {
PeriodicEvent = false;
}
}
if (Vset >= CV3->_Vmax){
CV3->_current_direction_up = false;
}else if (Vset <= CV3->_Vmin){
CV3->_current_direction_up = true;
}
/*stop condition*/
if(CV3->_cycleNumber == 0){
// PeriodicEvent = false;
ModeLED(POST_WORK);
InitEliteFlag();
INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
INSTRUCTION.sampleRate = 15;
INSTRUCTION.charge = 0x01;
INSTRUCTION.constantCurrent = 0x00;
INSTRUCTION.Vmax = 0xC350;
INSTRUCTION.Vmin = 0x0000;
INSTRUCTION.notifyRate = 500;
INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
}
}
// int32_t RealV;
// RealV = (int32_t)(Vset / 500);//[1uV]
// InputNotify(NOTIFY_VOLT, RealV);
}
#endif
@@ -2,216 +2,82 @@
#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;
static void iv_cy_vscan(void)
{
struct wm_iv_cy_ctx_t *iv_cy = (struct wm_iv_cy_ctx_t *)wm_get();
static bool VminCounter;
static bool VmaxCounter;
// reset origin volt at the begin
if (DACReset) {
Volt = INSTRUCTION.Ve1;
outputV = INSTRUCTION.Ve1;
if (INSTRUCTION.Ve1 < INSTRUCTION.Ve2)
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.Ve2 && direction_up) || (outputV <= INSTRUCTION.Ve2 && !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.Ve1 < INSTRUCTION.Ve2)
direction_up = true;
else
direction_up = false;
Volt1 = INSTRUCTION.Ve1;
if (direction_up)
Volt2 = INSTRUCTION.Ve1 + Amplitude;
else
Volt2 = INSTRUCTION.Ve1 - 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.Ve2) && direction_up) || ((outputV <= INSTRUCTION.Ve2) && !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 void CV_Vscan(CVMode *CV){
static int16_t VminCounter;
static int16_t VmaxCounter;
static uint16_t CycleCounter;
NotifyCycleNumber = (INSTRUCTION.cycleNumber - CV->_cycleNumber + 1);
NotifyCycleNumber = (instru.cycleNumber - iv_cy->_cycleNumber + 1);
if(vscanReset){
VmaxCounter = 0;
VminCounter = 0;
CycleCounter = 0;
VmaxCounter = false;
VminCounter = false;
if(INSTRUCTION.directionInit == 1){
CV->_direction_up = true;
CV->_current_direction_up = true;
}else if(INSTRUCTION.directionInit == 0){
CV->_direction_up = false;
CV->_current_direction_up = false;
if(instru.directionInit == 1){
iv_cy->_direction_up = true;
iv_cy->_current_direction_up = true;
}else if(instru.directionInit == 0){
iv_cy->_direction_up = false;
iv_cy->_current_direction_up = false;
}
//Vsetp = x * 20 * N, x=xmV ; N=VscanRate
if(INSTRUCTION.step <= 10){
CV->_Vstep = INSTRUCTION.step * INSTRUCTION.VsetRate / 5;
if(instru.step <= 10){
iv_cy->_Vstep = instru.step * instru.VsetRate / 5;
}else{
CV->_Vstep = INSTRUCTION.step / 5 * INSTRUCTION.VsetRate;
iv_cy->_Vstep = instru.step / 5 * instru.VsetRate;
}
if(CV->_Vmin == CV->_Vinit){
VminCounter = -1;
if(iv_cy->_Vmin == iv_cy->_Vinit){
VminCounter = true;
}
if(CV->_Vmax == CV->_Vinit){
VmaxCounter = -1;
if(iv_cy->_Vmax == iv_cy->_Vinit){
VmaxCounter = true;
}
Vset = CV->_Vinit;
Vset = iv_cy->_Vinit;
}
if(!vscanReset){
if (Vset >= CV->_Vmax){
VmaxCounter++;
}else if (Vset <= CV->_Vmin){
VminCounter++;
if (Vset >= iv_cy->_Vmax){
VmaxCounter = true;
}else if (Vset <= iv_cy->_Vmin){
VminCounter = true;
}
if (CV->_current_direction_up){
Vset = Vset + CV->_Vstep * GPT.GptimerMultiple;
if (iv_cy->_current_direction_up){
Vset = Vset + iv_cy->_Vstep * GPT.GptimerMultiple;
}else{
Vset = Vset - CV->_Vstep * GPT.GptimerMultiple;
Vset = Vset - iv_cy->_Vstep * GPT.GptimerMultiple;
}
if(VmaxCounter != 0 && VminCounter != 0){
if(VmaxCounter == VminCounter && CV->_direction_up && CV->_current_direction_up){
if(CycleCounter != VmaxCounter){
if(Vset >= CV->_Vinit){
CV->_cycleNumber--;
CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
}
if(VmaxCounter && VminCounter){
if(iv_cy->_direction_up && iv_cy->_current_direction_up){
if(Vset >= iv_cy->_Vinit){
iv_cy->_cycleNumber--;
VminCounter = false;
VmaxCounter = false;
}
}
if(VmaxCounter == VminCounter && !CV->_direction_up && !CV->_current_direction_up){
if(CycleCounter != VmaxCounter){
if(Vset <= CV->_Vinit){
CV->_cycleNumber--;
CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
}
if(!iv_cy->_direction_up && !iv_cy->_current_direction_up){
if(Vset <= iv_cy->_Vinit){
iv_cy->_cycleNumber--;
VminCounter = false;
VmaxCounter = false;
}
}
}
if (Vset >= CV->_Vmax){
CV->_current_direction_up = false;
}else if (Vset <= CV->_Vmin){
CV->_current_direction_up = true;
if (Vset >= iv_cy->_Vmax){
iv_cy->_current_direction_up = false;
}else if (Vset <= iv_cy->_Vmin){
iv_cy->_current_direction_up = true;
}
/*stop condition*/
if(CV->_cycleNumber == 0){
if(iv_cy->_cycleNumber == 0){
PeriodicEvent = false;
ELITE15_SPI_CLOSE();
ModeLED(NO_EVENT);
}
}
}
@@ -1,47 +1,18 @@
#ifndef ELITECVSCAN
#define ELITECVSCAN
#define Vset INSTRUCTION.Vset
#define Vset instru.Vset
static uint16_t CVSCANCurve(CVSCANMode *CVSCAN){
static uint16_t DACOutCode;
static int32_t Vin;
static int32_t Vout;
static int32_t DeltaVout;
Vin = CVSCAN->_measureVin * 200;//[5nV]
if(DACReset){
Vout = Vset + Vin;
DACReset = false;
}else{
DeltaVout = Vset - (Vout - Vin);
Vout = Vout + DeltaVout;
}
INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
int32_t RealV2;
RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
InputNotify(NOTIFY_VOLT, RealV2);
int32_t RealV;
RealV = (int32_t)(Vout / 200);//[1uV]
InputNotify(NOTIFY_IMPEDANCE, RealV);
DAC_outputV(DACOutCode);
return DACOutCode;
}
static void CVSCAN_Vscan(CVSCANMode *CVSCAN){
static void ca_vscan(void)
{
struct wm_ca_ctx_t *ca = (struct wm_ca_ctx_t *)wm_get();
if(vscanReset){
Vset = CVSCAN->_Vinit;
Vset = ca->_Vinit;
}
if(!vscanReset){
Vset = CVSCAN->_Vinit;
Vset = ca->_Vinit;
}
}
#endif
@@ -29,88 +29,337 @@ static bool DACReset;
//}
//#endif
#ifdef ELITE_VERSION_1_4
#define DACCLS 0x02
#define DACOUT 0x31
//#ifdef ELITE_VERSION_1_4
//#define DACCLS 0x02
//#define DACOUT 0x31
//
//static uint16_t DAC_outputV(uint16_t voltLV) {
// // C = command, X = don't care, D = data
// // CCCC CCCC = command
// // DDDD DDDD = v1
// // DDDD DDDD = v2
//
// // command
// // 0x02 = clear
// // 0x31 = output voltage
//
// uint8_t v1, v2 = 0;
// v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
// v2 = (uint8_t) (voltLV & 0x00FF);
//
// spi_DACtxbuf[0] = DACOUT;
// spi_DACtxbuf[1] = v1;
// spi_DACtxbuf[2] = v2;
//
// DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
//
// return voltLV;
//}
//#endif
static uint16_t DAC_outputV(uint16_t voltLV) {
// C = command, X = don't care, D = data
// CCCC CCCC = command
// DDDD DDDD = v1
// DDDD DDDD = v2
// command
// 0x02 = clear
// 0x31 = output voltage
#define VBIAS_LSB 107422 // 2200/4096 [mV] = 107422 [5nV]
#define VZERO_LSB 6875008 // VBIAS_LSB * 64
#define DAC12BIT_LSB 107422
uint8_t v1, v2 = 0;
v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
v2 = (uint8_t) (voltLV & 0x00FF);
static int32_t DAC_outputV(int32_t voltLV) { // LPDAC output, voltLV = Vbias-Vzero
static int32_t vztemp, vscan;
static uint32_t vb, vz, vbcode, vzcode, DACOutCode = 0;
spi_DACtxbuf[0] = DACOUT;
spi_DACtxbuf[1] = v1;
spi_DACtxbuf[2] = v2;
if(PeriodicEvent){
DAC_SPI_TEST(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
}else{
DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
vztemp = (-0.45 * voltLV) + 249000000;
if (voltLV < 0) {
vztemp -= DAC12BIT_LSB;
}
vzcode = (vztemp - 40000000 + VZERO_LSB / 2) / VZERO_LSB;
vz = vzcode * VZERO_LSB + 40000000;
return voltLV;
vb = voltLV + vz;
vbcode = ((vb - 40000000 + VBIAS_LSB / 2) / VBIAS_LSB);
DACOutCode = (0x0003FFFF & ((vzcode << 12) + vbcode));
DACOutCode = Cali_LPDAC(DACOutCode);
select_REG(LPDACDAT0);
w32_REG(DACOutCode);
vscan = (int32_t)(vb - vz) / 200;
return vscan;
}
static uint32_t DAC_outputF(uint32_t freq) {
select_REG(WGFCW);
w32_REG(freq);
return freq;
}
static void VoutGainControl(uint8_t VOUTLevel){
if(VOUTLevel == 0){
// VOUT gain level = 0, using 240K resister
PIN15_setOutputValue(Turon_VOUT_SMALL, 0);
PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 0);
}
else if(VOUTLevel == 1){
// VOUT gain level = 1, using 15K resister
PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
}
else if(VOUTLevel == 2){
// VOUT gain level = 2, using 15K resister
PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
}
else{
// default using 15K resister
PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
}
record_flag = false;
}
#endif
static uint32_t CalcPeriod(uint32_t freq){ //One Second = 10000
static int32_t User2Real(uint16_t UserCode){
/* transfer usercode to real voltage value (mV) */
return (int32_t)((UserCode - 25000) / 5);
uint32_t period;
if (freq == 1) {
period = 666667;
} else {
period = (1000000 + freq / 2) / freq; // [sec]
}
if (period < 20){
period = 20;
}
return period;
}
static uint32_t CalcDelayTime(uint32_t freq){
uint32_t delayTime, decadeSamplingTime;
delayTime = CalcPeriod(freq) * instru.delay; //get delay time
if (delayTime < 20) {
delayTime = 20;
} else {
delayTime = (delayTime + 5) / 10;
}
// 1000Hz
if (freq >= 100000) {
decadeSamplingTime = 1025;
}
// 100Hz
else if (freq >= 10000) {
decadeSamplingTime = 1025;
}
// 10Hz
else if (freq >= 1000) {
decadeSamplingTime = 11393;
}
// 1Hz
else if (freq >= 100) {
decadeSamplingTime = 91034;
}
//0.1Hz
else if (freq >= 10) {
decadeSamplingTime = 550000;
}
// 0.015Hz | 136s
else if (freq >= 1) {
decadeSamplingTime = 1360000;
}
delayTime += decadeSamplingTime; //delay+reading time
return delayTime;
}
static uint32_t User2Freq(uint32_t UserCode){
uint32_t freq;
freq = (UserCode * 149 + 50)/ 100;
return freq; //[100mHz]
}
static uint32_t Freq2DAC(uint32_t freq){
uint32_t code;
code = (freq * 100 + 75) / 149;
return code; //return code
}
// DAC Vout theoretical boundary <300, 100~ (mV)
#define DAC_VOUT_GAIN_SMALL_BOUNDARY 100000 // 100 mV = 25500(usercode)
#define DAC_VOUT_GAIN_LARGE_BOUNDARY 300000 // 300 mV = 26500(usercode)
#define DAC_VOUT_GAIN_SMALL_BOUNDARY 100000 // 25500(usercode) = 100 mV
#define DAC_VOUT_GAIN_LARGE_BOUNDARY 300000 // 26500(usercode) = 300 mV
#define DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE 26500 // 26500(usercode) = 300 mV
#define DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE 23500 // 23500(usercode) = -300 mV
static void AutoGainChangeVout(int32_t RealVolt){
RealVolt = (RealVolt - 25000) * 200; // (RealVolt - 25000) / 5 * 1000
static void AutoGainChangeVout(int32_t userCode){
int32_t RealVolt = (userCode - 25000) * 200; // (userCode - 25000) / 5 * 1000 [1uV]
// switch to 1 level volt(small) 15K
// switch to 2 level volt(large) 240K
if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_15K){
if(instru.VoutGainLevel == VOUT_GAIN_AUTO){
instru.VoutGainLevel = VOUT_GAIN_15K;
VoutGainControl(instru.VoutGainLevel);
}
if(instru.VoutGainLevel == VOUT_GAIN_15K){
if(RealVolt > DAC_VOUT_GAIN_LARGE_BOUNDARY || RealVolt < -1 * DAC_VOUT_GAIN_LARGE_BOUNDARY){
// switch to 2 level volt(large)
INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
VoutGainControl(INSTRUCTION.VoutGainLevel);
record_flag = false;
instru.VoutGainLevel = VOUT_GAIN_240K;
VoutGainControl(instru.VoutGainLevel);
}
}
else if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_240K){
else if(instru.VoutGainLevel == VOUT_GAIN_240K){
if(RealVolt < DAC_VOUT_GAIN_SMALL_BOUNDARY && RealVolt > -1 * DAC_VOUT_GAIN_SMALL_BOUNDARY ){
// switch to 1 level volt(small)
INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
VoutGainControl(INSTRUCTION.VoutGainLevel);
record_flag = false;
instru.VoutGainLevel = VOUT_GAIN_15K;
VoutGainControl(instru.VoutGainLevel);
}
}
}
static void SetWGAmp(uint16_t ampcode){
// uint32_t amplitude = Cali_HSAMP(ampcode);
// static uint64_t amp_cutoff = 40000000;
// uint32_t corrected_amp;
//
// corrected_amp = ((uint64_t)ampcode * 800 * 1000 / 2047) * (1 + ((uint64_t)instru.fset * (uint64_t)instru.fset) / (amp_cutoff * amp_cutoff)); //[uV]
//
// ampcode = corrected_amp * 2047 / 800000;
select_REG(WGCON);
w32_REG(0x0); // 0x0: DC disable ac first
select_REG(WGAMPLITUDE);
w32_REG(ampcode);
select_REG(WGCON);
w32_REG(0x00000004); //0x4: Sinusoid
}
static void SetEISHIGHZ(uint8_t ret){
uint32_t code;
select_REG(LPTIASW0); //LPTIASW0
code = r32_REG();
code = (code & (~(1 << 2))) | (ret << 2); //ret = 0 HighZ on | ret = 1 HighZ off
w32_REG(code);
}
static void HSDAC_GainControl(uint8_t G_EXA_PGA) {
/* Set the Gain value of PGA and Excitation amp */
uint32_t reg = 0;
uint8_t DACUpdateRate = 0x07;
switch (G_EXA_PGA) {
case 0x00:{
reg = 0x00000000;
break;
}
case 0x01:{
reg = 0x00000001;
break;
}
case 0x10:{
reg = 0x00001000;
break;
}
case 0x11:{
reg = 0x00001001;
break;
}
default:{
reg = 0x0000000E; // Default update rate = 7
break;
}
}
reg = reg | ((uint32_t)(DACUpdateRate) << 1);
select_REG(HSDACCON); // HSDACCON address
w32_REG(reg);
}
static void HSDAC_output(uint16_t amp) {
/* Set and write the amplitude of HSDAC. Full scale: 0x0200 ~ 0x0E00, 0x0800 = 0V */
/* Set and write the amplitude of HSDAC. Full scale: 512 ~ 3584, 2048 = 0V */
uint32_t amplitude = 0;
if (amp > 0x0E00) {
amplitude = 0x00000E00;
} else if (amp < 0x0200) {
amplitude = 0x00000200;
} else {
amplitude = (uint32_t) (amp & 0x0FFF);
}
select_REG(HSDACDAT); // HSDACDAT address
w32_REG(amplitude);
}
static void PowerMode_CutoffFrequencyControl (uint8_t bandwidth, uint8_t PowerMode) {
uint32_t reg = 0;
switch (bandwidth) {
case cutoff_auto :{
reg = (((uint32_t)(cutoff_auto)) & 0x0000000F) << 2;
break;
}
case cutoff_50k :{
reg = (((uint32_t)(cutoff_50k)) & 0x0000000F) << 2;
break;
}
case cutoff_100k :{
reg = (((uint32_t)(cutoff_100k)) & 0x0000000F) << 2;
break;
}
case cutoff_250k :{
reg = (((uint32_t)(cutoff_250k)) & 0x0000000F) << 2;
break;
}
default :{
reg = (((uint32_t)(cutoff_auto)) & 0x0000000F) << 2;
break;
}
}
switch (PowerMode) {
case LOW_PW_MODE :{
reg = reg | ((uint32_t)(LOW_PW_MODE) & 0x00000000F);
break;
}
case HIGH_PW_MODE :{
reg = reg | ((uint32_t)(HIGH_PW_MODE) & 0x00000000F);
break;
}
default :{
break;
}
}
select_REG(PMBW);
w32_REG(reg);
}
static int32_t cali_DAC_outputV(int32_t voltLV) { // LPDAC output, voltLV = Vbias-Vzero
static int32_t vztemp, vscan;
static uint32_t vb, vz, vbcode, vzcode, DACOutCode = 0;
vztemp = (-0.45 * voltLV) + 249000000;
if (voltLV < 0) {
vztemp -= DAC12BIT_LSB;
}
vzcode = (vztemp - 40000000 + VZERO_LSB / 2) / VZERO_LSB;
vz = vzcode * VZERO_LSB + 40000000;
vb = voltLV + vz;
vbcode = ((vb - 40000000 + VBIAS_LSB / 2) / VBIAS_LSB);
DACOutCode = (0x0003FFFF & ((vzcode << 12) + vbcode));
select_REG(LPDACDAT0);
w32_REG(DACOutCode);
vscan = (int32_t)(vb - vz) / 200;
// InputNotify(NOTIFY_VOLT, voltLV);
// InputNotify(NOTIFY_CURRENT, vztemp);
return vscan;
}
#endif
@@ -29,7 +29,7 @@
*/
#define BOARD_C6D4
#define BOARD_EIS
typedef struct _formula{
@@ -39,17 +39,452 @@ typedef struct _formula{
}Formula;
struct _correction{
Formula ADC_volt[3];
Formula ADC_current[4];
Formula Usercode2DAC[2];
uint16_t Gain0Boundary[2];
uint16_t Gain1Boundary[4];
uint16_t Gain2Boundary[2];
} Correction =
#ifdef BOARD_C6E1
#ifdef BOARD_EIS // EIS
{
.ADC_volt[0].coeff = (6268),
.ADC_volt[0].offset = -101548925,
.ADC_volt[1].coeff = (215286),
.ADC_volt[1].offset = -3498610755,
.ADC_volt[2].coeff = (6248966),
.ADC_volt[2].offset = -101525581798,
.ADC_current[0].coeff = 3140113,
.ADC_current[0].offset = (-51096616915),
.ADC_current[1].coeff = 71991480,
.ADC_current[1].offset = (-1171591233910),
.ADC_current[2].coeff = 1463918055,
.ADC_current[2].offset = (-23822237948708),
.ADC_current[3].coeff = 30759517333,
.ADC_current[3].offset = (-500591140209163),
.Usercode2DAC[0].coeff = (-10508844),
.Usercode2DAC[0].offset = 581826013531,
.Usercode2DAC[1].coeff = (-178229067),
.Usercode2DAC[1].offset = 4775935828877,
};
#endif
#ifdef BOARD_C7A1 //megafly
{
.ADC_volt[0].coeff = (6256),
.ADC_volt[0].offset = -101532028,
.ADC_volt[1].coeff = (215138),
.ADC_volt[1].offset = -3501890770,
.ADC_volt[2].coeff = (6245014),
.ADC_volt[2].offset = -101751226981,
.ADC_current[0].coeff = 3125920,
.ADC_current[0].offset = (-50880328288),
.ADC_current[1].coeff = 71636129,
.ADC_current[1].offset = (-1166093783868),
.ADC_current[2].coeff = 1459555637,
.ADC_current[2].offset = (-23757721396024),
.ADC_current[3].coeff = 30723232882,
.ADC_current[3].offset = (-500144809348170),
.Usercode2DAC[0].coeff = (-10543817),
.Usercode2DAC[0].offset = 583163641972,
.Usercode2DAC[1].coeff = (-178077711),
.Usercode2DAC[1].offset = 4777894559527,
//.Usercode2DAC15v = 41485,
};
#endif
#ifdef BOARD_C724 //megafly
{
.ADC_volt[0].coeff = (6251),
.ADC_volt[0].offset = -99750397,
.ADC_volt[1].coeff = (214419),
.ADC_volt[1].offset = -3491659841,
.ADC_volt[2].coeff = (6227737),
.ADC_volt[2].offset = -101557618268,
.ADC_current[0].coeff = 3138613,
.ADC_current[0].offset = (-51149570420),
.ADC_current[1].coeff = 71715555,
.ADC_current[1].offset = (-1168777305352),
.ADC_current[2].coeff = 1455501991,
.ADC_current[2].offset = (-23719715469357),
.ADC_current[3].coeff = 30688298312,
.ADC_current[3].offset = (-500150163983795),
.Usercode2DAC[0].coeff = (-10540182),
.Usercode2DAC[0].offset = 584459109821,
.Usercode2DAC[1].coeff = (-179175265),
.Usercode2DAC[1].offset = 4801179734836,
//.Usercode2DAC15v = MEGA_15V,
};
#endif
#ifdef BOARD_C874 //megafly
{
.ADC_volt[0].coeff = (6260),
.ADC_volt[0].offset = -99787811,
.ADC_volt[1].coeff = (214494),
.ADC_volt[1].offset = -3492178752,
.ADC_volt[2].coeff = (6231057),
.ADC_volt[2].offset = -101591914655,
.ADC_current[0].coeff = 3148251,
.ADC_current[0].offset = (-51277675282),
.ADC_current[1].coeff = 71859885,
.ADC_current[1].offset = (-1170556644217),
.ADC_current[2].coeff = 1462458824,
.ADC_current[2].offset = (-23822062635236),
.ADC_current[3].coeff = 30748473913,
.ADC_current[3].offset = (-500860829105930),
.Usercode2DAC[0].coeff = (-10570366),
.Usercode2DAC[0].offset = 585189864243,
.Usercode2DAC[1].coeff = (-178920333),
.Usercode2DAC[1].offset = 4794801719146,
//.Usercode2DAC15v = 41355,
};
#endif
#ifdef BOARD_C604
{
.ADC_volt[0].coeff = (6194),
.ADC_volt[0].offset = -100974071,
.ADC_volt[1].coeff = (215506),
.ADC_volt[1].offset = -3517864544,
.ADC_volt[2].coeff = (6243728),
.ADC_volt[2].offset = -102012564806,
.ADC_current[0].coeff = 3139436,
.ADC_current[0].offset = (-51217085818),
.ADC_current[1].coeff = 71622830,
.ADC_current[1].offset = (-1168462302473),
.ADC_current[2].coeff = 1462344785,
.ADC_current[2].offset = (-23855062972762),
.ADC_current[3].coeff = 30689232716,
.ADC_current[3].offset = (-500670762245868),
.Usercode2DAC[0].coeff = (-10507403),
.Usercode2DAC[0].offset = 582940058695,
.Usercode2DAC[1].coeff = (-178479878),
.Usercode2DAC[1].offset = 4782895510276,
};
#endif
#ifdef BOARD_C69F
{
.ADC_volt[0].coeff = (6118),
.ADC_volt[0].offset = -99518615,
.ADC_volt[1].coeff = (209748),
.ADC_volt[1].offset = -3417768725,
.ADC_volt[2].coeff = (6131501),
.ADC_volt[2].offset = -99999128933,
.ADC_current[0].coeff = 3148514,
.ADC_current[0].offset = (-50485662786),
.ADC_current[1].coeff = 71804564,
.ADC_current[1].offset = (-1151299062516),
.ADC_current[2].coeff = 1463584080,
.ADC_current[2].offset = (-23465643586165),
.ADC_current[3].coeff = 30747070723,
.ADC_current[3].offset = (-492979538892707),
.Usercode2DAC[0].coeff = (-10534427),
.Usercode2DAC[0].offset = 577647889649,
.Usercode2DAC[1].coeff = (-178317702),
.Usercode2DAC[1].offset = 4773350420707,
};
#endif
#ifdef BOARD_C903
{
.ADC_volt[0].coeff = (6268),
.ADC_volt[0].offset = -103687047,
.ADC_volt[1].coeff = (216289),
.ADC_volt[1].offset = -3581110600,
.ADC_volt[2].coeff = (6255165),
.ADC_volt[2].offset = -103653080405,
.ADC_current[0].coeff = 3136844,
.ADC_current[0].offset = (-51057548335),
.ADC_current[1].coeff = 71729828,
.ADC_current[1].offset = (-1167474302377),
.ADC_current[2].coeff = 1457587112,
.ADC_current[2].offset = (-23722230272507),
.ADC_current[3].coeff = 30688020320,
.ADC_current[3].offset = (-499567626613052),
.Usercode2DAC[0].coeff = (-10538549),
.Usercode2DAC[0].offset = 582561125327,
.Usercode2DAC[1].coeff = (-179443367),
.Usercode2DAC[1].offset = 4806000714268,
};
#endif
#ifdef BOARD_C60C
{
.ADC_volt[0].coeff = (6232),
.ADC_volt[0].offset = -100384012,
.ADC_volt[1].coeff = (216642),
.ADC_volt[1].offset = -3529452462,
.ADC_volt[2].coeff = (6233108),
.ADC_volt[2].offset = -100604531870,
.ADC_current[0].coeff = 3145651,
.ADC_current[0].offset = (-51102123184),
.ADC_current[1].coeff = 71727284,
.ADC_current[1].offset = (-1165169041311),
.ADC_current[2].coeff = 1463455403,
.ADC_current[2].offset = (-23772125686630),
.ADC_current[3].coeff = 30773610135,
.ADC_current[3].offset = (-499913505030514),
.Usercode2DAC[0].coeff = (-10570464),
.Usercode2DAC[0].offset = 583479916773,
.Usercode2DAC[1].coeff = (-178725281),
.Usercode2DAC[1].offset = 4787957689974,
};
#endif
#ifdef BOARD_C78B
{
.ADC_volt[0].coeff = (6242),
.ADC_volt[0].offset = -101356025,
.ADC_volt[1].coeff = (215624),
.ADC_volt[1].offset = -3503045312,
.ADC_volt[2].coeff = (6243816),
.ADC_volt[2].offset = -101524034738,
.ADC_current[0].coeff = 3131950,
.ADC_current[0].offset = (-50953509336),
.ADC_current[1].coeff = 71591803,
.ADC_current[1].offset = (-1164676104750),
.ADC_current[2].coeff = 1457994881,
.ADC_current[2].offset = (-23717445756897),
.ADC_current[3].coeff = 30731877501,
.ADC_current[3].offset = (-499947688305697),
.Usercode2DAC[0].coeff = (-10509141),
.Usercode2DAC[0].offset = 581313489845,
.Usercode2DAC[1].coeff = (-177847688),
.Usercode2DAC[1].offset = 4765751343445,
};
#endif
#ifdef BOARD_C615
{
.ADC_volt[0].coeff = (6213),
.ADC_volt[0].offset = -100904734,
.ADC_volt[1].coeff = (213486),
.ADC_volt[1].offset = -3475774161,
.ADC_volt[2].coeff = (6220838),
.ADC_volt[2].offset = -101367452805,
.ADC_current[0].coeff = 3133669,
.ADC_current[0].offset = (-50985338691),
.ADC_current[1].coeff = 71848701,
.ADC_current[1].offset = (-1168930549263),
.ADC_current[2].coeff = 1465220422,
.ADC_current[2].offset = (-23836711044239),
.ADC_current[3].coeff = 30753809644,
.ADC_current[3].offset = (-500364315274466),
.Usercode2DAC[0].coeff = (-10519306),
.Usercode2DAC[0].offset = 583547544303,
.Usercode2DAC[1].coeff = (-179481859),
.Usercode2DAC[1].offset = 4808633144378,
};
#endif
#ifdef BOARD_C797
{
.ADC_volt[0].coeff = (6285),
.ADC_volt[0].offset = -102399765,
.ADC_volt[1].coeff = (217179),
.ADC_volt[1].offset = -3541219740,
.ADC_volt[2].coeff = (6293290),
.ADC_volt[2].offset = -102701705789,
.ADC_current[0].coeff = 3124793,
.ADC_current[0].offset = (-50785593516),
.ADC_current[1].coeff = 71661923,
.ADC_current[1].offset = (-1164632411724),
.ADC_current[2].coeff = 1459117290,
.ADC_current[2].offset = (-23712400276764),
.ADC_current[3].coeff = 30624856407,
.ADC_current[3].offset = (-497729976849926),
.Usercode2DAC[0].coeff = (-10517402),
.Usercode2DAC[0].offset = 581255473226,
.Usercode2DAC[1].coeff = (-178353177),
.Usercode2DAC[1].offset = 4777407394955,
};
#endif
#ifdef BOARD_C639
{
.ADC_volt[0].coeff = (6208),
.ADC_volt[0].offset = -100729867,
.ADC_volt[1].coeff = (214500),
.ADC_volt[1].offset = -3488858165,
.ADC_volt[2].coeff = (6228268),
.ADC_volt[2].offset = -101395718164,
.ADC_current[0].coeff = 3139511,
.ADC_current[0].offset = (-51174954874),
.ADC_current[1].coeff = 71851912,
.ADC_current[1].offset = (-1171152880960),
.ADC_current[2].coeff = 1461965017,
.ADC_current[2].offset = (-23828340962540),
.ADC_current[3].coeff = 30773724865,
.ADC_current[3].offset = (-501611882239925),
.Usercode2DAC[0].coeff = (-10520659),
.Usercode2DAC[0].offset = 581192312483,
.Usercode2DAC[1].coeff = (-177973792),
.Usercode2DAC[1].offset = 4768259045109,
};
#endif
#ifdef BOARD_C5CD
{
.ADC_volt[0].coeff = (6279),
.ADC_volt[0].offset = -100548659,
.ADC_volt[1].coeff = (216253),
.ADC_volt[1].offset = -3471891549,
.ADC_volt[2].coeff = (6277392),
.ADC_volt[2].offset = -100862395596,
.ADC_current[0].coeff = 3136805,
.ADC_current[0].offset = (-50213343000),
.ADC_current[1].coeff = 72032077,
.ADC_current[1].offset = (-1153034516566),
.ADC_current[2].coeff = 1465628098,
.ADC_current[2].offset = (-23459820455868),
.ADC_current[3].coeff = 30833759075,
.ADC_current[3].offset = (-493561287778940),
.Usercode2DAC[0].coeff = (-10522269),
.Usercode2DAC[0].offset = 578531626885,
.Usercode2DAC[1].coeff = (-177684018),
.Usercode2DAC[1].offset = 4759051659585,
};
#endif
#ifdef BOARD_C771 //die
{
.ADC_volt[0].coeff = (6301),
.ADC_volt[0].offset = -102184705,
.ADC_volt[1].coeff = (216877),
.ADC_volt[1].offset = -3519583281,
.ADC_volt[2].coeff = (6298448),
.ADC_volt[2].offset = -102304286091,
.ADC_current[0].coeff = 3115431,
.ADC_current[0].offset = (-50586460394),
.ADC_current[1].coeff = 71203612,
.ADC_current[1].offset = (-1156022105141),
.ADC_current[2].coeff = 1451318434,
.ADC_current[2].offset = (-23560731221983),
.ADC_current[3].coeff = 30518004246,
.ADC_current[3].offset = (-495456618814855),
.Usercode2DAC[0].coeff = (-10568719),
.Usercode2DAC[0].offset = 585036272447,
.Usercode2DAC[1].coeff = (-179441058),
.Usercode2DAC[1].offset = 4807380622351,
};
#endif
#ifdef BOARD_C6E1 // not well
{
.ADC_volt[0].coeff = (-6251051),
.ADC_volt[0].offset = 102081366120,
@@ -80,38 +515,7 @@ struct _correction{
};
#endif
#ifdef BOARD_C7A1
{
.ADC_volt[0].coeff = (6204),
.ADC_volt[0].offset = -100237253,
.ADC_volt[1].coeff = (214511),
.ADC_volt[1].offset = -3485722036,
.ADC_volt[2].coeff = (6213224),
.ADC_volt[2].offset = -101104189300,
.ADC_current[0].coeff = 2078892,
.ADC_current[0].offset = (-33685110900),
.ADC_current[1].coeff = 64769469,
.ADC_current[1].offset = (-1048938859469),
.ADC_current[2].coeff = 2090182091,
.ADC_current[2].offset = (-33847893234994),
.ADC_current[3].coeff = 60030468992,
.ADC_current[3].offset = (-972275155887907),
.Usercode2DAC[0].coeff = (-10512772),
.Usercode2DAC[0].offset = 581302323013,
.Usercode2DAC[1].coeff = (-178991273),
.Usercode2DAC[1].offset = 4794464882260,
};
#endif
#ifdef BOARD_C6D4
#ifdef BOARD_C6D4 // not well
{
.ADC_volt[0].coeff = (6226),
.ADC_volt[0].offset = -100075170,
@@ -142,6 +546,409 @@ struct _correction{
};
#endif
#ifdef BOARD_C68B
{
.ADC_volt[0].coeff = (6268),
.ADC_volt[0].offset = -102174553,
.ADC_volt[1].coeff = (215573),
.ADC_volt[1].offset = -3518341586,
.ADC_volt[2].coeff = (6261878),
.ADC_volt[2].offset = -102172685043,
.ADC_current[0].coeff = 3126866,
.ADC_current[0].offset = (-50886322937),
.ADC_current[1].coeff = 71901602,
.ADC_current[1].offset = (-1169888894091),
.ADC_current[2].coeff = 1460660024,
.ADC_current[2].offset = (-23764191484059),
.ADC_current[3].coeff = 30760667430,
.ADC_current[3].offset = (-500493888709662),
.Usercode2DAC[0].coeff = (-10505380),
.Usercode2DAC[0].offset = 582175976769,
.Usercode2DAC[1].coeff = (-179056776),
.Usercode2DAC[1].offset = 4796575970947,
};
#endif
#ifdef BOARD_ED5A
{
.ADC_volt[0].coeff = (6255),
.ADC_volt[0].offset = -101981496,
.ADC_volt[1].coeff = (214609),
.ADC_volt[1].offset = -3506688208,
.ADC_volt[2].coeff = (6287576),
.ADC_volt[2].offset = -102718216344,
.ADC_current[0].coeff = 3135873,
.ADC_current[0].offset = (-51079799127),
.ADC_current[1].coeff = 71803212,
.ADC_current[1].offset = (-1169615889960),
.ADC_current[2].coeff = 1458743323,
.ADC_current[2].offset = (-23760656826631),
.ADC_current[3].coeff = 30800455379,
.ADC_current[3].offset = (-501709286949801),
.Usercode2DAC[0].coeff = (-10513739),
.Usercode2DAC[0].offset = 582219968611,
.Usercode2DAC[1].coeff = (-178675535),
.Usercode2DAC[1].offset = 4787365510181,
};
#endif
#ifdef BOARD_C705
{
.ADC_volt[0].coeff = (6268),
.ADC_volt[0].offset = -101548925,
.ADC_volt[1].coeff = (215286),
.ADC_volt[1].offset = -3498610755,
.ADC_volt[2].coeff = (6248966),
.ADC_volt[2].offset = -101525581798,
.ADC_current[0].coeff = 3140113,
.ADC_current[0].offset = (-51096616915),
.ADC_current[1].coeff = 71991480,
.ADC_current[1].offset = (-1171591233910),
.ADC_current[2].coeff = 1463918055,
.ADC_current[2].offset = (-23822237948708),
.ADC_current[3].coeff = 30759517333,
.ADC_current[3].offset = (-500591140209163),
.Usercode2DAC[0].coeff = (-10508844),
.Usercode2DAC[0].offset = 581826013531,
.Usercode2DAC[1].coeff = (-178229067),
.Usercode2DAC[1].offset = 4775935828877,
};
#endif
#ifdef BOARD_C6EF
{
.ADC_volt[0].coeff = (6250),
.ADC_volt[0].offset = -101736498,
.ADC_volt[1].coeff = (214630),
.ADC_volt[1].offset = -3500639899,
.ADC_volt[2].coeff = (6273983),
.ADC_volt[2].offset = -102312126624,
.ADC_current[0].coeff = 3118288,
.ADC_current[0].offset = (-50838741339),
.ADC_current[1].coeff = 71681550,
.ADC_current[1].offset = (-1168759089937),
.ADC_current[2].coeff = 1462272089,
.ADC_current[2].offset = (-23840506320817),
.ADC_current[3].coeff = 30686730661,
.ADC_current[3].offset = (-500337416473814),
.Usercode2DAC[0].coeff = (-10519033),
.Usercode2DAC[0].offset = 583249863408,
.Usercode2DAC[1].coeff = (-178191109),
.Usercode2DAC[1].offset = 4776269713117,
};
#endif
#ifdef BOARD_C5AF
{
.ADC_volt[0].coeff = (6251),
.ADC_volt[0].offset = -101338305,
.ADC_volt[1].coeff = (214878),
.ADC_volt[1].offset = -3492068490,
.ADC_volt[2].coeff = (6268745),
.ADC_volt[2].offset = -101859993760,
.ADC_current[0].coeff = 3137049,
.ADC_current[0].offset = (-50892341056),
.ADC_current[1].coeff = 71900313,
.ADC_current[1].offset = (-1166487347464),
.ADC_current[2].coeff = 1460255142,
.ADC_current[2].offset = (-23689442308761),
.ADC_current[3].coeff = 30735138864,
.ADC_current[3].offset = (-498647746053279),
.Usercode2DAC[0].coeff = (-10543618),
.Usercode2DAC[0].offset = 583204051611,
.Usercode2DAC[1].coeff = (-179160298),
.Usercode2DAC[1].offset = 4799658904964,
};
#endif
#ifdef BOARD_C6E7
{
.ADC_volt[0].coeff = (6273),
.ADC_volt[0].offset = -101507772,
.ADC_volt[1].coeff = (215283),
.ADC_volt[1].offset = -3492943359,
.ADC_volt[2].coeff = (6298452),
.ADC_volt[2].offset = -102172065832,
.ADC_current[0].coeff = 3126505,
.ADC_current[0].offset = (-50854986702),
.ADC_current[1].coeff = 71665253,
.ADC_current[1].offset = (-1165783058810),
.ADC_current[2].coeff = 1455913937,
.ADC_current[2].offset = (-23682364693928),
.ADC_current[3].coeff = 30656599965,
.ADC_current[3].offset = (-498686538286126),
.Usercode2DAC[0].coeff = (-10548474),
.Usercode2DAC[0].offset = 582963458480,
.Usercode2DAC[1].coeff = (-178967404),
.Usercode2DAC[1].offset = 4794329226068,
};
#endif
#ifdef BOARD_ED49
{
.ADC_volt[0].coeff = (6268),
.ADC_volt[0].offset = -102013810,
.ADC_volt[1].coeff = (215623),
.ADC_volt[1].offset = -3517703826,
.ADC_volt[2].coeff = (6273107),
.ADC_volt[2].offset = -102313312961,
.ADC_current[0].coeff = 3131182,
.ADC_current[0].offset = (-50878212788),
.ADC_current[1].coeff = 72031369,
.ADC_current[1].offset = (-1170539886748),
.ADC_current[2].coeff = 1458064484,
.ADC_current[2].offset = (-23692701530531),
.ADC_current[3].coeff = 30723432431,
.ADC_current[3].offset = (-499272075689840),
.Usercode2DAC[0].coeff = (-10554205),
.Usercode2DAC[0].offset = 583041949770,
.Usercode2DAC[1].coeff = (-178763469),
.Usercode2DAC[1].offset = 4789592107725,
};
#endif
#ifdef BOARD_F08F
{
.ADC_volt[0].coeff = (6264),
.ADC_volt[0].offset = -101640847,
.ADC_volt[1].coeff = (215785),
.ADC_volt[1].offset = -3508414799,
.ADC_volt[2].coeff = (6279952),
.ADC_volt[2].offset = -102076620345,
.ADC_current[0].coeff = 3141963,
.ADC_current[0].offset = (-51073231136),
.ADC_current[1].coeff = 72047691,
.ADC_current[1].offset = (-1171229918671),
.ADC_current[2].coeff = 1461468562,
.ADC_current[2].offset = (-23756885490434),
.ADC_current[3].coeff = 30873625562,
.ADC_current[3].offset = (-501896591223166),
.Usercode2DAC[0].coeff = (-10545767),
.Usercode2DAC[0].offset = 582980841096,
.Usercode2DAC[1].coeff = (-178801672),
.Usercode2DAC[1].offset = 4790333157194,
};
#endif
#ifdef BOARD_E774
{
.ADC_volt[0].coeff = (6244),
.ADC_volt[0].offset = -101801810,
.ADC_volt[1].coeff = (215275),
.ADC_volt[1].offset = -3519927387,
.ADC_volt[2].coeff = (6279589),
.ADC_volt[2].offset = -102655566741,
.ADC_current[0].coeff = 3123389,
.ADC_current[0].offset = (-50776951758),
.ADC_current[1].coeff = 71847315,
.ADC_current[1].offset = (-1168069714834),
.ADC_current[2].coeff = 1460393971,
.ADC_current[2].offset = (-23742664117895),
.ADC_current[3].coeff = 30737287182,
.ADC_current[3].offset = (-499721524793572),
.Usercode2DAC[0].coeff = (-10507966),
.Usercode2DAC[0].offset = 581918490604,
.Usercode2DAC[1].coeff = (-178253119),
.Usercode2DAC[1].offset = 4776203208556,
};
#endif
#ifdef BOARD_ED21
{
.ADC_volt[0].coeff = (6237),
.ADC_volt[0].offset = -101506434,
.ADC_volt[1].coeff = (214187),
.ADC_volt[1].offset = -3489017250,
.ADC_volt[2].coeff = (6277851),
.ADC_volt[2].offset = -102237808487,
.ADC_current[0].coeff = 3134799,
.ADC_current[0].offset = (-50971095746),
.ADC_current[1].coeff = 71733616,
.ADC_current[1].offset = (-1166459693615),
.ADC_current[2].coeff = 1462021081,
.ADC_current[2].offset = (-23772269392025),
.ADC_current[3].coeff = 30772308780,
.ADC_current[3].offset = (-500364040829566),
.Usercode2DAC[0].coeff = (-10490557),
.Usercode2DAC[0].offset = 582220982870,
.Usercode2DAC[1].coeff = (-178506659),
.Usercode2DAC[1].offset = 4784370884020,
};
#endif
#ifdef BOARD_EE3A
{
.ADC_volt[0].coeff = (6258),
.ADC_volt[0].offset = -101672777,
.ADC_volt[1].coeff = (215066),
.ADC_volt[1].offset = -3500967589,
.ADC_volt[2].coeff = (6272676),
.ADC_volt[2].offset = -102084032306,
.ADC_current[0].coeff = 3138624,
.ADC_current[0].offset = (-51107815498),
.ADC_current[1].coeff = 71797400,
.ADC_current[1].offset = (-1169199810893),
.ADC_current[2].coeff = 1462613856,
.ADC_current[2].offset = (-23816683013402),
.ADC_current[3].coeff = 30733477851,
.ADC_current[3].offset = (-500459333089804),
.Usercode2DAC[0].coeff = (-10547903),
.Usercode2DAC[0].offset = 582785161346,
.Usercode2DAC[1].coeff = (-179056776),
.Usercode2DAC[1].offset = 4797113133841,
};
#endif
#ifdef BOARD_F010
{
.ADC_volt[0].coeff = (6264),
.ADC_volt[0].offset = -101827242,
.ADC_volt[1].coeff = (215510),
.ADC_volt[1].offset = -3511696676,
.ADC_volt[2].coeff = (6292361),
.ADC_volt[2].offset = -102511071793,
.ADC_current[0].coeff = 3132603,
.ADC_current[0].offset = (-50965542108),
.ADC_current[1].coeff = 71657737,
.ADC_current[1].offset = (-1165964825950),
.ADC_current[2].coeff = 1458242488,
.ADC_current[2].offset = (-23726443385639),
.ADC_current[3].coeff = 30741056126,
.ADC_current[3].offset = (-500225222630998),
.Usercode2DAC[0].coeff = (-10586568),
.Usercode2DAC[0].offset = 584361939180,
.Usercode2DAC[1].coeff = (-179021013),
.Usercode2DAC[1].offset = 4795545657963,
};
#endif
#ifdef BOARD_EEEF
{
.ADC_volt[0].coeff = (6263),
.ADC_volt[0].offset = -101983153,
.ADC_volt[1].coeff = (214468),
.ADC_volt[1].offset = -3497722617,
.ADC_volt[2].coeff = (6268586),
.ADC_volt[2].offset = -102208366701,
.ADC_current[0].coeff = 3134472,
.ADC_current[0].offset = (-51003312621),
.ADC_current[1].coeff = 72026797,
.ADC_current[1].offset = (-1172092073650),
.ADC_current[2].coeff = 1463550415,
.ADC_current[2].offset = (-23814791825270),
.ADC_current[3].coeff = 30710210799,
.ADC_current[3].offset = (-499732239892393),
.Usercode2DAC[0].coeff = (-10554844),
.Usercode2DAC[0].offset = 583784029751,
.Usercode2DAC[1].coeff = (-178890877),
.Usercode2DAC[1].offset = 4792844364937,
};
#endif
// this function turn ADC measure value (0xXXXX) into real voltage
// unit should be uV
static int32_t DecodeADCVolt(uint8_t ADCGain, uint16_t ADC_measure){
@@ -153,12 +960,12 @@ static int32_t DecodeADCVolt(uint8_t ADCGain, uint16_t ADC_measure){
}
// this function turn ADC measure value (0xXXXX) into Vout voltage
// unit should be mV
// unit should be uV
static int32_t DecodeADCVoutVolt(uint16_t ADC_measure){
long long ADCVoutVolt = 0;
ADCVoutVolt = ((-62658782380) * ADC_measure + 1020118014900000);
ADCVoutVolt = ADCVoutVolt / 1e11;
ADCVoutVolt = ADCVoutVolt / 1e8;
return (int32_t) (ADCVoutVolt);
}
@@ -221,46 +1028,11 @@ static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_
return ret;
}
// #0 board, (0x5f75 <= rawdata) && (rawdata <= 0x5fb2)
// ((0x5f97 < rawdata) && (rawdata < 0x6589)) || ((0x5999 < rawdata) && (rawdata < 0x5f93))
static void ADC_overflow(uint8_t gain, uint8_t *rawdata){
// Gain boundary defines different ADC gain level working area
// Gain0Boundary = {lowerbound, upperbound}, is the lower and upper bound of gain level 0 working area.
uint16_t U16Rawdata = 0;
U16Rawdata = (((uint16_t) (rawdata[0]))<<8) | ((uint16_t) (rawdata[1]));
if(gain == I_GAIN_3M){
if( U16Rawdata <= Correction.Gain0Boundary[0]){
rawdata[0] = Correction.Gain0Boundary[0] >> 4;
rawdata[1] = (uint8_t) (Correction.Gain0Boundary[0] & 0x00FF);
}
else if(U16Rawdata >= Correction.Gain0Boundary[1]){
rawdata[0] = (uint8_t) (Correction.Gain0Boundary[1] >> 4);
rawdata[1] = (uint8_t) (Correction.Gain0Boundary[1] & 0x00FF);
}
}
else if(gain == I_GAIN_100K){
if( U16Rawdata <= Correction.Gain1Boundary[0]){
rawdata[0] = Correction.Gain1Boundary[0] >> 4;
rawdata[1] = (uint8_t) (Correction.Gain1Boundary[0] & 0x00FF);
}
else if(U16Rawdata >= Correction.Gain1Boundary[1]){
rawdata[0] = (uint8_t) (Correction.Gain1Boundary[1] >> 4);
rawdata[1] = (uint8_t) (Correction.Gain1Boundary[1] & 0x00FF);
}
}
}
// 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(uint8_t DACGain, uint16_t usercode)
static uint32_t Usercode_Correction_to_DAC(uint8_t DACGain, uint16_t usercode)
{
AutoGainChangeVout(usercode);
long long usercode_32;
uint16_t DACcode = 0;
@@ -268,9 +1040,19 @@ static uint16_t Usercode_Correction_to_DAC(uint8_t DACGain, uint16_t usercode)
DACcode = (uint16_t) ((Correction.Usercode2DAC[DACGain].coeff * usercode_32 + Correction.Usercode2DAC[DACGain].offset)/1e7);
return DACcode;
}
static uint32_t Usercode_Correction_to_Freq(uint16_t usercode)
{
uint32_t freqCode;
freqCode = ((uint32_t)(usercode) * 240) + 67109;
return freqCode;
}
static int32_t DAC_to_realV(uint8_t DACGain, uint16_t DACcode)
{
@@ -0,0 +1,150 @@
#ifndef ELITEEIS
#define ELITEEIS
static void eis_fscan(void)
{
struct wm_eis_ctx_t *eis = (struct wm_eis_ctx_t *)wm_get();
if (vscanReset) {
eis->_in_reset_flag = true;
eis->_f1 = User2Freq(eis->_f1);
eis->_f2 = User2Freq(eis->_f2);
eis->_fmax = User2Freq(eis->_fmax);
eis->_fmin = User2Freq(eis->_fmin);
if (instru.directionInit == 1) {
eis->_direction_up = true;
} else if (instru.directionInit == 0) {
eis->_direction_up = false;
}
eis->_decades = CalcDecade(instru.fmin, instru.fmax);
instru.fset = eis->_f1;
vscanReset = false;
}
if (!vscanReset) {
if(eis->_direction_up) {
if(eis->_sweepIndex == 0){
if(eis->_decadeIndex < eis->_decades) {
eis->_fd1 = eis->_f1 * TenPowerTable[eis->_decadeIndex];
eis->_fd2 = eis->_f1 * TenPowerTable[eis->_decadeIndex + 1];
} else if (eis->_decadeIndex == eis->_decades) {
eis->_fd1 = eis->_fd2;//eis->_f1 * TenPowerTable[decadeIndex];
eis->_fd2 = eis->_fmax;
}
}
if(eis->_decadeIndex != 0 && eis->_sweepIndex == 0){
eis->_sweepIndex++;
}
if(instru.scale == 0) { // logarithm
if (eis->_ppd == 10) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable10[eis->_sweepIndex] + 500)/ 1000;
}
else if (eis->_ppd == 9){
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable9[eis->_sweepIndex] + 500)/ 1000;
}
else if (eis->_ppd == 8) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable8[eis->_sweepIndex] + 500)/ 1000;
}
else if (eis->_ppd == 7) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable7[eis->_sweepIndex] + 500)/ 1000;
}
else if (eis->_ppd == 6) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable6[eis->_sweepIndex] + 500)/ 1000;
}
else if (eis->_ppd == 5) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable5[eis->_sweepIndex] + 500)/ 1000;
}
else if (eis->_ppd == 4) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable4[eis->_sweepIndex] + 500)/ 1000;
}
else if (eis->_ppd == 3) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable3[eis->_sweepIndex] + 500)/ 1000;
}
else if (eis->_ppd == 2) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable2[eis->_sweepIndex] + 500)/ 1000;
}
}
else if (instru.scale == 1) { // linear
instru.fset = eis->_fd1 + eis->_sweepIndex * ((eis->_fd2 - eis->_fd1) / (eis->_ppd - 1));
}
if(instru.fset > eis->_fmax){
instru.fset = eis->_fmax;
}
} else { //reverse
if(eis->_sweepIndex == 0){
if(eis->_decadeIndex < eis->_decades){
eis->_fd1 = eis->_f1 / TenPowerTable[eis->_decadeIndex];
eis->_fd2 = eis->_f1 / TenPowerTable[eis->_decadeIndex + 1];
} else if (eis->_decadeIndex == eis->_decades){
eis->_fd1 = eis->_fd2; //eis->_f1 / TenPowerTable[eis->_decadeIndex];
eis->_fd2 = eis->_fmin;
}
}
if(eis->_decadeIndex != 0 && eis->_sweepIndex == 0){
eis->_sweepIndex++;
}
if(instru.scale == 0) { // logarithm
if (eis->_ppd == 10) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable10[9 - eis->_sweepIndex] + 5000)/ 10000;
}
else if (eis->_ppd == 9) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable9[8 - eis->_sweepIndex] + 5000)/ 10000;
}
else if (eis->_ppd == 8) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable8[7 - eis->_sweepIndex] + 5000)/ 10000;
}
else if (eis->_ppd == 7) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable7[6 - eis->_sweepIndex] + 5000)/ 10000;
}
else if (eis->_ppd == 6) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable6[5 - eis->_sweepIndex] + 5000)/ 10000;
}
else if (eis->_ppd == 5) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable5[4 - eis->_sweepIndex] + 5000)/ 10000;
}
else if (eis->_ppd == 4) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable4[3 - eis->_sweepIndex] + 5000)/ 10000;
}
else if (eis->_ppd == 3) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable3[2 - eis->_sweepIndex] + 5000)/ 10000;
}
else if (eis->_ppd == 2) {
instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable2[1 - eis->_sweepIndex] + 5000)/ 10000;
}
}
else if(instru.scale == 1) { // linear
instru.fset = eis->_fd1 - eis->_sweepIndex * ((eis->_fd1 - eis->_fd2) / (eis->_ppd - 1));
}
if(instru.fset < eis->_fmin){
instru.fset = eis->_fmin;
}
}
if (!gainChange_flag) {
if (++eis->_sweepIndex == eis->_ppd) {
eis->_sweepIndex = 0;
eis->_decadeIndex ++;
}
}
}
SetSamplingTime(instru.fset);
instru.sampleRate = 2000;
}
#endif
@@ -7,7 +7,6 @@ struct _CT{
uint32_t SampleRate_counter;
uint16_t StepTimeCounter;
uint16_t NotifyCounter;
uint32_t StandByCounter;
}CT = {0};
// GPT counter
@@ -19,18 +18,13 @@ struct _GPT{
uint32_t NotifyCounter;
uint32_t VscanRateCounter;
uint32_t LeadTimeCounter;
uint32_t DelayTimeCounter;
uint32_t BatteryADCCounter;
uint32_t BatteryCheckCounter;
uint32_t GptimerMultiple;
uint32_t StiCounter;
}GPT = {0};
static void InitCT(){
CT.SampleRate_counter = 1;
CT.StepTimeCounter = 1;
CT.NotifyCounter = 1;
CT.StandByCounter = 0;
}
static void InitGPT(){
GPT.GptimerCounter = 0;
GPT.GptimerCounter0 = 0;
@@ -39,7 +33,9 @@ static void InitGPT(){
GPT.NotifyCounter = 0;
GPT.VscanRateCounter = 0;
GPT.LeadTimeCounter = 0;
GPT.DelayTimeCounter = 0;
GPT.BatteryADCCounter = 0;
GPT.BatteryCheckCounter = 0;
GPT.StiCounter = 0;
}
#endif
@@ -17,7 +17,7 @@ static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_In
#define elite_gptimer_start() GPTimerCC26XX_start(gptimer_handle)
#define elite_gptimer_stop() GPTimerCC26XX_stop(gptimer_handle)
#define elite_gptimer_close() GPTimerCC26XX_close(gptimer_handle)
#define CLOCK_FREQ 4800 // clock freq = 0.1 ms
#define CLOCK_FREQ 4769 // clock freq = 0.1 ms(4800), Measured(4769)
#define elite_gptimer_open() \
do { \
@@ -2,48 +2,73 @@
#ifndef ELITEIV
#define ELITEIV
#define Vset INSTRUCTION.Vset
#define Vset instru.Vset
static void IV_Vscan(IVMode *IV){
if(vscanReset){
if(INSTRUCTION.directionInit == 1){
IV->_direction_up = true;
IV->_current_direction_up = true;
}else if(INSTRUCTION.directionInit == 0){
IV->_direction_up = false;
IV->_current_direction_up = false;
}
static void iv_vscan(void)
{
struct wm_iv_ctx_t *iv = (struct wm_iv_ctx_t *)wm_get();
//Vsetp = x * 20 * N, x=xmV ; N=VscanRate
if(INSTRUCTION.step <= 10){
IV->_Vstep = INSTRUCTION.step * INSTRUCTION.VsetRate / 5;
}else{
IV->_Vstep = INSTRUCTION.step / 5 * INSTRUCTION.VsetRate;
}
if (vscanReset) {
// if (instru.directionInit == 1) {
// iv->_direction_up = true;
// iv->_current_direction_up = true;
// } else if (instru.directionInit == 0) {
// iv->_direction_up = false;
// iv->_current_direction_up = false;
// }
//
// //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
// if (instru.step <= 10) {
// iv->_Vstep = instru.step * instru.VsetRate / 5;
// } else {
// iv->_Vstep = instru.step / 5 * instru.VsetRate;
// }
//
// Vset = iv->_Vinit;
Vset = IV->_Vinit;
iv -> _Vstep = 2514; //10kHz increment
Vset = iv ->_Vinit;
// initCISBuf();
// cis_buf[0] = (uint8_t)((Vset & 0xFF000000) >> 24);
// cis_buf[1] = (uint8_t)((Vset & 0x00FF0000) >> 16);
// cis_buf[2] = (uint8_t)((Vset & 0x0000FF00) >> 8);
// cis_buf[3] = (uint8_t)(Vset & 0x000000FF);
// SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
}
if(!vscanReset){
if(IV->_current_direction_up){
if(Vset >= IV->_Vmax){
if (!vscanReset) {
if (iv->_current_direction_up) {
if (Vset >= iv->_Vmax) {
PeriodicEvent = false;
ELITE15_SPI_CLOSE();
ModeLED(NO_EVENT);
}
}else{
if(Vset <= IV->_Vmin){
PeriodicEvent = false;
ELITE15_SPI_CLOSE();
ModeLED(NO_EVENT);
}
}
} //else {
// if (Vset <= iv->_Vmin) {
// PeriodicEvent = false;
// }
// }
//
// if (iv->_current_direction_up) {
// Vset = Vset + iv->_Vstep * GPT.GptimerMultiple;
// } else {
// Vset = Vset - iv->_Vstep * GPT.GptimerMultiple;
// }
Vset = Vset + iv->_Vstep;
// InputNotify(NOTIFY_IMPEDANCE, Vset);
if (IV->_current_direction_up){
Vset = Vset + IV->_Vstep * GPT.GptimerMultiple;
}else{
Vset = Vset - IV->_Vstep * GPT.GptimerMultiple;
}
}
}
static void vo_vscan(void)
{
struct wm_vo_ctx_t *vo = (struct wm_vo_ctx_t *)wm_get();
if (vscanReset) {
Vset = vo->_Vinit;
}
if(!vscanReset) {
Vset = vo->_Vinit;
}
}
@@ -1,44 +1,14 @@
#ifndef __INSTR_H__
#define __INSTR_H__
#ifndef ELITEINSTRUCTION
#define ELITEINSTRUCTION
/** Iin, Vin, Vout **/
#define IIN_ADC 0x00
#define VIN_ADC 0x01
#define VOUT_DAC 0x02
#define HIGH_Z 0x03
/** ADC Iin gain level **/
#define I_GAIN_3M 0x00 // largest gain
#define I_GAIN_100K 0x01
#define I_GAIN_3K 0x02
#define I_GAIN_100R 0x03 // the least gain
#define I_GAIN_AUTO 0x04
/** ADC Vin gain level **/
#define VIN_GAIN_1M 0x00
#define VIN_GAIN_30K 0x01
#define VIN_GAIN_1K 0x02
#define VIN_GAIN_AUTO 0x03
/** Vout gain level **/
#define VOUT_GAIN_240K 0x00
#define VOUT_GAIN_15K 0x01
#define VOUT_GAIN_AUTO 0x02
/* DAC reset parameter */
#define DAC_ZERO 25000
// Step time macro
#define STEPTIME_HALF_SEC 5000
#define STEPTIME_ONE_SEC 10000
#define STEPTIME_TWO_SEC 20000
#ifdef __cpulsplus
extern "C" {
#endif
/*==============================
==== headstage instruction ====
=============================*/
struct HEADSTAGE_INSTRUCTION {
uint8_t chip_id;
uint8_t eliteFxn;
@@ -55,17 +25,38 @@ struct HEADSTAGE_INSTRUCTION {
int32_t Vmax;
int32_t Vmin;
/** EIS **/
uint32_t f1;
uint32_t f2;
uint32_t fmax;
uint32_t fmin;
uint32_t fset;
uint16_t dcbias;
uint16_t delay;
uint16_t acamp;
uint8_t avgnum;
uint8_t rtia;
uint16_t ppd;
uint8_t scale;
int32_t real;
int32_t imag;
uint8_t periodIndex;
uint32_t delayTime;
uint8_t settingIndex;
/** ADC parameter **/
uint8_t sampleRateIndex;
uint8_t notifyRateIndex;
uint32_t sampleRate;
uint8_t VoViSwitch;
uint8_t AutoGainEnable;
uint8_t VinAutoGainEnable;
uint8_t VoutAutoGainEnable;
uint8_t ADCGainLevel;
uint8_t ADCGainLv;
// voltage output gain
uint16_t VoutGainLevel;
uint8_t VinADCGainLevel;
uint8_t VinADCGainLv;
/** Notify parameter **/
uint32_t notifyRate;
@@ -75,11 +66,150 @@ struct HEADSTAGE_INSTRUCTION {
uint8_t charge;
int32_t constantCurrent;
int32_t Currentmax;
int32_t sti_v1;
int32_t sti_v2;
int32_t sti_v3;
int32_t sti_v4;
int32_t sti_v5;
int32_t sti_v6;
int32_t sti_v7;
int32_t sti_t1;
int32_t sti_t2;
int32_t sti_t3;
int32_t sti_t4;
int32_t sti_t5;
int32_t sti_t6;
int32_t sti_t7;
uint16_t sti_cy;
uint16_t sti_loop;
uint16_t StepTime;
} INSTRUCTION = {0};
uint8_t AdcChannel;
/* EIS DAC parameter */
uint8_t DAC_type;
uint16_t VAmpSet; // DAC Voltage Amplitude
/* EIS ADC parameter */
uint8_t HSTIAGainLv;
uint8_t HSTIAAutoGainEnable;
uint8_t LPTIAGainLv;
uint8_t LPTIAAutoGainEnable;
} instru = {0};
/** Iin, Vin, Vout **/
#define EIS_HSTIA 0x00
#define EIS_LPTIA 0x01
#define EIS_HSDAC 0x02
#define EIS_LPDAC 0x03
#define VOUT_DAC 0x04
#define IIN_ADC 0x05
#define VIN_ADC 0x06
#define HIGH_Z 0x07
/** ADC Iin gain level **/
#define I_GAIN_3M 0x07 // largest gain
#define I_GAIN_100K 0x08
#define I_GAIN_3K 0x09
#define I_GAIN_100R 0x0A // the least gain
#define I_GAIN_AUTO 0x04
// EIS LPTIA Iin Gain Level //
#define LPRTIA_512K 0x00
#define LPRTIA_12K 0x01
#define LPRTIA_4K 0x02
#define LPRTIA_200R 0x03
#define LPRTIA_GAIN_AUTO 0x04
// EIS HSTIA Iin Gain Level
#define HSRTIA_160K 0x00
#define HSRTIA_20K 0x01
#define HSRTIA_5K 0x02
#define HSRTIA_200R 0x03
#define HSRTIA_GAIN_AUTO 0x04
/** ADC Vin gain level **/
#define VIN_GAIN_1M 0x00
#define VIN_GAIN_30K 0x01
#define VIN_GAIN_1K 0x02
#define VIN_GAIN_AUTO 0x03
/** Vout gain level **/
#define VOUT_GAIN_240K 0x00
#define VOUT_GAIN_15K 0x01
#define VOUT_GAIN_AUTO 0x02
/* DAC reset parameter */
#define DAC_ZERO 25000
#define EIS_HSDAC_ZERO 0x0800
// Step time macro
#define STEPTIME_HALF_SEC 5000
#define STEPTIME_ONE_SEC 10000
#define STEPTIME_TWO_SEC 20000
/* AVG Number */
#define AVG2 0
#define AVG4 1
#define AVG8 2
#define AVG16 3
#define ADC1M6sps 0
#define ADC800Ksps 1
#define Sinc3OSR5 0
#define Sinc3OSR4 1
#define Sinc3OSR2 2
#define Sinc2OSR22 0
#define Sinc2OSR44 1
#define Sinc2OSR89 2
#define Sinc2OSR178 3
#define Sinc2OSR267 4
#define Sinc2OSR533 5
#define Sinc2OSR640 6
#define Sinc2OSR667 7
#define Sinc2OSR800 8
#define Sinc2OSR889 9
#define Sinc2OSR1067 10
#define Sinc2OSR1333 11
#define DFTNUM4 0
#define DFTNUM8 1
#define DFTNUM16 2
#define DFTNUM32 3
#define DFTNUM64 4
#define DFTNUM128 5
#define DFTNUM256 6
#define DFTNUM512 7
#define DFTNUM1024 8
#define DFTNUM2048 9
#define DFTNUM4096 10
#define DFTNUM8192 11
#define DFTNUM16384 12
#define AD5940_SYS_CLOCK 16000000
#define Cutoff_Freq 37000000 // 210kHz
///* LPTIA gain Level */
//#define LPRTIA200R 1 //Max 3mA
//#define LPRTIA4K 5 //Max 220uA
//#define LPRTIA12K 9 //Max 74uA
//#define LPRTIA512K 26 //Max 1.76uA
static uint32_t HSRTIATable[4] = {160000, 20000, 5000, 200};
/* HSTIA gain level (feedback R value) */
#define RTIA200R 0x00 // 200R
#define RTIA1k 0x01 // 1k
#define RTIA5k 0x02 // 5k
#define RTIA10k 0x03 // 10k
#define RTIA20k 0x04 // 20k
#define RTIA40k 0x05 // 40k
#define RTIA80k 0x06 // 80k
#define RTIA160k 0x07 // 160k
#define RTIAopen 0x08 // RTIA is open
/*********************************************************************
* @fn InitEliteInstruction
*
@@ -90,33 +220,86 @@ struct HEADSTAGE_INSTRUCTION {
* @return None.
*/
static void InitEliteInstruction(){
INSTRUCTION.chip_id = 0;
INSTRUCTION.eliteFxn = 0; //default is a null event
INSTRUCTION.VsetRateIndex = 0;
INSTRUCTION.VsetRate = 2;
INSTRUCTION.Vset = 0;
INSTRUCTION.VoltConstant = DAC_ZERO; //DAC_ZERO is about 0V
INSTRUCTION.directionInit = 1; //0:reverse 1:forward
INSTRUCTION.step = 0;
INSTRUCTION.Ve1 = DAC_ZERO;
INSTRUCTION.Ve2 = DAC_ZERO;
INSTRUCTION.Vinit = 0;
INSTRUCTION.Vmax = 0;
INSTRUCTION.Vmin = 0;
INSTRUCTION.sampleRateIndex = 1;
INSTRUCTION.sampleRate = 100;
INSTRUCTION.VoViSwitch = 0x01; //0:user see Vo 1: user see Vi
INSTRUCTION.AutoGainEnable = 1;
INSTRUCTION.VinAutoGainEnable = 1;
INSTRUCTION.VoutAutoGainEnable = 1;
INSTRUCTION.ADCGainLevel = I_GAIN_AUTO;
INSTRUCTION.VoutGainLevel = VOUT_GAIN_AUTO;
INSTRUCTION.VinADCGainLevel = VIN_GAIN_AUTO;
INSTRUCTION.notifyRate = STEPTIME_ONE_SEC;
INSTRUCTION.cycleNumber = 1;
INSTRUCTION.charge = 1; //0:discharge 1:charge
INSTRUCTION.constantCurrent = 0;
INSTRUCTION.Currentmax = 0;
INSTRUCTION.StepTime = STEPTIME_ONE_SEC;
instru.chip_id = 0;
instru.eliteFxn = 0; //default is a null event
instru.VsetRateIndex = 0;
instru.VsetRate = 2;
instru.Vset = 0;
instru.VoltConstant = DAC_ZERO; //DAC_ZERO is about 0V
instru.directionInit = 1; //0:reverse 1:forward
instru.step = 0;
instru.Ve1 = DAC_ZERO;
instru.Ve2 = DAC_ZERO;
instru.Vinit = 0;
instru.Vmax = 0;
instru.Vmin = 0;
instru.notifyRateIndex = 100;
instru.sampleRate = 15;
instru.VoViSwitch = 0x01; //0:user see Vo 1: user see Vi
instru.AutoGainEnable = 1;
instru.VinAutoGainEnable = 1;
instru.VoutAutoGainEnable = 1;
instru.ADCGainLv = I_GAIN_AUTO;
instru.VoutGainLevel = VOUT_GAIN_AUTO;
instru.VinADCGainLv = VIN_GAIN_AUTO;
instru.notifyRate = STEPTIME_ONE_SEC;
instru.cycleNumber = 1;
instru.charge = 1; //0:discharge 1:charge
instru.constantCurrent = 0;
instru.Currentmax = 0;
instru.StepTime = STEPTIME_ONE_SEC;
instru.AdcChannel = 0;
//EIS
instru.f1 = 0;
instru.f2 = 0;
instru.fset = 0;
instru.fmax = 0;
instru.fmin = 0;
instru.delay = 0;
instru.scale = 0;
instru.avgnum = 0;
instru.dcbias = 0;
instru.acamp = 0;
instru.rtia = 0;
instru.ppd = 1;
instru.periodIndex = 0;
instru.delayTime = 0;
instru.settingIndex = 0;
//pulse mode
instru.sti_t1 = 0;
instru.sti_t2 = 0;
instru.sti_t3 = 0;
instru.sti_t4 = 0;
instru.sti_t5 = 0;
instru.sti_t6 = 0;
instru.sti_t7 = 0;
instru.sti_v1 = DAC_ZERO;
instru.sti_v2 = DAC_ZERO;
instru.sti_v3 = DAC_ZERO;
instru.sti_v4 = DAC_ZERO;
instru.sti_v5 = DAC_ZERO;
instru.sti_v6 = DAC_ZERO;
instru.sti_v7 = DAC_ZERO;
instru.sti_loop = 1;
instru.sti_cy = 0;
// EIS DAC
instru.VAmpSet = EIS_HSDAC_ZERO;
instru.DAC_type = EIS_HSDAC;
// EIS ADC
instru.HSTIAGainLv = 0;
instru.HSTIAAutoGainEnable = 1;
instru.LPTIAGainLv = 0;
instru.LPTIAAutoGainEnable = 1;
}
#ifdef __cpulsplus
}
#endif
#endif
@@ -8,25 +8,27 @@ static bool TurnOnElite(uint8_t key) {
if (key == 0) {
// press 1 sec, power on LED, read bat power
if (TurnOnCounter >= CLOCK_ONE_SECOND) {
headstage_battery_volt();
uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
if( bat < 768 && bat > 20){
PIN15_setOutputValue(enable_5v, 0);
return false;
}else{
PIN15_setOutputValue(enable_5v, 1); // enable 5V
TurnOn10V();
// headstage_battery_volt();
// uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
// ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
// if( bat < 768 && bat > 20){
// PIN_setOutputValue(pin_handle, enable_5v, 0);
// return false;
// }else{
PIN_setOutputValue(pin_handle, enable_5v, 1); // enable 5V
Elite_SPI_init();
// TurnOn10V();
ModeLED(BT_WAIT);
AD5940_init();
return true;
}
// }
} else {
TurnOnCounter++;
return false;
}
} else {
TurnOnCounter = 0;
PIN15_setOutputValue(enable_5v, 0); // disable 5V
PIN_setOutputValue(pin_handle, enable_5v, 0); // disable 5V
return false;
}
}
@@ -46,18 +48,18 @@ static void EliteKeyPress(uint8_t key) {
// press 3~4 sec, shutdown 2650
else if (ShutDownCounter > (CLOCK_ONE_SECOND*3) ) {
LED_color(DARKLED, 0xFF, 0xFF, 0x00);
PIN15_setOutputValue(enable_5v, 0); // disable 5V
PIN_setOutputValue(pin_handle, enable_5v, 0); // disable 5V
}
ShutDownCounter ++;
} else {
if (OriginEliteFxn == INSTRUCTION.eliteFxn) { // old function == currunt instruction
if (OriginEliteFxn == instru.eliteFxn) { // old function == currunt instruction
if (ShutDownCounter != 0) {
// dark LED
checkFlafLED();
ShutDownCounter = 0;
}
} else { // old function != currunt instruction
OriginEliteFxn = INSTRUCTION.eliteFxn;
OriginEliteFxn = instru.eliteFxn;
if (ShutDownCounter != 0) {
ShutDownCounter = 0;
}
@@ -68,7 +70,7 @@ static void EliteKeyPress(uint8_t key) {
static void TurnOn10V() {
If10Von = true;
PIN15_setOutputValue(enable_10v, 1);
PIN_setOutputValue(pin_handle, enable_10v, 1);
CPUdelay(8000);
}
@@ -18,26 +18,21 @@ static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue)
spi_LEDtxbuf[SPI_LED_SIZE - 2] = 0xffff;
spi_LEDtxbuf[SPI_LED_SIZE - 1] = 0xffff;
if(PeriodicEvent){
LED_SPI_TEST(SPI_LED_SIZE, spi_LEDtxbuf, spi_LEDrxbuf);
}else{
LED_SPI(SPI_LED_SIZE, spi_LEDtxbuf, spi_LEDrxbuf);
}
LED_SPI(SPI_LED_SIZE, spi_LEDtxbuf, spi_LEDrxbuf);
}
static void Elite_led_color(uint16_t color){
switch (color) {
case COLOR_RED: {
LED_color(DARKLED, 0x50, 0x00, 0x00);
LED_color(DARKLED, 0xFF, 0x00, 0x00);
break;
}
case COLOR_ORANGE: {
LED_color(DARKLED, 0x50, 0x58, 0x09);
LED_color(DARKLED, 0xFF, 0x58, 0x09);
break;
}
case COLOR_YELLOW: {
LED_color(LIGHTLED, 0x50, 0x80, 0x00);
LED_color(LIGHTLED, 0xFF, 0x80, 0x00);
break;
}
case COLOR_GREEN: {
@@ -57,21 +52,42 @@ static void Elite_led_color(uint16_t color){
break;
}
case COLOR_MAGENTA: {
LED_color(DARKLED, 0x50, 0x00, 0x80);
LED_color(DARKLED, 0xFF, 0x00, 0x80);
break;
}
case COLOR_PURPLE: {
LED_color(DARKLED, 0x50, 0x00, 0xFF);
LED_color(DARKLED, 0xFF, 0x00, 0xFF);
break;
}
case COLOR_WHITE: {
LED_color(DARKLED, 0x50, 0xFF, 0xFF);
LED_color(DARKLED, 0xCA, 0xFF, 0xFF);
break;
}
case COLOR_BLACK: {
LED_color(0x00, 0x00, 0x00, 0x00);
break;
}
//dark LED
case COLOR_YELLOW_DARK: {
LED_color(DARKLED, 0xFF, 0x80, 0x00);
break;
}
case COLOR_GREEN_DARK: {
LED_color(DARKLED, 0x00, 0x33, 0x00);
break;
}
case COLOR_BLUE_DARK: {
LED_color(DARKLED, 0x00, 0x00, 0x33);
break;
}
case COLOR_CYAN_DARK: {
LED_color(DARKLED, 0x00, 0x10, 0x10);
break;
}
case COLOR_PURPLE_DARK: {
LED_color(DARKLED, 0x55, 0x00, 0x55);
break;
}
default: {
break;
}
@@ -118,7 +134,8 @@ static void ModeLED(uint16_t modeStatus) {
}
}
static void checkFlafLED() {
static void checkFlafLED()
{
if(btWaitLedFlag == 1){
ModeLED(BT_WAIT);
}
@@ -136,35 +153,47 @@ static void checkFlafLED() {
}
}
static void WorkModeLED() {
switch (INSTRUCTION.eliteFxn) {
case IV_CURVE:
case CV_CURVE:
case DIFFERENTIAL_PULSE_VOLTAMMETRY:
case SQUARE_WAVE_VOLTAMMETRY:
case VOLT_OUTPUT:
case ZT_CURVE:
case VT_CURVE:
case IT_CURVE:
case ADC_TEST:
case CYCLIC_VOLTAMMETRY:
case LINEAR_SWEEP_VOLTAMMETRY:
case CONSTANT_VSCAN:{
WORKLED();
break;
}
case CONSTANT_CURRENT:{
WORKLED();
break;
}
// case VIS_RST: {
// LEDPowerON();
// break;
// }
default: {
WORKLED();
break;
}
static void WorkModeLED()
{
switch (instru.eliteFxn) {
case CURVE_EIS:
case CURVE_EIS_CV:
case CURVE_IV:
case CURVE_VO:
case CURVE_RT:
case CURVE_VT:
case CURVE_IT:
case CURVE_CV:
case CURVE_CA:
case CURVE_CC:
case CURVE_OCP:
case CURVE_LSV:
case CURVE_IV_CY:
case CURVE_PULSE:
WORKLED();
break;
case CURVE_CALI_ADC:
if (instru.AdcChannel == IIN_ADC) {
Elite_led_color(COLOR_RED);
} else if (instru.AdcChannel == VIN_ADC) {
Elite_led_color(COLOR_ORANGE);
} else if (instru.AdcChannel == VOUT_DAC) {
Elite_led_color(COLOR_BLUE);
}else if (instru.AdcChannel == EIS_HSDAC) {
Elite_led_color(COLOR_PURPLE_DARK);
} else if (instru.AdcChannel == EIS_HSTIA) {
Elite_led_color(COLOR_WHITE);
} else if (instru.AdcChannel == EIS_LPTIA) {
Elite_led_color(COLOR_RED);
} else if (instru.AdcChannel == EIS_LPDAC) {
Elite_led_color(COLOR_BLUE);
}
break;
default:
break;
}
}
@@ -1,97 +1,46 @@
#ifndef ELITELSV
#define ELITELSV
#define Vset INSTRUCTION.Vset
#define Vset instru.Vset
static uint16_t LSVCurve(LSVMode *LSV){
static uint16_t DACOutCode;
static int32_t Vin;
static int32_t Vout;
static int32_t DeltaVout;
static void lsv_vscan(void)
{
struct wm_lsv_ctx_t *lsv = (struct wm_lsv_ctx_t *)wm_get();
Vin = LSV->_measureVin * 200;//[5nV]
if(DACReset){
Vout = Vset + Vin;
DACReset = false;
}else{
DeltaVout = Vset - (Vout - Vin);
Vout = Vout + DeltaVout;
}
NotifyCycleNumber = (instru.cycleNumber - lsv->_cycleNumber + 1);
INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
int32_t RealV2;
RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
InputNotify(NOTIFY_VOLT, RealV2);
int32_t RealV;
RealV = (int32_t)(Vout / 200);//[1uV]
InputNotify(NOTIFY_IMPEDANCE, RealV);
DAC_outputV(DACOutCode);
//
return DACOutCode;
}
static void LSV_Vscan(LSVMode *LSV){
NotifyCycleNumber = (INSTRUCTION.cycleNumber - LSV->_cycleNumber + 1);
if(vscanReset){
if(INSTRUCTION.directionInit == 1){
LSV->_direction_up = true;
LSV->_current_direction_up = true;
}else{
LSV->_direction_up = false;
LSV->_current_direction_up = false;
if (vscanReset) {
if (instru.directionInit == 1) {
lsv->_direction_up = true;
lsv->_current_direction_up = true;
} else {
lsv->_direction_up = false;
lsv->_current_direction_up = false;
}
//Vsetp = x * 20 * N, x=xmV ; N=VscanRate
if(INSTRUCTION.step <= 10){
LSV->_Vstep = INSTRUCTION.step * INSTRUCTION.VsetRate / 5;
}else{
LSV->_Vstep = INSTRUCTION.step / 5 * INSTRUCTION.VsetRate;
if (instru.step <= 10) {
lsv->_Vstep = instru.step * instru.VsetRate / 5;
} else {
lsv->_Vstep = instru.step / 5 * instru.VsetRate;
}
Vset = LSV->_Vinit;
Vset = lsv->_Vinit;
}
if(!vscanReset){
if (!vscanReset) {
if (LSV->_current_direction_up){
Vset = Vset + LSV->_Vstep * GPT.GptimerMultiple;
}else{
Vset = Vset - LSV->_Vstep * GPT.GptimerMultiple;
if (lsv->_current_direction_up) {
Vset = Vset + lsv->_Vstep * GPT.GptimerMultiple;
} else {
Vset = Vset - lsv->_Vstep * GPT.GptimerMultiple;
}
/*stop condition*/
if (Vset >= LSV->_Vmax){
ModeLED(POST_WORK);
// PeriodicEvent = false;
Vset = LSV->_Vmin;
InitEliteFlag();
INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
INSTRUCTION.sampleRate = 15;
INSTRUCTION.charge = 0x01;
INSTRUCTION.constantCurrent = 0x00;
INSTRUCTION.Vmax = 0xC350;
INSTRUCTION.Vmin = 0x0000;
INSTRUCTION.notifyRate = 500;
INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
}else if (Vset <= LSV->_Vmin){
ModeLED(POST_WORK);
// PeriodicEvent = false;
Vset = LSV->_Vmax;
InitEliteFlag();
INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
INSTRUCTION.sampleRate = 15;
INSTRUCTION.charge = 0x01;
INSTRUCTION.constantCurrent = 0x00;
INSTRUCTION.Vmax = 0xC350;
INSTRUCTION.Vmin = 0x0000;
INSTRUCTION.notifyRate = 500;
INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
if (Vset >= lsv->_Vmax) {
PeriodicEvent = false;
} else if (Vset <= lsv->_Vmin) {
PeriodicEvent = false;
}
}
}
@@ -29,6 +29,7 @@ static uint8_t NotifyVolt[4] = {0};
static uint8_t NotifyImpedance[4] = {0};
static uint8_t NotifyVoltBat[4] = {0};
static uint16_t NotifyCycleNumber = 0;
static uint8_t finishMode = 0;
// ****************** New Notify Format ******************************** //
/*
@@ -89,12 +90,12 @@ static uint16_t NotifyCycleNumber = 0;
static void SendNotify() {
initDATBuf();
not_buf[0] = INSTRUCTION.chip_id;
not_buf[0] = instru.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];
not_buf[i + 1] = NotifyCurrent[i]; // 1 2 3 4
not_buf[i + 5] = NotifyVolt[i]; // 5 6 7 8
not_buf[i + 9] = NotifyImpedance[i]; //9 10 11 12
}
// 1 Timestamp = 32 usec; 31 Timestamp ~= 1 msec
@@ -108,7 +109,9 @@ static void SendNotify() {
not_buf[17] = (NotifyCycleNumber >> 8) & 0xff;
not_buf[18] = NotifyCycleNumber & 0xff;
for (int i = 19; i < BLE_DAT_BUFF_SIZE; i++){
not_buf[19] = (finishMode << 7) & 0x80 | instru.ADCGainLv & 0x0F;
for (int i = 20; i < BLE_DAT_BUFF_SIZE; i++){
not_buf[i] = 0;
}
@@ -136,6 +139,7 @@ static void initCISBuf(){
static void initRawDataBuf(){
not_time_stamp = 0;
NotifyCycleNumber = 0;
finishMode = 0;
for (int i = 0; i < 4; i++){
NotifyCurrent[i] = 0;
@@ -148,7 +152,7 @@ static void FlushNotify(){
initRawDataBuf();
initDATBuf();
not_buf[0] = INSTRUCTION.chip_id;
not_buf[0] = instru.chip_id;
SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
}
@@ -0,0 +1,115 @@
#ifndef ELITEPULSE
#define ELITEPULSE
#define Vset instru.Vset
static void pulse_vscan(void)
{
struct wm_pulse_ctx_t *pulse = (struct wm_pulse_ctx_t *)wm_get();
static uint16_t lastVolt;
if (stiFirstTime) {
stiFirstTime = false;
lastVolt = 25000;
pulse->_sti_t_flag = 1;
pulse->_sti_v = pulse->_sti_v1;
pulse->_sti_t = pulse->_sti_t1;
if (pulse->_sti_t == 1) {
pulse->_sti_v = lastVolt;
}
} else if(!stiFirstTime) {
if (GPT.StiCounter >= pulse->_sti_t) {
GPT.StiCounter -= pulse->_sti_t; //to get right time
if (pulse->_sti_lp > 0) {
if (pulse->_sti_cy > 0) {
if (pulse->_sti_t_flag == 1) {
pulse->_sti_t_flag = 2;
pulse->_sti_v = pulse->_sti_v2;
pulse->_sti_t = pulse->_sti_t2;
if (pulse->_sti_t == 1) {
pulse->_sti_v = lastVolt;
}
} else if (pulse->_sti_t_flag == 2) {
pulse->_sti_t_flag = 3;
pulse->_sti_v = pulse->_sti_v3;
pulse->_sti_t = pulse->_sti_t3;
if (pulse->_sti_t == 1) {
pulse->_sti_v = lastVolt;
}
} else if (pulse->_sti_t_flag == 3) {
pulse->_sti_cy -- ;
if (pulse->_sti_cy == 0) {
pulse->_sti_t_flag = 4;
pulse->_sti_v = pulse->_sti_v4;
pulse->_sti_t = pulse->_sti_t4;
if (pulse->_sti_t == 1) {
pulse->_sti_v = lastVolt;
}
} else {
pulse->_sti_t_flag = 2;
pulse->_sti_v = pulse->_sti_v2;
pulse->_sti_t = pulse->_sti_t2;
if (pulse->_sti_t == 1) {
pulse->_sti_v = lastVolt;
}
}
}
} else if (pulse->_sti_cy <= 0){
if (pulse->_sti_t_flag == 4) {
pulse->_sti_lp -- ;
if (pulse->_sti_lp > 0) {
pulse->_sti_cy = instru.sti_cy;
pulse->_sti_t_flag = 2;
pulse->_sti_v = pulse->_sti_v2;
pulse->_sti_t = pulse->_sti_t2;
if (pulse->_sti_t == 1) {
pulse->_sti_v = lastVolt;
}
} else {
pulse->_sti_t_flag = 5;
pulse->_sti_v = pulse->_sti_v5;
pulse->_sti_t = pulse->_sti_t5;
if (pulse->_sti_t == 1) {
pulse->_sti_v = lastVolt;
}
}
}
}
} else if (pulse->_sti_lp <= 0) {
if (pulse->_sti_t_flag == 5) {
pulse->_sti_t_flag = 6;
pulse->_sti_v = pulse->_sti_v6;
pulse->_sti_t = pulse->_sti_t6;
if (pulse->_sti_t == 1) {
pulse->_sti_v = lastVolt;
}
} else if (pulse->_sti_t_flag == 6) {
pulse->_sti_t_flag = 7;
pulse->_sti_v = pulse->_sti_v7;
pulse->_sti_t = pulse->_sti_t7;
if (pulse->_sti_t == 1) {
pulse->_sti_v = lastVolt;
}
} else if (pulse->_sti_t_flag == 7) {
pulse->_sti_v = 25000;
PeriodicEvent = false;
PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // 0: open highz;
ModeLED(NO_EVENT);
}
}
}
}
if (lastVolt != pulse->_sti_v) {
lastVolt = pulse->_sti_v;
//if (pulse->_sti_v == 25000) {
// PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // 1 => close high_z mode
//} else {
// PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 1); // 1 => close high_z mode
//}
DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
}
}
#endif
@@ -3,21 +3,27 @@
#define ELITERESET
static void reset() {
ModeLED(NO_EVENT);
InitEliteFlag();
InitFlag();
InitCT();
InitGPT();
InitLH();
mode_init = true;
megaStiEnable = false;
PeriodicEvent = false; // is there an PeriodicEvent?
Free_Work_Mode = true; // Free(WorkModeData)
InitPeriodicEvent = true; // need to create a WorkModeData?
VinADCGainControl(VIN_GAIN_AUTO);
IinADCGainControl(I_GAIN_AUTO);
VoutGainControl(VOUT_GAIN_AUTO);
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0 => open high_z mode
InitGPT();
initINSBuf();
initDATBuf();
AD5940_HWReset();
AD5940_init();
// AD5940_sftreset();
// PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
HSTIAGainCtrl(HSRTIA_200R);
LPTIAGainCtrl(LPRTIA_200R);
HSDAC_GainControl(0x00);
HSDAC_output(0x0800);
for (int i = 0; i < SPI_LED_SIZE; i++) {
spi_LEDtxbuf[i] = 0;
spi_LEDrxbuf[i] = 0;
@@ -33,27 +39,28 @@ static void reset() {
spi_ADC_rxbuf[i] = 0;
}
PIN15_setOutputValue(ADC_CS, 1); // ADC_CS HIGH
PIN15_setOutputValue(DAC_CS, 1); // DAC_CS HIGH
PIN_setOutputValue(pin_handle, AD_CS, 1); // AD_CS HIGH
ModeLED(NO_EVENT);
CPUdelay(1600);
}
static void Eliteinterrupt() {
InitFlag();
ModeLED(NO_EVENT);
mode_init = true;
megaStiEnable = false;
PeriodicEvent = false; // is there an PeriodicEvent?
Free_Work_Mode = true; // Free(WorkModeData)
InitPeriodicEvent = true; // need to create a WorkModeData?
InitEliteFlag();
InitCT();
InitGPT();
InitLH();
VinADCGainControl(VIN_GAIN_AUTO);
IinADCGainControl(I_GAIN_AUTO);
VoutGainControl(VOUT_GAIN_AUTO);
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0 => open high_z mode
initINSBuf();
initDATBuf();
AD5940_HWReset();
AD5940_init();
// HSTIAGainCtrl(HSRTIA_200R);
// LPTIAGainCtrl(LPRTIA_200R);
// HSDAC_GainControl(0x00);
// HSDAC_output(0x0800);
for (int i = 0; i < SPI_LED_SIZE; i++) {
spi_LEDtxbuf[i] = 0;
@@ -70,8 +77,8 @@ static void Eliteinterrupt() {
spi_ADC_rxbuf[i] = 0;
}
PIN15_setOutputValue(ADC_CS, 1); // ADC_CS HIGH
PIN15_setOutputValue(DAC_CS, 1); // DAC_CS HIGH
PIN_setOutputValue(pin_handle, AD_CS, 1); // AD_CS HIGH
ModeLED(NO_EVENT);
CPUdelay(8000);
}
#endif
@@ -16,7 +16,7 @@
/* application use SPI parameters and buffers */
#define SPI_LED_SIZE 28
#define SPI_DAC_SIZE 3
#define SPI_DAC_SIZE 6
#define SPI_ADC_SIZE 4
static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
@@ -27,6 +27,8 @@ static uint8_t spi_rxbuf[SPI_DAC_SIZE] = {0};
static uint8_t spi_ADC_txbuf[SPI_ADC_SIZE] = {0};
static uint8_t spi_ADC_rxbuf[SPI_ADC_SIZE] = {0};
//
//static uint32_t SeqCmdBuff;
/* system use SPI parameters */
static SPI_Handle spiHandle0 = NULL; // SPI0 = LED
@@ -42,7 +44,7 @@ static void ELITE15_SPI_CLOSE();
static void Elite_SPI_init(){
SPI_init();
SPI_Params_init(&spiParams0);
spiParams0.bitRate = 2000; // 12k
spiParams0.bitRate = 2000; // 2k
spiParams0.mode = SPI_MASTER;
spiParams0.dataSize = 16;
spiParams0.frameFormat = SPI_POL0_PHA1;
@@ -52,25 +54,21 @@ static void Elite_SPI_init(){
spiParams1.bitRate = 1000000; // 1M
spiParams1.mode = SPI_MASTER;
spiParams1.dataSize = 8;
spiParams1.frameFormat = SPI_POL0_PHA1;
spiParams1.frameFormat = SPI_POL0_PHA0;
spiHandle1 = SPI_open(Board_SPI1, &spiParams1); // ADC DAC SPI
}
static void LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
ELITE15_SPI_HOLD();
LED_transaction.count = length;
LED_transaction.txBuf = spi_txbuf;
LED_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle0, &LED_transaction);
ELITE15_SPI_CLOSE();
}
static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
ELITE15_SPI_HOLD();
PIN_setOutputValue(pin_handle, D6, 0); // CS_ADC
PIN_setOutputValue(pin_handle, AD_CS, 0); // CS_ADC
ADC_DAC_transaction.count = length;
ADC_DAC_transaction.txBuf = spi_txbuf;
@@ -78,76 +76,197 @@ static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
PIN_setOutputValue(pin_handle, D6, 1); // CS_ADC
ELITE15_SPI_CLOSE();
PIN_setOutputValue(pin_handle, AD_CS, 1); // CS_ADC
}
static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
ELITE15_SPI_HOLD();
PIN_setOutputValue(pin_handle, D7, 0); // CD_DAC
ADC_DAC_transaction.count = length;
ADC_DAC_transaction.txBuf = spi_txbuf;
ADC_DAC_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
PIN_setOutputValue(pin_handle, D7, 1); // CD_DAC
ELITE15_SPI_CLOSE();
}
static void LED_SPI_TEST(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
LED_transaction.count = length;
LED_transaction.txBuf = spi_txbuf;
LED_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle0, &LED_transaction);
}
static void ADC_SPI_TEST(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
PIN_setOutputValue(pin_handle, D6, 0); // CS_ADC
ADC_DAC_transaction.count = length;
ADC_DAC_transaction.txBuf = spi_txbuf;
ADC_DAC_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
PIN_setOutputValue(pin_handle, D6, 1); // CS_ADC
}
static void DAC_SPI_TEST(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
PIN_setOutputValue(pin_handle, D7, 0); // CD_DAC
ADC_DAC_transaction.count = length;
ADC_DAC_transaction.txBuf = spi_txbuf;
ADC_DAC_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
PIN_setOutputValue(pin_handle, D7, 1); // CD_DAC
}
static void ELITE15_SPI_HOLD() {
PIN_setOutputValue(pin_handle, LOAD0, 1);
PIN_setOutputValue(pin_handle, LOAD1, 0);
PIN_setOutputValue(pin_handle, LOAD2, 0);
PIN_setOutputValue(pin_handle, D4, 1); // HOLD_MEM
PIN_setOutputValue(pin_handle, D5, 1); // CS_MEM
PIN_setOutputValue(pin_handle, D6, 1); // CS_ADC
PIN_setOutputValue(pin_handle, D7, 1); // CD_DAC
Elite_SPI_init();
// #ifdef ELITE_PIN_1_5_RE
// PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]); // ADC_CS
// PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]); // DAC_CS
// PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]); // update HIGH_Z_MODE
// #endif
//
// PIN_setOutputValue(pin_handle, LOAD0, 1);
// PIN_setOutputValue(pin_handle, LOAD1, 0);
// PIN_setOutputValue(pin_handle, LOAD2, 0);
}
static void ELITE15_SPI_CLOSE() {
PIN_setOutputValue(pin_handle, D4, 1); // HOLD_MEM
PIN_setOutputValue(pin_handle, D5, 1); // CS_MEM
PIN_setOutputValue(pin_handle, D6, 1); // CS_ADC
PIN_setOutputValue(pin_handle, D7, 1); // CD_DAC
PIN_setOutputValue(pin_handle, LOAD0, 0);
PIN_setOutputValue(pin_handle, LOAD1, 0);
PIN_setOutputValue(pin_handle, LOAD2, 0);
// PIN_setOutputValue(pin_handle, LOAD0, 0);
// PIN_setOutputValue(pin_handle, LOAD1, 0);
// PIN_setOutputValue(pin_handle, LOAD2, 0);
SPI_close(spiHandle0);
SPI_close(spiHandle1);
}
/* Elite1.5 Calibration SPI */
static void CAL_ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
ADC_DAC_transaction.count = length;
ADC_DAC_transaction.txBuf = spi_txbuf;
ADC_DAC_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
PIN_setOutputValue(pin_handle, AD_CS, 1); // CS_ADC
}
static void CAL_LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
LED_transaction.count = length;
LED_transaction.txBuf = spi_txbuf;
LED_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle0, &LED_transaction);
}
#ifdef ELITE_VERSION_EIS
/* define SPI command */
// datasheet page 98
#define SPICMD_SETADDR 0x20
#define SPICMD_WRITEREG 0x2D
#define SPICMD_READREG 0x6D
//define REG
#define LPDACCON0 0x2128
#define LPDACSW0 0x2124
#define LPDACDAT0 0x2120
#define LPREFBUFCON 0x2050
#define SWMUX 0x235C
#define LPTIASW0 0x20E4
#define SWCON 0x200C
#define HSDACCON 0x2010
#define HSDACDAT 0x2048
#define LPTIACON0 0x20EC
#define HSTIACON 0x20FC
#define AFECON 0x2000
#define DSWFULLCON 0x2150
#define NSWFULLCON 0x2154
#define PSWFULLCON 0x2158
#define TSWFULLCON 0x215C
#define WGFCW 0x2030
#define WGPHASE 0x2034
#define WGOFFSET 0x2038
#define WGAMPLITUDE 0x203C
#define WGCON 0x2014
#define DE0RESCON 0x20F8
#define ADCCON 0x21A8
#define DFTCON 0x20D0
#define ADCFILTERCON 0x2044
#define PMBW 0x22F0
#define CLKSEL 0x0414
#define CLKCON0 0x0408
#define CLKCON0KEY 0x0420
#define HSOSCCON 0x20BC
#define ADCBUFCON 0x238C
#define HSRTIACON 0x20F0
#define ADCDAT 0x2074
#define DFTREAL 0x2078
#define DFTIMAG 0x207C
static void select_REG(uint16_t addr){
PIN_setOutputValue(pin_handle, AD_CS, 0);
// CPUdelay(16000);
spi_DACtxbuf[0] = SPICMD_SETADDR;
spi_DACtxbuf[1] = (uint8_t)((addr & 0xFF00) >> 8);
spi_DACtxbuf[2] = (uint8_t)(addr & 0x00FF);
ADC_DAC_transaction.count = 3;
ADC_DAC_transaction.txBuf = spi_DACtxbuf;
ADC_DAC_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
// CPUdelay(16000);
PIN_setOutputValue(pin_handle, AD_CS, 1);
}
static void w16_REG(uint16_t data){
PIN_setOutputValue(pin_handle, AD_CS, 0);
spi_DACtxbuf[0] = SPICMD_WRITEREG;
spi_DACtxbuf[1] = (uint8_t)((data & 0xFF00) >> 8);
spi_DACtxbuf[2] = (uint8_t)(data & 0x00FF);
ADC_DAC_transaction.count = 3;
ADC_DAC_transaction.txBuf = spi_DACtxbuf;
ADC_DAC_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
PIN_setOutputValue(pin_handle, AD_CS, 1);
}
static int16_t r16_REG(){
int16_t ret;
PIN_setOutputValue(pin_handle, AD_CS, 0);
spi_DACtxbuf[0] = SPICMD_READREG;
spi_DACtxbuf[1] = 0x00;
spi_DACtxbuf[2] = 0x00;
spi_DACtxbuf[3] = 0x00;
ADC_DAC_transaction.count = 4;
ADC_DAC_transaction.txBuf = spi_DACtxbuf;
ADC_DAC_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
ret = (int16_t)spi_rxbuf[2] << 8 | \
(int16_t)spi_rxbuf[3];
PIN_setOutputValue(pin_handle, AD_CS, 1);
return ret;
}
static void w32_REG(uint32_t data){
PIN_setOutputValue(pin_handle, AD_CS, 0);
spi_DACtxbuf[0] = SPICMD_WRITEREG;
spi_DACtxbuf[1] = (uint8_t)((data & 0xFF000000) >> 24);
spi_DACtxbuf[2] = (uint8_t)((data & 0x00FF0000) >> 16);
spi_DACtxbuf[3] = (uint8_t)((data & 0x0000FF00) >> 8);
spi_DACtxbuf[4] = (uint8_t)(data & 0x000000FF);
ADC_DAC_transaction.count = 5;
ADC_DAC_transaction.txBuf = spi_DACtxbuf;
ADC_DAC_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
PIN_setOutputValue(pin_handle, AD_CS, 1);
}
static int32_t r32_REG(){
int32_t ret;
PIN_setOutputValue(pin_handle, AD_CS, 0);
spi_DACtxbuf[0] = SPICMD_READREG;
spi_DACtxbuf[1] = 0x00;
spi_DACtxbuf[2] = 0x00;
spi_DACtxbuf[3] = 0x00;
spi_DACtxbuf[4] = 0x00;
spi_DACtxbuf[5] = 0x00;
ADC_DAC_transaction.count = 6;
ADC_DAC_transaction.txBuf = spi_DACtxbuf;
ADC_DAC_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle1, &ADC_DAC_transaction);
ret = (int32_t)spi_rxbuf[2] << 24 | \
(int32_t)spi_rxbuf[3] << 16 | \
(int32_t)spi_rxbuf[4] << 8 | \
(int32_t)spi_rxbuf[5];
PIN_setOutputValue(pin_handle, AD_CS, 1);
return ret;
}
#endif // ELITE_EIS
#endif // ELITE_SPI
@@ -8,14 +8,16 @@
// change the output voltage step
// => get a R-T curve (with resolution = 1 sample/volt step )
static void ZT_Vscan(RTMode *RT){
if(vscanReset){
Vset = ((int32_t)(INSTRUCTION.VoltConstant) - 25000) * 4 * 10000; //[5nV]
OneWayVoltScan();
static void rt_vscan(void)
{
struct wm_rt_ctx_t *rt = (struct wm_rt_ctx_t *)wm_get();
if (vscanReset) {
Vset = rt->_Vinit;
}
if(!vscanReset){
if(!vscanReset) {
Vset = rt->_Vinit;
}
}
#endif
@@ -6,6 +6,65 @@
#include <Board.h>
#include <ti/drivers/PIN.h>
//#define ELITE_PIN_1_5
//#define ELITE_PIN_1_5_RE
#define ELITE_PIN_EIS
#ifdef ELITE_PIN_EIS
/* SPI Board */
#define Board_SPI0_MISO PIN_UNASSIGNED
#define Board_SPI0_MOSI IOID_4
#define Board_SPI0_CLK IOID_3
#define Board_SPI0_CS PIN_UNASSIGNED
#define Board_SPI1_MISO IOID_1
#define Board_SPI1_MOSI IOID_6
#define Board_SPI1_CLK IOID_5
#define Board_SPI1_CS PIN_UNASSIGNED
#define AD_CS IOID_10
//#define SD_MISO IOID_11
//#define SD_CS IOID_8
//#define SD_CLK IOID_7
//#define SD_MOSI IOID_13
#define switch_on IOID_14
#define enable_5v IOID_9
#define AD_reset IOID_13
#define enable_10v PIN_UNASSIGNED
#define HIGH_Z_MODE PIN_UNASSIGNED
#define shutdown_6994 PIN_UNASSIGNED
#define Turnon_I_LARGE PIN_UNASSIGNED
#define Turnon_I_MID PIN_UNASSIGNED
#define Turnon_I_SMALL PIN_UNASSIGNED
#define Turnon_V_MID PIN_UNASSIGNED
#define Turnon_V_SMALL PIN_UNASSIGNED
#define Turon_VOUT_SMALL PIN_UNASSIGNED
PIN_Handle pin_handle;
static PIN_State ZM_rst;
const PIN_Config BLE_IO[] = {
enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,// 5V_enable
AD_reset | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
switch_on | PIN_INPUT_EN | PIN_PULLDOWN,
AD_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
PIN_TERMINATE
};
static void remove_elite_pin() {
PIN_close(pin_handle);
pin_handle = PIN_open(&ZM_rst, BLE_IO);
}
#endif
#ifdef ELITE_PIN_1_5_RE
/* SPI Board */
#define Board_SPI0_MISO PIN_UNASSIGNED
#define Board_SPI0_MOSI D1
@@ -36,15 +95,24 @@
#define ADC_DAC_SPI_CLK LOAD0, D2
#define LED_MOSI LOAD0, D1
#define LED_CLK LOAD0, D0
#define MEM_HOLD LOAD0, D4
#define MEM_CS LOAD0, D5
#ifdef ELITE_PIN_1_5
#define MEM_HOLD LOAD0, D4
#define HIGH_Z_MODE LOAD2, D5
#endif
#ifdef ELITE_PIN_1_5_RE
#define MEM_HOLD LOAD1, D0
#define HIGH_Z_MODE LOAD0, D4
#endif
#define Turnon_I_MID LOAD2, D0
#define Turnon_I_SMALL LOAD2, D4
#define Turnon_I_LARGE LOAD2, D1
#define Turnon_V_SMALL LOAD2, D2
#define Turnon_V_MID LOAD2, D3
#define Turon_VOUT_SMALL LOAD2, D7
#define shutdown_6994 LOAD2, D6
//#define Turnon10K Turnon_I_MID
//#define Turnon200R Turnon_I_LARGE
@@ -55,9 +123,7 @@
#define Board_I2C0_SDA0 PIN_UNASSIGNED
#endif
#define shutdown_6994 LOAD2, D6
#define switch_on IOID_14
#define HIGH_Z_MODE LOAD2, D5
#define enable_10v LOAD1, D5
#define enable_5v LOAD1, D6
@@ -103,6 +169,7 @@ static void remove_elite_pin() {
PIN_close(pin_handle);
pin_handle = PIN_open(&ZM_rst, BLE_IO);
}
#endif
/*!
* @def BOOSTXL_CC2650MA_SPIName
@@ -42,22 +42,18 @@ static void headstage_battery_volt(){
static void EliteADCBattery(){
static uint8_t ADCSwitch = 0;
if(INSTRUCTION.eliteFxn == ADC_TEST){
if(ADCSwitch == 0){ /**read V**/
ReadADCBat(spi_ADC_rxbuf);
ADCSwitch++;
}
else if(ADCSwitch == 1){ /**read V**/
ReadADCBat(spi_ADC_rxbuf);
ADCSwitch++;
}
else if(ADCSwitch == 2){ /**read V(buffer)**/
headstage_battery_volt();
batteryCheck_flag = false;
ADCSwitch = 0;
}else{
if(ADCSwitch == 0){ /**read V**/
ReadADCBat(spi_ADC_rxbuf);
ADCSwitch++;
}
else if(ADCSwitch == 1){ /**read V**/
ReadADCBat(spi_ADC_rxbuf);
ADCSwitch++;
}
else if(ADCSwitch == 2){ /**read V(buffer)**/
headstage_battery_volt();
batteryCheck_flag = false;
ADCSwitch = 0;
}
}
}
@@ -85,7 +81,7 @@ static void measureBat(){
uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
if( bat < 768 && bat > 20){
PIN15_setOutputValue(enable_5v, 0);
PIN_setOutputValue(pin_handle, enable_5v, 0);
}
}
@@ -20,28 +20,55 @@
#define VIS_CC_ZERO 0x40
// RIS (real instruction)
#define IV_CURVE 0x10
#define CV_CURVE 0x20
#define VOLT_OUTPUT 0x30
#define ZT_CURVE 0x40
#define VT_CURVE 0x50
#define IT_CURVE 0x60
#define SET_SAMPLE_RATE 0x70
#define SET_ADC_DAC_GAIN 0x80
#define DIFFERENTIAL_PULSE_VOLTAMMETRY 0xA0
#define SQUARE_WAVE_VOLTAMMETRY 0xB0
#define CYCLIC_VOLTAMMETRY 0xC0
#define CONSTANT_CURRENT 0xD0
#define CYCLE_CONSTANT_CURRENT 0xF0
#define HIGH_CYCLE_CYCLIC_VOLTAMMETRY 0x01
#define LINEAR_SWEEP_VOLTAMMETRY 0x02
#define CONSTANT_VSCAN 0x03
#define ADC_TEST 0x90
enum all_mode_e {
CURVE_IV = 0x01, // I-V Curve //0x10,
CURVE_IV_CY = 0x02, // Cycle I-V //0x20,
CURVE_VO = 0x03, // Function Generator //0x30,
CURVE_RT = 0x04, // R-T Graph //0x40,
CURVE_VT = 0x05, // V-T Graph //0x50,
CURVE_IT = 0x06, // I-T Graph //0x60,
CURVE_CC = 0x07, // Constant Current (CC) //0xD0,
CURVE_OCP = 0x08, // Open Circuit Potential (OCP)
CURVE_CV = 0x09, // Cyclic Voltammetry (CV) //0xC0,
CURVE_LSV = 0x0A, // Linear Sweep Voltammetry (LSV) //0x02,
CURVE_CA = 0x0B, // Chronoamperometric Graph (CA) //0x03,
CURVE_PULSE = 0x0C, //0x94,
CURVE_EIS = 0xD1, //Should Change to 0xD1
CURVE_EIS_CV = 0xD2,
CURVE_CALI_DAC = 0xF0, //0x93,
CURVE_CALI_ADC = 0xF1, // Cali ADC - test //0x92,
// CURVE_CALI_ADC = 0x92, // Cali ADC - test //0x92,
SET_SAMPLE_RATE = 0xE0, //0x70,
// SET_SAMPLE_RATE = 0x70, //0x70,
SET_ADC_DAC_GAIN = 0xE1, //0x80,
// SET_ADC_DAC_GAIN = 0x80, //0x80,
};
// CIS (control instruction)
#define CIS_VERSION 0x40
#define CIS_VOLT 0x10
#define CIS_LED_TEST 0x70
#define CIS_CALI 0x30
#define CIS_CALI2 0x90
#define CTL_WRT 0x20
#define CTL_RD 0x21
#define CTL_RD_DFTR 0x78
#define CTL_RD_DFTI 0x7C
#define CTL_WRT_WGAMPL 0x3C
#define CTL_WRT_TRAP 0x2c
#define CTL_RESET 0x11
#define CTL_IMPEDANCE 0x12
#define CTL_CV3 0x13
#define cali_LPTIA_setGain 0x29
#define cali_LPDAC_voltout 0x39
#define cali_HSDAC_amp 0x49
#define cali_HSTIA_setGain 0x59
#define cali_HSDAC_DC 0x69
// mode parameter
#define STEP_TO_VSETRATE(step) step2VsetRate(step)
@@ -50,9 +77,23 @@
#define VDIRECTION(v1,v2) ((v1 > v2) ? 0 : 1)
#define AFTER_READ_I 0
#define AFTER_READ_V 1
#define ReadADCVolt(x) ((x==0)? ReadADCVout(spi_ADC_rxbuf) : ReadADCVin(spi_ADC_rxbuf))
#define PARA_1 0x01
#define PARA_2 0x02
#define PARA_3 0x03
#define PARA_4 0x04
#define PARA_5 0x05
#define PARA_6 0x06
#define PARA_7 0x07
#define PARA_8 0x08
#define PARA_9 0x09
#define PARA_10 0x0A
#define PARA_11 0x0B
#define PARA_12 0x0C
#define PARA_13 0x0D
#define PARA_14 0x0E
#define PARA_15 0x0F
#define PARA_16 0x10
#define PARA_17 0x11
//Elite LED
#define COLOR_BLACK 0x00
@@ -66,6 +107,12 @@
#define COLOR_PURPLE 0x08
#define COLOR_WHITE 0x09
#define COLOR_YELLOWGREEN 0x0A
#define COLOR_YELLOW_DARK 0xF3
#define COLOR_GREEN_DARK 0xF4
#define COLOR_BLUE_DARK 0xF5
#define COLOR_CYAN_DARK 0xF6
#define COLOR_PURPLE_DARK 0xF8
#define LEDPowerON() Elite_led_color(COLOR_GREEN)
#define WORKLED() Elite_led_color(COLOR_CYAN)
#define KEYLED() Elite_led_color(COLOR_YELLOW)
@@ -78,5 +125,16 @@
#define WORKING 0x04
#define POST_WORK 0x05
/* EIS define */
// cutoff frequency of the filter in AD5940
#define cutoff_auto 0x00
#define cutoff_50k 0x01
#define cutoff_100k 0x02
#define cutoff_250k 0x03
#define LOW_PW_MODE 0x00
#define HIGH_PW_MODE 0x01
#define VALUE_ZERO_TO_ONE(_v) (_v == 0) ? 1 : _v
#endif
@@ -2,11 +2,11 @@
#ifndef VERSION_DATE
#define VERSION_DATE
#define VERSION_DATE_YEAR 20
#define VERSION_DATE_YEAR 21
#define VERSION_DATE_MONTH 8
#define VERSION_DATE_DAY 28
#define VERSION_DATE_HOUR 13
#define VERSION_DATE_MINUTE 30
#define VERSION_DATE_DAY 30
#define VERSION_DATE_HOUR 15
#define VERSION_DATE_MINUTE 47
// this is NOT the version hash !!
// it's the last version hash
@@ -0,0 +1,197 @@
#include "eis_cali_table.h"
/* SendCaliValue
* 2~ : cutoff frequency
* 4~5 : voltage amplitude
* 2 : phase parameter a
* 3 : phase parameter b
* 4 : HSRTIA200R
* 5 : HSRTIA5K
* 6 : HSRTIA20K
* 7 : HSRTIA160K
*/
static void SendCaliValue0(void) {
uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
uint8_t index = 2;
cali_buf[1] = instru.chip_id;
cali_buf[index++] = (uint8_t) (CaliTable.CutoffFreq >> 24) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.CutoffFreq >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.CutoffFreq >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.CutoffFreq & 0xFF;
// cali_buf[index++] = (uint8_t) CaliTable.Temp & 0xFF;
// cali_buf[index++] = (uint8_t) CaliTable.HSRTIA200R & 0xFF;
//
// cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA5K >> 8) & 0xFF;
// cali_buf[index++] = (uint8_t) CaliTable.HSRTIA5K & 0xFF;
// cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA20K >> 8) & 0xFF;
// cali_buf[index++] = (uint8_t) CaliTable.HSRTIA20K & 0xFF;
//
// cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA160K >> 24) & 0xFF;
// cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA160K >> 16) & 0xFF;
// cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA160K >> 8) & 0xFF;
// cali_buf[index++] = (uint8_t) CaliTable.HSRTIA160K & 0xFF;
cali_buf[0] = index - 1;
SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf);
}
static void SendCaliValue1(void) {
uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
uint8_t filter_number1 = 2, index = 2;
cali_buf[1] = instru.chip_id;
for (int i = 0; i < filter_number1 ; i++) {
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 8)& 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Ft[i].PhaseParaA & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Ft[i].PhaseParaB & 0xFF;
}
cali_buf[0] = index - 1;
SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf);
}
static void SendCaliValue2(void) {
uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
uint8_t filter_number1 = 2, filter_number2 = 4, index = 2;
cali_buf[1] = instru.chip_id;
for (int i = filter_number1; i < filter_number2 ; i++) {
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaA >> 8)& 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Ft[i].PhaseParaA & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Ft[i].PhaseParaB >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Ft[i].PhaseParaB & 0xFF;
}
cali_buf[0] = index - 1;
SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
}
static void SendCaliValue3(void) {
uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
uint8_t index = 2;
cali_buf[1] = instru.chip_id;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_a >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_a >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_a >> 8)& 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[0].HSRTIA_a & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_b >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_b >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_b >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[0].HSRTIA_b & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_c >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_c >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[0].HSRTIA_c >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[0].HSRTIA_c & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[0].HSRTIA_d & 0xFF;
cali_buf[0] = index - 1;
SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
}
static void SendCaliValue4(void) {
uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
uint8_t index = 2;
cali_buf[1] = instru.chip_id;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_a >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_a >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_a >> 8)& 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[1].HSRTIA_a & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_b >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_b >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_b >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[1].HSRTIA_b & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_c >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_c >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[1].HSRTIA_c >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[1].HSRTIA_c & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[1].HSRTIA_d & 0xFF;
cali_buf[0] = index - 1;
SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
}
static void SendCaliValue5(void) {
uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
uint8_t index = 2;
cali_buf[1] = instru.chip_id;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_a >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_a >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_a >> 8)& 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[2].HSRTIA_a & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_b >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_b >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_b >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[2].HSRTIA_b & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_c >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_c >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[2].HSRTIA_c >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[2].HSRTIA_c & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[2].HSRTIA_d & 0xFF;
cali_buf[0] = index - 1;
SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
}
static void SendCaliValue6(void) {
uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
uint8_t index = 2;
cali_buf[1] = instru.chip_id;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_a >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_a >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_a >> 8)& 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[3].HSRTIA_a & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_b >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_b >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_b >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[3].HSRTIA_b & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_c >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_c >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_c >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[3].HSRTIA_c & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_d >> 24)& 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_d >> 16) & 0xFF;
cali_buf[index++] = (uint8_t) (CaliTable.Lv[3].HSRTIA_d >> 8) & 0xFF;
cali_buf[index++] = (uint8_t) CaliTable.Lv[3].HSRTIA_d & 0xFF;
cali_buf[0] = index - 1;
SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
}
@@ -0,0 +1,448 @@
#ifndef EIS_CALI_TABLE
#define EIS_CALI_TABLE
#define BOARD_TEST
typedef struct _SingleFilterCali{
uint32_t PhaseParaA;
int32_t PhaseParaB;
}SingleFilterCali;
typedef struct _SingleGainLvCali{
long long HSTIA_coeff;
long long HSTIA_offset;
long long LPTIA_coeff;
long long LPTIA_offset;
uint32_t HSRTIA_a;
int32_t HSRTIA_b;
int32_t HSRTIA_c;
uint32_t HSRTIA_d;
uint16_t HSRTIA_root;
}SingleGainLvCali;
struct _CaliTable{
//CIS to Controller
char DeviceName[25];
uint32_t CutoffFreq;
int32_t DAC_offset;
SingleFilterCali Ft[7];
//EIS
long long HSDAC_coeff;
long long HSDAC_offset;
long long LPDAC_coeff;
long long LPDAC_offset;
long long HSAMP_coeff;
long long HSAMP_offset;
SingleGainLvCali Lv[4];
}CaliTable =
#ifdef BOARD_TEST
{
//CIS to Controller
.DeviceName = "BOARD_TEST",
.CutoffFreq = 250000,
.DAC_offset = 0, // * 200 [5n]
// hsrtia160k
.Lv[0].HSRTIA_a = 0, // 1e8
.Lv[0].HSRTIA_b = 1, // 1e8
.Lv[0].HSRTIA_c = 0, // 1e4
.Lv[0].HSRTIA_d = 0,
// hsrtia20k
.Lv[1].HSRTIA_a = 0, // 1e8
.Lv[1].HSRTIA_b = 1, // 1e8
.Lv[1].HSRTIA_c = 0, // 1e4
.Lv[1].HSRTIA_d = 0,
// hsrtia5k
.Lv[2].HSRTIA_a = 0, //1e8
.Lv[2].HSRTIA_b = 1, // 1e8
.Lv[2].HSRTIA_c = 0, // 1e4
.Lv[2].HSRTIA_d = 0,
// hsrtia200r a*exp(bx) + c*exp(dx)
.Lv[3].HSRTIA_a = 1,
.Lv[3].HSRTIA_b = 0, // 1e6
.Lv[3].HSRTIA_c = 1, // 1e5
.Lv[3].HSRTIA_d = 0, // 1e6
.Ft[0].PhaseParaA = 15,
.Ft[0].PhaseParaB = -9000,
.Ft[1].PhaseParaA = 15,
.Ft[1].PhaseParaB = -9000,
.Ft[2].PhaseParaA = 15,
.Ft[2].PhaseParaB = -9000,
.Ft[3].PhaseParaA = 15,
.Ft[3].PhaseParaB = -9000,
//only for EIS 1e10
.HSAMP_coeff = 9703610267,
.HSAMP_offset = -12815281473,
.LPDAC_coeff = 10000464997,
.LPDAC_offset = -75871559054,
.HSDAC_coeff = 25196655311242,
.HSDAC_offset = 19932276246516,
.Lv[0].HSTIA_coeff = 1,
.Lv[0].HSTIA_offset = 0,
.Lv[1].HSTIA_coeff = 1,
.Lv[1].HSTIA_offset = 0,
.Lv[2].HSTIA_coeff = 1,
.Lv[2].HSTIA_offset = 0,
.Lv[3].HSTIA_coeff = 1,
.Lv[3].HSTIA_offset = 0,
.Lv[0].LPTIA_coeff = 1,
.Lv[0].LPTIA_offset = 0,
.Lv[1].LPTIA_coeff = 1,
.Lv[1].LPTIA_offset = 0,
.Lv[2].LPTIA_coeff = 1,
.Lv[2].LPTIA_offset = 0,
.Lv[3].LPTIA_coeff = 1,
.Lv[3].LPTIA_offset = 0
};
#elif defined(BOARD_A4_DA_32_D4_EF_CF)
{
.DeviceName = "BOARD_A4_DA_32_D4_EF_CF",
.CutoffFreq = 271000,
.DAC_offset = -19250, // * 200 [5n]
// hsrtia160k
.Lv[0].HSRTIA_a = 0, // 1e8
.Lv[0].HSRTIA_b = 8005810, // 1e8
.Lv[0].HSRTIA_c = -171109, // 1e4
.Lv[0].HSRTIA_d = 0,
// hsrtia20k
.Lv[1].HSRTIA_a = 357, // 1e8
.Lv[1].HSRTIA_b = 57813915, // 1e8
.Lv[1].HSRTIA_c = 1543941, // 1e4
.Lv[1].HSRTIA_d = 0,
// hsrtia5k
.Lv[2].HSRTIA_a = 15417, //1e8
.Lv[2].HSRTIA_b = -62720427, // 1e8
.Lv[2].HSRTIA_c = 225612029, // 1e4
.Lv[2].HSRTIA_d = 0,
// hsrtia200r a*exp(bx) + c*exp(dx)
.Lv[3].HSRTIA_a = 20450,
.Lv[3].HSRTIA_b = 1611, // 1e6
.Lv[3].HSRTIA_c = 4069, // 1e5
.Lv[3].HSRTIA_d = 7499, // 1e6
.Ft[0].PhaseParaA = 141808, //1e10
.Ft[0].PhaseParaB = -88304901, // 10000 Hz //1e6
.Ft[1].PhaseParaA = 338333,
.Ft[1].PhaseParaB = -89912194, // 100 Hz
.Ft[2].PhaseParaA = 20541858,
.Ft[2].PhaseParaB = -90000573, // 10 Hz
.Ft[3].PhaseParaA = 100923290,
.Ft[3].PhaseParaB = -90023337, // 0.01 Hz
//only for EIS 1e10
.HSAMP_coeff = 9703610267,
.HSAMP_offset = -12815281473,
.LPDAC_coeff = 10000464997,
.LPDAC_offset = -75871559054,
.HSDAC_coeff = 25196655311242,
.HSDAC_offset = 19932276246516,
.Lv[0].HSTIA_coeff = -1062,
.Lv[0].HSTIA_offset = 67755568664846,
.Lv[1].HSTIA_coeff = 23,
.Lv[1].HSTIA_offset = 101767408723,
.Lv[2].HSTIA_coeff = -31,
.Lv[2].HSTIA_offset = 2037756,
.Lv[3].HSTIA_coeff = -66623,
.Lv[3].HSTIA_offset = 44299692,
.Lv[0].LPTIA_coeff = 1,
.Lv[0].LPTIA_offset = 0,
.Lv[1].LPTIA_coeff = 1,
.Lv[1].LPTIA_offset = 0,
.Lv[2].LPTIA_coeff = 1,
.Lv[2].LPTIA_offset = 0,
.Lv[3].LPTIA_coeff = 1,
.Lv[3].LPTIA_offset = 0
};
#elif defined(BOARD_A4_DA_32_D4_ED_BF)
{
.DeviceName = "BOARD_A4_DA_32_D4_ED_BF",
.CutoffFreq = 262000,
.DAC_offset = -19250, // * 200 [5n]
// hsrtia160k
.Lv[0].HSRTIA_a = 0, // 1e8
.Lv[0].HSRTIA_b = 8053030, // 1e8
.Lv[0].HSRTIA_c = -217364, // 1e4
.Lv[0].HSRTIA_d = 0,
// hsrtia20k
.Lv[1].HSRTIA_a = 350, // 1e8
.Lv[1].HSRTIA_b = 58929847, // 1e8
.Lv[1].HSRTIA_c = 1111691, // 1e4
.Lv[1].HSRTIA_d = 0,
// hsrtia5k
.Lv[2].HSRTIA_a = 14842, //1e8
.Lv[2].HSRTIA_b = -38831335, // 1e8
.Lv[2].HSRTIA_c = 207680613, // 1e4
.Lv[2].HSRTIA_d = 0,
// hsrtia200r a*exp(bx) + c*exp(dx)
.Lv[3].HSRTIA_a = 20160,
.Lv[3].HSRTIA_b = 1609, // 1e6
.Lv[3].HSRTIA_c = 1085, // 1e5
.Lv[3].HSRTIA_d = 7883, // 1e6
.Ft[0].PhaseParaA = 144194, //1e10
.Ft[0].PhaseParaB = -88614855, // 10000 Hz //1e6
.Ft[1].PhaseParaA = 342333,
.Ft[1].PhaseParaB = -89906917, // 100 Hz
.Ft[2].PhaseParaA = 20561112,
.Ft[2].PhaseParaB = -90006375, // 10 Hz
.Ft[3].PhaseParaA = 100878445,
.Ft[3].PhaseParaB = -90013670, // 0.01 Hz
//only for EIS 1e10
.HSAMP_coeff = 9703610267,
.HSAMP_offset = -12815281473,
.LPDAC_coeff = 10000464997,
.LPDAC_offset = -75871559054,
.HSDAC_coeff = 25196655311242,
.HSDAC_offset = 19932276246516,
.Lv[0].HSTIA_coeff = -1062,
.Lv[0].HSTIA_offset = 67755568664846,
.Lv[1].HSTIA_coeff = 23,
.Lv[1].HSTIA_offset = 101767408723,
.Lv[2].HSTIA_coeff = -31,
.Lv[2].HSTIA_offset = 2037756,
.Lv[3].HSTIA_coeff = -66623,
.Lv[3].HSTIA_offset = 44299692,
.Lv[0].LPTIA_coeff = 1,
.Lv[0].LPTIA_offset = 0,
.Lv[1].LPTIA_coeff = 1,
.Lv[1].LPTIA_offset = 0,
.Lv[2].LPTIA_coeff = 1,
.Lv[2].LPTIA_offset = 0,
.Lv[3].LPTIA_coeff = 1,
.Lv[3].LPTIA_offset = 0
};
#elif defined(BOARD_A4_DA_32_D4_F0_59)
{
.DeviceName = "BOARD_A4_DA_32_D4_F0_59",
.CutoffFreq = 265000,
.DAC_offset = -19250, // * 200 [5n]
// hsrtia160k
.Lv[0].HSRTIA_a = 0, // 1e8
.Lv[0].HSRTIA_b = 7982677, // 1e8
.Lv[0].HSRTIA_c = -220834, // 1e4
.Lv[0].HSRTIA_d = 0,
// hsrtia20k
.Lv[1].HSRTIA_a = 386, // 1e8
.Lv[1].HSRTIA_b = 56887373, // 1e8
.Lv[1].HSRTIA_c = 2369927, // 1e4
.Lv[1].HSRTIA_d = 0,
// hsrtia5k
.Lv[2].HSRTIA_a = 14859, //1e8
.Lv[2].HSRTIA_b = -43698725, // 1e8
.Lv[2].HSRTIA_c = 210542432, // 1e4
.Lv[2].HSRTIA_d = 0,
// hsrtia200r a*exp(bx) + c*exp(dx)
.Lv[3].HSRTIA_a = 19600,
.Lv[3].HSRTIA_b = 1637, // 1e6
.Lv[3].HSRTIA_c = 659, // 1e5
.Lv[3].HSRTIA_d = 8167, // 1e6
.Ft[0].PhaseParaA = 146177, //1e10
.Ft[0].PhaseParaB = -88604805, // 10000 Hz //1e6
.Ft[1].PhaseParaA = 342195,
.Ft[1].PhaseParaB = -89912214, // 100 Hz
.Ft[2].PhaseParaA = 20559398,
.Ft[2].PhaseParaB = -90006634, // 10 Hz
.Ft[3].PhaseParaA = 100415851,
.Ft[3].PhaseParaB = -89982615, // 0.01 Hz
//only for EIS 1e10
.HSAMP_coeff = 9703610267,
.HSAMP_offset = -12815281473,
.LPDAC_coeff = 10000464997,
.LPDAC_offset = -75871559054,
.HSDAC_coeff = 25196655311242,
.HSDAC_offset = 19932276246516,
.Lv[0].HSTIA_coeff = -1062,
.Lv[0].HSTIA_offset = 67755568664846,
.Lv[1].HSTIA_coeff = 23,
.Lv[1].HSTIA_offset = 101767408723,
.Lv[2].HSTIA_coeff = -31,
.Lv[2].HSTIA_offset = 2037756,
.Lv[3].HSTIA_coeff = -66623,
.Lv[3].HSTIA_offset = 44299692,
.Lv[0].LPTIA_coeff = 1,
.Lv[0].LPTIA_offset = 0,
.Lv[1].LPTIA_coeff = 1,
.Lv[1].LPTIA_offset = 0,
.Lv[2].LPTIA_coeff = 1,
.Lv[2].LPTIA_offset = 0,
.Lv[3].LPTIA_coeff = 1,
.Lv[3].LPTIA_offset = 0
};
#elif defined(BOARD_A4_DA_32_D4_ED_91)
{
.DeviceName = "BOARD_A4_DA_32_D4_ED_91",
.CutoffFreq = 265550,
.DAC_offset = -19250,
// hsrtia160k
.Lv[0].HSRTIA_a = 0, // 1e8
.Lv[0].HSRTIA_b = 7983901, // 1e8
.Lv[0].HSRTIA_c = -217990, // 1e4
.Lv[0].HSRTIA_d = 0,
// hsrtia20k
.Lv[1].HSRTIA_a = 338, // 1e8
.Lv[1].HSRTIA_b = 58576686, // 1e8
.Lv[1].HSRTIA_c = 1238326, // 1e4
.Lv[1].HSRTIA_d = 0,
// hsrtia5k
.Lv[2].HSRTIA_a = 14554, //1e8
.Lv[2].HSRTIA_b = -36919197, // 1e8
.Lv[2].HSRTIA_c = 205602111, // 1e4
.Lv[2].HSRTIA_d = 0,
// hsrtia200r a*exp(bx) + c*exp(dx)
.Lv[3].HSRTIA_a = 19890,
.Lv[3].HSRTIA_b = 1620, // 1e6
.Lv[3].HSRTIA_c = 893, // 1e5
.Lv[3].HSRTIA_d = 7970, // 1e6
.Ft[0].PhaseParaA = 146478, //1e10
.Ft[0].PhaseParaB = -88583908, // 10000 Hz //1e6
.Ft[1].PhaseParaA = 342341,
.Ft[1].PhaseParaB = -89891632, // 100 Hz
.Ft[2].PhaseParaA = 20576527,
.Ft[2].PhaseParaB = -90009194, // 10 Hz
.Ft[3].PhaseParaA = 100884331,
.Ft[3].PhaseParaB = -90024204, // 0.01 Hz
//only for EIS 1e10
.HSAMP_coeff = 9703610267,
.HSAMP_offset = -12815281473,
.LPDAC_coeff = 10000464997,
.LPDAC_offset = -75871559054,
.HSDAC_coeff = 25196655311242,
.HSDAC_offset = 19932276246516,
.Lv[0].HSTIA_coeff = -1062,
.Lv[0].HSTIA_offset = 67755568664846,
.Lv[1].HSTIA_coeff = 23,
.Lv[1].HSTIA_offset = 101767408723,
.Lv[2].HSTIA_coeff = -31,
.Lv[2].HSTIA_offset = 2037756,
.Lv[3].HSTIA_coeff = -66623,
.Lv[3].HSTIA_offset = 44299692,
.Lv[0].LPTIA_coeff = 1,
.Lv[0].LPTIA_offset = 0,
.Lv[1].LPTIA_coeff = 1,
.Lv[1].LPTIA_offset = 0,
.Lv[2].LPTIA_coeff = 1,
.Lv[2].LPTIA_offset = 0,
.Lv[3].LPTIA_coeff = 1,
.Lv[3].LPTIA_offset = 0
};
#elif defined(BOARD_A4_DA_32_D4_E7_D2)
{
.DeviceName = "BOARD_A4_DA_32_D4_E7_D2",
.CutoffFreq = 275000,
.Ft[0].PhaseParaA = 155530, //1e10
.Ft[0].PhaseParaB = -87720229, // 1e6
.Ft[1].PhaseParaA = 341776,
.Ft[1].PhaseParaB = -89919625,
.Ft[2].PhaseParaA = 20542303,
.Ft[2].PhaseParaB = -89997668,
.Ft[3].PhaseParaA = 100310791,
.Ft[3].PhaseParaB = -89988818,
//only for EIS 1e8
.HSAMP_coeff = 9745467306673,
.HSAMP_offset = -11243183077,
.LPDAC_coeff = 1001472547,
.LPDAC_offset = -395332002445,
.HSDAC_coeff = 2532582201433,
.HSDAC_offset = 19873740865949,
.Lv[0].HSTIA_coeff = -4032141,
.Lv[0].HSTIA_offset = 1040297509317,
.Lv[1].HSTIA_coeff = -3181894,
.Lv[1].HSTIA_offset = 820944361270,
.Lv[2].HSTIA_coeff = -13482,
.Lv[2].HSTIA_offset = 3480817953,
.Lv[3].HSTIA_coeff = -333074,
.Lv[3].HSTIA_offset = 85901359807,
.Lv[0].LPTIA_coeff = 1,
.Lv[0].LPTIA_offset = 0,
.Lv[1].LPTIA_coeff = 1,
.Lv[1].LPTIA_offset = 0,
.Lv[2].LPTIA_coeff = 1,
.Lv[2].LPTIA_offset = 0,
.Lv[3].LPTIA_coeff = 1,
.Lv[3].LPTIA_offset = 0
};
#endif
static uint32_t Cali_LPDAC (uint32_t value) {
uint32_t res;
res = (uint32_t)(((int64_t)CaliTable.LPDAC_coeff * value + (int64_t)CaliTable.LPDAC_offset + 5e9) / 1e10);
return res;
}
static uint32_t Cali_HSAMP (uint16_t value) {
uint32_t res;
res = (uint32_t)(((int64_t)CaliTable.HSAMP_coeff * value + (int64_t)CaliTable.HSAMP_offset + 5e9) / 1e10);
return res;
}
static uint32_t Cali_HSTIA (uint32_t value, uint8_t gain_level) {
uint32_t res;
res = (uint32_t)(((int64_t)CaliTable.Lv[gain_level].HSTIA_coeff * value + (int64_t)CaliTable.Lv[gain_level].HSTIA_offset + 5e9) / 1e10);
return res;
}
#endif
@@ -129,16 +129,16 @@ static void update_ins_sti_channel(uint8_t *buf, uint8 sti_chp, uint8 sti_chn) {
static void update_ins_buffer() {
uint8 header = 0b10100000;
uint8 amp_gain = (INSTRUCTION.amp_gain & 0b11) << 3;
uint8 amp_lbf = INSTRUCTION.amp_low_band_freq & 0b111;
uint8 amp_gain = (instru.amp_gain & 0b11) << 3;
uint8 amp_lbf = instru.amp_low_band_freq & 0b111;
uint8 channel = 0; // should be call update_ins_channel to modify this value
uint8 chopper = (INSTRUCTION.chopper) ? 0b00001000 : 0;
uint8 fast_settle = (INSTRUCTION.fast_settle) ? 0b00000100 : 0;
uint8 sti_enable = (INSTRUCTION.work_mode != STI_MODE_DISABLE) ? 0b00000010 : 0;
uint8 sti_volt_l = (INSTRUCTION.sti_volt & 0b11111) >> 4;
uint8 sti_volt_h = (INSTRUCTION.sti_volt & 0b01111) << 4;
uint8 sti_chp = INSTRUCTION.sti_channel_pmos & 0b1111;
uint8 sti_chn = (INSTRUCTION.sti_channel_nmos & 0b1111) << 4;
uint8 chopper = (instru.chopper) ? 0b00001000 : 0;
uint8 fast_settle = (instru.fast_settle) ? 0b00000100 : 0;
uint8 sti_enable = (instru.work_mode != STI_MODE_DISABLE) ? 0b00000010 : 0;
uint8 sti_volt_l = (instru.sti_volt & 0b11111) >> 4;
uint8 sti_volt_h = (instru.sti_volt & 0b01111) << 4;
uint8 sti_chp = instru.sti_channel_pmos & 0b1111;
uint8 sti_chn = (instru.sti_channel_nmos & 0b1111) << 4;
uint8 clk_signal = 0; // should be call update_ins_clock to modify this value
spi_txbuf[0] = header | amp_gain | amp_lbf;
@@ -193,7 +193,7 @@ static bool update_ins_rec_buffer() {
* @param: buf: pointer of the SPI buffer.
*/
static void update_ins_sti_buffer() {
switch (INSTRUCTION.work_mode) {
switch (instru.work_mode) {
case STI_MODE_POS:
case STI_MODE_NEG:
// copy [4:7]
@@ -215,7 +215,7 @@ static void update_ins_sti_buffer() {
update_ins_sti_enable(spi_txbuf, TRUE);
// ins buf [4:7]
update_ins_sti_enable(spi_txbuf + 4, TRUE);
update_ins_sti_channel(spi_txbuf + 4, 0xF, INSTRUCTION.sti_channel_pmos);
update_ins_sti_channel(spi_txbuf + 4, 0xF, instru.sti_channel_pmos);
// ins buf [8:B]
update_ins_sti_enable(spi_txbuf + 8, FALSE);
break;
@@ -238,13 +238,13 @@ static void update_ins_sti_buffer() {
spi_txbuf[15] = spi_txbuf[3];
// change content
update_ins_sti_enable(spi_txbuf + 0, TRUE);
update_ins_sti_channel(spi_txbuf + 0, INSTRUCTION.sti_channel_pmos, INSTRUCTION.sti_channel_nmos);
update_ins_sti_channel(spi_txbuf + 0, instru.sti_channel_pmos, instru.sti_channel_nmos);
// ins buf [4:7]
update_ins_sti_enable(spi_txbuf + 4, TRUE);
update_ins_sti_channel(spi_txbuf + 4, INSTRUCTION.sti_channel_nmos, INSTRUCTION.sti_channel_pmos);
update_ins_sti_channel(spi_txbuf + 4, instru.sti_channel_nmos, instru.sti_channel_pmos);
// ins buf [8:B]
update_ins_sti_enable(spi_txbuf + 8, TRUE);
update_ins_sti_channel(spi_txbuf + 8, 0xF, INSTRUCTION.sti_channel_nmos);
update_ins_sti_channel(spi_txbuf + 8, 0xF, instru.sti_channel_nmos);
// ins buf [C:F]
update_ins_sti_enable(spi_txbuf + 12, FALSE);
break;
@@ -281,12 +281,12 @@ static void headstage_tni_update_instruction_callback(uint8_t ins_type, uint8_t
}
static uint8_t *spi_transact_rec_instruction() {
if (IS_REC_MODE(INSTRUCTION.work_mode)) {
if (IS_REC_MODE(instru.work_mode)) {
PIN_setOutputValue(pin_handle, IOID_13, 1); // DBS_P2S turn on
headstage_spi_transaction(SPI_BUFFER_SIZE, spi_txbuf, spi_rxbuf);
PIN_setOutputValue(pin_handle, IOID_13, 0); // DBS_P2S turn off
} else if (IS_ARM_MODE(INSTRUCTION.work_mode) && !adc_clock_signal) {
} else if (IS_ARM_MODE(instru.work_mode) && !adc_clock_signal) {
create_ramp(spi_rxbuf);
}
@@ -22,7 +22,7 @@
#include "EliteWorkData.h"
#include <driverlib/aon_batmon.h>
static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData);
static void SimpleBLEPeripheral_performPeriodicTask(void);
static void SimpleBLEPeripheral_clockHandler(UArg arg) {
// Store the event.
@@ -46,21 +46,30 @@ static void ZM_init() {
// initialize
pin_handle = PIN_open(&ZM_rst, BLE_IO);
PIN_setOutputValue(pin_handle, AD_CS, 1); // AD_CS HIGH
/*
Init_Elite15_PIN();
ELITE15_SPI_HOLD();
PIN15_setOutputValue(shutdown_6994, 1); // OFF = 1 => turn off 6994
PIN15_setOutputValue(enable_10v, 0); // enable 10V
PIN15_setOutputValue(ADC_CS, 1); // ADC_CS HIGH
PIN15_setOutputValue(DAC_CS, 1); // DAC_CS HIGH
PIN15_setOutputValue(MEM_CS, 1); // MEM_CS HIGH
PIN15_setOutputValue(HIGH_Z_MODE, 0); // HIGH Z MODE
PIN_setOutputValue(pin_handle, shutdown_6994, 1); // OFF = 1 => turn off 6994
PIN_setOutputValue(pin_handle, enable_10v, 0); // enable 10V
PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
*/
InitEliteInstruction();
IinADCGainControl(INSTRUCTION.ADCGainLevel);
VinADCGainControl(INSTRUCTION.VinADCGainLevel);
VoutGainControl(INSTRUCTION.VoutGainLevel);
// init DAC, set output ~= 0 V
// instru.VoutGainLevel = VOUT_GAIN_15K;
// VoutGainControl(instru.VoutGainLevel);
// DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
/* when elite open, must change vin level,
measure battery value will be right */
// VinADCGainControl(VIN_GAIN_AUTO);
elite_gptimer_open();
elite_gptimer_start();
// PIN_registerIntCb(pin_handle, switch_on_callback);
// PIN_setInterrupt(pin_handle, switch_on | PIN_IRQ_POSEDGE);
@@ -71,7 +80,7 @@ static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, ui
static void DACCode2Real2Notify(uint16_t DACcode) {
int32_t RealV;
RealV = DAC_to_realV(INSTRUCTION.VoutGainLevel, DACcode);
RealV = DAC_to_realV(instru.VoutGainLevel, DACcode);
NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
@@ -79,23 +88,30 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
}
#define IsPeriodicMode() ( \
(INSTRUCTION.eliteFxn == IV_CURVE) || \
(INSTRUCTION.eliteFxn == CV_CURVE) || \
(INSTRUCTION.eliteFxn == IT_CURVE) || \
(INSTRUCTION.eliteFxn == VT_CURVE) || \
(INSTRUCTION.eliteFxn == ZT_CURVE) || \
(INSTRUCTION.eliteFxn == CONSTANT_CURRENT) || \
(INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY) || \
(INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY) || \
(INSTRUCTION.eliteFxn == CONSTANT_VSCAN) \
#define IsPeriodicMode() ( \
(instru.eliteFxn == CURVE_EIS) || \
(instru.eliteFxn == CURVE_EIS_CV) || \
(instru.eliteFxn == CURVE_IV) || \
(instru.eliteFxn == CURVE_IV_CY) || \
(instru.eliteFxn == CURVE_IT) || \
(instru.eliteFxn == CURVE_VT) || \
(instru.eliteFxn == CURVE_RT) || \
(instru.eliteFxn == CURVE_CC) || \
(instru.eliteFxn == CURVE_CV) || \
(instru.eliteFxn == CURVE_LSV) || \
(instru.eliteFxn == CURVE_CA) || \
(instru.eliteFxn == CURVE_VO) || \
(instru.eliteFxn == CURVE_OCP) || \
(instru.eliteFxn == CURVE_CALI_ADC) \
)
#define Ve1MatchVe2Mode() ( \
(INSTRUCTION.eliteFxn == IV_CURVE) || \
(INSTRUCTION.eliteFxn == CV_CURVE) || \
(INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY) || \
(INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY) \
#define Ve1MatchVe2Mode() ( \
(instru.eliteFxn == CURVE_EIS) || \
(instru.eliteFxn == CURVE_EIS_CV) || \
(instru.eliteFxn == CURVE_IV) || \
(instru.eliteFxn == CURVE_IV_CY) || \
(instru.eliteFxn == CURVE_CV) || \
(instru.eliteFxn == CURVE_LSV) \
)
/*********************************************************************
@@ -107,196 +123,476 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
*
* @return None.
*/
static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
if ( IsPeriodicMode() ){
/** Periodic Event **/
// Default working flow is vscan -> ADC read -> send notify
// We will need a flag to control vscan, ADC and notify
static void SimpleBLEPeripheral_performPeriodicTask(void) {
if (IsPeriodicMode()) {
if(instru.eliteFxn == CURVE_EIS){
GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
GPT.GptimerCounter0 = GPT.GptimerCounter;
GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
GPT.GptimerCounter0 = GPT.GptimerCounter;
if(EliteWorkReset){
InitEliteGPtimer();
EliteWorkReset = false;
batteryADC_flag = false;
record_flag = true;
VinADCGainControl(INSTRUCTION.VinADCGainLevel);
IinADCGainControl(INSTRUCTION.ADCGainLevel);
VoutGainControl(INSTRUCTION.VoutGainLevel);
if( Ve1MatchVe2Mode() ){
if (INSTRUCTION.Ve1 == INSTRUCTION.Ve2) {
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1));
if (mode_init){
GPT.SampleRateCounter = 0;
mode_init = false;
gainChange_flag = false;
firstFreq_flag = true;
fset_flag = true;
fout_flag = true;
firstTimeReset = true;
notifyFirst_flag = true;
DACReset = true;
vscanReset = true;
leadTimeReset = true;
if (instru.f1 == instru.f2) {
DAC_outputF(instru.f1);
PeriodicEvent = false;
ELITE15_SPI_CLOSE();
ModeLED(NO_EVENT);
}
SetEISHIGHZ(1);
}
}
GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
vscanReset = true;
}else{
if(notifyFirst_flag){
GPT.NotifyCounter = INSTRUCTION.notifyRate - 20;
notifyFirst_flag = false;
//vscan counter //fset counter
if (fset_flag) {
vscan_ctrl(); //set
fset_flag = false;
fout_flag = true;
}
vscanReset = false;
leadTimeReset = false;
}
//vscan counter
GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate){
if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate * 2){
GPT.GptimerMultiple = GPT.VscanRateCounter / INSTRUCTION.VsetRate;
}else{
GPT.GptimerMultiple = 1;
//ADC counter
GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
if(GPT.SampleRateCounter >= instru.sampleRate){
GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
ADC_flag = true;
if(ADC_flag){
EliteADCControl(); //read data
ADC_flag = false;
}
}
GPT.VscanRateCounter -= INSTRUCTION.VsetRate * GPT.GptimerMultiple; //To get right time
vscan_flag = true;
if(vscan_flag){
EliteVscanControl(WorkModeData);
vscan_flag = false;
}
}
//battery counter
GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
if(GPT.BatteryCheckCounter >= 50000){
GPT.BatteryCheckCounter -= 50000; //To get right time
batteryCheck_flag = true;
}
uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
if( bat < 768 && bat > 20){
PIN15_setOutputValue(enable_5v, 0);
}
//ADC counter
GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
if(GPT.SampleRateCounter >= INSTRUCTION.sampleRate){
GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
ADC_flag = true;
if(ADC_flag){
EliteADCControl(WorkModeData);
ADC_flag = false;
}
}
//Notify counter(Notify control, check if we need to send notify)
//please don't put Notify counter before ADC counter, maybe get wrong data
GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
if(GPT.NotifyCounter >= INSTRUCTION.notifyRate){
GPT.NotifyCounter -= INSTRUCTION.notifyRate; //To get right time
notify_flag = true;
//Notify counter(Notify control, check if we need to send notify)
//please don't put Notify counter before ADC counter, maybe get wrong data
if(vscanReset){
notify_flag = false;
}
if(notify_flag){
SendNotify();
SendNotify(); //send
notify_flag = false;
fset_flag = true;
time0 = (Timestamp_get32()) / 31;
time1 = 0;
delta_time = 0;
}
mode_done(); //finishMode = 1, SendNotify(), Eliteinterrupt()
} else {
/** Periodic Event **/
// Default working flow is vscan -> ADC read -> send notify
// We will need a flag to control vscan, ADC and notify
static bool first_highz_flag = false;
GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
GPT.GptimerCounter0 = GPT.GptimerCounter;
if (mode_init) {
GPT.SampleRateCounter = instru.sampleRate - 10;
GPT.VscanRateCounter = instru.VsetRate - 1;
mode_init = false;
batteryADC_flag = false;
record_flag = true;
fset_flag = true;
firstTimeReset = true;
notifyFirst_flag = true;
first_highz_flag = true;
I_GAIN_100R_counter = 0;
I_GAIN_3K_counter = 0;
I_GAIN_100K_counter = 0;
I_GAIN_3M_counter = 0;
VIN_GAIN_1M_counter = 0;
VIN_GAIN_30K_counter = 0;
VIN_GAIN_1K_counter = 0;
VOUT_GAIN_240K_counter = 0;
VOUT_GAIN_15K_counter = 0;
DACReset = true;
vscanReset = true;
leadTimeReset = true;
/*
VinADCGainCtrl(instru.VinADCGainLv);
IinADCGainControl(instru.ADCGainLv);
VoutGainControl(instru.VoutGainLevel);
*/
if (Ve1MatchVe2Mode()) {
if (instru.Ve1 == instru.Ve2) {
// DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.Ve1));
DAC_outputV(instru.Ve1);
PeriodicEvent = false;
SetEISHIGHZ(1);
// PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // 0: open highz;
ModeLED(NO_EVENT);
}
}
}
GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
if (leadTimeReset && GPT.LeadTimeCounter <= 2000) {
vscanReset = true;
if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
if (instru.eliteFxn == CURVE_OCP) {
PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0);
} else {
SetEISHIGHZ(1); // // High Z | 1 off | 0 on
// PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 1); // HIGH Z MODE // 1: close; 0: open;
}
first_highz_flag = false;
}
} else {
if (notifyFirst_flag) {
GPT.NotifyCounter = instru.notifyRate - 20;
notifyFirst_flag = false;
}
vscanReset = false;
leadTimeReset = false;
}
//vscan counter //fset counter
GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
if (GPT.VscanRateCounter >= instru.VsetRate) {
if (GPT.VscanRateCounter >= instru.VsetRate * 2) {
GPT.GptimerMultiple = GPT.VscanRateCounter / instru.VsetRate;
} else {
GPT.GptimerMultiple = 1;
}
GPT.VscanRateCounter -= instru.VsetRate * GPT.GptimerMultiple; //To get right time
vscan_flag = true;
if (vscan_flag) {
vscan_ctrl(); //set
vscan_flag = false;
}
}
//ADC counter
GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
if(GPT.SampleRateCounter >= instru.sampleRate){
GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
ADC_flag = true;
if(ADC_flag){
EliteADCControl(); //read data
ADC_flag = false;
}
}
//Notify counter(Notify control, check if we need to send notify)
//please don't put Notify counter before ADC counter, maybe get wrong data
GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
if(GPT.NotifyCounter >= instru.notifyRate){
GPT.NotifyCounter -= instru.notifyRate; //To get right time
notify_flag = true;
if(vscanReset){
notify_flag = false;
}
if(notify_flag){
SendNotify(); //send
notify_flag = false;
}
}
mode_done(); //finishMode = 1, SendNotify(), Eliteinterrupt()
}
}
else if (instru.eliteFxn == CURVE_PULSE) {
/** Periodic Event **/
// Default working flow is vscan -> ADC read -> send notify
// We will need a flag to control vscan, ADC and notify
GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
GPT.GptimerCounter0 = GPT.GptimerCounter;
if(mode_init){
GPT.SampleRateCounter = instru.sampleRate - 10;
GPT.VscanRateCounter = instru.VsetRate - 1;
mode_init = false;
batteryADC_flag = false;
record_flag = true;
firstTimeReset = true;
notifyFirst_flag = true;
//pulsemode variable
stiFirstTime = true;
VinADCGainCtrl(instru.VinADCGainLv);
IinADCGainControl(instru.ADCGainLv);
VoutGainControl(instru.VoutGainLevel);
if (Ve1MatchVe2Mode()) {
if (instru.Ve1 == instru.Ve2) {
DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.Ve1));
PeriodicEvent = false;
PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // 0: open highz;
ModeLED(NO_EVENT);
}
} else if (instru.eliteFxn == CURVE_PULSE) {
if(!megaStiEnable){
PeriodicEvent = false;
PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // 0: open highz;
ModeLED(NO_EVENT);
}
}
}
GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
vscanReset = true;
}else{
if(notifyFirst_flag){
GPT.NotifyCounter = instru.notifyRate - 20;
notifyFirst_flag = false;
}
vscanReset = false;
leadTimeReset = false;
}
//vscan counter
GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
//pulse mode counter
GPT.StiCounter = GPT.StiCounter + GPT.DeltaGptimerCounter;
if (vscanReset) {
DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
//vscanReset = false;
}else{
if (megaStiEnable) {
pulse_vscan();
}
}
// EliteDone();
}else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
WorkModeData->VO->_Vset = INSTRUCTION.VoltConstant;
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
FreeWorkMode(WorkModeData);
// if(GPT.VscanRateCounter >= instru.VsetRate){
// if(GPT.VscanRateCounter >= instru.VsetRate * 2){
// GPT.GptimerMultiple = GPT.VscanRateCounter / instru.VsetRate;
// }else{
// GPT.GptimerMultiple = 1;
// }
// GPT.VscanRateCounter -= instru.VsetRate * GPT.GptimerMultiple; //To get right time
// vscan_flag = true;
// if(vscan_flag){
// vscan_ctrl();
// vscan_flag = false;
// }
// }
//battery counter
GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
if(GPT.BatteryCheckCounter >= 50000){
GPT.BatteryCheckCounter -= 50000; //To get right time
batteryCheck_flag = true;
}
uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
if( bat < 768 && bat > 20){
PIN_setOutputValue(pin_handle, enable_5v, 0);
}
//ADC counter
GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
if(GPT.SampleRateCounter >= instru.sampleRate){
GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
ADC_flag = true;
if(ADC_flag){
EliteADCControl();
ADC_flag = false;
}
}
//Notify counter(Notify control, check if we need to send notify)
//please don't put Notify counter before ADC counter, maybe get wrong data
GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
if(GPT.NotifyCounter >= instru.notifyRate){
GPT.NotifyCounter -= instru.notifyRate; //To get right time
notify_flag = true;
if(vscanReset){
notify_flag = false;
}
if(notify_flag){
SendNotify();
notify_flag = false;
}
}
mode_done();
}
else if (instru.eliteFxn == CURVE_CALI_DAC) {
// DAC_outputV(instru.VoltConstant); //UserCode -> DAC code -> DAC out
wm_deinit();
PeriodicEvent = false;
ELITE15_SPI_CLOSE();
}else{
InitFlag();
}
}
static void EliteADCControl(WorkMode *WorkModeData) {
switch (INSTRUCTION.eliteFxn) {
case IV_CURVE:{
CC_Plot(WorkModeData);
static void EliteADCControl(void) //CURVE_IV => CC_Plot() | CURVE_CV => Iin_Vin_Vout_Plot
{
void *wm = wm_get();
switch (instru.eliteFxn) {
case CURVE_EIS:
EIS_Plot();
break;
}
case CV_CURVE:{
CC_Plot(WorkModeData);
case CURVE_IV:
case CURVE_IV_CY:
Iin_Vin_Vout_Plot();
if (record_flag) {
InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
InputNotify(NOTIFY_IMPEDANCE, MEAS_VOUT(wm));
}
break;
}
case IT_CURVE:{
IT_Plot(WorkModeData);
case CURVE_RT:
Iin_Vin_Vout_Plot();
if (record_flag) {
InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
InputNotify(NOTIFY_VOLT, MEAS_VOUT(wm));
}
break;
}
case VT_CURVE:{
VT_Plot(WorkModeData);
case CURVE_CC:
Iin_Vin_Vout_Plot();
if (record_flag) {
InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
InputNotify(NOTIFY_IMPEDANCE, MEAS_VOUT(wm));
}
break;
}
case ZT_CURVE:{
CC_Plot(WorkModeData);
case CURVE_EIS_CV:
case CURVE_CV:
CV_Plot();
break;
}
case CONSTANT_CURRENT:{
CC_Plot(WorkModeData);
case CURVE_CA:
case CURVE_LSV:
Iin_Vin_Vout_Plot();
if (record_flag) {
InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
InputNotify(NOTIFY_VOLT, MEAS_VOUT(wm) - MEAS_VIN(wm));
InputNotify(NOTIFY_IMPEDANCE, MEAS_VOUT(wm));
}
break;
}
case CYCLIC_VOLTAMMETRY:{
CC_Plot(WorkModeData);
case CURVE_PULSE:
Iin_Vin_Vout_Plot();
if (record_flag) {
InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
InputNotify(NOTIFY_IMPEDANCE, MEAS_VOUT(wm));
}
break;
}
case LINEAR_SWEEP_VOLTAMMETRY:{
CC_Plot(WorkModeData);
case CURVE_IT:
IT_Plot();
if (record_flag) {
InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
}
break;
}
case CONSTANT_VSCAN:{
CC_Plot(WorkModeData);
case CURVE_VT:
VT_Plot();
if (record_flag) {
InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
}
break;
}
default:{
case CURVE_VO:
Iin_Vin_Vout_Plot();
if (record_flag) {
InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
InputNotify(NOTIFY_VOLT, MEAS_VOUT(wm));
}
break;
case CURVE_OCP:
Iin_Vin_Vout_Plot();
if (record_flag) {
InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
InputNotify(NOTIFY_VOLT, MEAS_VOUT(wm) - MEAS_VIN(wm));
}
break;
case CURVE_CALI_ADC:
if (instru.AdcChannel == IIN_ADC) {
cali_IT_plot();
} else if (instru.AdcChannel == VIN_ADC) {
cali_VT_plot();
} else if (instru.AdcChannel == VOUT_DAC) {
cali_VT_plot();
} else if (instru.AdcChannel == EIS_HSTIA) {
cali_IT_plot();
} else if (instru.AdcChannel == EIS_LPTIA) {
cali_VT_plot();
}
break;
default:
break;
}
}
}
static void EliteDone() {
if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)) {
static void mode_done(void) //finishMode = 1, SendNotify(), Eliteinterrupt()
{
if ((instru.eliteFxn == CURVE_EIS_CV) ||
(instru.eliteFxn == CURVE_IV) ||
(instru.eliteFxn == CURVE_CV) ||
(instru.eliteFxn == CURVE_LSV) ||
(instru.eliteFxn == CURVE_IV_CY)) {
if (!PeriodicEvent) {
finishMode = 1;
SendNotify();
Eliteinterrupt();
}
} else if (instru.eliteFxn == CURVE_EIS){
if (!PeriodicEvent) {
Eliteinterrupt();
}
}
}
static void EliteVscanControl(WorkMode *WorkModeData) {
switch (INSTRUCTION.eliteFxn) {
case IV_CURVE:{
IV_Vscan(WorkModeData->IV);
static void vscan_ctrl(void) //CURVE_IV => iv_vscan()
{
switch (instru.eliteFxn) {
case CURVE_EIS:
eis_fscan();
break;
}
case CV_CURVE:{
CV_Vscan(WorkModeData->CV);
case CURVE_IV:
iv_vscan();
break;
}
case ZT_CURVE:{
ZT_Vscan(WorkModeData->RT);
case CURVE_IV_CY:
iv_cy_vscan();
break;
}
case CYCLIC_VOLTAMMETRY:{
CV3_Vscan(WorkModeData->CV3);
case CURVE_VO:
vo_vscan();
break;
}
case CONSTANT_CURRENT:{
CC_Vscan(WorkModeData->CC);
case CURVE_RT:
rt_vscan();
break;
}
case LINEAR_SWEEP_VOLTAMMETRY:{
LSV_Vscan(WorkModeData->LSV);
case CURVE_EIS_CV:
case CURVE_CV:
cv_vscan();
break;
}
case CONSTANT_VSCAN:{
CVSCAN_Vscan(WorkModeData->CVSCAN);
case CURVE_LSV:
lsv_vscan();
break;
}
case CURVE_CA:
ca_vscan();
break;
default:{
break;
}
@@ -331,38 +627,16 @@ static void step2VsetRate(uint32_t step){
0.01mv, index = 4, n = 10000 */
if(step >= 10000){
INSTRUCTION.VsetRateIndex = 0;
instru.VsetRateIndex = 0;
}else if (step >= 1000){
INSTRUCTION.VsetRateIndex = 1;
instru.VsetRateIndex = 1;
}else if (step >= 100){
INSTRUCTION.VsetRateIndex = 2;
instru.VsetRateIndex = 2;
}else if (step >= 10){
INSTRUCTION.VsetRateIndex = 3;
instru.VsetRateIndex = 3;
}else if (step >= 1){
INSTRUCTION.VsetRateIndex = 4;
instru.VsetRateIndex = 4;
}
}
static void InitFlag(){
PeriodicEvent = false; // is there an PeriodicEvent?
Free_Work_Mode = true; // Free(WorkModeData)
}
static void InitEliteGPtimer() {
GPT.SampleRateCounter = INSTRUCTION.sampleRate - 10;
GPT.VscanRateCounter = INSTRUCTION.VsetRate - 1;
notifyFirst_flag = true;
}
static void InitEliteFlag() {
InitPeriodicEvent = true; // need to create a WorkModeData?
DACReset = true;
vscanReset = true;
EliteWorkReset = true;
leadTimeReset = true;
I_GAIN_100R_counter = 0;
I_GAIN_3K_counter = 0;
I_GAIN_100K_counter = 0;
I_GAIN_3M_counter = 0;
}
#endif /* IMPEDANCE_METER_H_ */
@@ -543,29 +543,22 @@ static void SimpleBLEPeripheral_init(void) {
// static void detectKey_clockHandler(UArg arg);
static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
uint8_t key= 0;
bool EliteOn = 0;
uint16_t counter6994 = 0;
batteryADC_flag = false;
// Initialize application
SimpleBLEPeripheral_init();
ZM_init();
// Elite_SPI_init();
WorkMode *WorkModeData = CreateWorkMode();
uint8_t key = 0;
uint16_t counter6994 = 0;
bool EliteOn = 0;
// init DAC, set output ~= 0 V
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
elite_gptimer_start();
// Application main loops
GPT.GptimerCounter0 = GPT.GptimerCounter;
batteryADC_flag = false;
headstage_battery_volt();
//headstage_battery_volt();
headstage_init_device_info();
for (;;) {
for (;;) { //keeps going until Periodic Event != True
// Waits for a signal to the semaphore associated with the calling thread.
// Note that the semaphore associated with a thread is signaled when a
// message is queued to the message receive queue of the thread or when
@@ -612,41 +605,43 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
}
}
}
if(events & SBP_PERIODIC_EVT){
events &= ~SBP_PERIODIC_EVT;
if (!PeriodicEvent) { // if there is no periodic event
key = PIN_getInputValue(switch_on);
if (EliteOn) {
if (counter6994 < CLOCK_ONE_SECOND/2) { // counter6994 enable a IC after 35 counts
if (counter6994 < CLOCK_ONE_SECOND*5) { // counter6994 enable a IC after 35 counts
counter6994++;
} else if (counter6994 == CLOCK_ONE_SECOND/2) {
PIN15_setOutputValue(shutdown_6994, 1); // OFF = 1 => turn off 6994
} else if (counter6994 == CLOCK_ONE_SECOND*5) {
//PIN_setOutputValue(pin_handle, shutdown_6994, 0); // OFF = 1 => turn off 6994
counter6994++;
} else if (counter6994 > CLOCK_ONE_SECOND*5) {
counter6994 = 0;
}
EliteKeyPress(key);
if(key != 0){ //detect Elite battery power when no periodic event
measureBat();
}
if(Free_Work_Mode){
FreeWorkMode(WorkModeData);
InitEliteInstruction();
IinADCGainControl(INSTRUCTION.ADCGainLevel);
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
// if(key != 0){ //detect Elite battery power when no periodic event
// measureBat();
// }
if(Free_Work_Mode){
wm_deinit();
InitEliteInstruction();
Free_Work_Mode = false;
}
} else {
EliteOn = TurnOnElite(key);
// AD5940_init();
}
}
else { // if there is periodic event
if(InitPeriodicEvent){
InitWorkMode(WorkModeData);
wm_init();
InitPeriodicEvent = false;
}
// Perform periodic application task
SimpleBLEPeripheral_performPeriodicTask(WorkModeData);
SimpleBLEPeripheral_performPeriodicTask();
key = PIN_getInputValue(switch_on);
EliteKeyPress(key); // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
}
@@ -975,6 +970,7 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)
case GAPROLE_WAITING_AFTER_TIMEOUT:
SimpleBLEPeripheral_freeAttRsp(bleNotConnected);
ModeLED(BT_WAIT);
#ifdef PLUS_BROADCASTER
// Reset flag for next connection.