Skip to content

Commit b02f131

Browse files
committed
TinyUSB adjust
1 parent f40274a commit b02f131

Some content is hidden

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

74 files changed

+48
-20
lines changed

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#define CONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200
2727
#define CONFIG_ESPTOOLPY_FLASHMODE_QIO 1
2828
#define CONFIG_ESPTOOLPY_FLASHMODE "dio"
29-
#define CONFIG_ESPTOOLPY_FLASHFREQ_80M 1
30-
#define CONFIG_ESPTOOLPY_FLASHFREQ "80m"
29+
#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
30+
#define CONFIG_ESPTOOLPY_FLASHFREQ "40m"
3131
#define CONFIG_ESPTOOLPY_FLASHSIZE_4MB 1
3232
#define CONFIG_ESPTOOLPY_FLASHSIZE "4MB"
3333
#define CONFIG_ESPTOOLPY_FLASHSIZE_DETECT 1
@@ -353,21 +353,29 @@
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_DFU_RT_ENABLED 1
363369
#define CONFIG_USB_DESC_USE_ESPRESSIF_VID 1
364370
#define CONFIG_USB_DESC_USE_DEFAULT_PID 1
365371
#define CONFIG_USB_DESC_BCDDEVICE 0x0100
366-
#define CONFIG_USB_DESC_MANUFACTURER_STRING "Espressif Systems"
372+
#define CONFIG_USB_DESC_MANUFACTURER_STRING "Espressif"
367373
#define CONFIG_USB_DESC_PRODUCT_STRING "Espressif Device"
368374
#define CONFIG_USB_DESC_SERIAL_STRING "123456"
369375
#define CONFIG_USB_DESC_CDC_STRING "Espressif CDC Device"
370376
#define CONFIG_USB_DESC_MSC_STRING "Espressif MSC Device"
377+
#define CONFIG_USB_DESC_MIDI_STRING "Espressif MIDI Device"
378+
#define CONFIG_USB_DESC_HID_STRING "Espressif HID Device"
371379
#define CONFIG_USB_DESC_VENDOR_STRING "Espressif VENDOR Device"
372380
#define CONFIG_UNITY_ENABLE_FLOAT 1
373381
#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 0x04
30+
#define EPNUM_VENDOR 0x06
3031

3132
#ifdef __cplusplus
3233
extern "C" {

tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tusb_config.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,14 @@ extern "C" {
8989
# define CONFIG_USB_CUSTOM_CLASS_ENABLED 0
9090
#endif
9191

92+
#ifndef CONFIG_USB_DFU_RT_ENABLED
93+
# define CONFIG_USB_DFU_RT_ENABLED 0
94+
#endif
95+
96+
#ifndef CONFIG_USB_NET_ENABLED
97+
# define CONFIG_USB_NET_ENABLED 0
98+
#endif
99+
92100
#ifndef CONFIG_USB_VENDOR_ENABLED
93101
# define CONFIG_USB_VENDOR_ENABLED 0
94102
#endif
@@ -97,6 +105,8 @@ extern "C" {
97105
#define CFG_TUD_CDC CONFIG_USB_CDC_ENABLED
98106
#define CFG_TUD_MSC CONFIG_USB_MSC_ENABLED
99107
#define CFG_TUD_HID CONFIG_USB_HID_ENABLED
108+
#define CFG_TUD_DFU_RT CONFIG_USB_DFU_RT_ENABLED
109+
#define CFG_TUD_NET CONFIG_USB_NET_ENABLED
100110

101111
#define CFG_TUD_MIDI CONFIG_USB_MIDI_ENABLED
102112
#define CFG_TUD_CUSTOM_CLASS CONFIG_USB_CUSTOM_CLASS_ENABLED

tools/sdk/esp32s2/ld/esp32s2.project.ld

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

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.

0 commit comments

Comments
 (0)