diff --git a/tools/sdk/esp32s2/include/config/sdkconfig.h b/tools/sdk/esp32s2/include/config/sdkconfig.h index 3f5035d3..496706f4 100644 --- a/tools/sdk/esp32s2/include/config/sdkconfig.h +++ b/tools/sdk/esp32s2/include/config/sdkconfig.h @@ -365,14 +365,14 @@ #define CONFIG_USB_MIDI_RX_BUFSIZE 64 #define CONFIG_USB_MIDI_TX_BUFSIZE 64 #define CONFIG_USB_VENDOR_ENABLED 1 -#define CONFIG_USB_CUSTOM_CLASS_ENABLED 1 -#define CONFIG_USB_DEBUG 1 +#define CONFIG_USB_DFU_RT_ENABLED 1 +#define CONFIG_USB_NET_ENABLED 1 #define CONFIG_USB_DESC_USE_ESPRESSIF_VID 1 #define CONFIG_USB_DESC_USE_DEFAULT_PID 1 -#define CONFIG_USB_DESC_BCDDEVICE 0x0723 +#define CONFIG_USB_DESC_BCDDEVICE 0x0100 #define CONFIG_USB_DESC_MANUFACTURER_STRING "Espressif" -#define CONFIG_USB_DESC_PRODUCT_STRING "ESP32-S2" -#define CONFIG_USB_DESC_SERIAL_STRING "0" +#define CONFIG_USB_DESC_PRODUCT_STRING "Espressif Device" +#define CONFIG_USB_DESC_SERIAL_STRING "123456" #define CONFIG_USB_DESC_CDC_STRING "Espressif CDC Device" #define CONFIG_USB_DESC_MSC_STRING "Espressif MSC Device" #define CONFIG_USB_DESC_MIDI_STRING "Espressif MIDI Device" diff --git a/tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tusb_config.h b/tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tusb_config.h index 2f687343..36d47dd0 100644 --- a/tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tusb_config.h +++ b/tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tusb_config.h @@ -89,6 +89,14 @@ extern "C" { # define CONFIG_USB_CUSTOM_CLASS_ENABLED 0 #endif +#ifndef CONFIG_USB_DFU_RT_ENABLED +# define CONFIG_USB_DFU_RT_ENABLED 0 +#endif + +#ifndef CONFIG_USB_NET_ENABLED +# define CONFIG_USB_NET_ENABLED 0 +#endif + #ifndef CONFIG_USB_VENDOR_ENABLED # define CONFIG_USB_VENDOR_ENABLED 0 #endif @@ -97,6 +105,8 @@ extern "C" { #define CFG_TUD_CDC CONFIG_USB_CDC_ENABLED #define CFG_TUD_MSC CONFIG_USB_MSC_ENABLED #define CFG_TUD_HID CONFIG_USB_HID_ENABLED +#define CFG_TUD_DFU_RT CONFIG_USB_DFU_RT_ENABLED +#define CFG_TUD_NET CONFIG_USB_NET_ENABLED #define CFG_TUD_MIDI CONFIG_USB_MIDI_ENABLED #define CFG_TUD_CUSTOM_CLASS CONFIG_USB_CUSTOM_CLASS_ENABLED diff --git a/tools/sdk/esp32s2/lib/libtinyusb.a b/tools/sdk/esp32s2/lib/libtinyusb.a index c2baa2d7..f3eed02e 100644 Binary files a/tools/sdk/esp32s2/lib/libtinyusb.a and b/tools/sdk/esp32s2/lib/libtinyusb.a differ diff --git a/tools/sdk/esp32s2/sdkconfig b/tools/sdk/esp32s2/sdkconfig index 2200c738..51552d9b 100644 --- a/tools/sdk/esp32s2/sdkconfig +++ b/tools/sdk/esp32s2/sdkconfig @@ -989,6 +989,7 @@ CONFIG_SPIFFS_USE_MTIME=y # CONFIG_USB_ENABLED=y CONFIG_USB_MAX_POWER_USAGE=500 +# CONFIG_USB_USE_BUILTIN_DESCRIPTORS is not set CONFIG_USB_CDC_ENABLED=y CONFIG_USB_CDC_RX_BUFSIZE=1024 CONFIG_USB_CDC_TX_BUFSIZE=1024 @@ -1000,18 +1001,20 @@ CONFIG_USB_MIDI_ENABLED=y CONFIG_USB_MIDI_RX_BUFSIZE=64 CONFIG_USB_MIDI_TX_BUFSIZE=64 CONFIG_USB_VENDOR_ENABLED=y -CONFIG_USB_CUSTOM_CLASS_ENABLED=y -CONFIG_USB_DEBUG=y +CONFIG_USB_DFU_RT_ENABLED=y +CONFIG_USB_NET_ENABLED=y +# CONFIG_USB_CUSTOM_CLASS_ENABLED is not set +# CONFIG_USB_DEBUG is not set # # Descriptor configuration # CONFIG_USB_DESC_USE_ESPRESSIF_VID=y CONFIG_USB_DESC_USE_DEFAULT_PID=y -CONFIG_USB_DESC_BCDDEVICE=0x0723 +CONFIG_USB_DESC_BCDDEVICE=0x0100 CONFIG_USB_DESC_MANUFACTURER_STRING="Espressif" -CONFIG_USB_DESC_PRODUCT_STRING="ESP32-S2" -CONFIG_USB_DESC_SERIAL_STRING="0" +CONFIG_USB_DESC_PRODUCT_STRING="Espressif Device" +CONFIG_USB_DESC_SERIAL_STRING="123456" CONFIG_USB_DESC_CDC_STRING="Espressif CDC Device" CONFIG_USB_DESC_MSC_STRING="Espressif MSC Device" CONFIG_USB_DESC_MIDI_STRING="Espressif MIDI Device"