Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add uart 6 and 7 #12928

Merged
merged 3 commits into from
Jul 10, 2023
Merged

add uart 6 and 7 #12928

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8121cb5
add uart 6 and 7
freasy Jun 26, 2023
fc3bd13
Update src/main/drivers/at32/serial_uart_at32f43x.c
freasy Jun 26, 2023
04c38fd
code formatting
freasy Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
108 changes: 93 additions & 15 deletions src/main/drivers/at32/serial_uart_at32f43x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,18 @@
#ifndef UART5_RX_DMA_CHANNEL
#define UART5_RX_DMA_CHANNEL NULL
#endif
#ifndef UART6_RX_DMA_CHANNEL
#define UART6_RX_DMA_CHANNEL NULL
#endif
#ifndef UART6_TX_DMA_CHANNEL
#define UART6_TX_DMA_CHANNEL NULL
#endif
#ifndef UART7_RX_DMA_CHANNEL
#define UART7_RX_DMA_CHANNEL NULL
#endif
#ifndef UART7_TX_DMA_CHANNEL
#define UART7_TX_DMA_CHANNEL NULL
#endif
#ifndef UART8_TX_DMA_CHANNEL
#define UART8_TX_DMA_CHANNEL NULL
#endif
Expand All @@ -92,7 +104,7 @@ const uartHardware_t uartHardware[UARTDEV_COUNT] = {
},
.txPins = {
{ DEFIO_TAG_E(PA9), GPIO_MUX_7 },
{ DEFIO_TAG_E(PA15), GPIO_MUX_7 },
{ DEFIO_TAG_E(PA15), GPIO_MUX_7 },
{ DEFIO_TAG_E(PB6), GPIO_MUX_7 },
},
.rcc = RCC_APB2(USART1),
Expand All @@ -117,14 +129,14 @@ const uartHardware_t uartHardware[UARTDEV_COUNT] = {
.txDMAResource = (dmaResource_t *)UART2_TX_DMA_CHANNEL,
#endif
.rxPins = {
{ DEFIO_TAG_E(PA3), GPIO_MUX_7 },
{ DEFIO_TAG_E(PA15), GPIO_MUX_8 },
{ DEFIO_TAG_E(PA3), GPIO_MUX_7 },
{ DEFIO_TAG_E(PA15), GPIO_MUX_8 },
{ DEFIO_TAG_E(PB0), GPIO_MUX_6 },
},
.txPins = {
{ DEFIO_TAG_E(PA2), GPIO_MUX_7 },
{ DEFIO_TAG_E(PA8), GPIO_MUX_8 },
{ DEFIO_TAG_E(PA14), GPIO_MUX_8 },
{ DEFIO_TAG_E(PA14), GPIO_MUX_8 },
},
.rcc = RCC_APB1(USART2),
.irqn = USART2_IRQn,
Expand All @@ -149,12 +161,12 @@ const uartHardware_t uartHardware[UARTDEV_COUNT] = {
#endif
.rxPins = {
{ DEFIO_TAG_E(PB11), GPIO_MUX_7 },
{ DEFIO_TAG_E(PC5 ), GPIO_MUX_7 },
{ DEFIO_TAG_E(PC5), GPIO_MUX_7 },
{ DEFIO_TAG_E(PC11), GPIO_MUX_7 },
},
.txPins = {
{ DEFIO_TAG_E(PB10), GPIO_MUX_7 },
{ DEFIO_TAG_E(PC4 ), GPIO_MUX_7 },
{ DEFIO_TAG_E(PC4), GPIO_MUX_7 },
{ DEFIO_TAG_E(PC10), GPIO_MUX_7 },
},
.rcc = RCC_APB1(USART3),
Expand All @@ -179,11 +191,11 @@ const uartHardware_t uartHardware[UARTDEV_COUNT] = {
.txDMAResource = (dmaResource_t *)UART4_TX_DMA_CHANNEL,
#endif
.rxPins = {
{ DEFIO_TAG_E(PA1), GPIO_MUX_8 },
{ DEFIO_TAG_E(PA1), GPIO_MUX_8 },
{ DEFIO_TAG_E(PC11), GPIO_MUX_8 },
},
.txPins = {
{ DEFIO_TAG_E(PA0), GPIO_MUX_8 },
{ DEFIO_TAG_E(PA0), GPIO_MUX_8 },
{ DEFIO_TAG_E(PC10), GPIO_MUX_8 },
},
.rcc = RCC_APB1(UART4),
Expand All @@ -208,16 +220,16 @@ const uartHardware_t uartHardware[UARTDEV_COUNT] = {
.txDMAResource = (dmaResource_t *)UART5_TX_DMA_CHANNEL,
#endif
.rxPins = {
{ DEFIO_TAG_E(PB5), GPIO_MUX_8 },
{ DEFIO_TAG_E(PB8), GPIO_MUX_8 },
{ DEFIO_TAG_E(PD2), GPIO_MUX_8 },
{ DEFIO_TAG_E(PB5), GPIO_MUX_8 },
{ DEFIO_TAG_E(PB8), GPIO_MUX_8 },
{ DEFIO_TAG_E(PD2), GPIO_MUX_8 },
{ DEFIO_TAG_E(PE11), GPIO_MUX_8 },
},
.txPins = {
{ DEFIO_TAG_E(PB6), GPIO_MUX_8 },
{ DEFIO_TAG_E(PB9), GPIO_MUX_8 },
{ DEFIO_TAG_E(PC12), GPIO_MUX_8 },
{ DEFIO_TAG_E(PE10), GPIO_MUX_8 },
{ DEFIO_TAG_E(PB6), GPIO_MUX_8 },
{ DEFIO_TAG_E(PB9), GPIO_MUX_8 },
{ DEFIO_TAG_E(PC12), GPIO_MUX_8 },
{ DEFIO_TAG_E(PE10), GPIO_MUX_8 },
},
.rcc = RCC_APB1(UART5),
.irqn = UART5_IRQn,
Expand All @@ -230,6 +242,72 @@ const uartHardware_t uartHardware[UARTDEV_COUNT] = {
},
#endif

#ifdef USE_UART6
{
.device = UARTDEV_6,
.reg = USART6,
#ifdef USE_DMA
.rxDMAMuxId = DMAMUX_DMAREQ_ID_USART6_RX,
.rxDMAResource = (dmaResource_t *)UART6_RX_DMA_CHANNEL,
.txDMAMuxId = DMAMUX_DMAREQ_ID_USART6_RX,
.txDMAResource = (dmaResource_t *)UART6_TX_DMA_CHANNEL,
#endif
.rxPins = {
{ DEFIO_TAG_E(PA5), GPIO_MUX_8 },
{ DEFIO_TAG_E(PA12), GPIO_MUX_8 },
{ DEFIO_TAG_E(PC7), GPIO_MUX_8 },
{ DEFIO_TAG_E(PG9), GPIO_MUX_8 },
},
.txPins = {
{ DEFIO_TAG_E(PA4), GPIO_MUX_8 },
{ DEFIO_TAG_E(PA11), GPIO_MUX_8 },
{ DEFIO_TAG_E(PC6), GPIO_MUX_8 },
{ DEFIO_TAG_E(PG4), GPIO_MUX_8 },
},
.rcc = RCC_APB2(USART6),
.irqn = USART6_IRQn,
.txPriority = NVIC_PRIO_SERIALUART6_TXDMA,
.rxPriority = NVIC_PRIO_SERIALUART6,
.txBuffer = uart6TxBuffer,
.rxBuffer = uart6RxBuffer,
.txBufferSize = sizeof(uart6TxBuffer),
.rxBufferSize = sizeof(uart6RxBuffer),
},
#endif

#ifdef USE_UART7
{
.device = UARTDEV_7,
.reg = UART7,
#ifdef USE_DMA
.rxDMAMuxId = DMAMUX_DMAREQ_ID_UART7_RX,
.rxDMAResource = (dmaResource_t *)UART7_RX_DMA_CHANNEL,
.txDMAMuxId = DMAMUX_DMAREQ_ID_UART7_TX,
.txDMAResource = (dmaResource_t *)UART7_TX_DMA_CHANNEL,
#endif
.rxPins = {
{ DEFIO_TAG_E(PB3), GPIO_MUX_8 },
{ DEFIO_TAG_E(PC0), GPIO_MUX_8 },
{ DEFIO_TAG_E(PE7), GPIO_MUX_8 },
{ DEFIO_TAG_E(PF6), GPIO_MUX_8 },
},
.txPins = {
{ DEFIO_TAG_E(PB4), GPIO_MUX_8 },
{ DEFIO_TAG_E(PC1), GPIO_MUX_8 },
{ DEFIO_TAG_E(PE8), GPIO_MUX_8 },
{ DEFIO_TAG_E(PF7), GPIO_MUX_8 },
},
.rcc = RCC_APB1(UART7),
.irqn = UART7_IRQn,
.txPriority = NVIC_PRIO_SERIALUART7_TXDMA,
.rxPriority = NVIC_PRIO_SERIALUART7,
.txBuffer = uart7TxBuffer,
.rxBuffer = uart7RxBuffer,
.txBufferSize = sizeof(uart7TxBuffer),
.rxBufferSize = sizeof(uart7RxBuffer),
},
#endif


#ifdef USE_UART8
{
Expand Down