Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 05:15:25 +03:00
Code Issues Wiki Activity

Merge pull request #4925 from jflyper/bfdev-adc-internal-handle-empty-channel-case

Browse source 
Internal ADC (VREFINT, Core temp) Handle empty main ADC channel case
This commit is contained in:
Michael Keller 2018-01-11 07:31:24 +13:00 • committed by GitHub
commit 1d4073366c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/main/drivers/adc_stm32f4xx.c
View file

@ -218,9 +218,11 @@ void adcInit(const adcConfig_t *config)
adcOperatingConfig[i].enabled = true; adcOperatingConfig[i].enabled = true;
} }
#ifndef USE_ADC_INTERNAL
if (!adcActive) { if (!adcActive) {
return; return;
} }
#endif
RCC_ClockCmd(adc.rccADC, ENABLE); RCC_ClockCmd(adc.rccADC, ENABLE);
@ -233,6 +235,22 @@ void adcInit(const adcConfig_t *config)
ADC_CommonInitStructure.ADC_TwoSamplingDelay = ADC_TwoSamplingDelay_5Cycles; ADC_CommonInitStructure.ADC_TwoSamplingDelay = ADC_TwoSamplingDelay_5Cycles;
ADC_CommonInit(&ADC_CommonInitStructure); ADC_CommonInit(&ADC_CommonInitStructure);
#ifdef USE_ADC_INTERNAL
// If device is not ADC1 or there's no active channel, then initialize ADC1 separately
if (device != ADCDEV_1 || !adcActive) {
RCC_ClockCmd(adcHardware[ADCDEV_1].rccADC, ENABLE);
adcInitDevice(ADC1, 2);
ADC_Cmd(ADC1, ENABLE);
}
// Initialize for injected conversion
adcInitInternalInjected();
if (!adcActive) {
return;
}
#endif
adcInitDevice(adc.ADCx, configuredAdcChannels); adcInitDevice(adc.ADCx, configuredAdcChannels);
uint8_t rank = 1; uint8_t rank = 1;
@ -247,17 +265,6 @@ void adcInit(const adcConfig_t *config)
ADC_DMACmd(adc.ADCx, ENABLE); ADC_DMACmd(adc.ADCx, ENABLE);
ADC_Cmd(adc.ADCx, ENABLE); ADC_Cmd(adc.ADCx, ENABLE);
#ifdef USE_ADC_INTERNAL
// If device is not ADC1, then initialize ADC1 separately
if (device != ADCDEV_1) {
RCC_ClockCmd(adcHardware[ADCDEV_1].rccADC, ENABLE);
adcInitDevice(ADC1, 2);
ADC_Cmd(ADC1, ENABLE);
}
// Initialize for injected conversion
adcInitInternalInjected();
#endif
dmaInit(dmaGetIdentifier(adc.DMAy_Streamx), OWNER_ADC, 0); dmaInit(dmaGetIdentifier(adc.DMAy_Streamx), OWNER_ADC, 0);