From 9686c81f7d089a486a8d0546f5df00609035fdbf Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Thu, 2 Dec 2021 09:12:36 -0500 Subject: [PATCH] boards: enable flow control on CDCACM This enables flow control on CDCACM for the NuttX boards which fixes a problem where HITL would stall. The stall could happen if the hardware would be a bit too slow in keeping up with the incoming messages. Often, this happened on arming because the logger would take some time to log all parameters right at the beginning. The stall would then not recover due to NuttX bug where the rx interrupt would not be restored correctly and instead only a slower watchdog would release the next read. This watchdog takes 200ms which means it's hard to impossible to get out of the situation without restarting sim and/or PX4. For more information about the issue, see: apache/incubator-nuttx#3633 As a workaround, until that bug is fixed, and because it makes sense anyway, I propose to enable FLOWCONTROL for the serial via USB. --- boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig | 1 + boards/atl/mantis-edu/nuttx-config/nsh/defconfig | 1 + boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig | 1 + boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig | 1 + boards/cuav/nora/nuttx-config/bootloader/defconfig | 1 + boards/cuav/nora/nuttx-config/nsh/defconfig | 1 + boards/cuav/x7pro/nuttx-config/bootloader/defconfig | 1 + boards/cuav/x7pro/nuttx-config/nsh/defconfig | 1 + boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig | 1 + boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig | 1 + boards/cubepilot/cubeorange/nuttx-config/test/defconfig | 1 + boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig | 1 + boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig | 1 + boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig | 1 + boards/holybro/durandal-v1/nuttx-config/nsh/defconfig | 1 + boards/holybro/kakutef7/nuttx-config/nsh/defconfig | 1 + boards/holybro/pix32v5/nuttx-config/nsh/defconfig | 1 + boards/matek/h743-slim/nuttx-config/bootloader/defconfig | 1 + boards/matek/h743-slim/nuttx-config/nsh/defconfig | 1 + boards/modalai/fc-v1/nuttx-config/nsh/defconfig | 1 + boards/modalai/fc-v2/nuttx-config/bootloader/defconfig | 1 + boards/modalai/fc-v2/nuttx-config/nsh/defconfig | 1 + boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig | 1 + boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig | 1 + boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig | 1 + boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig | 1 + boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig | 1 + boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig | 1 + boards/mro/pixracerpro/nuttx-config/bootloader/defconfig | 1 + boards/mro/pixracerpro/nuttx-config/nsh/defconfig | 1 + boards/mro/x21-777/nuttx-config/nsh/defconfig | 1 + boards/mro/x21/nuttx-config/nsh/defconfig | 1 + boards/omnibus/f4sd/nuttx-config/nsh/defconfig | 1 + boards/px4/fmu-v2/nuttx-config/nsh/defconfig | 1 + boards/px4/fmu-v3/nuttx-config/nsh/defconfig | 1 + boards/px4/fmu-v4/nuttx-config/nsh/defconfig | 1 + boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig | 1 + boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig | 1 + boards/px4/fmu-v5/nuttx-config/debug/defconfig | 1 + boards/px4/fmu-v5/nuttx-config/nsh/defconfig | 1 + boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig | 1 + boards/px4/fmu-v5/nuttx-config/uavcanv1/defconfig | 1 + boards/px4/fmu-v5x/nuttx-config/nsh/defconfig | 1 + boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig | 1 + boards/px4/fmu-v6u/nuttx-config/nsh/defconfig | 1 + boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig | 1 + boards/px4/fmu-v6x/nuttx-config/nsh/defconfig | 1 + boards/spracing/h7extreme/nuttx-config/nsh/defconfig | 1 + boards/uvify/core/nuttx-config/nsh/defconfig | 1 + src/modules/mavlink/mavlink_main.cpp | 3 +-- 50 files changed, 50 insertions(+), 2 deletions(-) diff --git a/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig b/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig index 336b948287..4802f6fe06 100644 --- a/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig +++ b/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig @@ -42,6 +42,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0030 CONFIG_CDCACM_PRODUCTSTR="MindPX FMU v2.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/atl/mantis-edu/nuttx-config/nsh/defconfig b/boards/atl/mantis-edu/nuttx-config/nsh/defconfig index 608638b092..ad6c7671cf 100644 --- a/boards/atl/mantis-edu/nuttx-config/nsh/defconfig +++ b/boards/atl/mantis-edu/nuttx-config/nsh/defconfig @@ -47,6 +47,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0061 CONFIG_CDCACM_PRODUCTSTR="PX4 ATL Mantis-EDU" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig b/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig index 750756e3bc..f3465a41b9 100644 --- a/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig +++ b/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig @@ -42,6 +42,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0016 CONFIG_CDCACM_PRODUCTSTR="PX4 Crazyflie v2.0" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig b/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig index e2fd5b722b..3202fd8125 100644 --- a/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig +++ b/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig @@ -41,6 +41,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0016 CONFIG_CDCACM_PRODUCTSTR="PX4 Crazyflie v2.0" CONFIG_CDCACM_RXBUFSIZE=300 diff --git a/boards/cuav/nora/nuttx-config/bootloader/defconfig b/boards/cuav/nora/nuttx-config/bootloader/defconfig index 00490f1c63..9ea14fb7c9 100644 --- a/boards/cuav/nora/nuttx-config/bootloader/defconfig +++ b/boards/cuav/nora/nuttx-config/bootloader/defconfig @@ -29,6 +29,7 @@ CONFIG_BOARD_LOOPSPERMSEC=22114 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x004c CONFIG_CDCACM_PRODUCTSTR="PX4 BL CUAV Nora" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/cuav/nora/nuttx-config/nsh/defconfig b/boards/cuav/nora/nuttx-config/nsh/defconfig index fc60b479f1..202c77ee81 100644 --- a/boards/cuav/nora/nuttx-config/nsh/defconfig +++ b/boards/cuav/nora/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x004c CONFIG_CDCACM_PRODUCTSTR="PX4 CUAV Nora" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/cuav/x7pro/nuttx-config/bootloader/defconfig b/boards/cuav/x7pro/nuttx-config/bootloader/defconfig index a5b4203ff7..56d0a0be58 100644 --- a/boards/cuav/x7pro/nuttx-config/bootloader/defconfig +++ b/boards/cuav/x7pro/nuttx-config/bootloader/defconfig @@ -29,6 +29,7 @@ CONFIG_BOARD_LOOPSPERMSEC=22114 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x004c CONFIG_CDCACM_PRODUCTSTR="PX4 BL CUAV X7Pro" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/cuav/x7pro/nuttx-config/nsh/defconfig b/boards/cuav/x7pro/nuttx-config/nsh/defconfig index 05aacde2d9..720cfbf338 100644 --- a/boards/cuav/x7pro/nuttx-config/nsh/defconfig +++ b/boards/cuav/x7pro/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x004c CONFIG_CDCACM_PRODUCTSTR="PX4 CUAV X7Pro" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig b/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig index 923ca26681..0975c4e372 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig +++ b/boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig @@ -29,6 +29,7 @@ CONFIG_BOARD_LOOPSPERMSEC=79954 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x1016 CONFIG_CDCACM_PRODUCTSTR="PX4 BL CubePilot CubeOrange" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig index ac2df7b3eb..4e0386b66f 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig +++ b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig @@ -47,6 +47,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x1016 CONFIG_CDCACM_PRODUCTSTR="CubeOrange" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/cubepilot/cubeorange/nuttx-config/test/defconfig b/boards/cubepilot/cubeorange/nuttx-config/test/defconfig index 7bea4b2425..6470c318c1 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/test/defconfig +++ b/boards/cubepilot/cubeorange/nuttx-config/test/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x1016 CONFIG_CDCACM_PRODUCTSTR="CubeOrange" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig b/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig index 4a0086dd8f..fc10b672d1 100644 --- a/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig +++ b/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig @@ -48,6 +48,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x1012 CONFIG_CDCACM_PRODUCTSTR="CubeYellow" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig b/boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig index 2eca42ecc0..e7308f37ce 100644 --- a/boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig +++ b/boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig @@ -41,6 +41,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0016 CONFIG_CDCACM_PRODUCTSTR="PX4 FreeFly RTK GPS" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig b/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig index 65ff26e9ed..fa77567d82 100644 --- a/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig +++ b/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig @@ -29,6 +29,7 @@ CONFIG_BOARD_LOOPSPERMSEC=22114 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x004b CONFIG_CDCACM_PRODUCTSTR="PX4 BL Holybro Durandal Vx" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig b/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig index c9f992435e..91c4d68bf0 100644 --- a/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig +++ b/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x004b CONFIG_CDCACM_PRODUCTSTR="PX4 DurandalV1" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/holybro/kakutef7/nuttx-config/nsh/defconfig b/boards/holybro/kakutef7/nuttx-config/nsh/defconfig index eb34b3c77b..650c4b06a6 100644 --- a/boards/holybro/kakutef7/nuttx-config/nsh/defconfig +++ b/boards/holybro/kakutef7/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0016 CONFIG_CDCACM_PRODUCTSTR="PX4 KakuteF7" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/holybro/pix32v5/nuttx-config/nsh/defconfig b/boards/holybro/pix32v5/nuttx-config/nsh/defconfig index 0202d952da..53ccb262d1 100644 --- a/boards/holybro/pix32v5/nuttx-config/nsh/defconfig +++ b/boards/holybro/pix32v5/nuttx-config/nsh/defconfig @@ -47,6 +47,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x004E CONFIG_CDCACM_PRODUCTSTR="PX4 PIX32V5" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/matek/h743-slim/nuttx-config/bootloader/defconfig b/boards/matek/h743-slim/nuttx-config/bootloader/defconfig index ae0dd4e10d..2bb3fd8f67 100644 --- a/boards/matek/h743-slim/nuttx-config/bootloader/defconfig +++ b/boards/matek/h743-slim/nuttx-config/bootloader/defconfig @@ -29,6 +29,7 @@ CONFIG_BOARD_LOOPSPERMSEC=22114 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x004b CONFIG_CDCACM_PRODUCTSTR="Matek H743-slim" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/matek/h743-slim/nuttx-config/nsh/defconfig b/boards/matek/h743-slim/nuttx-config/nsh/defconfig index 21daee1921..a3d9dc548a 100644 --- a/boards/matek/h743-slim/nuttx-config/nsh/defconfig +++ b/boards/matek/h743-slim/nuttx-config/nsh/defconfig @@ -45,6 +45,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0036 CONFIG_CDCACM_PRODUCTSTR="MatekH743-slim" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/modalai/fc-v1/nuttx-config/nsh/defconfig b/boards/modalai/fc-v1/nuttx-config/nsh/defconfig index 72b6e7cf6c..08fa2bfede 100644 --- a/boards/modalai/fc-v1/nuttx-config/nsh/defconfig +++ b/boards/modalai/fc-v1/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0xa32f CONFIG_CDCACM_PRODUCTSTR="PX4 FMU ModalAI FCv1" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/modalai/fc-v2/nuttx-config/bootloader/defconfig b/boards/modalai/fc-v2/nuttx-config/bootloader/defconfig index c73b8df7d0..4d847c2713 100644 --- a/boards/modalai/fc-v2/nuttx-config/bootloader/defconfig +++ b/boards/modalai/fc-v2/nuttx-config/bootloader/defconfig @@ -29,6 +29,7 @@ CONFIG_BOARD_LOOPSPERMSEC=95150 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0xa330 CONFIG_CDCACM_PRODUCTSTR="PX4 BL ModalAI FCv2" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/modalai/fc-v2/nuttx-config/nsh/defconfig b/boards/modalai/fc-v2/nuttx-config/nsh/defconfig index 7c535f99c6..8fb5ab7319 100644 --- a/boards/modalai/fc-v2/nuttx-config/nsh/defconfig +++ b/boards/modalai/fc-v2/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0xa330 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU ModalAI FCv2" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig index efed7322aa..0a02d7744a 100644 --- a/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x008D CONFIG_CDCACM_PRODUCTSTR="mRoControlZeroF7" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig index 557217caff..e405469a91 100644 --- a/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x008D CONFIG_CDCACM_PRODUCTSTR="mRoControlZeroF7" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig b/boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig index 164dcd2307..cfe8f205bd 100644 --- a/boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig +++ b/boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig @@ -29,6 +29,7 @@ CONFIG_BOARD_LOOPSPERMSEC=95150 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x1023 CONFIG_CDCACM_PRODUCTSTR="PX4 BL mRo ControlZeroH7 OEM" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig index b316da8b5f..5785698b27 100644 --- a/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x1024 CONFIG_CDCACM_PRODUCTSTR="mRoControlZeroH7 OEM" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig b/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig index 6f9bd3dd4e..bea411e71f 100644 --- a/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig +++ b/boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig @@ -29,6 +29,7 @@ CONFIG_BOARD_LOOPSPERMSEC=95150 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x1023 CONFIG_CDCACM_PRODUCTSTR="PX4 BL mRo ControlZeroH7" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig index e2da0cb10c..b7a87538ea 100644 --- a/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x1023 CONFIG_CDCACM_PRODUCTSTR="mRoControlZeroH7" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig b/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig index cb6c7300ac..0f4a2da8fc 100644 --- a/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig +++ b/boards/mro/pixracerpro/nuttx-config/bootloader/defconfig @@ -29,6 +29,7 @@ CONFIG_BOARD_LOOPSPERMSEC=95150 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x1017 CONFIG_CDCACM_PRODUCTSTR="PX4 BL mRo Pixracer Pro" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/mro/pixracerpro/nuttx-config/nsh/defconfig b/boards/mro/pixracerpro/nuttx-config/nsh/defconfig index bcdea89e75..d72f637f37 100644 --- a/boards/mro/pixracerpro/nuttx-config/nsh/defconfig +++ b/boards/mro/pixracerpro/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x1017 CONFIG_CDCACM_PRODUCTSTR="mRoPixracerPro" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/mro/x21-777/nuttx-config/nsh/defconfig b/boards/mro/x21-777/nuttx-config/nsh/defconfig index 4f0f7efbd6..6bb38344cd 100644 --- a/boards/mro/x21-777/nuttx-config/nsh/defconfig +++ b/boards/mro/x21-777/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0088 CONFIG_CDCACM_PRODUCTSTR="mRo x2.1-777" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/mro/x21/nuttx-config/nsh/defconfig b/boards/mro/x21/nuttx-config/nsh/defconfig index a9c1382680..e09d3dbb50 100644 --- a/boards/mro/x21/nuttx-config/nsh/defconfig +++ b/boards/mro/x21/nuttx-config/nsh/defconfig @@ -43,6 +43,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0021 CONFIG_CDCACM_PRODUCTSTR="PX4 AUAV X2.1" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/omnibus/f4sd/nuttx-config/nsh/defconfig b/boards/omnibus/f4sd/nuttx-config/nsh/defconfig index 7716fdb8ea..2b87fb28bf 100644 --- a/boards/omnibus/f4sd/nuttx-config/nsh/defconfig +++ b/boards/omnibus/f4sd/nuttx-config/nsh/defconfig @@ -30,6 +30,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0001 CONFIG_CDCACM_PRODUCTSTR="PX4 OmnibusF4SD" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v2/nuttx-config/nsh/defconfig b/boards/px4/fmu-v2/nuttx-config/nsh/defconfig index 6b7d75eaf4..b3144a3820 100644 --- a/boards/px4/fmu-v2/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v2/nuttx-config/nsh/defconfig @@ -42,6 +42,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0011 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v2.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig b/boards/px4/fmu-v3/nuttx-config/nsh/defconfig index 4dd677c4ca..fb85646a8d 100644 --- a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v3/nuttx-config/nsh/defconfig @@ -43,6 +43,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0011 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v2.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v4/nuttx-config/nsh/defconfig b/boards/px4/fmu-v4/nuttx-config/nsh/defconfig index 8c8a944762..83df59eb0d 100644 --- a/boards/px4/fmu-v4/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v4/nuttx-config/nsh/defconfig @@ -43,6 +43,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0012 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v4.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig b/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig index 05a78ab94c..4060a6289e 100644 --- a/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig @@ -43,6 +43,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0013 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v4.x PRO" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig b/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig index b0e401d913..6eee24ce91 100644 --- a/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig @@ -47,6 +47,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0032 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v5.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v5/nuttx-config/debug/defconfig b/boards/px4/fmu-v5/nuttx-config/debug/defconfig index 103a4a7674..c65e8aa889 100644 --- a/boards/px4/fmu-v5/nuttx-config/debug/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/debug/defconfig @@ -48,6 +48,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0032 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v5.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig index dbd5f96d6e..db355479ff 100644 --- a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig @@ -47,6 +47,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0032 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v5.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig b/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig index 815b5c27da..1c596f2339 100644 --- a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig @@ -48,6 +48,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0032 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v5.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v5/nuttx-config/uavcanv1/defconfig b/boards/px4/fmu-v5/nuttx-config/uavcanv1/defconfig index 74b6bfc547..b54593dbe7 100644 --- a/boards/px4/fmu-v5/nuttx-config/uavcanv1/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/uavcanv1/defconfig @@ -49,6 +49,7 @@ CONFIG_C99_BOOL8=y CONFIG_CAN_EXTID=y CONFIG_CAN_FIFOSIZE=32 CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0032 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v5.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig index b4da22205e..a78f32bde6 100644 --- a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0033 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v5X.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig b/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig index 2eb2c66c62..17da3161c3 100644 --- a/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig +++ b/boards/px4/fmu-v6u/nuttx-config/bootloader/defconfig @@ -29,6 +29,7 @@ CONFIG_BOARD_LOOPSPERMSEC=95150 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0036 CONFIG_CDCACM_PRODUCTSTR="PX4 BL FMU v6U.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig b/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig index 1ad42f450a..5d9bd478a8 100644 --- a/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0036 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v6U.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig b/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig index b591af999d..98401d82f4 100644 --- a/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig +++ b/boards/px4/fmu-v6x/nuttx-config/bootloader/defconfig @@ -29,6 +29,7 @@ CONFIG_BOARD_LOOPSPERMSEC=95150 CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0035 CONFIG_CDCACM_PRODUCTSTR="PX4 BL FMU v6X.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig b/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig index 46017d08da..e7460884bd 100644 --- a/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig @@ -46,6 +46,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0035 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v6X.x" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/spracing/h7extreme/nuttx-config/nsh/defconfig b/boards/spracing/h7extreme/nuttx-config/nsh/defconfig index 4b132f88a3..6143e72a5e 100644 --- a/boards/spracing/h7extreme/nuttx-config/nsh/defconfig +++ b/boards/spracing/h7extreme/nuttx-config/nsh/defconfig @@ -47,6 +47,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x004b CONFIG_CDCACM_PRODUCTSTR="PX4 SP RACING H7 EXTREME" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/boards/uvify/core/nuttx-config/nsh/defconfig b/boards/uvify/core/nuttx-config/nsh/defconfig index e071503475..dc6761f43c 100644 --- a/boards/uvify/core/nuttx-config/nsh/defconfig +++ b/boards/uvify/core/nuttx-config/nsh/defconfig @@ -42,6 +42,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CDCACM=y +CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0012 CONFIG_CDCACM_PRODUCTSTR="PX4 FMU UVify Core" CONFIG_CDCACM_RXBUFSIZE=600 diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 495676ca53..c16658c208 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -2071,7 +2071,7 @@ Mavlink::task_main(int argc, char *argv[]) /* USB serial is indicated by /dev/ttyACMx */ if (strncmp(_device_name, "/dev/ttyACM", 11) == 0) { if (_datarate == 0) { - _datarate = 800000; + _datarate = 100000; } /* USB has no baudrate, but use a magic number for 'fast' */ @@ -2083,7 +2083,6 @@ Mavlink::task_main(int argc, char *argv[]) _ftp_on = true; _is_usb_uart = true; - _flow_control_mode = FLOW_CONTROL_OFF; set_telemetry_status_type(telemetry_status_s::LINK_TYPE_USB); }