Merge branch 'release/v6.13.0'

Author: valeros

boards/minimain_esp32s2.json

@@ -35,7 +35,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "Deparment of Alchemy MiniMain ESP32-S2",
+  "name": "Department of Alchemy MiniMain ESP32-S2",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,

builder/frameworks/espidf.py

@@ -1320,7 +1320,8 @@ def _get_installed_pip_packages(python_exe_path):
         "cryptography": "~=44.0.0" if IDF5 else ">=2.1.4,<35.0.0",
         "pyparsing": ">=3.1.0,<4" if IDF5 else ">=2.0.3,<2.4.0",
         "idf-component-manager": "~=2.2" if IDF5 else "~=1.0",
-        "esp-idf-kconfig": "~=2.5.0"
+        "esp-idf-kconfig": "~=2.5.0",
+        "pydantic": "<2.12.0"
     }
 
     if not IDF5:

examples/espidf-peripherals-usb/components/esp_tinyusb/CHANGELOG.md

@@ -1,3 +1,93 @@
+## 2.1.0
+
+- Added configurable Suspend/Resume device event support using TinyUSB callbacks `tud_suspend_cb` and `tud_resume_cb`
+
+## 2.0.1~1
+
+- esp_tinyusb: Claim forward compatibility with TinyUSB 0.19
+- CDC: Added support for new VFS API (for esp-idf v5.4 and higher)
+
+## 2.0.1
+
+- esp_tinyusb: Added ESP32H4 support
+- esp_tinyusb: Fixed an assertion failure on the GetOtherSpeedDescriptor() request for ESP32P4 when the OTG1.1 port is used
+- MSC: Added dynamic member and storage operation multitask protection
+- MSC: Used `esp_vfs_fat_register_cfg` function prototype for esp-idf v5.3 and higher
+
+## 2.0.0
+
+- esp_tinyusb: Added USB Compliance Verification results
+- CDC-ACM: Added a configurable parameter for the endpoint DMA buffer
+
+### Breaking changes
+
+- esp_tinyusb: External PHY is no longer initialized automatically. If an external PHY is required, it must be explicitly initialized by the user with configuration parameter `phy.skip_setup = true`
+- esp_tinyusb: Added run-time configuration for peripheral port selection, task settings, and descriptors. For more details, refer to the [Espressif's Addition to TinyUSB Mirgation guide v2](../../docs/device/migration-guides/v2/tinyusb.md)
+- esp_tinyusb: Added USB Device event callback to handle different USB Device events. For the list of supported USB Device events, refer to to [Espressif's Addition to TinyUSB - README](../esp_tinyusb/README.md)
+- esp_tinyusb: Removed configuration option to handle TinyUSB events outside of this driver
+- NCM: Added possibility to deinit the driver
+- NCM: Updated public API; refer to the [NCM Class Migration guide v2](../../docs/device/migration-guides/v2/tinyusb_ncm.md)
+- MSC: Removed dedicated callbacks; introduced a single callback with an event ID for each storage
+- MSC: Added storage format support
+- MSC: Added dual storage support (SPI/Flash and SD/MMC)
+- MSC: Updated public API; refer to the [MSC Class Migration guide v2](../../docs/device/migration-guides/v2/tinyusb_msc.md)
+- Console: Updated public API; refer to the [Console Class Migration guide v2](../../docs/device/migration-guides/v2/tinyusb_console.md)
+- CDC-ACM: Updated public API; refer to the [CDC-ACM Class Migration guide v2](../../docs/device/migration-guides/v2/tinyusb_cdc_acm.md)
+
+## 1.7.6~1
+
+- esp_tinyusb: Added documentation to README.md
+
+## 1.7.6
+
+- MSC: Fixed the possibility to use SD/MMC storage with large capacity (more than 4 GB)
+
+## 1.7.5
+
+- esp_tinyusb: Provide forward compatibility with IDF 6.0
+
+## 1.7.4~1
+
+- esp_tinyusb: Claim forward compatibility with IDF 6.0
+
+## 1.7.4
+
+- MSC: WL Sector runtime check during spiflash init (fix for build time error check)
+
+## 1.7.3 [yanked]
+
+- MSC: Improved transfer speed to SD cards and SPI flash
+
+## 1.7.2
+
+- esp_tinyusb: Fixed crash on logging from ISR
+- PHY: Fixed crash with external_phy=true configuration
+
+## 1.7.1
+
+- NCM: Changed default NTB config to decrease DRAM memory usage (fix for DRAM overflow on ESP32S2)
+
+## 1.7.0 [yanked]
+
+- NCM: Added possibility to configure NCM Transfer Blocks (NTB) via menuconfig
+- esp_tinyusb: Added option to select TinyUSB peripheral on esp32p4 via menuconfig (USB_PHY_SUPPORTS_P4_OTG11 in esp-idf is required)
+- esp_tinyusb: Fixed uninstall tinyusb driver with not default task configuration
+
+## 1.6.0
+
+- CDC-ACM: Fixed memory leak on deinit
+- esp_tinyusb: Added Teardown
+
+## 1.5.0
+
+- esp_tinyusb: Added DMA mode option to tinyusb DCD DWC2 configuration
+- esp_tinyusb: Changed the default affinity mask of the task to CPU1
+
+## 1.4.5
+
+- CDC-ACM: Fixed memory leak at VFS unregister
+- Vendor specific: Provided default configuration
+
 ## 1.4.4
 
 - esp_tinyusb: Added HighSpeed and Qualifier device descriptors in tinyusb configuration

examples/espidf-peripherals-usb/components/esp_tinyusb/CMakeLists.txt

@@ -2,42 +2,52 @@ set(srcs
     "descriptors_control.c"
     "tinyusb.c"
     "usb_descriptors.c"
+    "tinyusb_task.c"
     )
 
-if(NOT CONFIG_TINYUSB_NO_DEFAULT_TASK)
-    list(APPEND srcs "tusb_tasks.c")
-endif() # CONFIG_TINYUSB_NO_DEFAULT_TASK
+set(priv_req "")
+
+if(${IDF_VERSION_MAJOR} LESS 6)
+    list(APPEND priv_req "usb")
+endif()
 
 if(CONFIG_TINYUSB_CDC_ENABLED)
     list(APPEND srcs
         "cdc.c"
-        "tusb_cdc_acm.c"
+        "tinyusb_cdc_acm.c"
         )
     if(CONFIG_VFS_SUPPORT_IO)
         list(APPEND srcs
-            "tusb_console.c"
+            "tinyusb_console.c"
             "vfs_tinyusb.c"
             )
     endif() # CONFIG_VFS_SUPPORT_IO
 endif() # CONFIG_TINYUSB_CDC_ENABLED
 
 if(CONFIG_TINYUSB_MSC_ENABLED)
     list(APPEND srcs
-        tusb_msc_storage.c
+        "tinyusb_msc.c"
+        "storage_spiflash.c"
         )
+    if(CONFIG_SOC_SDMMC_HOST_SUPPORTED)
+        list(APPEND srcs
+            "storage_sdmmc.c"
+            )
+    endif() # CONFIG_SOC_SDMMC_HOST_SUPPORTED
 endif() # CONFIG_TINYUSB_MSC_ENABLED
 
+
 if(CONFIG_TINYUSB_NET_MODE_NCM)
     list(APPEND srcs
-         tinyusb_net.c
+         "tinyusb_net.c"
          )
 endif() # CONFIG_TINYUSB_NET_MODE_NCM
 
 idf_component_register(SRCS ${srcs}
                        INCLUDE_DIRS "include"
                        PRIV_INCLUDE_DIRS "include_private"
-                       PRIV_REQUIRES usb
-                       REQUIRES fatfs vfs                 
+                       PRIV_REQUIRES ${priv_req}
+                       REQUIRES fatfs vfs
                        )
 
 # Determine whether tinyusb is fetched from component registry or from local path