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

Elite 1.4-re RT mode

Browse Source
This commit is contained in:
alan
2019-09-20 14:01:30 +08:00
parent 77b1259bf3
commit bdb280c029
2 changed files with 3 additions and 17 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/EliteDeviceCorrection.h
+1 -15
View File
@@ -298,21 +298,7 @@ static int32_t DecodeADCVolt(uint16_t ADC_measure){
// unit should be pA
static int32_t DecodeADCCurrent(uint8_t ADCGain, uint16_t ADC_measure){
long long ADCRealCurrent = 0;
if(INSTRUCTION.ADCGainLevel == GAIN_200K){
LED_color(DARKLED, 0xFF, 0x00, 0x00);
}
else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
LED_color(DARKLED, 0xFF, 0x00, 0xFF);
}
else if(INSTRUCTION.ADCGainLevel == GAIN_200R){
LED_color(DARKLED, 0xFF, 0xFF, 0x00);
}
else{
LED_color(DARKLED, 0xFF, 0xFF, 0xFF);
}
if(INSTRUCTION.ADCGainLevel != ADCGain){
LED_color(DARKLED, 0xFF, 0xFF, 0xFF);
}
ADCRealCurrent = (Correction.ADC_current[ADCGain].coeff * ADC_measure + Correction.ADC_current[ADCGain].offset)/1e7;
// Current unit is pA;
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h
+2 -2
View File
@@ -834,8 +834,8 @@ static void update_ZM_instruction(uint8 *ins) {
case VOLT_OUTPUT: {
INSTRUCTION.eliteFxn = VOLT_OUTPUT;
INSTRUCTION.VoltConstant = ( ((uint16_t)(ins[3])) << 8) | (uint16_t)(ins[4]);
// DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
DAC_outputV(INSTRUCTION.VoltConstant);
DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
// DAC_outputV(INSTRUCTION.VoltConstant);
break;
}