diff options
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/Documentation/NuttShell.html | 23 | ||||
-rwxr-xr-x | nuttx/configs/stm32f4discovery/README.txt | 14 | ||||
-rw-r--r-- | nuttx/configs/stm32f4discovery/nsh/defconfig | 18 |
3 files changed, 43 insertions, 12 deletions
diff --git a/nuttx/Documentation/NuttShell.html b/nuttx/Documentation/NuttShell.html index c601271c4..1a2a1da06 100644 --- a/nuttx/Documentation/NuttShell.html +++ b/nuttx/Documentation/NuttShell.html @@ -2218,13 +2218,28 @@ nsh> </li> </ul> <p> - If USB tracing is enabled, then NSH will initialize USB tracing as requested by the following: + If USB tracing is enabled (<code>CONFIG_USBDEV_TRACE</code>), then NSH will initialize USB tracing as requested by the following. + Default: Only USB errors are traced. </p> <ul> <li> - <code>CONFIG_NSH_UBSDEV_TRACEINIT</code>. - Bit set with each bit enabling a trace option (see <code>include/nuttx/usb/usbdev_trace.h</code>). - Default: Only USB errors are traced. + <code>CONFIG_NSH_USBDEV_TRACEINIT</code>. + Show initialization events + </li> + <li> + <code>CONFIG_NSH_USBDEV_TRACECLASS</code>. + Show class driver events + </li> + <li> + <code>CONFIG_NSH_USBDEV_TRACETRANSFERS</code>. + Show data transfer events + </li> + <li> + <code>CONFIG_NSH_USBDEV_TRACECONTROLLER</code>. + Show controller events + <li> + <code>CONFIG_NSH_USBDEV_TRACEINTERRUPTS</code>. + Show interrupt-related events. </li> </ul> </td> diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index a995d023a..de6c94435 100755 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -1018,7 +1018,7 @@ Where <subdir> is one of the following: However, that configuration does not work. It fails early probably because of some dependency on /dev/console before the USB connection is established. - But there is a work around for this that does work fine (but has some side + But there is a work around for this that works better (but has some side effects). The following configuration will also create a NSH USB console but this version will will use /dev/console. Instead, it will use the normal /dev/ttyACM0 USB serial device for the console: @@ -1033,16 +1033,20 @@ Where <subdir> is one of the following: CONFIG_NSH_USBCONDEV="/dev/ttyACM0" + NOTE 1: When you first start the USB console, you have hit ENTER a few + times before NSH starts. The logic does this to prevent sending USB data + before there is anything on the host side listening for USB serial input. + Now the side effects: - - NOTE 1. When any other device other than /dev/console is used for a user + + NOTE 2. When any other device other than /dev/console is used for a user interface, linefeeds (\n) will not be expanded to carriage return / linefeeds (\r\n). You will need to set your terminal program to account for this. - NOTE 2: /dev/console still exists and still refers to the serial port. So + NOTE 3: /dev/console still exists and still refers to the serial port. So you can still use certain kinds of debug output (see include/debug.h, all - of the interfaces based on lib_lowprintf will work in this configraration). + of the interfaces based on lib_lowprintf will work in this configuration). nxlines: ------ diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig index 75b8ac871..7dbdb6b81 100644 --- a/nuttx/configs/stm32f4discovery/nsh/defconfig +++ b/nuttx/configs/stm32f4discovery/nsh/defconfig @@ -1222,8 +1222,16 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # readable/write-able USB driver such as: CONFIG_NSH_USBCONDEV="/dev/ttyACM0". # CONFIG_NSH_UBSDEV_MINOR - The minor device number of the USB device. # Default: 0 -# CONFIG_NSH_UBSDEV_TRACEINIT - Bit set with each bit enabling a trace option -# (see include/nuttx/usb/usbdev_trace.h). Default: Only USB errors are traced. +# CONFIG_NSH_USBDEV_TRACEINIT - Is using a USB console and CONFIG_USB_TRACE +# is defined, this will show initialization events +# CONFIG_NSH_USBDEV_TRACECLASS - Is using a USB console and CONFIG_USB_TRACE +# is defined, this will show class driver events +# CONFIG_NSH_USBDEV_TRACETRANSFERS - Is using a USB console and CONFIG_USB_TRACE +# is defined, this will show data transfer events +# CONFIG_NSH_USBDEV_TRACECONTROLLER - Is using a USB console and CONFIG_USB_TRACE +# is defined, this will show controller events +# CONFIG_NSH_USBDEV_TRACEINTERRUPTS - Is using a USB console and CONFIG_USB_TRACE +# is defined, this will show interrupt-related events. # CONFIG_NSH_CONDEV - If CONFIG_NSH_CONSOLE is set to 'y', then CONFIG_NSH_CONDEV # may also be set to select the serial device used to support the NSH console. # This should be set to the quoted name of a readable/write-able character @@ -1265,7 +1273,11 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_USBCONSOLE=n CONFIG_NSH_USBCONDEV="/dev/ttyACM0" CONFIG_NSH_UBSDEV_MINOR=0 -#CONFIG_NSH_UBSDEV_TRACEINIT +CONFIG_NSH_USBDEV_TRACEINIT=n +CONFIG_NSH_USBDEV_TRACECLASS=n +CONFIG_NSH_USBDEV_TRACETRANSFERS=n +CONFIG_NSH_USBDEV_TRACECONTROLLER=n +CONFIG_NSH_USBDEV_TRACEINTERRUPTS=n #CONFIG_NSH_CONDEV CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 |