Skip to content

Commit 9e61fa7

Browse files
me-no-devme-no-dev
authored
IDF release/v5.4 (#11512)
* IDF release/v5.4 f0f2980d * fix(p4): Allow custom pins on P4 for ESP-Hosted
1 parent 0213200 commit 9e61fa7

File tree

2 files changed

+45
-35
lines changed

2 files changed

+45
-35
lines changed

‎libraries/WiFi/src/WiFiGeneric.cpp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,23 @@ static bool wifiHostedInit() {
252252
if (!hosted_initialized) {
253253
hosted_initialized = true;
254254
struct esp_hosted_sdio_config conf = INIT_DEFAULT_HOST_SDIO_CONFIG();
255+
#ifdef BOARD_HAS_SDIO_ESP_HOSTED
256+
conf.pin_clk.pin = BOARD_SDIO_ESP_HOSTED_CLK;
257+
conf.pin_cmd.pin = BOARD_SDIO_ESP_HOSTED_CMD;
258+
conf.pin_d0.pin = BOARD_SDIO_ESP_HOSTED_D0;
259+
conf.pin_d1.pin = BOARD_SDIO_ESP_HOSTED_D1;
260+
conf.pin_d2.pin = BOARD_SDIO_ESP_HOSTED_D2;
261+
conf.pin_d3.pin = BOARD_SDIO_ESP_HOSTED_D3;
262+
conf.pin_reset.pin = BOARD_SDIO_ESP_HOSTED_RESET;
263+
#else
255264
conf.pin_clk.pin = CONFIG_ESP_SDIO_PIN_CLK;
256265
conf.pin_cmd.pin = CONFIG_ESP_SDIO_PIN_CMD;
257266
conf.pin_d0.pin = CONFIG_ESP_SDIO_PIN_D0;
258267
conf.pin_d1.pin = CONFIG_ESP_SDIO_PIN_D1;
259268
conf.pin_d2.pin = CONFIG_ESP_SDIO_PIN_D2;
260269
conf.pin_d3.pin = CONFIG_ESP_SDIO_PIN_D3;
261-
//conf.pin_rst.pin = CONFIG_ESP_SDIO_GPIO_RESET_SLAVE;
270+
conf.pin_reset.pin = CONFIG_ESP_SDIO_GPIO_RESET_SLAVE;
271+
#endif
262272
// esp_hosted_sdio_set_config() will fail on second attempt but here temporarily to not cause exception on reinit
263273
if (esp_hosted_sdio_set_config(&conf) != ESP_OK || esp_hosted_init() != ESP_OK) {
264274
log_e("esp_hosted_init failed!");

‎package/package_esp32_index.template.json‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
{
5252
"packager": "esp32",
5353
"name": "esp32-arduino-libs",
54-
"version": "idf-release_v5.4-aed8bdc8-v1"
54+
"version": "idf-release_v5.4-f0f2980d-v1"
5555
},
5656
{
5757
"packager": "esp32",
@@ -104,63 +104,63 @@
104104
"tools": [
105105
{
106106
"name": "esp32-arduino-libs",
107-
"version": "idf-release_v5.4-aed8bdc8-v1",
107+
"version": "idf-release_v5.4-f0f2980d-v1",
108108
"systems": [
109109
{
110110
"host": "i686-mingw32",
111-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
112-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
113-
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
114-
"size": "353758763"
111+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
112+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
113+
"checksum": "SHA-256:b1a77c83634111d78a356f1d1756dc815eeeb91605c5d8714a0db7cccbd0bede",
114+
"size": "353978504"
115115
},
116116
{
117117
"host": "x86_64-mingw32",
118-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
119-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
120-
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
121-
"size": "353758763"
118+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
119+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
120+
"checksum": "SHA-256:b1a77c83634111d78a356f1d1756dc815eeeb91605c5d8714a0db7cccbd0bede",
121+
"size": "353978504"
122122
},
123123
{
124124
"host": "arm64-apple-darwin",
125-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
126-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
127-
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
128-
"size": "353758763"
125+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
126+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
127+
"checksum": "SHA-256:b1a77c83634111d78a356f1d1756dc815eeeb91605c5d8714a0db7cccbd0bede",
128+
"size": "353978504"
129129
},
130130
{
131131
"host": "x86_64-apple-darwin",
132-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
133-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
134-
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
135-
"size": "353758763"
132+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
133+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
134+
"checksum": "SHA-256:b1a77c83634111d78a356f1d1756dc815eeeb91605c5d8714a0db7cccbd0bede",
135+
"size": "353978504"
136136
},
137137
{
138138
"host": "x86_64-pc-linux-gnu",
139-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
140-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
141-
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
142-
"size": "353758763"
139+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
140+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
141+
"checksum": "SHA-256:b1a77c83634111d78a356f1d1756dc815eeeb91605c5d8714a0db7cccbd0bede",
142+
"size": "353978504"
143143
},
144144
{
145145
"host": "i686-pc-linux-gnu",
146-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
147-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
148-
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
149-
"size": "353758763"
146+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
147+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
148+
"checksum": "SHA-256:b1a77c83634111d78a356f1d1756dc815eeeb91605c5d8714a0db7cccbd0bede",
149+
"size": "353978504"
150150
},
151151
{
152152
"host": "aarch64-linux-gnu",
153-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
154-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
155-
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
156-
"size": "353758763"
153+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
154+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
155+
"checksum": "SHA-256:b1a77c83634111d78a356f1d1756dc815eeeb91605c5d8714a0db7cccbd0bede",
156+
"size": "353978504"
157157
},
158158
{
159159
"host": "arm-linux-gnueabihf",
160-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
161-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
162-
"checksum": "SHA-256:448691c3171f79b2136e4ab8006e9c78bd1627156dab1365fff8f8867a6a7e5b",
163-
"size": "353758763"
160+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
161+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-f0f2980d-v1.zip",
162+
"checksum": "SHA-256:b1a77c83634111d78a356f1d1756dc815eeeb91605c5d8714a0db7cccbd0bede",
163+
"size": "353978504"
164164
}
165165
]
166166
},

0 commit comments

Comments
 (0)