diff options
| author | breederbai <[email protected]> | 2022-06-13 22:04:09 +0800 |
|---|---|---|
| committer | guo <[email protected]> | 2022-06-14 17:00:11 +0800 |
| commit | 14cd8d0145163fb4d27af181df27caff9e438e51 (patch) | |
| tree | 6b499922777e1c71fee3fa6a9a10b81fcebf362f | |
| parent | b0030704d0b8d13a7f0dc977cd9c9cecc2b37365 (diff) | |
[bsp][stm32]：修复UART6 DMA分配有可能冲突的BUG
用户自己可以添加DMA分配文件，所以这里的DMA分配有可能和用户自定义的冲突
| -rw-r--r-- | bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h index b535cf4850..016ec32dee 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h @@ -259,7 +259,7 @@ extern "C" { #define SPI5_TX_DMA_INSTANCE DMA2_Stream6 #define SPI5_TX_DMA_CHANNEL DMA_CHANNEL_7 #define SPI5_TX_DMA_IRQ DMA2_Stream6_IRQn -#elif defined(BSP_UART6_TX_USING_DMA) && !defined(BSP_USING_SDIO) +#elif defined(BSP_UART6_TX_USING_DMA) && !defined(BSP_USING_SDIO) && !defined(UART6_TX_DMA_INSTANCE) #define UART6_DMA_TX_IRQHandler DMA2_Stream6_IRQHandler #define UART6_TX_DMA_RCC RCC_AHB1ENR_DMA2EN #define UART6_TX_DMA_INSTANCE DMA2_Stream6 |