diff --git a/configs/shenzhou/README.txt b/configs/shenzhou/README.txt index fcc39de74da..1f3f254aaba 100644 --- a/configs/shenzhou/README.txt +++ b/configs/shenzhou/README.txt @@ -716,11 +716,12 @@ Where is one of the following: nuttx-code/NxWidgets/UnitTests/README.txt - Here is the quick summary of the build steps: + Here is the quick summary of the build steps (Assuming that all of + the required packages are available in a directory ~/nuttx-code): 1. Intall the nxwm configuration - $ cd ~/nuttx/nuttx-code/tools + $ cd ~/nuttx-code/tools $ ./configure.sh shenzhou/nxwm 2. Make the build context (only) @@ -732,27 +733,27 @@ Where is one of the following: 3. Install the nxwm unit test - $ cd ~/nuttx/nuttx-code/NxWidgets - $ tools/install.sh ~/nuttx/nuttx-code/apps nxwm + $ cd ~/nuttx-code/NxWidgets + $ tools/install.sh ~/nuttx-code/apps nxwm Creating symbolic link - - To ~/nuttx/nuttx-code/NxWidgets/UnitTests/nxwm - - At ~/nuttx/nuttx-code/apps/external + - To ~/nuttx-code/NxWidgets/UnitTests/nxwm + - At ~/nuttx-code/apps/external 4. Build the NxWidgets library - $ cd ~/nuttx/nuttx-code/NxWidgets/libnxwidgets - $ make TOPDIR=~/nuttx/nuttx-code + $ cd ~/nuttx-code/NxWidgets/libnxwidgets + $ make TOPDIR=~/nuttx-code ... 5. Build the NxWM library - $ cd ~/nuttx/nuttx-code/NxWidgets/nxwm - $ make TOPDIR=~/nuttx/nuttx-code + $ cd ~/nuttx-code/NxWidgets/nxwm + $ make TOPDIR=~/nuttx-code ... 6. Built NuttX with the installed unit test as the application - $ cd ~/nuttx/nuttx-code + $ cd ~/nuttx-code $ make NOTE: Reading from the LCD is not currently supported by this diff --git a/configs/sim/README.txt b/configs/sim/README.txt index 833ec58dc7f..b8a921e7f42 100644 --- a/configs/sim/README.txt +++ b/configs/sim/README.txt @@ -409,15 +409,15 @@ nxwm This is a special configuration setup for the NxWM window manager UnitTest. The NxWM window manager can be found here: - trunk/NxWidgets/nxwm + nuttx-code/NxWidgets/nxwm The NxWM unit test can be found at: - trunk/NxWidgets/UnitTests/nxwm + nuttx-code/NxWidgets/UnitTests/nxwm Documentation for installing the NxWM unit test can be found here: - trunk/NxWidgets/UnitTests/READEM.txt + nuttx-code/NxWidgets/UnitTests/READEM.txt NOTE: There is an issue with running this example under the simulation. In the default configuration, this example will diff --git a/configs/stm3220g-eval/README.txt b/configs/stm3220g-eval/README.txt index b3b7fd476fb..89c6b923307 100644 --- a/configs/stm3220g-eval/README.txt +++ b/configs/stm3220g-eval/README.txt @@ -947,21 +947,22 @@ Where is one of the following: This is a special configuration setup for the NxWM window manager UnitTest. The NxWM window manager can be found here: - trunk/NxWidgets/nxwm + nuttx-code/NxWidgets/nxwm The NxWM unit test can be found at: - trunk/NxWidgets/UnitTests/nxwm + nuttx-code/NxWidgets/UnitTests/nxwm Documentation for installing the NxWM unit test can be found here: - trunk/NxWidgets/UnitTests/README.txt + nuttx-code/NxWidgets/UnitTests/README.txt - Here is the quick summary of the build steps: + Here is the quick summary of the build steps (Assuming that all of + the required packages are available in a directory ~/nuttx-code): 1. Intall the nxwm configuration - $ cd ~/nuttx/trunk/nuttx/tools + $ cd ~/nuttx-code/nuttx/tools $ ./configure.sh stm3220g-eval/nxwm 2. Make the build context (only) @@ -973,27 +974,27 @@ Where is one of the following: 3. Install the nxwm unit test - $ cd ~/nuttx/trunk/NxWidgets - $ tools/install.sh ~/nuttx/trunk/apps nxwm + $ cd ~/nuttx-code/NxWidgets + $ tools/install.sh ~/nuttx-code/apps nxwm Creating symbolic link - - To ~/nuttx/trunk/NxWidgets/UnitTests/nxwm - - At ~/nuttx/trunk/apps/external + - To ~/nuttx-code/NxWidgets/UnitTests/nxwm + - At ~/nuttx-code/apps/external 4. Build the NxWidgets library - $ cd ~/nuttx/trunk/NxWidgets/libnxwidgets - $ make TOPDIR=~/nuttx/trunk/nuttx + $ cd ~/nuttx-code/NxWidgets/libnxwidgets + $ make TOPDIR=~/nuttx-code/nuttx ... 5. Build the NxWM library - $ cd ~/nuttx/trunk/NxWidgets/nxwm - $ make TOPDIR=~//nuttx/trunk/nuttx + $ cd ~/nuttx-code/NxWidgets/nxwm + $ make TOPDIR=~/nuttx-code/nuttx ... 6. Built NuttX with the installed unit test as the application - $ cd ~/nuttx/trunk/nuttx + $ cd ~/nuttx-code/nuttx $ make ostest: diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig index 7b7028cf84d..83c2f484177 100644 --- a/configs/stm3220g-eval/nxwm/defconfig +++ b/configs/stm3220g-eval/nxwm/defconfig @@ -507,7 +507,7 @@ CONFIG_STMPE811_THRESHX=39 CONFIG_STMPE811_THRESHY=51 # -# USB Device Configuration +# STM32 USB OTG FS Device Configuration # CONFIG_USBDEV=n CONFIG_USBDEV_ISOCHRONOUS=n @@ -518,6 +518,18 @@ CONFIG_USBDEV_MAXPOWER=100 CONFIG_USBDEV_TRACE=n CONFIG_USBDEV_TRACE_NRECORDS=128 +# +# STM32 USB OTG FS Host Configuration +# +CONFIG_USBHOST=n +#CONFIG_STM32_OTGFS_RXFIFO_SIZE +#CONFIG_STM32_OTGFS_NPTXFIFO_SIZE +#CONFIG_STM32_OTGFS_PTXFIFO_SIZE +#CONFIG_STM32_OTGFS_DESCSIZE +CONFIG_STM32_OTGFS_SOFINTR=n +CONFIG_STM32_USBHOST_REGDEBUG=n +CONFIG_STM32_USBHOST_PKTDUMP=n + # # USB Serial Device Configuration # diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt index 75ca1ea77f5..df98f087d53 100644 --- a/configs/stm3240g-eval/README.txt +++ b/configs/stm3240g-eval/README.txt @@ -1226,21 +1226,22 @@ Where is one of the following: This is a special configuration setup for the NxWM window manager UnitTest. The NxWM window manager can be found here: - trunk/NxWidgets/nxwm + nuttx-code/NxWidgets/nxwm The NxWM unit test can be found at: - trunk/NxWidgets/UnitTests/nxwm + nuttx-code/NxWidgets/UnitTests/nxwm Documentation for installing the NxWM unit test can be found here: - trunk/NxWidgets/UnitTests/README.txt + nuttx-code/NxWidgets/UnitTests/README.txt - Here is the quick summary of the build steps: + Here is the quick summary of the build steps (Assuming that all of + the required packages are available in a directory ~/nuttx-code): 1. Intall the nxwm configuration - $ cd ~/nuttx/trunk/nuttx/tools + $ cd ~/nuttx-code/nuttx/tools $ ./configure.sh stm3240g-eval/nxwm 2. Make the build context (only) @@ -1252,27 +1253,27 @@ Where is one of the following: 3. Install the nxwm unit test - $ cd ~/nuttx/trunk/NxWidgets - $ tools/install.sh ~/nuttx/trunk/apps nxwm + $ cd ~/nuttx-code/NxWidgets + $ tools/install.sh ~/nuttx-code/apps nxwm Creating symbolic link - - To ~/nuttx/trunk/NxWidgets/UnitTests/nxwm - - At ~/nuttx/trunk/apps/external + - To ~/nuttx-code/NxWidgets/UnitTests/nxwm + - At ~/nuttx-code/apps/external 4. Build the NxWidgets library - $ cd ~/nuttx/trunk/NxWidgets/libnxwidgets - $ make TOPDIR=~/nuttx/trunk/nuttx + $ cd ~/nuttx-code/NxWidgets/libnxwidgets + $ make TOPDIR=~/nuttx-code/nuttx ... 5. Build the NxWM library - $ cd ~/nuttx/trunk/NxWidgets/nxwm - $ make TOPDIR=~//nuttx/trunk/nuttx + $ cd ~/nuttx-code/NxWidgets/nxwm + $ make TOPDIR=~/nuttx-code/nuttx ... 6. Built NuttX with the installed unit test as the application - $ cd ~/nuttx/trunk/nuttx + $ cd ~/nuttx-code/nuttx $ make ostest: