diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-08 11:38:00 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-08 11:38:00 +0400 |
| commit | 320624e995d46d80db0d219d9c61af08e1b8cadf (patch) | |
| tree | 6c41aa76675cab6c8ef6a668ee4505f913bff44e /nuttx-configs/px4fmu-v2 | |
| parent | 39b1f7244ce06ff89492ad6843c5fc74a30dfe67 (diff) | |
| parent | cf9fa61a39f83e6fe4611ecf9336c1fcd1faaa78 (diff) | |
| download | px4-firmware-320624e995d46d80db0d219d9c61af08e1b8cadf.tar.gz px4-firmware-320624e995d46d80db0d219d9c61af08e1b8cadf.tar.bz2 px4-firmware-320624e995d46d80db0d219d9c61af08e1b8cadf.zip | |
Merge branch 'master' into beta_mavlink2
Diffstat (limited to 'nuttx-configs/px4fmu-v2')
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index 0fceb2043..9c75e6c59 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -306,7 +306,7 @@ CONFIG_UART5_RXDMA=y # CONFIG_USART6_RS485 is not set CONFIG_USART6_RXDMA=y # CONFIG_UART7_RS485 is not set -# CONFIG_UART7_RXDMA is not set +CONFIG_UART7_RXDMA=y # CONFIG_UART8_RS485 is not set CONFIG_UART8_RXDMA=y CONFIG_SERIAL_DISABLE_REORDERING=y @@ -539,8 +539,8 @@ CONFIG_SERIAL_NPOLLWAITERS=2 # 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_NO_SERIAL_CONSOLE is not set # |