Skip to content

Commit 0e4b502

Browse files
authored
Update dma_config.h
串口dma中断名称统一修改为uart
1 parent 6203117 commit 0e4b502

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ extern "C" {
132132
#define SPI1_RX_DMA_INSTANCE DMA2_Stream2
133133
#define SPI1_RX_DMA_CHANNEL DMA_CHANNEL_3
134134
#define SPI1_RX_DMA_IRQ DMA2_Stream2_IRQn
135-
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(USART1_RX_DMA_INSTANCE)
136-
#define USART1_DMA_RX_IRQHandler DMA2_Stream2_IRQHandler
137-
#define USART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
138-
#define USART1_RX_DMA_INSTANCE DMA2_Stream2
139-
#define USART1_RX_DMA_CHANNEL DMA_CHANNEL_4
140-
#define USART1_RX_DMA_IRQ DMA2_Stream2_IRQn
135+
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA_INSTANCE)
136+
#define UART1_DMA_RX_IRQHandler DMA2_Stream2_IRQHandler
137+
#define UART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
138+
#define UART1_RX_DMA_INSTANCE DMA2_Stream2
139+
#define UART1_RX_DMA_CHANNEL DMA_CHANNEL_4
140+
#define UART1_RX_DMA_IRQ DMA2_Stream2_IRQn
141141
#endif
142142

143143
/* DMA2 stream3 */
@@ -184,12 +184,12 @@ extern "C" {
184184
#define SPI1_TX_DMA_INSTANCE DMA2_Stream5
185185
#define SPI1_TX_DMA_CHANNEL DMA_CHANNEL_3
186186
#define SPI1_TX_DMA_IRQ DMA2_Stream5_IRQn
187-
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(USART1_RX_DMA_INSTANCE)
188-
#define USART1_DMA_RX_IRQHandler DMA2_Stream5_IRQHandler
189-
#define USART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
190-
#define USART1_RX_DMA_INSTANCE DMA2_Stream5
191-
#define USART1_RX_DMA_CHANNEL DMA_CHANNEL_4
192-
#define USART1_RX_DMA_IRQ DMA2_Stream5_IRQn
187+
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA_INSTANCE)
188+
#define UART1_DMA_RX_IRQHandler DMA2_Stream5_IRQHandler
189+
#define UART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
190+
#define UART1_RX_DMA_INSTANCE DMA2_Stream5
191+
#define UART1_RX_DMA_CHANNEL DMA_CHANNEL_4
192+
#define UART1_RX_DMA_IRQ DMA2_Stream5_IRQn
193193
#elif defined(BSP_SPI5_RX_USING_DMA) && !defined(SPI5_RX_DMA_INSTANCE)
194194
#define SPI5_DMA_RX_IRQHandler DMA2_Stream5_IRQHandler
195195
#define SPI5_RX_DMA_RCC RCC_AHB1ENR_DMA2EN

0 commit comments

Comments
 (0)