diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-22 09:25:13 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-22 09:25:13 +0200 |
commit | cfa9054aa4e6accae1fefaad1a13316301ce56fc (patch) | |
tree | f5584368070b39950740166a44a97ec66f980ae6 /nuttx-configs/px4fmu-v1/nsh | |
parent | 3005c8aae0ed0c74d2d611712d9e7d659f4ed453 (diff) | |
download | px4-firmware-cfa9054aa4e6accae1fefaad1a13316301ce56fc.tar.gz px4-firmware-cfa9054aa4e6accae1fefaad1a13316301ce56fc.tar.bz2 px4-firmware-cfa9054aa4e6accae1fefaad1a13316301ce56fc.zip |
Moved to USART1 for the main console, starting a 2nd NSH instance on USB if needed, reworked start scripts to not fall over
Diffstat (limited to 'nuttx-configs/px4fmu-v1/nsh')
-rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index a7a6725c6..412a29fbe 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -368,7 +368,7 @@ CONFIG_TASK_NAME_SIZE=24 CONFIG_START_YEAR=1970 CONFIG_START_MONTH=1 CONFIG_START_DAY=1 -# CONFIG_DEV_CONSOLE is not set +CONFIG_DEV_CONSOLE=y # CONFIG_MUTEX_TYPES is not set CONFIG_PRIORITY_INHERITANCE=y CONFIG_SEM_PREALLOCHOLDERS=0 @@ -476,11 +476,11 @@ CONFIG_ARCH_HAVE_USART6=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 -# CONFIG_USART1_SERIAL_CONSOLE is not set +CONFIG_USART1_SERIAL_CONSOLE=y # CONFIG_USART2_SERIAL_CONSOLE is not set # CONFIG_UART5_SERIAL_CONSOLE is not set # CONFIG_USART6_SERIAL_CONSOLE is not set -CONFIG_NO_SERIAL_CONSOLE=y +# CONFIG_NO_SERIAL_CONSOLE is not set # # USART1 Configuration @@ -550,7 +550,7 @@ CONFIG_USBDEV_MAXPOWER=500 # CONFIG_USBDEV_COMPOSITE is not set # CONFIG_PL2303 is not set CONFIG_CDCACM=y -CONFIG_CDCACM_CONSOLE=y +CONFIG_CDCACM_CONSOLE=n CONFIG_CDCACM_EP0MAXPACKET=64 CONFIG_CDCACM_EPINTIN=1 CONFIG_CDCACM_EPINTIN_FSSIZE=64 |