wisetop/past-project-past_code_cc2650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Elite_1.5_Taylor_061721' into Elite_1.5_Taylor_061721

Browse Source
This commit is contained in:
Taylor Liao
2021-08-04 16:50:23 +08:00
parent 02e72276aa df3b074539
commit 79239bd4a7
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteADC.h
+1 -1
View File
@@ -648,7 +648,7 @@ static void HSTIA_cali_config() {
select_REG(PSWFULLCON); //PSWFULLCON
w32_REG(0x00000400); //P11: P to CE0
select_REG(TSWFULLCON); //TSWFULLCON
w32_REG(0x00000120); //T9 | T6: HSTIA neg input to SE0
w32_REG(0x00000120); //T9 | T6: HSTIA neg input to DE0
}
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDAC.h
+3 -3
View File
@@ -169,9 +169,9 @@ static void SetDACBias(uint16_t daccode){
static void SetWGAmp(uint16_t ampcode){
uint32_t amplitude = ((uint32_t)(ampcode & 0x0FFF));
select_REG(WGFCW); //2030
w32_REG(0x00333333); //SINEFCW/2^30 * 16 MHz
//
// select_REG(WGFCW); //2030
// w32_REG(0x00333333); //SINEFCW/2^30 * 16 MHz
select_REG(WGCON);
w32_REG(0x0); // 0x0: DC disable ac first
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_mode_ADC_DAC.h
+7 -3
View File
@@ -690,6 +690,7 @@ static void cali_IT_plot(void) {
static uint8_t rec_cnt = 0;
static uint16_t cali_count_max = 1000;
int32_t ADCValueAVG = 0;
int32_t temp = 0;
/* ADC_cnt: 0 - read Iin and do NOT buffer the Iin after changing gain twice
* 1 - read Iin and increase ADC_cnt
@@ -699,7 +700,8 @@ static void cali_IT_plot(void) {
if (instru.EISAutoGainEnable) {
MEAS_CURR(wm) = 0xFFFF;
} else {
MEAS_CURR(wm) = ReadRawADC();
// MEAS_CURR(wm) = (ReadRawADC() & 0x0000FFFF);
temp = (ReadRawADC() & 0x0000FFFF);
}
// if (instru.TIAGainLv == 0) {
@@ -731,8 +733,10 @@ static void cali_IT_plot(void) {
ModeLED(NO_EVENT);
} else {
cali_count++;
ADCValueSUM = ADCValueSUM + MEAS_CURR(wm);
InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
// ADCValueSUM = ADCValueSUM + MEAS_CURR(wm);
ADCValueSUM = ADCValueSUM + temp;
// InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
InputNotify(NOTIFY_CURRENT, temp);
InputNotify(NOTIFY_VOLT, ADCValueSUM);
InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
}
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h
+1
View File
@@ -1126,6 +1126,7 @@ static void update_ZM_instruction(uint8 *ins) {
} else {
instru.EISAutoGainEnable = 1;
instru.TIAGainLv = RTIA0;
HSTIAGainCtrl(instru.TIAGainLv);
}
HSTIAGainCtrl(instru.TIAGainLv);
break;