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

[H7] Enable ADC

Browse source 
- Initial cut without internal sensors

- Full DMA including internal sensors spanning multiple ADC peripherals

- Skip ADC initialisation when ADC instance is unused to avoid crash.

- Add volatile & DMA_RAM attribute to ADC DMA buffer

- Revised DMA coherency handling

- adcGetChannelValues - added comment and moved def to adc_impl.h

- Changes per PR comment (indentation fix)
This commit is contained in:
jflyper 2019-05-06 11:21:47 +09:00
parent 1cbff2b9aa
commit 1b49b33e00
8 changed files with 518 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/drivers/adc_impl.h
View file

@ -26,6 +26,12 @@
#if defined(STM32F4) || defined(STM32F7)
#define ADC_TAG_MAP_COUNT 16
#elif defined(STM32H7)
#ifdef USE_ADC_INTERNAL
#define ADC_TAG_MAP_COUNT 30
#else
#define ADC_TAG_MAP_COUNT 28
#endif
#elif defined(STM32F3)
#define ADC_TAG_MAP_COUNT 39
#else
@ -37,7 +43,10 @@ typedef struct adcTagMap_s {
#if !defined(STM32F1) // F1 pins have uniform connection to ADC instances
uint8_t devices;
#endif
uint8_t channel;
uint32_t channel;
#if defined(STM32H7)
uint8_t channelOrdinal;
#endif
} adcTagMap_t;
// Encoding for adcTagMap_t.devices
@ -57,14 +66,21 @@ typedef struct adcDevice_s {
#if defined(STM32F4) || defined(STM32F7)
DMA_Stream_TypeDef* DMAy_Streamx;
uint32_t channel;
#elif defined(STM32H7)
DMA_Stream_TypeDef* DMAy_Streamx;
uint32_t request;
#else
DMA_Channel_TypeDef* DMAy_Channelx;
#endif
#endif
#if defined(STM32F7)
#if defined(STM32F7) || defined(STM32H7)
ADC_HandleTypeDef ADCHandle;
DMA_HandleTypeDef DmaHandle;
#endif
#if defined(STM32H7)
uint8_t irq;
uint32_t channelBits;
#endif
} adcDevice_t;
extern const adcDevice_t adcHardware[];
@ -75,3 +91,7 @@ extern volatile uint16_t adcValues[ADC_CHANNEL_COUNT];
uint8_t adcChannelByTag(ioTag_t ioTag);
ADCDevice adcDeviceByInstance(ADC_TypeDef *instance);
bool adcVerifyPin(ioTag_t tag, ADCDevice device);
// Marshall values in DMA instance/channel based order to adcChannel based order.
// Required for multi DMA instance implementation
void adcGetChannelValues(void);