Merged David Sidranes WIP

4 files changed, 49 insertions, 15 deletions

diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig
index 615c8273b..e44e19a36 100644
--- a/nuttx-configs/aerocore/nsh/defconfig
+++ b/nuttx-configs/aerocore/nsh/defconfig
@@ -292,6 +292,7 @@ CONFIG_STM32_USART_SINGLEWIRE=y
 # CONFIG_STM32_I2C_DYNTIMEO is not set
 CONFIG_STM32_I2CTIMEOSEC=0
 CONFIG_STM32_I2CTIMEOMS=10
+CONFIG_STM32_I2CTIMEOTICKS=10
 # CONFIG_STM32_I2C_DUTY16_9 is not set
 
 #
@@ -465,6 +466,8 @@ CONFIG_MTD_BYTE_WRITE=y
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_SMART is not set
 CONFIG_MTD_RAMTRON=y
+CONFIG_RAMTRON_WRITEWAIT=y
+CONFIG_RAMTRON_SETSPEED=y
 CONFIG_RAMTRON_FUJITSU=y
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST39FV is not set
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig
index e8b1c468c..93018cb06 100644
--- a/nuttx-configs/px4fmu-v1/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v1/nsh/defconfig
@@ -321,6 +321,7 @@ CONFIG_USART6_RXDMA=y
 # CONFIG_USART7_RXDMA is not set
 # CONFIG_USART8_RXDMA is not set
 CONFIG_SERIAL_DISABLE_REORDERING=y
+CONFIG_STM32_FLOWCONTROL_BROKEN=y
 CONFIG_STM32_USART_SINGLEWIRE=y
 
 #
@@ -335,6 +336,7 @@ CONFIG_STM32_USART_SINGLEWIRE=y
 # CONFIG_STM32_I2C_DYNTIMEO is not set
 CONFIG_STM32_I2CTIMEOSEC=0
 CONFIG_STM32_I2CTIMEOMS=10
+CONFIG_STM32_I2CTIMEOTICKS=10
 # CONFIG_STM32_I2C_DUTY16_9 is not set
 
 #
@@ -544,6 +546,8 @@ CONFIG_MTD_BYTE_WRITE=y
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
+CONFIG_RAMTRON_WRITEWAIT=y
+CONFIG_RAMTRON_SETSPEED=y
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
@@ -597,6 +601,9 @@ CONFIG_USART6_2STOP=0
 # CONFIG_USART6_OFLOWCONTROL is not set
 CONFIG_SERIAL_IFLOWCONTROL=y
 CONFIG_SERIAL_OFLOWCONTROL=y
+CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS=y
+CONFIG_SERIAL_IFLOWCONTROL_LOWER_WATERMARK=10
+CONFIG_SERIAL_IFLOWCONTROL_UPPER_WATERMARK=90
 CONFIG_USBDEV=y
 
 #
@@ -746,7 +753,6 @@ CONFIG_STDIO_BUFFER_SIZE=180
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
 CONFIG_LIB_HOMEDIR="/"
-CONFIG_LIBM=y
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIB_RAND_ORDER=1
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig
index ee1f97798..cbb4674c9 100644
--- a/nuttx-configs/px4fmu-v2/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v2/nsh/defconfig
@@ -43,8 +43,6 @@ CONFIG_ARCH_MATH_H=y
 #
 # CONFIG_DEBUG is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
-CONFIG_ARMV7M_STACKCHECK=y
-CONFIG_SERIAL_TERMIOS=y
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -115,6 +113,7 @@ CONFIG_ARCH_FPU=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
+CONFIG_ARMV7M_STACKCHECK=y
 # CONFIG_ARMV7M_ITMSYSLOG is not set
 CONFIG_SDIO_DMA=y
 CONFIG_SDIO_DMAPRIO=0x00010000
@@ -154,6 +153,7 @@ CONFIG_SDIO_DMAPRIO=0x00010000
 # CONFIG_ARCH_CHIP_STM32F100VC is not set
 # CONFIG_ARCH_CHIP_STM32F100VD is not set
 # CONFIG_ARCH_CHIP_STM32F100VE is not set
+# CONFIG_ARCH_CHIP_STM32F102CB is not set
 # CONFIG_ARCH_CHIP_STM32F103T8 is not set
 # CONFIG_ARCH_CHIP_STM32F103TB is not set
 # CONFIG_ARCH_CHIP_STM32F103C4 is not set
@@ -164,6 +164,7 @@ CONFIG_SDIO_DMAPRIO=0x00010000
 # CONFIG_ARCH_CHIP_STM32F103RC is not set
 # CONFIG_ARCH_CHIP_STM32F103RD is not set
 # CONFIG_ARCH_CHIP_STM32F103RE is not set
+# CONFIG_ARCH_CHIP_STM32F103RG is not set
 # CONFIG_ARCH_CHIP_STM32F103V8 is not set
 # CONFIG_ARCH_CHIP_STM32F103VB is not set
 # CONFIG_ARCH_CHIP_STM32F103VC is not set
@@ -210,6 +211,7 @@ CONFIG_ARCH_CHIP_STM32F427V=y
 # CONFIG_STM32_VALUELINE is not set
 # CONFIG_STM32_CONNECTIVITYLINE is not set
 # CONFIG_STM32_PERFORMANCELINE is not set
+# CONFIG_STM32_USBACCESSLINE is not set
 # CONFIG_STM32_HIGHDENSITY is not set
 # CONFIG_STM32_MEDIUMDENSITY is not set
 # CONFIG_STM32_LOWDENSITY is not set
@@ -365,6 +367,7 @@ CONFIG_UART7_RXDMA=y
 # CONFIG_UART8_RS485 is not set
 CONFIG_UART8_RXDMA=y
 CONFIG_SERIAL_DISABLE_REORDERING=y
+CONFIG_STM32_FLOWCONTROL_BROKEN=y
 CONFIG_STM32_USART_SINGLEWIRE=y
 
 #
@@ -380,6 +383,7 @@ CONFIG_STM32_USART_SINGLEWIRE=y
 # CONFIG_STM32_I2C_DYNTIMEO is not set
 CONFIG_STM32_I2CTIMEOSEC=0
 CONFIG_STM32_I2CTIMEOMS=10
+CONFIG_STM32_I2CTIMEOTICKS=10
 # CONFIG_STM32_I2C_DUTY16_9 is not set
 
 #
@@ -503,7 +507,6 @@ CONFIG_INIT_ENTRYPOINT=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=0
 CONFIG_TASK_NAME_SIZE=24
-CONFIG_MAX_TASK_ARGS=10
 CONFIG_MAX_TASKS=32
 # CONFIG_SCHED_HAVE_PARENT is not set
 CONFIG_SCHED_WAITPID=y
@@ -656,10 +659,13 @@ CONFIG_MTD_BYTE_WRITE=y
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_SMART is not set
 CONFIG_MTD_RAMTRON=y
+CONFIG_RAMTRON_WRITEWAIT=y
+CONFIG_RAMTRON_SETSPEED=y
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
+# CONFIG_EEPROM is not set
 CONFIG_PIPES=y
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -702,6 +708,11 @@ CONFIG_USART6_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
+CONFIG_SERIAL_IFLOWCONTROL=y
+CONFIG_SERIAL_OFLOWCONTROL=y
+CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS=y
+CONFIG_SERIAL_IFLOWCONTROL_LOWER_WATERMARK=10
+CONFIG_SERIAL_IFLOWCONTROL_UPPER_WATERMARK=90
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_SERIAL_TERMIOS=y
 # CONFIG_USART1_SERIAL_CONSOLE is not set
@@ -797,7 +808,6 @@ CONFIG_UART8_PARITY=0
 CONFIG_UART8_2STOP=0
 # CONFIG_UART8_IFLOWCONTROL is not set
 # CONFIG_UART8_OFLOWCONTROL is not set
-CONFIG_SERIAL_IFLOWCONTROL=y
 CONFIG_SERIAL_OFLOWCONTROL=y
 CONFIG_USBDEV=y
 
@@ -946,9 +956,9 @@ CONFIG_STDIO_BUFFER_SIZE=32
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
 CONFIG_LIB_HOMEDIR="/"
-CONFIG_LIBM=y
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 CONFIG_LIBC_FLOATINGPOINT=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -995,6 +1005,11 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_CXX_NEWLONG is not set
 
 #
+# uClibc++ Standard C++ Library
+#
+# CONFIG_UCLIBCXX is not set
+
+#
 # Application Configuration
 #
 
@@ -1010,6 +1025,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_CAN is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
+# CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
@@ -1030,6 +1046,7 @@ CONFIG_EXAMPLES_MOUNT_RAMDEVNO=0
 # CONFIG_EXAMPLES_MTDPART is not set
 # CONFIG_EXAMPLES_NRF24L01TERM is not set
 CONFIG_EXAMPLES_NSH=y
+# CONFIG_EXAMPLES_NSH_CXXINITIALIZE is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXTERM is not set
@@ -1067,11 +1084,13 @@ CONFIG_EXAMPLES_NSH=y
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
@@ -1169,28 +1188,28 @@ CONFIG_NSH_CODECS_BUFSIZE=128
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=y
+
+#
+# Scripting Support
+#
 # CONFIG_NSH_DISABLESCRIPT is not set
-# CONFIG_NSH_DISABLEBG is not set
+# CONFIG_NSH_DISABLE_ITEF is not set
+# CONFIG_NSH_DISABLE_LOOPS is not set
 CONFIG_NSH_ROMFSETC=y
 # CONFIG_NSH_ROMFSRC is not set
 CONFIG_NSH_ROMFSMOUNTPT="/etc"
 CONFIG_NSH_INITSCRIPT="init.d/rcS"
 CONFIG_NSH_ROMFSDEVNO=0
 CONFIG_NSH_ROMFSSECTSIZE=128
+# CONFIG_NSH_DEFAULTROMFS is not set
 CONFIG_NSH_ARCHROMFS=y
+# CONFIG_NSH_CUSTOMROMFS is not set
 CONFIG_NSH_FATDEVNO=1
 CONFIG_NSH_FATSECTSIZE=512
 CONFIG_NSH_FATNSECTORS=1024
 CONFIG_NSH_FATMOUNTPT="/tmp"
 
 #
-# Scripting Support
-#
-# CONFIG_NSH_DISABLESCRIPT is not set
-# CONFIG_NSH_DISABLE_ITEF is not set
-# CONFIG_NSH_DISABLE_LOOPS is not set
-
-#
 # Console Configuration
 #
 CONFIG_NSH_CONSOLE=y
@@ -1222,6 +1241,11 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 
 #
+# CU Minimal Terminal
+#
+# CONFIG_SYSTEM_CUTERM is not set
+
+#
 # FLASH Program Installation
 #
 # CONFIG_SYSTEM_INSTALL is not set
@@ -1249,7 +1273,6 @@ CONFIG_NSH_ARCHINIT=y
 #
 # NxPlayer media player library / command Line
 #
-# CONFIG_SYSTEM_NXPLAYER is not set
 
 #
 # RAM test
@@ -1309,6 +1332,7 @@ CONFIG_SYSTEM_SYSINFO_STACKSIZE=1024
 # USB CDC/ACM Device Commands
 #
 CONFIG_SYSTEM_CDCACM=y
+CONFIG_SYSTEM_CDCACM_DEVMINOR=0
 
 #
 # USB Composite Device Commands
diff --git a/nuttx-configs/px4io-v1/nsh/defconfig b/nuttx-configs/px4io-v1/nsh/defconfig
index 17729ebf4..afe7373ad 100755
--- a/nuttx-configs/px4io-v1/nsh/defconfig
+++ b/nuttx-configs/px4io-v1/nsh/defconfig
@@ -136,6 +136,7 @@ CONFIG_STM32_I2C1=y
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_I2CTIMEOSEC=0
 CONFIG_STM32_I2CTIMEOMS=1
+CONFIG_STM32_I2CTIMEOTICKS=1
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n