diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-20 16:26:15 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-20 16:26:15 +0200 |
| commit | 2a58929ffde494ba7db0bd09178545d5d650b420 (patch) | |
| tree | ccd9f8c3d5fa26ef06d8838250ee6465cdfa571a /nuttx-configs | |
| parent | 230c09e2f44e0bcf8613815e2f771b4dffe8b042 (diff) | |
| parent | b7cc1c880f94138655696d7bd4a526fc218a4242 (diff) | |
| download | px4-firmware-2a58929ffde494ba7db0bd09178545d5d650b420.tar.gz px4-firmware-2a58929ffde494ba7db0bd09178545d5d650b420.tar.bz2 px4-firmware-2a58929ffde494ba7db0bd09178545d5d650b420.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup
Diffstat (limited to 'nuttx-configs')
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index 861d59b4b..a7a6725c6 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -268,7 +268,7 @@ CONFIG_USART2_RXDMA=y # CONFIG_USART3_RXDMA is not set # CONFIG_UART4_RXDMA is not set # CONFIG_UART5_RS485 is not set -CONFIG_UART5_RXDMA=n +CONFIG_UART5_RXDMA=y # CONFIG_USART6_RS485 is not set CONFIG_USART6_RXDMA=y # CONFIG_USART7_RXDMA is not set |