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

[CV] try to fix auto

Browse Source
This commit is contained in:
YiChin
2019-11-18 11:36:33 +08:00
parent a4e62ac39e
commit dff4082ea9
2 changed files with 16 additions and 9 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/EliteITCurve.h
+12 -8
View File
@@ -38,23 +38,27 @@ static int32_t IT_Plot(WorkMode *WorkModeData) {
break;
}
default: {
#define CURRENT_MODE WorkModeData->IV
#define CURRENT_MODE WorkModeData->IT
break;
}
}
// read ADC current
int32_t RealCurrent = 0, RealVolt = 0;
static uint8_t PreviousGain = GAIN_AUTO;
static uint8_t PreviousGain = GAIN_200R;
if(INSTRUCTION.AutoGainEnable){
if(INSTRUCTION.eliteFxn == IV_CURVE){
if (PreviousGain != INSTRUCTION.ADCGainLevel){
PreviousGain = INSTRUCTION.ADCGainLevel;
ReadCurrent(spi_ADC_rxbuf);
}
}
RealCurrent = AutoGainReadCurrent(spi_ADC_rxbuf);
if(PreviousGain != INSTRUCTION.ADCGainLevel){
PreviousGain = INSTRUCTION.ADCGainLevel;
CURRENT_MODE->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
CURRENT_MODE->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
}
if(PreviousGain != INSTRUCTION.ADCGainLevel){
PreviousGain = INSTRUCTION.ADCGainLevel;
CURRENT_MODE->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
CURRENT_MODE->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
}
}
else{
ReadCurrent(spi_ADC_rxbuf);
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h
+4 -1
View File
@@ -153,7 +153,10 @@ static void EliteDACControl(WorkMode *WorkModeData) {
if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE)) {
// output a certain voltage and put it into NotifyVolt
VoltScan(WorkModeData);
// DACCode2Real2Notify(VoltScan(WorkModeData));
if(INSTRUCTION.eliteFxn == CV_CURVE){
DACCode2Real2Notify(VoltScan(WorkModeData));
}
}
else if (INSTRUCTION.eliteFxn == ZT_CURVE){