diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 70c31dceea..ed9962df0f 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3446,3 +3446,7 @@ The work around for now: Just disable reading from the LCD. * drivers/lcd/ssd1289.c: Add some logic to reduce the amount of output when CONFIG_DEBUG_LCD is enabled. + * configs/shenzhou/nxwm/defconfig: Bug found and fixed... The + original configuration had too much stuff turned on. Reducing + stack sizes, some features, and buffer sizes made the + configuration reliable (Reading from the LCD is still disabled). diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt index 515b487e73..fcc39de74d 100644 --- a/nuttx/configs/shenzhou/README.txt +++ b/nuttx/configs/shenzhou/README.txt @@ -760,9 +760,9 @@ Where is one of the following: and drivers/lcd/ssd1289.c also supports reading from the LCD. This limits some graphics capabilities. - If you enable reading from the LCD, you will see some memory - corruption. If you get inspired to debug this problem, you can - turn the LCD read functionality back on by setting: + Reading from the LCD is not supported only because it has not + been test. If you get inspired to test this feature, you can + turn the LCD read functionality on by setting: -CONFIG_LCD_NOGETRUN=y +# CONFIG_LCD_NOGETRUN is not set diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig index 4b84144b62..1b21fbd1ba 100644 --- a/nuttx/configs/shenzhou/nxwm/defconfig +++ b/nuttx/configs/shenzhou/nxwm/defconfig @@ -121,15 +121,15 @@ CONFIG_STM32_CODESOURCERYW=y # CONFIG_STM32_CRC is not set # CONFIG_STM32_DMA1 is not set # CONFIG_STM32_DMA2 is not set -CONFIG_STM32_BKP=y +# CONFIG_STM32_BKP is not set # CONFIG_STM32_CAN1 is not set # CONFIG_STM32_DAC1 is not set # CONFIG_STM32_DAC2 is not set CONFIG_STM32_ETHMAC=y -CONFIG_STM32_I2C1=y +# CONFIG_STM32_I2C1 is not set # CONFIG_STM32_I2C2 is not set # CONFIG_STM32_IWDG is not set -CONFIG_STM32_PWR=y +# CONFIG_STM32_PWR is not set # CONFIG_STM32_SPI1 is not set # CONFIG_STM32_SPI2 is not set CONFIG_STM32_SPI3=y @@ -149,14 +149,12 @@ CONFIG_STM32_USART2=y # CONFIG_STM32_USB is not set # CONFIG_STM32_WWDG is not set CONFIG_STM32_SPI=y -CONFIG_STM32_I2C=y # # Alternate Pin Mapping # CONFIG_STM32_USART2_REMAP=y CONFIG_STM32_SPI3_REMAP=y -# CONFIG_STM32_I2C1_REMAP is not set CONFIG_STM32_ETH_REMAP=y # CONFIG_STM32_JTAG_DISABLE is not set CONFIG_STM32_JTAG_FULL_ENABLE=y @@ -171,15 +169,6 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y # CONFIG_STM32_SPI_INTERRUPTS is not set # CONFIG_STM32_SPI_DMA is not set -# -# I2C Configuration -# -# CONFIG_STM32_I2C_DYNTIMEO is not set -CONFIG_STM32_I2CTIMEOSEC=0 -CONFIG_STM32_I2CTIMEOMS=500 -CONFIG_STM32_I2CTIMEOTICKS=500 -# CONFIG_STM32_I2C_DUTY16_9 is not set - # # Ethernet MAC configuration # @@ -285,10 +274,10 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=192 CONFIG_SCHED_WORKPERIOD=50000 -CONFIG_SCHED_WORKSTACKSIZE=2048 +CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 # CONFIG_SCHED_LPWORK is not set -CONFIG_SCHED_WAITPID=y +# CONFIG_SCHED_WAITPID is not set # CONFIG_SCHED_ATEXIT is not set CONFIG_SCHED_ONEXIT=y CONFIG_SCHED_ONEXIT_MAX=1 @@ -323,9 +312,9 @@ CONFIG_PREALLOC_TIMERS=4 # # CONFIG_CUSTOM_STACK is not set CONFIG_IDLETHREAD_STACKSIZE=1024 -CONFIG_USERMAIN_STACKSIZE=2048 +CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_PTHREAD_STACK_MIN=256 -CONFIG_PTHREAD_STACK_DEFAULT=2048 +CONFIG_PTHREAD_STACK_DEFAULT=1024 # # Device Drivers @@ -336,22 +325,13 @@ CONFIG_DEV_NULL=y # CONFIG_RAMDISK is not set # CONFIG_CAN is not set # CONFIG_PWM is not set -CONFIG_I2C=y -# CONFIG_I2C_SLAVE is not set -CONFIG_I2C_TRANSFER=y -# CONFIG_I2C_WRITEREAD is not set -CONFIG_I2C_POLLED=y -# CONFIG_I2C_TRACE is not set +# CONFIG_I2C is not set CONFIG_ARCH_HAVE_I2CRESET=y -# CONFIG_I2C_RESET is not set CONFIG_SPI=y # CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set -CONFIG_RTC=y -# CONFIG_RTC_DATETIME is not set -# CONFIG_RTC_HIRES is not set -# CONFIG_RTC_ALARM is not set +# CONFIG_RTC is not set # CONFIG_WATCHDOG is not set # CONFIG_ANALOG is not set # CONFIG_BCH is not set @@ -432,16 +412,16 @@ CONFIG_PHY_DM9161=y # CONFIG_NET_NOINTS is not set CONFIG_NET_MULTIBUFFER=y # CONFIG_NET_IPv6 is not set -CONFIG_NSOCKET_DESCRIPTORS=10 +CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NET_NACTIVESOCKETS=16 CONFIG_NET_SOCKOPTS=y CONFIG_NET_BUFSIZE=562 # CONFIG_NET_TCPURGDATA is not set CONFIG_NET_TCP=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_TCP_CONNS=16 +CONFIG_NET_MAX_LISTENPORTS=16 CONFIG_NET_TCP_READAHEAD_BUFSIZE=562 -CONFIG_NET_NTCP_READAHEAD_BUFFERS=16 +CONFIG_NET_NTCP_READAHEAD_BUFFERS=4 CONFIG_NET_TCP_RECVDELAY=0 CONFIG_NET_TCPBACKLOG=y CONFIG_NET_UDP=y @@ -464,12 +444,7 @@ CONFIG_NET_ARPTAB_SIZE=16 # # File system configuration # -CONFIG_FS_FAT=y -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FAT_MAXFNAME=32 -# CONFIG_FS_FATTIME is not set -# CONFIG_FAT_DMAMEMORY is not set +# CONFIG_FS_FAT is not set # CONFIG_FS_RAMMAP is not set # CONFIG_NFS is not set # CONFIG_FS_NXFFS is not set @@ -962,7 +937,7 @@ CONFIG_NETUTILS_WEBCLIENT=y # NSH Library # CONFIG_NSH_LIBRARY=y -CONFIG_NSH_BUILTIN_APPS=y +# CONFIG_NSH_BUILTIN_APPS is not set # # Disable Individual commands @@ -1016,9 +991,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_TELNET=y CONFIG_NSH_TELNETD_PORT=23 CONFIG_NSH_TELNETD_DAEMONPRIO=100 -CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048 +CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=1596 CONFIG_NSH_TELNETD_CLIENTPRIO=100 -CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048 +CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=1596 CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_IPADDR=0x0a000002 CONFIG_NSH_DRIPADDR=0x0a000001 @@ -1036,10 +1011,10 @@ CONFIG_NXWIDGETS=y CONFIG_NXWIDGETS_DEVNO=0 CONFIG_NXWIDGETS_VPLANE=0 CONFIG_NXWIDGETS_SERVERPRIO=51 -CONFIG_NXWIDGETS_SERVERSTACK=2048 +CONFIG_NXWIDGETS_SERVERSTACK=1596 CONFIG_NXWIDGETS_CLIENTPRIO=50 CONFIG_NXWIDGETS_LISTENERPRIO=50 -CONFIG_NXWIDGETS_LISTENERSTACK=2048 +CONFIG_NXWIDGETS_LISTENERSTACK=1596 # CONFIG_NXWIDGETS_EXTERNINIT is not set # CONFIG_NXWIDGET_EVENTWAIT is not set @@ -1128,13 +1103,13 @@ CONFIG_NXWM_STARTWINDOW_MQNAME="/dev/nxwm" CONFIG_NXWM_STARTWINDOW_MXMSGS=32 CONFIG_NXWM_STARTWINDOW_MXMPRIO=42 CONFIG_NXWM_STARTWINDOW_PRIO=50 -CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048 +CONFIG_NXWM_STARTWINDOW_STACKSIZE=1596 # # NxConsole Window Configuration # CONFIG_NXWM_NXCONSOLE_PRIO=50 -CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048 +CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596 CONFIG_NXWM_NXCONSOLE_WCOLOR= CONFIG_NXWM_NXCONSOLE_FONTCOLOR= CONFIG_NXWM_NXCONSOLE_FONTID= @@ -1148,7 +1123,7 @@ CONFIG_NXWM_TOUCHSCREEN_DEVNO=0 CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0" CONFIG_NXWM_TOUCHSCREEN_SIGNO=5 CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=50 -CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK= +CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596 CONFIG_NXWM_KEYBOARD=y # @@ -1158,7 +1133,7 @@ CONFIG_NXWM_KEYBOARD_DEVPATH="/dev/console" CONFIG_NXWM_KEYBOARD_SIGNO=6 CONFIG_NXWM_KEYBOARD_BUFSIZE=16 CONFIG_NXWM_KEYBOARD_LISTENERPRIO=50 -CONFIG_NXWM_KEYBOARD_LISTENERSTACK=2048 +CONFIG_NXWM_KEYBOARD_LISTENERSTACK=1024 # # Calibration display settings @@ -1170,7 +1145,7 @@ CONFIG_NXWM_CALIBRATION_TOUCHEDCOLOR= CONFIG_NXWM_CALIBRATION_ICON="" CONFIG_NXWM_CALIBRATION_SIGNO=5 CONFIG_NXWM_CALIBRATION_LISTENERPRIO=50 -CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048 +CONFIG_NXWM_CALIBRATION_LISTENERSTACK=1024 # # Calibration display settings @@ -1191,14 +1166,6 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5 # # I2C tool # -CONFIG_SYSTEM_I2CTOOL=y -CONFIG_I2CTOOL_BUILTIN=y -CONFIG_I2CTOOL_MINBUS=1 -CONFIG_I2CTOOL_MAXBUS=3 -CONFIG_I2CTOOL_MINADDR=0x03 -CONFIG_I2CTOOL_MAXADDR=0x77 -CONFIG_I2CTOOL_MAXREGADDR=0xff -CONFIG_I2CTOOL_DEFFREQ=100000 # # FLASH Program Installation