Skip to content

Commit a3f2568

Browse files
me-no-devAsc91pre-commit-ci-lite[bot]
authored
IDF release/v5.3 (#10465)
* fix(usb): Update tinyusb init call * Update esp-insights version (#10456) * Add support for WiFi to ESP32-P4 (#10463) * feat(p4): Add support for WiFi to ESP32-P4 Implements support for external MCU connected through SDIO * fix(p4): Init SDIO host properly on Network boot esp-hosted has one function marked as "constructor" that did not run in the boot phase of the chip. This calls the function when network is started * Fix RainMaker dependent versions because Matter requires Insights 1.0.1 * IDF release/v5.3 707d097b * ci(pre-commit): Apply automatic fixes --------- Co-authored-by: Mahesh Tupe <[email protected]> Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
1 parent c6bf1b4 commit a3f2568

File tree

3 files changed

+46
-32
lines changed

3 files changed

+46
-32
lines changed

‎cores/esp32/esp32-hal-tinyusb.c

+9-10
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ void deinit_usb_hal() {
174174
esp_err_t tinyusb_driver_install(const tinyusb_config_t *config) {
175175
init_usb_hal(config->external_phy);
176176
#if CONFIG_IDF_TARGET_ESP32P4
177-
if (!tud_init(1)) {
177+
if (!tusb_init(1, TUSB_ROLE_DEVICE)) {
178178
#else
179-
if (!tud_init(0)) {
179+
if (!tusb_init(0, TUSB_ROLE_DEVICE)) {
180180
#endif
181181
log_e("Can't initialize the TinyUSB stack.");
182182
return ESP_FAIL;
@@ -287,15 +287,14 @@ enum {
287287
VENDOR_REQUEST_MICROSOFT = 2
288288
};
289289

290-
static uint8_t const tinyusb_bos_descriptor[] = {
291-
// total length, number of device caps
292-
TUD_BOS_DESCRIPTOR(BOS_TOTAL_LEN, 2),
290+
static uint8_t const tinyusb_bos_descriptor[] = {// total length, number of device caps
291+
TUD_BOS_DESCRIPTOR(BOS_TOTAL_LEN, 2),
293292

294-
// Vendor Code, iLandingPage
295-
TUD_BOS_WEBUSB_DESCRIPTOR(VENDOR_REQUEST_WEBUSB, 1),
293+
// Vendor Code, iLandingPage
294+
TUD_BOS_WEBUSB_DESCRIPTOR(VENDOR_REQUEST_WEBUSB, 1),
296295

297-
// Microsoft OS 2.0 descriptor
298-
TUD_BOS_MS_OS_20_DESCRIPTOR(MS_OS_20_DESC_LEN, VENDOR_REQUEST_MICROSOFT)
296+
// Microsoft OS 2.0 descriptor
297+
TUD_BOS_MS_OS_20_DESCRIPTOR(MS_OS_20_DESC_LEN, VENDOR_REQUEST_MICROSOFT)
299298
};
300299

301300
/*
@@ -831,7 +830,7 @@ esp_err_t tinyusb_init(tinyusb_device_config_t *config) {
831830
periph_ll_enable_clk_clear_rst(PERIPH_USB_MODULE);
832831
}
833832
#endif
834-
833+
835834
tinyusb_config_t tusb_cfg = {
836835
.external_phy = false // In the most cases you need to use a `false` value
837836
};

‎idf_component.yml

+21-6
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ dependencies:
5151
require: public
5252
espressif/esp_modem:
5353
version: "^1.1.0"
54-
espressif/network_provisioning:
55-
version: "~1.0.0"
5654
espressif/esp-zboss-lib:
5755
version: "^1.0.1"
5856
rules:
@@ -65,22 +63,39 @@ dependencies:
6563
version: "^1.3.4"
6664
rules:
6765
- if: "target != esp32c2"
66+
# RainMaker Start (Fixed versions, because Matter supports only Insights 1.0.1)
67+
espressif/network_provisioning:
68+
version: "1.0.2"
6869
espressif/esp_rainmaker:
69-
version: "^1.0.0"
70+
version: "1.5.0"
7071
rules:
7172
- if: "target not in [esp32c2, esp32p4]"
7273
espressif/rmaker_common:
73-
version: "^1.4.6"
74+
version: "1.4.6"
7475
rules:
7576
- if: "target not in [esp32c2, esp32p4]"
7677
espressif/esp_insights:
77-
version: "^1.2.1"
78+
version: "1.0.1"
79+
rules:
80+
- if: "target not in [esp32c2, esp32p4]"
81+
# New version breaks esp_insights 1.0.1
82+
espressif/esp_diag_data_store:
83+
version: "1.0.1"
84+
rules:
85+
- if: "target not in [esp32c2, esp32p4]"
86+
espressif/esp_diagnostics:
87+
version: "1.0.2"
88+
rules:
89+
- if: "target not in [esp32c2, esp32p4]"
90+
espressif/cbor:
91+
version: "0.6.0~1"
7892
rules:
7993
- if: "target not in [esp32c2, esp32p4]"
8094
espressif/qrcode:
81-
version: "^0.1.0~1"
95+
version: "0.1.0~2"
8296
rules:
8397
- if: "target not in [esp32c2, esp32p4]"
98+
# RainMaker End
8499
espressif/esp-sr:
85100
version: "^1.4.2"
86101
rules:

‎package/package_esp32_index.template.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -101,57 +101,57 @@
101101
"host": "i686-mingw32",
102102
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
103103
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
104-
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
105-
"size": "351074410"
104+
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
105+
"size": "350992761"
106106
},
107107
{
108108
"host": "x86_64-mingw32",
109109
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
110110
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
111-
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
112-
"size": "351074410"
111+
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
112+
"size": "350992761"
113113
},
114114
{
115115
"host": "arm64-apple-darwin",
116116
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
117117
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
118-
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
119-
"size": "351074410"
118+
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
119+
"size": "350992761"
120120
},
121121
{
122122
"host": "x86_64-apple-darwin",
123123
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
124124
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
125-
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
126-
"size": "351074410"
125+
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
126+
"size": "350992761"
127127
},
128128
{
129129
"host": "x86_64-pc-linux-gnu",
130130
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
131131
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
132-
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
133-
"size": "351074410"
132+
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
133+
"size": "350992761"
134134
},
135135
{
136136
"host": "i686-pc-linux-gnu",
137137
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
138138
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
139-
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
140-
"size": "351074410"
139+
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
140+
"size": "350992761"
141141
},
142142
{
143143
"host": "aarch64-linux-gnu",
144144
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
145145
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
146-
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
147-
"size": "351074410"
146+
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
147+
"size": "350992761"
148148
},
149149
{
150150
"host": "arm-linux-gnueabihf",
151151
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
152152
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
153-
"checksum": "SHA-256:b4d431c8e6e9eb26c78cb187b9082055544956a4dac8e224ff884f770e5f0e5a",
154-
"size": "351074410"
153+
"checksum": "SHA-256:8a3f8ba621b187a53635deef36e335aa72f18d15c89170a32ce401bedee946be",
154+
"size": "350992761"
155155
}
156156
]
157157
},

0 commit comments

Comments
 (0)