Skip to content

Commit 6f92b60

Browse files
me-no-devme-no-dev
authored
IDF release/v5.4 (#11212)
* fix(i2c): update i2c_ll_slave_init for IDF 5.4 * IDF release/v5.4 8ad0d3d8
1 parent 210edfe commit 6f92b60

File tree

2 files changed

+67
-65
lines changed

2 files changed

+67
-65
lines changed

‎cores/esp32/esp32-hal-i2c-slave.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,12 @@ esp_err_t i2cSlaveInit(uint8_t num, int sda, int scl, uint16_t slaveID, uint32_t
335335
}
336336
#endif // !defined(CONFIG_IDF_TARGET_ESP32P4)
337337

338-
i2c_ll_slave_init(i2c->dev);
339338
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
339+
i2c_ll_set_mode(i2c->dev, I2C_BUS_MODE_SLAVE);
340+
i2c_ll_enable_pins_open_drain(i2c->dev, true);
340341
i2c_ll_enable_fifo_mode(i2c->dev, true);
341342
#else
343+
i2c_ll_slave_init(i2c->dev);
342344
i2c_ll_slave_set_fifo_mode(i2c->dev, true);
343345
#endif
344346
i2c_ll_set_slave_addr(i2c->dev, slaveID, false);

‎package/package_esp32_index.template.json‎

Lines changed: 64 additions & 64 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-2f7dcd86-v1"
54+
"version": "idf-release_v5.4-8ad0d3d8-v1"
5555
},
5656
{
5757
"packager": "esp32",
@@ -76,7 +76,7 @@
7676
{
7777
"packager": "esp32",
7878
"name": "openocd-esp32",
79-
"version": "v0.12.0-esp32-20241016"
79+
"version": "v0.12.0-esp32-20250422"
8080
},
8181
{
8282
"packager": "esp32",
@@ -104,63 +104,63 @@
104104
"tools": [
105105
{
106106
"name": "esp32-arduino-libs",
107-
"version": "idf-release_v5.4-2f7dcd86-v1",
107+
"version": "idf-release_v5.4-8ad0d3d8-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-2f7dcd86-v1.zip",
112-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-2f7dcd86-v1.zip",
113-
"checksum": "SHA-256:11f1271fe5e2857155d90384690069e4d33f0f97a4c04e7474b29a7cbc7ededd",
114-
"size": "352347498"
111+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
112+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
113+
"checksum": "SHA-256:19b58817f57c5bcf06640b2e789144f44c298ad8c5c26ff95fd52e63a3be9cfb",
114+
"size": "353625670"
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-2f7dcd86-v1.zip",
119-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-2f7dcd86-v1.zip",
120-
"checksum": "SHA-256:11f1271fe5e2857155d90384690069e4d33f0f97a4c04e7474b29a7cbc7ededd",
121-
"size": "352347498"
118+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
119+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
120+
"checksum": "SHA-256:19b58817f57c5bcf06640b2e789144f44c298ad8c5c26ff95fd52e63a3be9cfb",
121+
"size": "353625670"
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-2f7dcd86-v1.zip",
126-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-2f7dcd86-v1.zip",
127-
"checksum": "SHA-256:11f1271fe5e2857155d90384690069e4d33f0f97a4c04e7474b29a7cbc7ededd",
128-
"size": "352347498"
125+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
126+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
127+
"checksum": "SHA-256:19b58817f57c5bcf06640b2e789144f44c298ad8c5c26ff95fd52e63a3be9cfb",
128+
"size": "353625670"
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-2f7dcd86-v1.zip",
133-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-2f7dcd86-v1.zip",
134-
"checksum": "SHA-256:11f1271fe5e2857155d90384690069e4d33f0f97a4c04e7474b29a7cbc7ededd",
135-
"size": "352347498"
132+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
133+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
134+
"checksum": "SHA-256:19b58817f57c5bcf06640b2e789144f44c298ad8c5c26ff95fd52e63a3be9cfb",
135+
"size": "353625670"
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-2f7dcd86-v1.zip",
140-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-2f7dcd86-v1.zip",
141-
"checksum": "SHA-256:11f1271fe5e2857155d90384690069e4d33f0f97a4c04e7474b29a7cbc7ededd",
142-
"size": "352347498"
139+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
140+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
141+
"checksum": "SHA-256:19b58817f57c5bcf06640b2e789144f44c298ad8c5c26ff95fd52e63a3be9cfb",
142+
"size": "353625670"
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-2f7dcd86-v1.zip",
147-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-2f7dcd86-v1.zip",
148-
"checksum": "SHA-256:11f1271fe5e2857155d90384690069e4d33f0f97a4c04e7474b29a7cbc7ededd",
149-
"size": "352347498"
146+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
147+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
148+
"checksum": "SHA-256:19b58817f57c5bcf06640b2e789144f44c298ad8c5c26ff95fd52e63a3be9cfb",
149+
"size": "353625670"
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-2f7dcd86-v1.zip",
154-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-2f7dcd86-v1.zip",
155-
"checksum": "SHA-256:11f1271fe5e2857155d90384690069e4d33f0f97a4c04e7474b29a7cbc7ededd",
156-
"size": "352347498"
153+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
154+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
155+
"checksum": "SHA-256:19b58817f57c5bcf06640b2e789144f44c298ad8c5c26ff95fd52e63a3be9cfb",
156+
"size": "353625670"
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-2f7dcd86-v1.zip",
161-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-2f7dcd86-v1.zip",
162-
"checksum": "SHA-256:11f1271fe5e2857155d90384690069e4d33f0f97a4c04e7474b29a7cbc7ededd",
163-
"size": "352347498"
160+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
161+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-8ad0d3d8-v1.zip",
162+
"checksum": "SHA-256:19b58817f57c5bcf06640b2e789144f44c298ad8c5c26ff95fd52e63a3be9cfb",
163+
"size": "353625670"
164164
}
165165
]
166166
},
@@ -414,56 +414,56 @@
414414
},
415415
{
416416
"name": "openocd-esp32",
417-
"version": "v0.12.0-esp32-20241016",
417+
"version": "v0.12.0-esp32-20250422",
418418
"systems": [
419419
{
420420
"host": "x86_64-pc-linux-gnu",
421-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-linux-amd64-0.12.0-esp32-20241016.tar.gz",
422-
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20241016.tar.gz",
423-
"checksum": "SHA-256:e82b0f036dc99244bead5f09a86e91bb2365cbcd1122ac68261e5647942485df",
424-
"size": "2398717"
421+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-linux-amd64-0.12.0-esp32-20250422.tar.gz",
422+
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20250422.tar.gz",
423+
"checksum": "SHA-256:eb1fa9b21c65b45a2200af6dcc2914e32335d37b6dbbd181778dcc0dc025e70a",
424+
"size": "2445546"
425425
},
426426
{
427427
"host": "aarch64-linux-gnu",
428-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-linux-arm64-0.12.0-esp32-20241016.tar.gz",
429-
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20241016.tar.gz",
430-
"checksum": "SHA-256:8f8daf5bd22ec5d2fa9257b0862ec33da18ee677e023fb9a9eb17f74ce208c76",
431-
"size": "2271584"
428+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-linux-arm64-0.12.0-esp32-20250422.tar.gz",
429+
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20250422.tar.gz",
430+
"checksum": "SHA-256:f70334a9b12a75b4d943e09fa5db30973037c39dbb54d6fa9f1a7118228b3d1c",
431+
"size": "2330926"
432432
},
433433
{
434434
"host": "arm-linux-gnueabihf",
435-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-linux-armel-0.12.0-esp32-20241016.tar.gz",
436-
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20241016.tar.gz",
437-
"checksum": "SHA-256:bc9c020ecf20e2000f76cffa44305fd5bc44d2e688ea78cce423399d33f19767",
438-
"size": "2414206"
435+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-linux-armel-0.12.0-esp32-20250422.tar.gz",
436+
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20250422.tar.gz",
437+
"checksum": "SHA-256:4ac34d6fd1af86aeda87c8318732f8d691c300c285c7fd2f5037c432c63fbbb3",
438+
"size": "2470732"
439439
},
440440
{
441441
"host": "x86_64-apple-darwin",
442-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-macos-0.12.0-esp32-20241016.tar.gz",
443-
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20241016.tar.gz",
444-
"checksum": "SHA-256:02a2dffe801a2d005fa9e614d80ff8173395b2cb0b5d3118d0229d094a9946a7",
445-
"size": "2508089"
442+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-macos-0.12.0-esp32-20250422.tar.gz",
443+
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20250422.tar.gz",
444+
"checksum": "SHA-256:9186a7a06304c6d9201cbce4ee3c7099b393bf8d329cda17a68874f92308f6ce",
445+
"size": "2548730"
446446
},
447447
{
448448
"host": "arm64-apple-darwin",
449-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-macos-arm64-0.12.0-esp32-20241016.tar.gz",
450-
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20241016.tar.gz",
451-
"checksum": "SHA-256:c382f9e884d6565cb6089bff5f200f4810994667d885f062c3d3c5625a0fa9d6",
452-
"size": "2552569"
449+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-macos-arm64-0.12.0-esp32-20250422.tar.gz",
450+
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20250422.tar.gz",
451+
"checksum": "SHA-256:2cc39318d52f393233ff1f777871aebe5b97b3fbad29556a238489263401b774",
452+
"size": "2593819"
453453
},
454454
{
455455
"host": "i686-mingw32",
456-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-win32-0.12.0-esp32-20241016.zip",
457-
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20241016.zip",
458-
"checksum": "SHA-256:3b5d615e0a72cc771a45dd469031312d5881c01d7b6bc9edb29b8b6bda8c2e90",
459-
"size": "2946244"
456+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-win32-0.12.0-esp32-20250422.zip",
457+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20250422.zip",
458+
"checksum": "SHA-256:ecb4f8533fa9098d10000f5f7e8b8eaa8591015b824b481078ddb2b37e7aa6f2",
459+
"size": "2988859"
460460
},
461461
{
462462
"host": "x86_64-mingw32",
463-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20241016/openocd-esp32-win64-0.12.0-esp32-20241016.zip",
464-
"archiveFileName": "openocd-esp32-win64-0.12.0-esp32-20241016.zip",
465-
"checksum": "SHA-256:5e7b2fd1947d3a8625f6a11db7a2340cf2f41ff4c61284c022c7d7c32b18780a",
466-
"size": "2946244"
463+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-win64-0.12.0-esp32-20250422.zip",
464+
"archiveFileName": "openocd-esp32-win64-0.12.0-esp32-20250422.zip",
465+
"checksum": "SHA-256:e9eae8e1a8d0e030cd81dcb08394a9137cb7338a6211dfabcdbdfb37b58c5a23",
466+
"size": "2988858"
467467
}
468468
]
469469
},

0 commit comments

Comments
 (0)