diff --git a/boards/nucleo-f334r8/include/periph_conf.h b/boards/nucleo-f334r8/include/periph_conf.h index 38b64d43d28440a930a4a3f608bc9ba5745ff134..2e32e8a57b82ea1fd054c9c1bcfa87d45f938ead 100644 --- a/boards/nucleo-f334r8/include/periph_conf.h +++ b/boards/nucleo-f334r8/include/periph_conf.h @@ -90,10 +90,32 @@ static const uart_conf_t uart_config[] = { .tx_af = GPIO_AF7, .bus = APB1, .irqn = USART2_IRQn + }, + { + .dev = USART1, + .rcc_mask = RCC_APB2ENR_USART1EN, + .rx_pin = GPIO_PIN(PORT_A, 10), + .tx_pin = GPIO_PIN(PORT_A, 9), + .rx_af = GPIO_AF7, + .tx_af = GPIO_AF7, + .bus = APB2, + .irqn = USART1_IRQn + }, + { + .dev = USART3, + .rcc_mask = RCC_APB1ENR_USART3EN, + .rx_pin = GPIO_PIN(PORT_B, 11), + .tx_pin = GPIO_PIN(PORT_B, 10), + .rx_af = GPIO_AF7, + .tx_af = GPIO_AF7, + .bus = APB1, + .irqn = USART3_IRQn } }; #define UART_0_ISR (isr_usart2) +#define UART_1_ISR (isr_usart1) +#define UART_2_ISR (isr_usart3) #define UART_NUMOF (sizeof(uart_config) / sizeof(uart_config[0])) /** @} */ diff --git a/boards/nucleo-f401re/include/periph_conf.h b/boards/nucleo-f401re/include/periph_conf.h index 322a6c753f3ee4b26ef23fa94fe39fb662629f42..d697b2ecee33e6ddf0b1fda3856c466a3b4cd4ac 100644 --- a/boards/nucleo-f401re/include/periph_conf.h +++ b/boards/nucleo-f401re/include/periph_conf.h @@ -94,20 +94,6 @@ static const uart_conf_t uart_config[] = { #ifdef UART_USE_DMA .dma_stream = 6, .dma_chan = 4 -#endif - }, - { - .dev = USART6, - .rcc_mask = RCC_APB2ENR_USART6EN, - .rx_pin = GPIO_PIN(PORT_A, 12), - .tx_pin = GPIO_PIN(PORT_A, 11), - .rx_af = GPIO_AF8, - .tx_af = GPIO_AF8, - .bus = APB2, - .irqn = USART6_IRQn, -#ifdef UART_USE_DMA - .dma_stream = 6, - .dma_chan = 4 #endif }, { @@ -122,15 +108,29 @@ static const uart_conf_t uart_config[] = { #ifdef UART_USE_DMA .dma_stream = 6, .dma_chan = 4 +#endif + }, + { + .dev = USART6, + .rcc_mask = RCC_APB2ENR_USART6EN, + .rx_pin = GPIO_PIN(PORT_A, 12), + .tx_pin = GPIO_PIN(PORT_A, 11), + .rx_af = GPIO_AF8, + .tx_af = GPIO_AF8, + .bus = APB2, + .irqn = USART6_IRQn, +#ifdef UART_USE_DMA + .dma_stream = 6, + .dma_chan = 4 #endif } }; #define UART_0_ISR (isr_usart2) #define UART_0_DMA_ISR (isr_dma1_stream6) -#define UART_1_ISR (isr_usart6) +#define UART_1_ISR (isr_usart1) #define UART_1_DMA_ISR (isr_dma1_stream6) -#define UART_2_ISR (isr_usart1) +#define UART_2_ISR (isr_usart6) #define UART_2_DMA_ISR (isr_dma1_stream6) #define UART_NUMOF (sizeof(uart_config) / sizeof(uart_config[0])) diff --git a/boards/nucleo-f410rb/include/periph_conf.h b/boards/nucleo-f410rb/include/periph_conf.h index 605212d4c313dd14dae65756ed9dd133ba01e2ba..0f61d4393f6729c2df586bc157ef0605baa25da1 100644 --- a/boards/nucleo-f410rb/include/periph_conf.h +++ b/boards/nucleo-f410rb/include/periph_conf.h @@ -106,8 +106,22 @@ static const uart_conf_t uart_config[] = { .bus = APB2, .irqn = USART1_IRQn, #ifdef UART_USE_DMA - .dma_stream = 5, + .dma_stream = 7, .dma_chan = 4 +#endif + }, + { + .dev = USART6, + .rcc_mask = RCC_APB2ENR_USART6EN, + .rx_pin = GPIO_PIN(PORT_A, 12), + .tx_pin = GPIO_PIN(PORT_A, 11), + .rx_af = GPIO_AF8, + .tx_af = GPIO_AF8, + .bus = APB2, + .irqn = USART6_IRQn, +#ifdef UART_USE_DMA + .dma_stream = 7, + .dma_chan = 5 #endif } }; @@ -116,7 +130,9 @@ static const uart_conf_t uart_config[] = { #define UART_0_ISR (isr_usart2) #define UART_0_DMA_ISR (isr_dma1_stream6) #define UART_1_ISR (isr_usart1) -#define UART_1_DMA_ISR (isr_dma1_stream5) +#define UART_1_DMA_ISR (isr_dma2_stream7) +#define UART_2_ISR (isr_usart6) +#define UART_2_DMA_ISR (isr_dma2_stream7) /* deduct number of defined UART interfaces */ #define UART_NUMOF (sizeof(uart_config) / sizeof(uart_config[0])) diff --git a/boards/nucleo-f446re/include/periph_conf.h b/boards/nucleo-f446re/include/periph_conf.h index ca1f2b9e72d92132844074c4fdee6086d8e437e7..cc69f628e5a235203b4783d8b020137f9cb0e8c0 100644 --- a/boards/nucleo-f446re/include/periph_conf.h +++ b/boards/nucleo-f446re/include/periph_conf.h @@ -65,20 +65,6 @@ static const uart_conf_t uart_config[] = { #ifdef UART_USE_DMA .dma_stream = 6, .dma_chan = 4 -#endif - }, - { - .dev = USART3, - .rcc_mask = RCC_APB1ENR_USART3EN, - .rx_pin = GPIO_PIN(PORT_C, 11), - .tx_pin = GPIO_PIN(PORT_C, 10), - .rx_af = GPIO_AF7, - .tx_af = GPIO_AF7, - .bus = APB1, - .irqn = USART3_IRQn, -#ifdef UART_USE_DMA - .dma_stream = 5, - .dma_chan = 4 #endif }, { @@ -93,16 +79,30 @@ static const uart_conf_t uart_config[] = { #ifdef UART_USE_DMA .dma_stream = 4, .dma_chan = 4 +#endif + }, + { + .dev = USART3, + .rcc_mask = RCC_APB1ENR_USART3EN, + .rx_pin = GPIO_PIN(PORT_C, 11), + .tx_pin = GPIO_PIN(PORT_C, 10), + .rx_af = GPIO_AF7, + .tx_af = GPIO_AF7, + .bus = APB1, + .irqn = USART3_IRQn, +#ifdef UART_USE_DMA + .dma_stream = 5, + .dma_chan = 4 #endif }, }; #define UART_0_ISR (isr_usart2) #define UART_0_DMA_ISR (isr_dma1_stream6) -#define UART_1_ISR (isr_usart3) -#define UART_1_DMA_ISR (isr_dma1_stream5) -#define UART_2_ISR (isr_usart1) -#define UART_2_DMA_ISR (isr_dma1_stream4) +#define UART_1_ISR (isr_usart1) +#define UART_1_DMA_ISR (isr_dma1_stream4) +#define UART_2_ISR (isr_usart3) +#define UART_2_DMA_ISR (isr_dma1_stream5) #define UART_NUMOF (sizeof(uart_config) / sizeof(uart_config[0])) /** @} */ diff --git a/boards/nucleo-l152re/include/periph_conf.h b/boards/nucleo-l152re/include/periph_conf.h index 75dc563d91bfe12a0785fd8322b63a8ff3e442ca..307ac2d59a7582cf97b352a1989ba33ad7136058 100644 --- a/boards/nucleo-l152re/include/periph_conf.h +++ b/boards/nucleo-l152re/include/periph_conf.h @@ -103,16 +103,6 @@ static const uart_conf_t uart_config[] = { .bus = APB1, .irqn = USART2_IRQn }, - { - .dev = USART3, - .rcc_mask = RCC_APB1ENR_USART3EN, - .rx_pin = GPIO_PIN(PORT_C, 11), - .tx_pin = GPIO_PIN(PORT_C, 10), - .rx_af = GPIO_AF7, - .tx_af = GPIO_AF7, - .bus = APB1, - .irqn = USART3_IRQn - }, { .dev = USART1, .rcc_mask = RCC_APB2ENR_USART1EN, @@ -123,11 +113,21 @@ static const uart_conf_t uart_config[] = { .bus = APB2, .irqn = USART1_IRQn }, + { + .dev = USART3, + .rcc_mask = RCC_APB1ENR_USART3EN, + .rx_pin = GPIO_PIN(PORT_C, 11), + .tx_pin = GPIO_PIN(PORT_C, 10), + .rx_af = GPIO_AF7, + .tx_af = GPIO_AF7, + .bus = APB1, + .irqn = USART3_IRQn + }, }; #define UART_0_ISR (isr_usart2) -#define UART_1_ISR (isr_usart3) -#define UART_2_ISR (isr_usart1) +#define UART_1_ISR (isr_usart1) +#define UART_2_ISR (isr_usart3) #define UART_NUMOF (sizeof(uart_config) / sizeof(uart_config[0])) /** @} */