diff options
| -rw-r--r-- | ports/esp32/lockfiles/dependencies.lock.esp32 | 2 | ||||
| -rw-r--r-- | ports/esp32/lockfiles/dependencies.lock.esp32c2 | 2 | ||||
| -rw-r--r-- | ports/esp32/lockfiles/dependencies.lock.esp32c3 | 2 | ||||
| -rw-r--r-- | ports/esp32/lockfiles/dependencies.lock.esp32c6 | 2 | ||||
| -rw-r--r-- | ports/esp32/lockfiles/dependencies.lock.esp32s2 | 13 | ||||
| -rw-r--r-- | ports/esp32/lockfiles/dependencies.lock.esp32s3 | 13 | ||||
| -rw-r--r-- | ports/esp32/main/idf_component.yml | 5 |
7 files changed, 22 insertions, 17 deletions
diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32 b/ports/esp32/lockfiles/dependencies.lock.esp32 index f48a8bcad..4b0b2d972 100644 --- a/ports/esp32/lockfiles/dependencies.lock.esp32 +++ b/ports/esp32/lockfiles/dependencies.lock.esp32 @@ -30,6 +30,6 @@ direct_dependencies: - espressif/lan867x - espressif/mdns - idf -manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55 +manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3 target: esp32 version: 2.0.0 diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c2 b/ports/esp32/lockfiles/dependencies.lock.esp32c2 index 34311207e..5c5cea0c9 100644 --- a/ports/esp32/lockfiles/dependencies.lock.esp32c2 +++ b/ports/esp32/lockfiles/dependencies.lock.esp32c2 @@ -16,6 +16,6 @@ dependencies: direct_dependencies: - espressif/mdns - idf -manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55 +manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3 target: esp32c2 version: 2.0.0 diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c3 b/ports/esp32/lockfiles/dependencies.lock.esp32c3 index 811a3ab51..4c4c869c2 100644 --- a/ports/esp32/lockfiles/dependencies.lock.esp32c3 +++ b/ports/esp32/lockfiles/dependencies.lock.esp32c3 @@ -16,6 +16,6 @@ dependencies: direct_dependencies: - espressif/mdns - idf -manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55 +manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3 target: esp32c3 version: 2.0.0 diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32c6 b/ports/esp32/lockfiles/dependencies.lock.esp32c6 index 74f2cdbd4..b7435e107 100644 --- a/ports/esp32/lockfiles/dependencies.lock.esp32c6 +++ b/ports/esp32/lockfiles/dependencies.lock.esp32c6 @@ -16,6 +16,6 @@ dependencies: direct_dependencies: - espressif/mdns - idf -manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55 +manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3 target: esp32c6 version: 2.0.0 diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32s2 b/ports/esp32/lockfiles/dependencies.lock.esp32s2 index a672c6d5e..a13d9fd40 100644 --- a/ports/esp32/lockfiles/dependencies.lock.esp32s2 +++ b/ports/esp32/lockfiles/dependencies.lock.esp32s2 @@ -10,19 +10,20 @@ dependencies: type: service version: 1.1.0 espressif/tinyusb: - component_hash: aa65639878f27a44d349044afd9c3fc134a92bd560874fdac1d836019b5c07ca + component_hash: ee1c962cff61eb975d508258d509974d58031cc27ff0d6c4117a67a613a49594 dependencies: - name: idf - require: private version: '>=5.0' source: - registry_url: https://components.espressif.com/ - type: service + git: https://github.com/micropython/tinyusb-espressif.git + path: . + type: git targets: - esp32s2 - esp32s3 - esp32p4 - version: 0.18.0~4 + - esp32h4 + version: e4c0ec3caab3d9c25374de7047653b9ced8f14ff idf: source: type: idf @@ -31,6 +32,6 @@ direct_dependencies: - espressif/mdns - espressif/tinyusb - idf -manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55 +manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3 target: esp32s2 version: 2.0.0 diff --git a/ports/esp32/lockfiles/dependencies.lock.esp32s3 b/ports/esp32/lockfiles/dependencies.lock.esp32s3 index f0f229c90..d5e7045b7 100644 --- a/ports/esp32/lockfiles/dependencies.lock.esp32s3 +++ b/ports/esp32/lockfiles/dependencies.lock.esp32s3 @@ -10,19 +10,20 @@ dependencies: type: service version: 1.1.0 espressif/tinyusb: - component_hash: aa65639878f27a44d349044afd9c3fc134a92bd560874fdac1d836019b5c07ca + component_hash: ee1c962cff61eb975d508258d509974d58031cc27ff0d6c4117a67a613a49594 dependencies: - name: idf - require: private version: '>=5.0' source: - registry_url: https://components.espressif.com/ - type: service + git: https://github.com/micropython/tinyusb-espressif.git + path: . + type: git targets: - esp32s2 - esp32s3 - esp32p4 - version: 0.18.0~4 + - esp32h4 + version: e4c0ec3caab3d9c25374de7047653b9ced8f14ff idf: source: type: idf @@ -31,6 +32,6 @@ direct_dependencies: - espressif/mdns - espressif/tinyusb - idf -manifest_hash: ea629d6996152d77801fb1acae35b27596fdc023a933d40287d80f98dc497b55 +manifest_hash: da32add5eb5e196ac97a99eb579025222ec572f5db4038873fbf9d3b9d6ed5a3 target: esp32s3 version: 2.0.0 diff --git a/ports/esp32/main/idf_component.yml b/ports/esp32/main/idf_component.yml index 1ee8aa976..77904865b 100644 --- a/ports/esp32/main/idf_component.yml +++ b/ports/esp32/main/idf_component.yml @@ -4,7 +4,10 @@ dependencies: espressif/tinyusb: rules: - if: "target in [esp32s2, esp32s3]" - version: "~0.18.0" + # Temporary workaround for https://github.com/hathach/tinyusb/issues/3154 + # Can be removed once fix is released in espressif/tinyusb + git: https://github.com/micropython/tinyusb-espressif.git + version: cherrypick/dwc2_zlp_fix espressif/lan867x: version: "~1.0.0" rules: |