yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

FMUv5: Swap debug and PX4 IO serial ports to avoid DMA channel resource overlap

Browse Source 
This is necessary to be able to use DMA on the IO link. We free one channel by disabling DMA entirely on the debug console.
This commit is contained in:
Lorenz Meier
2018-02-27 16:56:58 +01:00
parent f0a8569c93
commit 8c28591f2d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/defconfig
View File

@@ -174,7 +174,7 @@ CONFIG_UART4_RXDMA=y
# CONFIG_USART6_RS485 is not set # CONFIG_USART6_RS485 is not set
CONFIG_USART6_RXDMA=y CONFIG_USART6_RXDMA=y
# CONFIG_UART7_RS485 is not set # CONFIG_UART7_RS485 is not set
CONFIG_UART7_RXDMA=y # CONFIG_UART7_RXDMA is not set
# CONFIG_UART8_RS485 is not set # CONFIG_UART8_RS485 is not set
CONFIG_UART8_RXDMA=y CONFIG_UART8_RXDMA=y
CONFIG_SERIAL_DISABLE_REORDERING=y CONFIG_SERIAL_DISABLE_REORDERING=y
@@ -835,8 +835,8 @@ CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
# CONFIG_USART3_SERIAL_CONSOLE is not set # CONFIG_USART3_SERIAL_CONSOLE is not set
# CONFIG_UART4_SERIAL_CONSOLE is not set # CONFIG_UART4_SERIAL_CONSOLE is not set
# CONFIG_USART6_SERIAL_CONSOLE is not set # CONFIG_USART6_SERIAL_CONSOLE is not set
# CONFIG_UART7_SERIAL_CONSOLE is not set CONFIG_UART7_SERIAL_CONSOLE=y
CONFIG_UART8_SERIAL_CONSOLE=y # CONFIG_UART8_SERIAL_CONSOLE is not set
# CONFIG_OTHER_SERIAL_CONSOLE is not set # CONFIG_OTHER_SERIAL_CONSOLE is not set
# CONFIG_NO_SERIAL_CONSOLE is not set # CONFIG_NO_SERIAL_CONSOLE is not set

14
src/drivers/boards/px4fmu-v5/board_config.h
View File

@@ -56,15 +56,15 @@
/* PX4IO connection configuration */ /* PX4IO connection configuration */
#define BOARD_USES_PX4IO_VERSION 2 #define BOARD_USES_PX4IO_VERSION 2
#define PX4IO_SERIAL_DEVICE "/dev/ttyS5" #define PX4IO_SERIAL_DEVICE "/dev/ttyS6"
#define PX4IO_SERIAL_TX_GPIO GPIO_UART7_TX #define PX4IO_SERIAL_TX_GPIO GPIO_UART8_TX
#define PX4IO_SERIAL_RX_GPIO GPIO_UART7_RX #define PX4IO_SERIAL_RX_GPIO GPIO_UART8_RX
#define PX4IO_SERIAL_BASE STM32_UART7_BASE /* hardwired on the board */ #define PX4IO_SERIAL_BASE STM32_UART8_BASE /* hardwired on the board */
#define PX4IO_SERIAL_VECTOR STM32_IRQ_UART7 #define PX4IO_SERIAL_VECTOR STM32_IRQ_UART7
#define PX4IO_SERIAL_TX_DMAMAP DMAMAP_UART7_TX #define PX4IO_SERIAL_TX_DMAMAP DMAMAP_UART8_TX
#define PX4IO_SERIAL_RX_DMAMAP DMAMAP_UART7_RX #define PX4IO_SERIAL_RX_DMAMAP DMAMAP_UART8_RX
#define PX4IO_SERIAL_RCC_REG STM32_RCC_APB1ENR #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_CLOCK STM32_PCLK1_FREQUENCY
#define PX4IO_SERIAL_BITRATE 1500000 /* 1.5Mbps -> max rate for IO */ #define PX4IO_SERIAL_BITRATE 1500000 /* 1.5Mbps -> max rate for IO */