Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IDF release/v5.3 #10465

Merged
merged 7 commits into from
Oct 15, 2024
Merged

IDF release/v5.3 #10465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5c240a
fix(usb): Update tinyusb init call
me-no-dev Oct 10, 2024
1ef10a6
Update esp-insights version (#10456)
Asc91 Oct 15, 2024
eef3d06
Add support for WiFi to ESP32-P4 (#10463)
me-no-dev Oct 15, 2024
6f0cff1
Fix RainMaker dependent versions because Matter requires Insights 1.0.1
me-no-dev Oct 15, 2024
80e6e4d
IDF release/v5.3 707d097b
me-no-dev Oct 15, 2024
43f1a80
Merge branch 'release/v3.1.x' into idf-release/v5.3
me-no-dev Oct 15, 2024
4dce046
ci(pre-commit): Apply automatic fixes
pre-commit-ci-lite[bot] Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions cores/esp32/esp32-hal-tinyusb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ void deinit_usb_hal() {
esp_err_t tinyusb_driver_install(const tinyusb_config_t *config) {
init_usb_hal(config->external_phy);
#if CONFIG_IDF_TARGET_ESP32P4
if (!tud_init(1)) {
if (!tusb_init(1, TUSB_ROLE_DEVICE)) {
#else
if (!tud_init(0)) {
if (!tusb_init(0, TUSB_ROLE_DEVICE)) {
#endif
log_e("Can't initialize the TinyUSB stack.");
return ESP_FAIL;
Expand Down Expand Up @@ -287,15 +287,14 @@ enum {
VENDOR_REQUEST_MICROSOFT = 2
};

static uint8_t const tinyusb_bos_descriptor[] = {
// total length, number of device caps
TUD_BOS_DESCRIPTOR(BOS_TOTAL_LEN, 2),
static uint8_t const tinyusb_bos_descriptor[] = {// total length, number of device caps
TUD_BOS_DESCRIPTOR(BOS_TOTAL_LEN, 2),

// Vendor Code, iLandingPage
TUD_BOS_WEBUSB_DESCRIPTOR(VENDOR_REQUEST_WEBUSB, 1),
// Vendor Code, iLandingPage
TUD_BOS_WEBUSB_DESCRIPTOR(VENDOR_REQUEST_WEBUSB, 1),

// Microsoft OS 2.0 descriptor
TUD_BOS_MS_OS_20_DESCRIPTOR(MS_OS_20_DESC_LEN, VENDOR_REQUEST_MICROSOFT)
// Microsoft OS 2.0 descriptor
TUD_BOS_MS_OS_20_DESCRIPTOR(MS_OS_20_DESC_LEN, VENDOR_REQUEST_MICROSOFT)
};

/*
Expand Down Expand Up @@ -831,7 +830,7 @@ esp_err_t tinyusb_init(tinyusb_device_config_t *config) {
periph_ll_enable_clk_clear_rst(PERIPH_USB_MODULE);
}
#endif

tinyusb_config_t tusb_cfg = {
.external_phy = false // In the most cases you need to use a `false` value
};
Expand Down
27 changes: 21 additions & 6 deletions idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ dependencies:
require: public
espressif/esp_modem:
version: "^1.1.0"
espressif/network_provisioning:
version: "~1.0.0"
espressif/esp-zboss-lib:
version: "^1.0.1"
rules:
Expand All @@ -65,22 +63,39 @@ dependencies:
version: "^1.3.4"
rules:
- if: "target != esp32c2"
# RainMaker Start (Fixed versions, because Matter supports only Insights 1.0.1)
espressif/network_provisioning:
version: "1.0.2"
espressif/esp_rainmaker:
version: "^1.0.0"
version: "1.5.0"
rules:
- if: "target not in [esp32c2, esp32p4]"
espressif/rmaker_common:
version: "^1.4.6"
version: "1.4.6"
rules:
- if: "target not in [esp32c2, esp32p4]"
espressif/esp_insights:
version: "^1.2.1"
version: "1.0.1"
rules:
- if: "target not in [esp32c2, esp32p4]"
# New version breaks esp_insights 1.0.1
espressif/esp_diag_data_store:
version: "1.0.1"
rules:
- if: "target not in [esp32c2, esp32p4]"
espressif/esp_diagnostics:
version: "1.0.2"
rules:
- if: "target not in [esp32c2, esp32p4]"
espressif/cbor:
version: "0.6.0~1"
rules:
- if: "target not in [esp32c2, esp32p4]"
espressif/qrcode:
version: "^0.1.0~1"
version: "0.1.0~2"
rules:
- if: "target not in [esp32c2, esp32p4]"
# RainMaker End
espressif/esp-sr:
version: "^1.4.2"
rules:
Expand Down
32 changes: 16 additions & 16 deletions package/package_esp32_index.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,57 +101,57 @@
"host": "i686-mingw32",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
"size": "351074410"
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
"size": "350992761"
},
{
"host": "x86_64-mingw32",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
"size": "351074410"
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
"size": "350992761"
},
{
"host": "arm64-apple-darwin",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
"size": "351074410"
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
"size": "350992761"
},
{
"host": "x86_64-apple-darwin",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
"size": "351074410"
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
"size": "350992761"
},
{
"host": "x86_64-pc-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
"size": "351074410"
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
"size": "350992761"
},
{
"host": "i686-pc-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
"size": "351074410"
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
"size": "350992761"
},
{
"host": "aarch64-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
"size": "351074410"
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
"size": "350992761"
},
{
"host": "arm-linux-gnueabihf",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
"size": "351074410"
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
"size": "350992761"
}
]
},
Expand Down
Loading