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

Old UI calibration okay, good!!!

Browse Source
This commit is contained in:
Benny Liu
2021-09-30 18:36:55 +08:00
parent 49f99fb9f6
commit ac14aa1e1e
4 changed files with 15 additions and 16 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/EliteDAC.h
-3
View File
@@ -359,17 +359,14 @@ static void Cali_DAC_output () {
static int32_t LPvolt = 0;
if (instru.DAC_type == HSDACtype_DC) {
instru.AdcChannel = EIS_DAC;
HS_cali_config();
HSDAC_output(instru.VAmpSet);
} else if (instru.DAC_type == LPDACtype_DC) {
instru.AdcChannel = EIS_DAC;
LP_cali_config();
LPvolt = (int32_t)(instru.VAmpSet);
LPvolt = (LPvolt - 25000) * 4 * 4000;
cali_DAC_outputV(LPvolt);
} else if (instru.DAC_type == HSDACtype_AC) {
instru.AdcChannel = EIS_DAC;
HS_cali_config();
DAC_outputF(0x00000800);
SetWGAmp(instru.VAmpSet); // sine wave generation usage
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteInstruction.h
+2 -2
View File
@@ -102,10 +102,10 @@ struct HEADSTAGE_INSTRUCTION {
#define EIS_HSTIA 0x00
#define EIS_LPTIA 0x01
#define EIS_DAC 0x02
#define VOUT_DAC 0x03
#define HIGH_Z 0x03
#define IIN_ADC 0x04
#define VIN_ADC 0x05
#define HIGH_Z 0x06
#define VOUT_DAC 0x06
#define HSDACtype_DC 0x00
#define LPDACtype_DC 0x01
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteReset.h
+2 -2
View File
@@ -55,8 +55,8 @@ static void Eliteinterrupt() {
InitGPT();
initINSBuf();
initDATBuf();
AD5940_HWReset();
AD5940_init();
// AD5940_HWReset();
// AD5940_init();
// HSTIAGainCtrl(HSRTIA_200R);
// LPTIAGainCtrl(LPRTIA_200R);
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h
+11 -9
View File
@@ -1034,11 +1034,13 @@ static void update_ZM_instruction(uint8 *ins) {
case HIGH_Z : {
switch(ins[4]) {
case 0x00 : {
SetEISHIGHZ(0); //open CE0
AD5940_HWReset();
AD5940_init();
// SetEISHIGHZ(0); //open CE0
break;
}
case 0x01 : {
SetEISHIGHZ(1); //close CE0
// SetEISHIGHZ(1); //close CE0
break;
}
default : {
@@ -1131,9 +1133,9 @@ static void update_ZM_instruction(uint8 *ins) {
break;
}
case EIS_HSTIA :{ // 0x00
instru.VAmpSet = ((uint16_t)(ins[4]) << 8) | (uint16_t)(ins[5]);
instru.DAC_type = HSDACtype_DC;
Cali_DAC_output(); // HSDAC output DC bias
// instru.VAmpSet = ((uint16_t)(ins[4]) << 8) | (uint16_t)(ins[5]);
// instru.DAC_type = HSDACtype_DC;
// Cali_DAC_output(); // HSDAC output DC bias
instru.eliteFxn = CURVE_CALI_ADC;
instru.AdcChannel = EIS_HSTIA;
instru.notifyRate = 1000;
@@ -1143,9 +1145,9 @@ static void update_ZM_instruction(uint8 *ins) {
break;
}
case EIS_LPTIA :{ // 0x01
instru.VAmpSet = ((uint16_t)(ins[4]) << 8) | (uint16_t)(ins[5]);
instru.DAC_type = LPDACtype_DC;
Cali_DAC_output(); // LPDAC output DC bias
// instru.VAmpSet = ((uint16_t)(ins[4]) << 8) | (uint16_t)(ins[5]);
// instru.DAC_type = LPDACtype_DC;
// Cali_DAC_output(); // LPDAC output DC bias
instru.eliteFxn = CURVE_CALI_ADC;
instru.AdcChannel = EIS_LPTIA;
instru.notifyRate = 1000;
@@ -1157,6 +1159,7 @@ static void update_ZM_instruction(uint8 *ins) {
}
case EIS_DAC :{ // 0x02
instru.eliteFxn = CURVE_CALI_ADC;
instru.AdcChannel = EIS_DAC;
instru.notifyRate = 1000;
instru.sampleRate = 15;
instru.VAmpSet = ((uint16_t)(ins[4]) << 8) | (uint16_t)(ins[5]);
@@ -1455,7 +1458,6 @@ static void update_ZM_instruction(uint8 *ins) {
}
case cali_HSTIA_Iin: { // 0x65
instru.VAmpSet = ((uint16_t)(ins[4]) << 8) | (uint16_t)(ins[5]);
// instru.VAmpSet = 0x0E00;
instru.DAC_type = HSDACtype_DC;
Cali_DAC_output(); // HSDAC output DC bias