aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Greer <duncangreer@gmail.com>2013-05-21 19:18:59 +1000
committerDuncan Greer <duncangreer@gmail.com>2013-05-21 19:18:59 +1000
commit7469b9c7006fd2bd3f56416045d4d8a86b92a384 (patch)
treeb89e11f6358c4280b90ccb7fbd097e437ec5d174
parent2db1422fa7cb400f45eddfdae622c7f84c883acb (diff)
downloadpx4-firmware-7469b9c7006fd2bd3f56416045d4d8a86b92a384.tar.gz
px4-firmware-7469b9c7006fd2bd3f56416045d4d8a86b92a384.tar.bz2
px4-firmware-7469b9c7006fd2bd3f56416045d4d8a86b92a384.zip
Revert "enable usb console" - shouldn't be in pull request branch.
This reverts commit fdb897c3dd5561a1d9f22b35ec049e50d526d08b.
-rwxr-xr-xnuttx/configs/px4fmu/nsh/defconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/configs/px4fmu/nsh/defconfig b/nuttx/configs/px4fmu/nsh/defconfig
index 94d99112e..02e224302 100755
--- a/nuttx/configs/px4fmu/nsh/defconfig
+++ b/nuttx/configs/px4fmu/nsh/defconfig
@@ -248,7 +248,7 @@ CONFIG_SERIAL_TERMIOS=y
CONFIG_SERIAL_CONSOLE_REINIT=y
CONFIG_STANDARD_SERIAL=y
-CONFIG_USART1_SERIAL_CONSOLE=n
+CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART3_SERIAL_CONSOLE=n
CONFIG_UART4_SERIAL_CONSOLE=n
@@ -561,7 +561,7 @@ CONFIG_START_MONTH=1
CONFIG_START_DAY=1
CONFIG_GREGORIAN_TIME=n
CONFIG_JULIAN_TIME=n
-CONFIG_DEV_CONSOLE=n
+CONFIG_DEV_CONSOLE=y
CONFIG_DEV_LOWCONSOLE=n
CONFIG_MUTEX_TYPES=n
CONFIG_PRIORITY_INHERITANCE=y
@@ -925,7 +925,7 @@ CONFIG_USBDEV_TRACE_NRECORDS=512
# Size of the serial receive/transmit buffers. Default 256.
#
CONFIG_CDCACM=y
-CONFIG_CDCACM_CONSOLE=y
+CONFIG_CDCACM_CONSOLE=n
#CONFIG_CDCACM_EP0MAXPACKET
CONFIG_CDCACM_EPINTIN=1
#CONFIG_CDCACM_EPINTIN_FSSIZE