diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-12 22:11:22 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-12 22:11:22 +0200 |
| commit | 5efba7dca45867b028a01326934ea968ee908836 (patch) | |
| tree | 2ca5468d292ca2cec79e386d889c9be881b1dde7 | |
| parent | 7bf0e6f3e26ee9e10073293677563f6862758557 (diff) | |
| parent | 1ecd52494ce0125171e1b692234d5a5efdab761d (diff) | |
| download | px4-firmware-5efba7dca45867b028a01326934ea968ee908836.tar.gz px4-firmware-5efba7dca45867b028a01326934ea968ee908836.tar.bz2 px4-firmware-5efba7dca45867b028a01326934ea968ee908836.zip | |
Merge branch 'master' of github.com:PX4/Firmware into airspeed_test_fix
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 6 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index f2c7d22bf..a651faffa 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -417,8 +417,8 @@ CONFIG_PREALLOC_TIMERS=50 # # Stack and heap information # -CONFIG_IDLETHREAD_STACKSIZE=4096 -CONFIG_USERMAIN_STACKSIZE=3500 +CONFIG_IDLETHREAD_STACKSIZE=3500 +CONFIG_USERMAIN_STACKSIZE=3000 CONFIG_PTHREAD_STACK_MIN=512 CONFIG_PTHREAD_STACK_DEFAULT=2048 @@ -679,7 +679,7 @@ CONFIG_BUILTIN=y # # Standard C Library Options # -CONFIG_STDIO_BUFFER_SIZE=256 +CONFIG_STDIO_BUFFER_SIZE=180 CONFIG_STDIO_LINEBUFFER=y CONFIG_NUNGET_CHARS=2 CONFIG_LIB_HOMEDIR="/" diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index 7d5e6e9df..a55c95a29 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -451,8 +451,8 @@ CONFIG_PREALLOC_TIMERS=50 # # Stack and heap information # -CONFIG_IDLETHREAD_STACKSIZE=6000 -CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_IDLETHREAD_STACKSIZE=3500 +CONFIG_USERMAIN_STACKSIZE=3000 CONFIG_PTHREAD_STACK_MIN=512 CONFIG_PTHREAD_STACK_DEFAULT=2048 |