diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 07:31:37 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 07:31:37 +0100 |
| commit | 3c6ebdbf8fdc455b39563132bac8b547e7d960af (patch) | |
| tree | f81ccfcd68981906efd238dba5d2b045003481f1 /nuttx-configs/px4fmu-v2 | |
| parent | e9dca284d583197d5ec6abdedfdc98151a229ca9 (diff) | |
| parent | 38ae6bcc5fd5e9ab1a7304140ec6b36ff027625f (diff) | |
| download | px4-firmware-3c6ebdbf8fdc455b39563132bac8b547e7d960af.tar.gz px4-firmware-3c6ebdbf8fdc455b39563132bac8b547e7d960af.tar.bz2 px4-firmware-3c6ebdbf8fdc455b39563132bac8b547e7d960af.zip | |
merged master into nuttx_bringup
Diffstat (limited to 'nuttx-configs/px4fmu-v2')
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index 46ec079a4..87b02c77e 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -581,8 +581,13 @@ CONFIG_SCHED_LPWORKSTACKSIZE=4000 # # Stack and heap information # +<<<<<<< HEAD CONFIG_IDLETHREAD_STACKSIZE=6000 CONFIG_USERMAIN_STACKSIZE=4096 +======= +CONFIG_IDLETHREAD_STACKSIZE=3500 +CONFIG_USERMAIN_STACKSIZE=2600 +>>>>>>> 38ae6bcc5fd5e9ab1a7304140ec6b36ff027625f CONFIG_PTHREAD_STACK_MIN=512 CONFIG_PTHREAD_STACK_DEFAULT=2048 # CONFIG_LIB_SYSCALL is not set @@ -998,6 +1003,18 @@ CONFIG_ARCH_MEMCPY=y # # Non-standard Library Support # +<<<<<<< HEAD +======= +CONFIG_SCHED_WORKQUEUE=y +CONFIG_SCHED_HPWORK=y +CONFIG_SCHED_WORKPRIORITY=192 +CONFIG_SCHED_WORKPERIOD=5000 +CONFIG_SCHED_WORKSTACKSIZE=1800 +CONFIG_SCHED_LPWORK=y +CONFIG_SCHED_LPWORKPRIORITY=50 +CONFIG_SCHED_LPWORKPERIOD=50000 +CONFIG_SCHED_LPWORKSTACKSIZE=1800 +>>>>>>> 38ae6bcc5fd5e9ab1a7304140ec6b36ff027625f # CONFIG_LIB_KBDCODEC is not set # CONFIG_LIB_SLCDCODEC is not set |