Update IDF to v5.5.2

Author: valeros

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

examples/espidf-peripherals-usb/components/esp_tinyusb/Kconfig

@@ -6,72 +6,57 @@ menu "TinyUSB Stack"
         help
             Specify verbosity of TinyUSB log output.
 
-    choice TINYUSB_RHPORT
-        depends on IDF_TARGET_ESP32P4
-        prompt "TinyUSB PHY"
-        default TINYUSB_RHPORT_HS
-        help
-            Allows set the USB PHY Controller for TinyUSB: HS (USB OTG2.0 PHY for HighSpeed)
+    menu "TinyUSB DCD"
+        choice TINYUSB_MODE
+            prompt "DCD Mode"
+            default TINYUSB_MODE_DMA
+            help
+                TinyUSB DCD DWC2 Driver supports two modes: Slave mode (based on IRQ) and Buffer DMA mode.
 
-        config TINYUSB_RHPORT_HS
-            bool "HS"
-    endchoice
+            config TINYUSB_MODE_SLAVE
+                bool "Slave/IRQ"
+            config TINYUSB_MODE_DMA
+                bool "Buffer DMA"
+        endchoice
+    endmenu # "TinyUSB DCD"
 
-    menu "TinyUSB task configuration"
-        config TINYUSB_NO_DEFAULT_TASK
-            bool "Do not create a TinyUSB task"
+    menu "TinyUSB callbacks"
+        config TINYUSB_SUSPEND_CALLBACK
+            bool "Register suspend callback"
             default n
             help
-                This option allows to not create the FreeRTOS task during the driver initialization.
-                User will have to handle TinyUSB events manually.
+                Register TinyUSB's suspend callback (tud_suspend_cb()) in esp_tinyusb.
 
-        config TINYUSB_TASK_PRIORITY
-            int "TinyUSB task priority"
-            default 5
-            depends on !TINYUSB_NO_DEFAULT_TASK
-            help
-                Set the priority of the default TinyUSB main task.
+                When enabled, esp_tinyusb provides a strong implementation of
+                tud_suspend_cb() and dispatches TINYUSB_EVENT_SUSPENDED via the
+                esp_tinyusb device event callback.
 
-        config TINYUSB_TASK_STACK_SIZE
-            int "TinyUSB task stack size (bytes)"
-            default 4096
-            depends on !TINYUSB_NO_DEFAULT_TASK
-            help
-                Set the stack size of the default TinyUSB main task.
+                When disabled, tinyusb provides weak implementation of the tud_suspend_cb(),
+                and user can provide it's own strong implementation of the tud_suspend_cb().
+
+                NOTE: When this option is enabled, user applications MUST NOT
+                define tud_suspend_cb() themselves. Defining tud_suspend_cb()
+                in the application while this option is enabled will result in
+                a linker error due to multiple definitions.
 
-        choice TINYUSB_TASK_AFFINITY
-            prompt "TinyUSB task affinity"
-            default TINYUSB_TASK_AFFINITY_NO_AFFINITY
-            depends on !TINYUSB_NO_DEFAULT_TASK
+        config TINYUSB_RESUME_CALLBACK
+            bool "Register resume callback"
+            default n
             help
-                Allows setting TinyUSB tasks affinity, i.e. whether the task is pinned to
-                CPU0, pinned to CPU1, or allowed to run on any CPU.
+                Register TinyUSB's resume callback (tud_resume_cb()) in esp_tinyusb.
 
-            config TINYUSB_TASK_AFFINITY_NO_AFFINITY
-                bool "No affinity"
-            config TINYUSB_TASK_AFFINITY_CPU0
-                bool "CPU0"
-            config TINYUSB_TASK_AFFINITY_CPU1
-                bool "CPU1"
-                depends on !FREERTOS_UNICORE
-        endchoice
+                When enabled, esp_tinyusb provides a strong implementation of
+                tud_resume_cb() and dispatches TINYUSB_EVENT_RESUMED via the
+                esp_tinyusb device event callback.
 
-        config TINYUSB_TASK_AFFINITY
-            hex
-            default FREERTOS_NO_AFFINITY if TINYUSB_TASK_AFFINITY_NO_AFFINITY
-            default 0x0 if TINYUSB_TASK_AFFINITY_CPU0
-            default 0x1 if TINYUSB_TASK_AFFINITY_CPU1
+                When disabled, tinyusb provides weak implementation of the tud_resume_cb(),
+                and user can provide it's own strong implementation of the tud_resume_cb().
 
-        config TINYUSB_INIT_IN_DEFAULT_TASK
-            bool "Initialize TinyUSB stack within the default TinyUSB task"
-            default n
-            depends on !TINYUSB_NO_DEFAULT_TASK
-            help
-                Run TinyUSB stack initialization just after starting the default TinyUSB task.
-                This is especially useful in multicore scenarios, when we need to pin the task
-                to a specific core and, at the same time initialize TinyUSB stack
-                (i.e. install interrupts) on the same core.
-    endmenu
+                NOTE: When this option is enabled, user applications MUST NOT
+                define tud_resume_cb() themselves. Defining tud_resume_cb()
+                in the application while this option is enabled will result in
+                a linker error due to multiple definitions.
+    endmenu # "TinyUSB callbacks"
 
     menu "Descriptor configuration"
         comment "You can provide your custom descriptors via tinyusb_driver_install()"
@@ -141,7 +126,7 @@ menu "TinyUSB Stack"
                 Name of the MSC device.
     endmenu # "Descriptor configuration"
 
-    menu "Massive Storage Class (MSC)"
+    menu "Mass Storage Class (MSC)"
         config TINYUSB_MSC_ENABLED
             bool "Enable TinyUSB MSC feature"
             default n
@@ -151,8 +136,10 @@ menu "TinyUSB Stack"
         config TINYUSB_MSC_BUFSIZE
             depends on TINYUSB_MSC_ENABLED
             int "MSC FIFO size"
-            default 512
-            range 64 10000
+            default 512 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H4
+            default 8192 if IDF_TARGET_ESP32P4
+            range 64 8192 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H4
+            range 64 32768 if IDF_TARGET_ESP32P4
             help
                 MSC FIFO size, in bytes.
 
@@ -162,7 +149,7 @@ menu "TinyUSB Stack"
             default "/data"
             help
                 MSC Mount Path of storage.
-    endmenu # "Massive Storage Class"
+    endmenu # "Mass Storage Class"
 
     menu "Communication Device Class (CDC)"
         config TINYUSB_CDC_ENABLED
@@ -185,14 +172,23 @@ menu "TinyUSB Stack"
             default 512
             range 64 10000
             help
-                CDC FIFO size of RX channel.
+                This buffer size defines maximum data length in bytes that you can receive at once.
+                Must be greater or equal to TINYUSB_CDC_EP_BUFSIZE for correct receiving.
 
         config TINYUSB_CDC_TX_BUFSIZE
             depends on TINYUSB_CDC_ENABLED
             int "CDC FIFO size of TX channel"
             default 512
             help
-                CDC FIFO size of TX channel.
+                This buffer size defines maximum data length in bytes that you can transmit at once.
+
+        config TINYUSB_CDC_EP_BUFSIZE
+            depends on TINYUSB_CDC_ENABLED
+            int "CDC Endpoint buffer size"
+            default 512
+            help
+                This low layer buffer has the most significant impact on performance. Set to 8192 for best performance.
+                Sizes above 8192 bytes bring only little performance improvement.
     endmenu # "Communication Device Class"
 
     menu "Musical Instrument Digital Interface (MIDI)"
@@ -268,5 +264,59 @@ menu "TinyUSB Stack"
             config TINYUSB_NET_MODE_NONE
                 bool "None"
         endchoice
+
+        config TINYUSB_NCM_OUT_NTB_BUFFS_COUNT
+            int "Number of NCM NTB buffers for reception side"
+            depends on TINYUSB_NET_MODE_NCM
+            default 3
+            range 1 6
+            help
+                Number of NTB buffers for reception side.
+                Can be increased to improve performance and stability with the cost of additional RAM requirements.
+                Helps to mitigate "tud_network_can_xmit: request blocked" warning message when running NCM device.
+
+        config TINYUSB_NCM_IN_NTB_BUFFS_COUNT
+            int "Number of NCM NTB buffers for transmission side"
+            depends on TINYUSB_NET_MODE_NCM
+            default 3
+            range 1 6
+            help
+                Number of NTB buffers for transmission side.
+                Can be increased to improve performance and stability with the cost of additional RAM requirements.
+                Helps to mitigate "tud_network_can_xmit: request blocked" warning message when running NCM device.
+
+        config TINYUSB_NCM_OUT_NTB_BUFF_MAX_SIZE
+            int "NCM NTB Buffer size for reception size"
+            depends on TINYUSB_NET_MODE_NCM
+            default 3200
+            range 1600 10240
+            help
+                Size of NTB buffers on the reception side. The minimum size used by Linux is 2048 bytes.
+                NTB buffer size must be significantly larger than the MTU (Maximum Transmission Unit).
+                The typical default MTU size for Ethernet is 1500 bytes, plus an additional packet overhead.
+                To improve performance, the NTB buffer size should be large enough to fit multiple MTU-sized
+                frames in a single NTB buffer and it's length should be multiple of 4.
+
+        config TINYUSB_NCM_IN_NTB_BUFF_MAX_SIZE
+            int "NCM NTB Buffer size for transmission size"
+            depends on TINYUSB_NET_MODE_NCM
+            default 3200
+            range 1600 10240
+            help
+                Size of NTB buffers on the transmission side. The minimum size used by Linux is 2048 bytes.
+                NTB buffer size must be significantly larger than the MTU (Maximum Transmission Unit).
+                The typical default MTU size for Ethernet is 1500 bytes, plus an additional packet overhead.
+                To improve performance, the NTB buffer size should be large enough to fit multiple MTU-sized
+                frames in a single NTB buffer and it's length should be multiple of 4.
+
     endmenu # "Network driver (ECM/NCM/RNDIS)"
+
+    menu "Vendor Specific Interface"
+        config TINYUSB_VENDOR_COUNT
+            int "TinyUSB Vendor specific interfaces count"
+            default 0
+            range 0 2
+            help
+                Setting value greater than 0 will enable TinyUSB Vendor specific feature.
+    endmenu # "Vendor Specific Interface"
 endmenu # "TinyUSB Stack"