Skip to content

Commit d12af93

Browse files
committed
TinyUSB adjust
1 parent 7e9d75a commit d12af93

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+36
-21
lines changed

tools/sdk/esp32s2/include/config/sdkconfig.h

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -353,21 +353,30 @@
353353
#define CONFIG_SPIFFS_META_LENGTH 4
354354
#define CONFIG_SPIFFS_USE_MTIME 1
355355
#define CONFIG_USB_ENABLED 1
356-
#define CONFIG_USB_MAX_POWER_USAGE 100
356+
#define CONFIG_USB_MAX_POWER_USAGE 500
357357
#define CONFIG_USB_CDC_ENABLED 1
358-
#define CONFIG_USB_CDC_RX_BUFSIZE 64
359-
#define CONFIG_USB_CDC_TX_BUFSIZE 64
358+
#define CONFIG_USB_CDC_RX_BUFSIZE 1024
359+
#define CONFIG_USB_CDC_TX_BUFSIZE 1024
360360
#define CONFIG_USB_MSC_ENABLED 1
361361
#define CONFIG_USB_MSC_BUFSIZE 512
362+
#define CONFIG_USB_HID_ENABLED 1
363+
#define CONFIG_USB_HID_BUFSIZE 16
364+
#define CONFIG_USB_MIDI_ENABLED 1
365+
#define CONFIG_USB_MIDI_RX_BUFSIZE 64
366+
#define CONFIG_USB_MIDI_TX_BUFSIZE 64
362367
#define CONFIG_USB_VENDOR_ENABLED 1
368+
#define CONFIG_USB_CUSTOM_CLASS_ENABLED 1
369+
#define CONFIG_USB_DEBUG 1
363370
#define CONFIG_USB_DESC_USE_ESPRESSIF_VID 1
364371
#define CONFIG_USB_DESC_USE_DEFAULT_PID 1
365-
#define CONFIG_USB_DESC_BCDDEVICE 0x0100
366-
#define CONFIG_USB_DESC_MANUFACTURER_STRING "Espressif Systems"
367-
#define CONFIG_USB_DESC_PRODUCT_STRING "Espressif Device"
368-
#define CONFIG_USB_DESC_SERIAL_STRING "123456"
372+
#define CONFIG_USB_DESC_BCDDEVICE 0x0723
373+
#define CONFIG_USB_DESC_MANUFACTURER_STRING "Espressif"
374+
#define CONFIG_USB_DESC_PRODUCT_STRING "ESP32-S2"
375+
#define CONFIG_USB_DESC_SERIAL_STRING "0"
369376
#define CONFIG_USB_DESC_CDC_STRING "Espressif CDC Device"
370377
#define CONFIG_USB_DESC_MSC_STRING "Espressif MSC Device"
378+
#define CONFIG_USB_DESC_MIDI_STRING "Espressif MIDI Device"
379+
#define CONFIG_USB_DESC_HID_STRING "Espressif HID Device"
371380
#define CONFIG_USB_DESC_VENDOR_STRING "Espressif VENDOR Device"
372381
#define CONFIG_UNITY_ENABLE_FLOAT 1
373382
#define CONFIG_UNITY_ENABLE_DOUBLE 1

tools/sdk/esp32s2/include/tinyusb/port/common/include/descriptors_control.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@
2424
* Auto ProductID layout's Bitmap:
2525
* [MSB] HID | MSC | CDC [LSB]
2626
*/
27-
#define EPNUM_MSC 0x03
28-
#define EPNUM_VENDOR 0x06
29-
#define EPNUM_MIDI 0x05
27+
#define EPNUM_MSC 0x01
28+
#define EPNUM_HID 0x02
29+
#define EPNUM_MIDI 0x06
30+
#define EPNUM_VENDOR 0x07
3031

3132
#ifdef __cplusplus
3233
extern "C" {

tools/sdk/esp32s2/lib/libapp_trace.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libasio.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libcbor.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libcoap.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libconsole.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libcxx.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libdriver.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libefuse.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp-tls.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp32s2.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_common.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_eth.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_event.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_hid.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_netif.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_system.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_timer.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_wifi.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libexpat.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libfatfs.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libfb_gfx.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libfreemodbus.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libfreertos.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libheap.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libjsmn.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libjson.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/liblibsodium.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/liblog.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/liblwip.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libmbedcrypto.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libmbedtls.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libmbedx509.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libmdns.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libmqtt.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libnewlib.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libnghttp.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libnvs_flash.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libopenssl.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libperfmon.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libprotobuf-c.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libprotocomm.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libpthread.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libsdmmc.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libsoc.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libspi_flash.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libspiffs.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libtinyusb.a

167 KB
Binary file not shown.

tools/sdk/esp32s2/lib/libulp.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libunity.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libvfs.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libxtensa.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/sdkconfig

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -987,29 +987,34 @@ CONFIG_SPIFFS_USE_MTIME=y
987987
# TinyUSB
988988
#
989989
CONFIG_USB_ENABLED=y
990-
CONFIG_USB_MAX_POWER_USAGE=100
990+
CONFIG_USB_MAX_POWER_USAGE=500
991991
CONFIG_USB_CDC_ENABLED=y
992-
CONFIG_USB_CDC_RX_BUFSIZE=64
993-
CONFIG_USB_CDC_TX_BUFSIZE=64
992+
CONFIG_USB_CDC_RX_BUFSIZE=1024
993+
CONFIG_USB_CDC_TX_BUFSIZE=1024
994994
CONFIG_USB_MSC_ENABLED=y
995995
CONFIG_USB_MSC_BUFSIZE=512
996-
# CONFIG_USB_HID_ENABLED is not set
997-
# CONFIG_USB_MIDI_ENABLED is not set
996+
CONFIG_USB_HID_ENABLED=y
997+
CONFIG_USB_HID_BUFSIZE=16
998+
CONFIG_USB_MIDI_ENABLED=y
999+
CONFIG_USB_MIDI_RX_BUFSIZE=64
1000+
CONFIG_USB_MIDI_TX_BUFSIZE=64
9981001
CONFIG_USB_VENDOR_ENABLED=y
999-
# CONFIG_USB_CUSTOM_CLASS_ENABLED is not set
1000-
# CONFIG_USB_DEBUG is not set
1002+
CONFIG_USB_CUSTOM_CLASS_ENABLED=y
1003+
CONFIG_USB_DEBUG=y
10011004

10021005
#
10031006
# Descriptor configuration
10041007
#
10051008
CONFIG_USB_DESC_USE_ESPRESSIF_VID=y
10061009
CONFIG_USB_DESC_USE_DEFAULT_PID=y
1007-
CONFIG_USB_DESC_BCDDEVICE=0x0100
1008-
CONFIG_USB_DESC_MANUFACTURER_STRING="Espressif Systems"
1009-
CONFIG_USB_DESC_PRODUCT_STRING="Espressif Device"
1010-
CONFIG_USB_DESC_SERIAL_STRING="123456"
1010+
CONFIG_USB_DESC_BCDDEVICE=0x0723
1011+
CONFIG_USB_DESC_MANUFACTURER_STRING="Espressif"
1012+
CONFIG_USB_DESC_PRODUCT_STRING="ESP32-S2"
1013+
CONFIG_USB_DESC_SERIAL_STRING="0"
10111014
CONFIG_USB_DESC_CDC_STRING="Espressif CDC Device"
10121015
CONFIG_USB_DESC_MSC_STRING="Espressif MSC Device"
1016+
CONFIG_USB_DESC_MIDI_STRING="Espressif MIDI Device"
1017+
CONFIG_USB_DESC_HID_STRING="Espressif HID Device"
10131018
CONFIG_USB_DESC_VENDOR_STRING="Espressif VENDOR Device"
10141019
# end of Descriptor configuration
10151020
# end of TinyUSB

0 commit comments

Comments
 (0)