TinyUSB adjust

Author: me-no-dev

Diff for: tools/sdk/esp32s2/include/config/sdkconfig.h

@@ -26,8 +26,8 @@
 #define CONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200
 #define CONFIG_ESPTOOLPY_FLASHMODE_QIO 1
 #define CONFIG_ESPTOOLPY_FLASHMODE "dio"
-#define CONFIG_ESPTOOLPY_FLASHFREQ_80M 1
-#define CONFIG_ESPTOOLPY_FLASHFREQ "80m"
+#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
+#define CONFIG_ESPTOOLPY_FLASHFREQ "40m"
 #define CONFIG_ESPTOOLPY_FLASHSIZE_4MB 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "4MB"
 #define CONFIG_ESPTOOLPY_FLASHSIZE_DETECT 1
@@ -353,21 +353,29 @@
 #define CONFIG_SPIFFS_META_LENGTH 4
 #define CONFIG_SPIFFS_USE_MTIME 1
 #define CONFIG_USB_ENABLED 1
-#define CONFIG_USB_MAX_POWER_USAGE 100
+#define CONFIG_USB_MAX_POWER_USAGE 500
 #define CONFIG_USB_CDC_ENABLED 1
-#define CONFIG_USB_CDC_RX_BUFSIZE 64
-#define CONFIG_USB_CDC_TX_BUFSIZE 64
+#define CONFIG_USB_CDC_RX_BUFSIZE 1024
+#define CONFIG_USB_CDC_TX_BUFSIZE 1024
 #define CONFIG_USB_MSC_ENABLED 1
 #define CONFIG_USB_MSC_BUFSIZE 512
+#define CONFIG_USB_HID_ENABLED 1
+#define CONFIG_USB_HID_BUFSIZE 16
+#define CONFIG_USB_MIDI_ENABLED 1
+#define CONFIG_USB_MIDI_RX_BUFSIZE 64
+#define CONFIG_USB_MIDI_TX_BUFSIZE 64
 #define CONFIG_USB_VENDOR_ENABLED 1
+#define CONFIG_USB_DFU_RT_ENABLED 1
 #define CONFIG_USB_DESC_USE_ESPRESSIF_VID 1
 #define CONFIG_USB_DESC_USE_DEFAULT_PID 1
 #define CONFIG_USB_DESC_BCDDEVICE 0x0100
-#define CONFIG_USB_DESC_MANUFACTURER_STRING "Espressif Systems"
+#define CONFIG_USB_DESC_MANUFACTURER_STRING "Espressif"
 #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"
+#define CONFIG_USB_DESC_HID_STRING "Espressif HID Device"
 #define CONFIG_USB_DESC_VENDOR_STRING "Espressif VENDOR Device"
 #define CONFIG_UNITY_ENABLE_FLOAT 1
 #define CONFIG_UNITY_ENABLE_DOUBLE 1

Diff for: tools/sdk/esp32s2/include/tinyusb/port/common/include/descriptors_control.h

@@ -24,9 +24,10 @@
  * Auto ProductID layout's Bitmap:
  *   [MSB]         HID | MSC | CDC          [LSB]
  */
-#define EPNUM_MSC 0x03
-#define EPNUM_VENDOR  0x06
-#define EPNUM_MIDI   0x05
+#define EPNUM_MSC       0x01
+#define EPNUM_HID       0x02
+#define EPNUM_MIDI      0x04
+#define EPNUM_VENDOR    0x06
 
 #ifdef __cplusplus
 extern "C" {

Diff for: 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 for: tools/sdk/esp32s2/ld/esp32s2.project.ld

@@ -49,6 +49,7 @@ CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
 CONFIG_BOOTLOADER_LOG_LEVEL=0
 CONFIG_BOOTLOADER_SPI_WP_PIN=7
+# CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 # CONFIG_BOOTLOADER_FACTORY_RESET is not set
 # CONFIG_BOOTLOADER_APP_TEST is not set
@@ -78,11 +79,11 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 # CONFIG_ESPTOOLPY_FLASHMODE_DIO is not set
 # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
 CONFIG_ESPTOOLPY_FLASHMODE="dio"
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-# CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
 # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
-CONFIG_ESPTOOLPY_FLASHFREQ="80m"
+CONFIG_ESPTOOLPY_FLASHFREQ="40m"
 # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
@@ -987,15 +988,21 @@ CONFIG_SPIFFS_USE_MTIME=y
 # TinyUSB
 #
 CONFIG_USB_ENABLED=y
-CONFIG_USB_MAX_POWER_USAGE=100
+CONFIG_USB_MAX_POWER_USAGE=500
+# CONFIG_USB_USE_BUILTIN_DESCRIPTORS is not set
 CONFIG_USB_CDC_ENABLED=y
-CONFIG_USB_CDC_RX_BUFSIZE=64
-CONFIG_USB_CDC_TX_BUFSIZE=64
+CONFIG_USB_CDC_RX_BUFSIZE=1024
+CONFIG_USB_CDC_TX_BUFSIZE=1024
 CONFIG_USB_MSC_ENABLED=y
 CONFIG_USB_MSC_BUFSIZE=512
-# CONFIG_USB_HID_ENABLED is not set
-# CONFIG_USB_MIDI_ENABLED is not set
+CONFIG_USB_HID_ENABLED=y
+CONFIG_USB_HID_BUFSIZE=16
+CONFIG_USB_MIDI_ENABLED=y
+CONFIG_USB_MIDI_RX_BUFSIZE=64
+CONFIG_USB_MIDI_TX_BUFSIZE=64
 CONFIG_USB_VENDOR_ENABLED=y
+CONFIG_USB_DFU_RT_ENABLED=y
+# CONFIG_USB_NET_ENABLED is not set
 # CONFIG_USB_CUSTOM_CLASS_ENABLED is not set
 # CONFIG_USB_DEBUG is not set
 
@@ -1005,11 +1012,13 @@ CONFIG_USB_VENDOR_ENABLED=y
 CONFIG_USB_DESC_USE_ESPRESSIF_VID=y
 CONFIG_USB_DESC_USE_DEFAULT_PID=y
 CONFIG_USB_DESC_BCDDEVICE=0x0100
-CONFIG_USB_DESC_MANUFACTURER_STRING="Espressif Systems"
+CONFIG_USB_DESC_MANUFACTURER_STRING="Espressif"
 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"
+CONFIG_USB_DESC_HID_STRING="Espressif HID Device"
 CONFIG_USB_DESC_VENDOR_STRING="Espressif VENDOR Device"
 # end of Descriptor configuration
 # end of TinyUSB