From 74b6cc5bce13d8e5eb6d97d76c5f35910e44226c Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 3 Dec 2019 01:28:59 -0800 Subject: [PATCH] px4_fmu-v5:Use Serial TX DMA on Telem 2 --- boards/px4/fmu-v5/nuttx-config/include/board.h | 2 +- boards/px4/fmu-v5/nuttx-config/nsh/defconfig | 1 + boards/px4/fmu-v5/src/init.c | 3 ++- platforms/nuttx/NuttX/nuttx | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/boards/px4/fmu-v5/nuttx-config/include/board.h b/boards/px4/fmu-v5/nuttx-config/include/board.h index e2df082c8e..c41f2bef31 100644 --- a/boards/px4/fmu-v5/nuttx-config/include/board.h +++ b/boards/px4/fmu-v5/nuttx-config/include/board.h @@ -355,8 +355,8 @@ /* UART RX DMA configurations */ #define DMAMAP_USART1_RX DMAMAP_USART1_RX_2 +#define DMAMAP_USART3_TX DMAMAP_USART3_TX_1 #define DMAMAP_USART6_RX DMAMAP_USART6_RX_2 - /* CAN * * CAN1 is routed to transceiver. diff --git a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig index fd13b0029c..379f7dde8e 100644 --- a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig @@ -242,6 +242,7 @@ CONFIG_USART3_OFLOWCONTROL=y CONFIG_USART3_RXBUFSIZE=600 CONFIG_USART3_RXDMA=y CONFIG_USART3_TXBUFSIZE=3000 +CONFIG_USART3_TXDMA=y CONFIG_USART6_BAUD=57600 CONFIG_USART6_RXBUFSIZE=600 CONFIG_USART6_RXDMA=y diff --git a/boards/px4/fmu-v5/src/init.c b/boards/px4/fmu-v5/src/init.c index f23bfd6793..2278a988c5 100644 --- a/boards/px4/fmu-v5/src/init.c +++ b/boards/px4/fmu-v5/src/init.c @@ -236,6 +236,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) syslog(LOG_ERR, "[boot] DMA alloc FAILED\n"); } +#if defined(SERIAL_HAVE_RXDMA) /* set up the serial DMA polling */ static struct hrt_call serial_dma_call; @@ -252,7 +253,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) ts_to_abstime(&ts), (hrt_callout)stm32_serial_dma_poll, NULL); - +#endif /* initial LED state */ drv_led_start(); diff --git a/platforms/nuttx/NuttX/nuttx b/platforms/nuttx/NuttX/nuttx index 398a59aaa4..2e55ce8ec9 160000 --- a/platforms/nuttx/NuttX/nuttx +++ b/platforms/nuttx/NuttX/nuttx @@ -1 +1 @@ -Subproject commit 398a59aaa4df2b32af2fdc1e3dd566f88d7eea38 +Subproject commit 2e55ce8ec97d37b3d3c46b1aaab0a09364fcf254