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

[H7][ADC] Batch call DeInit() for all used devices

Browse source
This commit is contained in:
jflyper 2020-10-02 17:36:09 +09:00
parent 5db852a2f4
commit 9df6d77647
1 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/main/drivers/adc_stm32h7xx.c
View file

@ -162,7 +162,7 @@ static uint32_t adcRegularRankMap[] = {
#undef RANK #undef RANK
static void Error_Handler(void) { while (1) { } } static void errorHandler(void) { while (1) { } }
// Note on sampling time. // Note on sampling time.
// Temperature sensor has minimum sample time of 9us. // Temperature sensor has minimum sample time of 9us.
@ -174,11 +174,7 @@ void adcInitDevice(adcDevice_t *adcdev, int channelCount)
hadc->Instance = adcdev->ADCx; hadc->Instance = adcdev->ADCx;
if (HAL_ADC_DeInit(hadc) != HAL_OK) // DeInit is done in adcInit().
{
// ADC de-initialization Error
Error_Handler();
}
hadc->Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4; hadc->Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
hadc->Init.Resolution = ADC_RESOLUTION_12B; hadc->Init.Resolution = ADC_RESOLUTION_12B;
@ -198,13 +194,13 @@ void adcInitDevice(adcDevice_t *adcdev, int channelCount)
// Initialize this ADC peripheral // Initialize this ADC peripheral
if (HAL_ADC_Init(hadc) != HAL_OK) { if (HAL_ADC_Init(hadc) != HAL_OK) {
Error_Handler(); errorHandler();
} }
// Execute calibration // Execute calibration
if (HAL_ADCEx_Calibration_Start(hadc, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED) != HAL_OK) { if (HAL_ADCEx_Calibration_Start(hadc, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED) != HAL_OK) {
Error_Handler(); errorHandler();
} }
} }
@ -317,6 +313,24 @@ void adcInit(const adcConfig_t *config)
} }
} }
// DeInit ADCx with inputs
// We have to batch call DeInit() for all devices as DeInit() initializes ADCx_COMMON register.
for (int dev = 0; dev < ADCDEV_COUNT; dev++) {
adcDevice_t *adc = &adcDevice[dev];
if (!(adc->ADCx && adc->channelBits)) {
continue;
}
adc->ADCHandle.Instance = adc->ADCx;
if (HAL_ADC_DeInit(&adc->ADCHandle) != HAL_OK) {
// ADC de-initialization Error
errorHandler();
}
}
// Configure ADCx with inputs // Configure ADCx with inputs
int dmaBufferIndex = 0; int dmaBufferIndex = 0;
@ -370,7 +384,7 @@ void adcInit(const adcConfig_t *config)
sConfig.Offset = 0; /* Parameter discarded because offset correction is disabled */ sConfig.Offset = 0; /* Parameter discarded because offset correction is disabled */
if (HAL_ADC_ConfigChannel(&adc->ADCHandle, &sConfig) != HAL_OK) { if (HAL_ADC_ConfigChannel(&adc->ADCHandle, &sConfig) != HAL_OK) {
Error_Handler(); errorHandler();
} }
} }
@ -442,7 +456,7 @@ void adcInit(const adcConfig_t *config)
// Start conversion in DMA mode // Start conversion in DMA mode
if (HAL_ADC_Start_DMA(&adc->ADCHandle, (uint32_t *)&adcConversionBuffer[dmaBufferIndex], BITCOUNT(adc->channelBits)) != HAL_OK) { if (HAL_ADC_Start_DMA(&adc->ADCHandle, (uint32_t *)&adcConversionBuffer[dmaBufferIndex], BITCOUNT(adc->channelBits)) != HAL_OK) {
Error_Handler(); errorHandler();
} }
dmaBufferIndex += BITCOUNT(adc->channelBits); dmaBufferIndex += BITCOUNT(adc->channelBits);