diff --git a/platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/defconfig index 381f802082..af94144b57 100644 --- a/platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/defconfig +++ b/platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/defconfig @@ -174,7 +174,7 @@ CONFIG_UART4_RXDMA=y # CONFIG_USART6_RS485 is not set CONFIG_USART6_RXDMA=y # CONFIG_UART7_RS485 is not set -CONFIG_UART7_RXDMA=y +# CONFIG_UART7_RXDMA is not set # CONFIG_UART8_RS485 is not set CONFIG_UART8_RXDMA=y CONFIG_SERIAL_DISABLE_REORDERING=y @@ -835,8 +835,8 @@ CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y # CONFIG_USART3_SERIAL_CONSOLE is not set # CONFIG_UART4_SERIAL_CONSOLE is not set # CONFIG_USART6_SERIAL_CONSOLE is not set -# CONFIG_UART7_SERIAL_CONSOLE is not set -CONFIG_UART8_SERIAL_CONSOLE=y +CONFIG_UART7_SERIAL_CONSOLE=y +# CONFIG_UART8_SERIAL_CONSOLE is not set # CONFIG_OTHER_SERIAL_CONSOLE is not set # CONFIG_NO_SERIAL_CONSOLE is not set diff --git a/src/drivers/boards/px4fmu-v5/board_config.h b/src/drivers/boards/px4fmu-v5/board_config.h index eb229c3e39..b5b8d5b653 100644 --- a/src/drivers/boards/px4fmu-v5/board_config.h +++ b/src/drivers/boards/px4fmu-v5/board_config.h @@ -56,15 +56,15 @@ /* PX4IO connection configuration */ #define BOARD_USES_PX4IO_VERSION 2 -#define PX4IO_SERIAL_DEVICE "/dev/ttyS5" -#define PX4IO_SERIAL_TX_GPIO GPIO_UART7_TX -#define PX4IO_SERIAL_RX_GPIO GPIO_UART7_RX -#define PX4IO_SERIAL_BASE STM32_UART7_BASE /* hardwired on the board */ +#define PX4IO_SERIAL_DEVICE "/dev/ttyS6" +#define PX4IO_SERIAL_TX_GPIO GPIO_UART8_TX +#define PX4IO_SERIAL_RX_GPIO GPIO_UART8_RX +#define PX4IO_SERIAL_BASE STM32_UART8_BASE /* hardwired on the board */ #define PX4IO_SERIAL_VECTOR STM32_IRQ_UART7 -#define PX4IO_SERIAL_TX_DMAMAP DMAMAP_UART7_TX -#define PX4IO_SERIAL_RX_DMAMAP DMAMAP_UART7_RX +#define PX4IO_SERIAL_TX_DMAMAP DMAMAP_UART8_TX +#define PX4IO_SERIAL_RX_DMAMAP DMAMAP_UART8_RX #define PX4IO_SERIAL_RCC_REG STM32_RCC_APB1ENR -#define PX4IO_SERIAL_RCC_EN RCC_APB1ENR_UART7EN +#define PX4IO_SERIAL_RCC_EN RCC_APB1ENR_UART8EN #define PX4IO_SERIAL_CLOCK STM32_PCLK1_FREQUENCY #define PX4IO_SERIAL_BITRATE 1500000 /* 1.5Mbps -> max rate for IO */