diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-13 21:25:08 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-13 21:25:08 +0200 |
| commit | 5aea635a89c1a542c3874264b9369bb540e48c9e (patch) | |
| tree | 4424840c2966e16a4e96e033a692903f86889f2f /nuttx-configs/px4fmu-v1/nsh/defconfig | |
| parent | f20a9c48732b578acd7164ae5c513c657092ab91 (diff) | |
| parent | 178a3e8567b3e721771fffcb8f32df140ad1038b (diff) | |
| download | px4-firmware-5aea635a89c1a542c3874264b9369bb540e48c9e.tar.gz px4-firmware-5aea635a89c1a542c3874264b9369bb540e48c9e.tar.bz2 px4-firmware-5aea635a89c1a542c3874264b9369bb540e48c9e.zip | |
Merge remote-tracking branch 'upstream/master' into mtecs
Conflicts:
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
Diffstat (limited to 'nuttx-configs/px4fmu-v1/nsh/defconfig')
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index 127418f1f..c599b118f 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -504,8 +504,8 @@ CONFIG_MTD_BYTE_WRITE=y # # USART1 Configuration # -CONFIG_USART1_RXBUFSIZE=512 -CONFIG_USART1_TXBUFSIZE=512 +CONFIG_USART1_RXBUFSIZE=256 +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USART1_BAUD=57600 CONFIG_USART1_BITS=8 CONFIG_USART1_PARITY=0 @@ -528,8 +528,8 @@ CONFIG_USART2_OFLOWCONTROL=y # # UART5 Configuration # -CONFIG_UART5_RXBUFSIZE=512 -CONFIG_UART5_TXBUFSIZE=512 +CONFIG_UART5_RXBUFSIZE=256 +CONFIG_UART5_TXBUFSIZE=128 CONFIG_UART5_BAUD=57600 CONFIG_UART5_BITS=8 CONFIG_UART5_PARITY=0 @@ -540,8 +540,8 @@ CONFIG_UART5_2STOP=0 # # USART6 Configuration # -CONFIG_USART6_RXBUFSIZE=512 -CONFIG_USART6_TXBUFSIZE=512 +CONFIG_USART6_RXBUFSIZE=128 +CONFIG_USART6_TXBUFSIZE=64 CONFIG_USART6_BAUD=57600 CONFIG_USART6_BITS=8 CONFIG_USART6_PARITY=0 |