Merge branch 'feature/usb_device_examples_update_v2.0.0' into 'master'

feature(usb_device): Examples update to esp_tinyusb v2.0.0

Closes IDF-13618

See merge request espressif/esp-idf!41610

Author: tore-espressif

examples/network/sta2eth/main/idf_component.yml

@@ -1,7 +1,7 @@
 ## IDF Component Manager Manifest File
 dependencies:
   espressif/esp_tinyusb:
-    version: "^1.3.0"
+    version: "^2.0.0"
     rules:
       - if: "idf_version >=4.4"
       - if: "target in [esp32s2, esp32s3]"

examples/network/sta2eth/main/usb_ncm_iface.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -12,6 +12,7 @@
 #include "esp_netif.h"
 #include "esp_event.h"
 #include "tinyusb.h"
+#include "tinyusb_default_config.h"
 #include "tinyusb_net.h"
 #include "wired_iface.h"
 #include "dhcpserver/dhcpserver_options.h"
@@ -44,9 +45,7 @@ void mac_spoof(mac_spoof_direction_t direction, uint8_t *buffer, uint16_t len, u
 
 esp_err_t wired_bridge_init(wired_rx_cb_t rx_cb, wired_free_cb_t free_cb)
 {
-    const tinyusb_config_t tusb_cfg = {
-        .external_phy = false,
-    };
+    const tinyusb_config_t tusb_cfg = TINYUSB_DEFAULT_CONFIG();
     ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
 
     tinyusb_net_config_t net_config = {
@@ -56,7 +55,7 @@ esp_err_t wired_bridge_init(wired_rx_cb_t rx_cb, wired_free_cb_t free_cb)
 
     esp_read_mac(net_config.mac_addr, ESP_MAC_WIFI_STA);
 
-    esp_err_t ret = tinyusb_net_init(TINYUSB_USBDEV_0, &net_config);
+    esp_err_t ret = tinyusb_net_init(&net_config);
     if (ret != ESP_OK) {
         ESP_LOGE(TAG, "USB net init but not connect wifi");
         return ret;
@@ -113,9 +112,7 @@ static esp_err_t netif_recv_callback(void *buffer, uint16_t len, void *ctx)
  */
 esp_err_t wired_netif_init(void)
 {
-    const tinyusb_config_t tusb_cfg = {
-        .external_phy = false,
-    };
+    const tinyusb_config_t tusb_cfg = TINYUSB_DEFAULT_CONFIG();
     ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
 
     const tinyusb_net_config_t net_config = {
@@ -125,7 +122,7 @@ esp_err_t wired_netif_init(void)
         .on_recv_callback = netif_recv_callback,
     };
 
-    esp_err_t ret = tinyusb_net_init(TINYUSB_USBDEV_0, &net_config);
+    esp_err_t ret = tinyusb_net_init(&net_config);
     if (ret != ESP_OK) {
         ESP_LOGE(TAG, "Cannot initialize USB Net device");
         return ret;

examples/network/sta2eth/sdkconfig.defaults.esp32s3

@@ -1,11 +1,4 @@
 # ESP32S3 has USB-OTG, let's prefer virtual Ethernet (USB-NCM device)
 CONFIG_EXAMPLE_WIRED_INTERFACE_IS_USB=y
 CONFIG_EXAMPLE_WIRED_INTERFACE_IS_ETHERNET=n
-
-# TinyUSB needs to be initialized and run from one core
-# that's why we pin the task to CPU0 and init tusb in the task
-# on dual core devices (ESP32S3)
-CONFIG_TINYUSB_TASK_AFFINITY_CPU0=y
-CONFIG_TINYUSB_INIT_IN_DEFAULT_TASK=y
-
 CONFIG_TINYUSB_NET_MODE_NCM=y

examples/peripherals/usb/device/tusb_composite_msc_serialdevice/main/idf_component.yml

@@ -1,3 +1,4 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp_tinyusb: "^1.2"
+  espressif/esp_tinyusb:
+    version: "^2.0.0"

examples/peripherals/usb/device/tusb_composite_msc_serialdevice/main/tusb_composite_main.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -10,8 +10,9 @@
 #include "esp_partition.h"
 #include "esp_check.h"
 #include "tinyusb.h"
-#include "tusb_msc_storage.h"
-#include "tusb_cdc_acm.h"
+#include "tinyusb_default_config.h"
+#include "tinyusb_msc.h"
+#include "tinyusb_cdc_acm.h"
 
 #define BASE_PATH "/usb" // base path to mount the partition
 
@@ -144,42 +145,36 @@ void app_main(void)
     ESP_LOGI(TAG, "Initializing storage...");
 
     static wl_handle_t wl_handle = WL_INVALID_HANDLE;
+
     ESP_ERROR_CHECK(storage_init_spiflash(&wl_handle));
 
-    const tinyusb_msc_spiflash_config_t config_spi = {
-        .wl_handle = wl_handle
+    tinyusb_msc_storage_handle_t storage_hdl = NULL;
+
+    const tinyusb_msc_storage_config_t storage_cfg = {
+        .mount_point = TINYUSB_MSC_STORAGE_MOUNT_APP,       // Initial mount point to APP
+        .medium.wl_handle = wl_handle,
+        .fat_fs = {
+            .base_path = BASE_PATH,                        // User specific base path
+        },
     };
-    ESP_ERROR_CHECK(tinyusb_msc_storage_init_spiflash(&config_spi));
-    ESP_ERROR_CHECK(tinyusb_msc_storage_mount(BASE_PATH));
+
+    ESP_ERROR_CHECK(tinyusb_msc_new_storage_spiflash(&storage_cfg, &storage_hdl));
+
     file_operations();
 
     ESP_LOGI(TAG, "USB Composite initialization");
-    const tinyusb_config_t tusb_cfg = {
-        .device_descriptor = NULL,
-        .string_descriptor = NULL,
-        .string_descriptor_count = 0,
-        .external_phy = false,
-#if (TUD_OPT_HIGH_SPEED)
-        .fs_configuration_descriptor = NULL,
-        .hs_configuration_descriptor = NULL,
-        .qualifier_descriptor = NULL,
-#else
-        .configuration_descriptor = NULL,
-#endif // TUD_OPT_HIGH_SPEED
-    };
+    const tinyusb_config_t tusb_cfg = TINYUSB_DEFAULT_CONFIG();
     ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
 
     tinyusb_config_cdcacm_t acm_cfg = {
-        .usb_dev = TINYUSB_USBDEV_0,
         .cdc_port = TINYUSB_CDC_ACM_0,
-        .rx_unread_buf_sz = 64,
         .callback_rx = &tinyusb_cdc_rx_callback, // the first way to register a callback
         .callback_rx_wanted_char = NULL,
         .callback_line_state_changed = NULL,
         .callback_line_coding_changed = NULL
     };
 
-    ESP_ERROR_CHECK(tusb_cdc_acm_init(&acm_cfg));
+    ESP_ERROR_CHECK(tinyusb_cdcacm_init(&acm_cfg));
     /* the second way to register a callback */
     ESP_ERROR_CHECK(tinyusb_cdcacm_register_callback(
                         TINYUSB_CDC_ACM_0,

examples/peripherals/usb/device/tusb_console/main/idf_component.yml

@@ -1,3 +1,4 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp_tinyusb: "^1"
+  espressif/esp_tinyusb:
+    version: "^2.0.0"

examples/peripherals/usb/device/tusb_console/main/tusb_console_main.c

@@ -1,13 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
 
 // DESCRIPTION:
-// This example contains minimal code to make ESP32-S2 based device
-// recognizable by USB-host devices as a USB Serial Device printing output from
-// the application.
+// This example contains minimal code to make a USB device, recognizable by USB-host as
+// a USB Serial Device printing output from the application.
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -16,8 +15,9 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "tinyusb.h"
-#include "tusb_cdc_acm.h"
-#include "tusb_console.h"
+#include "tinyusb_default_config.h"
+#include "tinyusb_cdc_acm.h"
+#include "tinyusb_console.h"
 #include "sdkconfig.h"
 
 static const char *TAG = "example";
@@ -27,23 +27,11 @@ void app_main(void)
     /* Setting TinyUSB up */
     ESP_LOGI(TAG, "USB initialization");
 
-    const tinyusb_config_t tusb_cfg = {
-        .device_descriptor = NULL,
-        .string_descriptor = NULL,
-        .external_phy = false, // In the most cases you need to use a `false` value
-#if (TUD_OPT_HIGH_SPEED)
-        .fs_configuration_descriptor = NULL,
-        .hs_configuration_descriptor = NULL,
-        .qualifier_descriptor = NULL,
-#else
-        .configuration_descriptor = NULL,
-#endif // TUD_OPT_HIGH_SPEED
-    };
-
+    const tinyusb_config_t tusb_cfg = TINYUSB_DEFAULT_CONFIG();
     ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
 
     tinyusb_config_cdcacm_t acm_cfg = { 0 }; // the configuration uses default values
-    ESP_ERROR_CHECK(tusb_cdc_acm_init(&acm_cfg));
+    ESP_ERROR_CHECK(tinyusb_cdcacm_init(&acm_cfg));
 
     ESP_LOGI(TAG, "USB initialization DONE");
     while (1) {
@@ -54,13 +42,13 @@ void app_main(void)
         fprintf(stderr, "example: print -> stderr\n");
         vTaskDelay(1000 / portTICK_PERIOD_MS);
 
-        esp_tusb_init_console(TINYUSB_CDC_ACM_0); // log to usb
+        ESP_ERROR_CHECK(tinyusb_console_init(TINYUSB_CDC_ACM_0)); // log to usb
         ESP_LOGI(TAG, "log -> USB");
         vTaskDelay(1000 / portTICK_PERIOD_MS);
         fprintf(stdout, "example: print -> stdout\n");
         vTaskDelay(1000 / portTICK_PERIOD_MS);
         fprintf(stderr, "example: print -> stderr\n");
         vTaskDelay(1000 / portTICK_PERIOD_MS);
-        esp_tusb_deinit_console(TINYUSB_CDC_ACM_0); // log to uart
+        ESP_ERROR_CHECK(tinyusb_console_deinit(TINYUSB_CDC_ACM_0)); // log to uart
     }
 }

examples/peripherals/usb/device/tusb_hid/main/idf_component.yml

@@ -1,3 +1,4 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp_tinyusb: "^1.1"
+  espressif/esp_tinyusb:
+    version: "^2.0.0"

examples/peripherals/usb/device/tusb_hid/main/tusb_hid_example_main.c

@@ -9,6 +9,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "tinyusb.h"
+#include "tinyusb_default_config.h"
 #include "class/hid/hid_device.h"
 #include "driver/gpio.h"
 
@@ -164,19 +165,15 @@ void app_main(void)
     ESP_ERROR_CHECK(gpio_config(&boot_button_config));
 
     ESP_LOGI(TAG, "USB initialization");
-    const tinyusb_config_t tusb_cfg = {
-        .device_descriptor = NULL,
-        .string_descriptor = hid_string_descriptor,
-        .string_descriptor_count = sizeof(hid_string_descriptor) / sizeof(hid_string_descriptor[0]),
-        .external_phy = false,
+    tinyusb_config_t tusb_cfg = TINYUSB_DEFAULT_CONFIG();
+
+    tusb_cfg.descriptor.device = NULL;
+    tusb_cfg.descriptor.full_speed_config = hid_configuration_descriptor;
+    tusb_cfg.descriptor.string = hid_string_descriptor;
+    tusb_cfg.descriptor.string_count = sizeof(hid_string_descriptor) / sizeof(hid_string_descriptor[0]);
 #if (TUD_OPT_HIGH_SPEED)
-        .fs_configuration_descriptor = hid_configuration_descriptor, // HID configuration descriptor for full-speed and high-speed are the same
-        .hs_configuration_descriptor = hid_configuration_descriptor,
-        .qualifier_descriptor = NULL,
-#else
-        .configuration_descriptor = hid_configuration_descriptor,
+    tusb_cfg.descriptor.high_speed_config = hid_configuration_descriptor;
 #endif // TUD_OPT_HIGH_SPEED
-    };
 
     ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
     ESP_LOGI(TAG, "USB initialization DONE");

examples/peripherals/usb/device/tusb_midi/main/idf_component.yml

@@ -1,3 +1,4 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp_tinyusb: "^1.1"
+  espressif/esp_tinyusb:
+    version: "^2.0.0"