Skip to content

Commit 1df0ce4

Browse files
Jason2866Jason2866
authored
Merge branch 'espressif:release/v2.x' into release/v2.x
2 parents 3958eab + ccff800 commit 1df0ce4

File tree

1,276 files changed

+16637
-14509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,276 files changed

+16637
-14509
lines changed

‎package/package_esp32_index.template.json

+30-30
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
{
7373
"packager": "esp32",
7474
"name": "openocd-esp32",
75-
"version": "v0.12.0-esp32-20230419"
75+
"version": "v0.12.0-esp32-20230921"
7676
},
7777
{
7878
"packager": "esp32",
@@ -472,56 +472,56 @@
472472
},
473473
{
474474
"name": "openocd-esp32",
475-
"version": "v0.12.0-esp32-20230419",
475+
"version": "v0.12.0-esp32-20230921",
476476
"systems": [
477477
{
478478
"host": "x86_64-pc-linux-gnu",
479-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-linux-amd64-0.12.0-esp32-20230419.tar.gz",
480-
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20230419.tar.gz",
481-
"checksum": "SHA-256:5144e7516cd75a2152b35ecae0a400f7d3d4424c2488fbacc49433564f54c70d",
482-
"size": 2126949
479+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz",
480+
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz",
481+
"checksum": "SHA-256:61e38e0a13a5c1664624ec1c397d7f7d6868554b0d345d3fb1f7294cce38cc4b",
482+
"size": 2193783
483483
},
484484
{
485485
"host": "aarch64-linux-gnu",
486-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-linux-arm64-0.12.0-esp32-20230419.tar.gz",
487-
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20230419.tar.gz",
488-
"checksum": "SHA-256:1c4d900c738fe00730c6033abb6cf1cc6587717dbeee291d5908272d153d329a",
489-
"size": 1989161
486+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-arm64-0.12.0-esp32-20230921.tar.gz",
487+
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20230921.tar.gz",
488+
"checksum": "SHA-256:6430315dc1b926541c93cef63d2b08982543ad3f9fe6e0d7107c8a518ef20432",
489+
"size": 2062058
490490
},
491491
{
492492
"host": "arm-linux-gnueabihf",
493-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-linux-armel-0.12.0-esp32-20230419.tar.gz",
494-
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20230419.tar.gz",
495-
"checksum": "SHA-256:293258fd67618dd352e1096137ad9f2b801926eaf74ffcd570540ae94ad8ee5c",
496-
"size": 2129727
493+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-armel-0.12.0-esp32-20230921.tar.gz",
494+
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20230921.tar.gz",
495+
"checksum": "SHA-256:5df16d8a91f013a547f6b3b914c655a9d267996a3b6503031b335ac04a4f8d15",
496+
"size": 2206666
497497
},
498498
{
499499
"host": "x86_64-apple-darwin",
500-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-macos-0.12.0-esp32-20230419.tar.gz",
501-
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20230419.tar.gz",
502-
"checksum": "SHA-256:621aad7d011c6817cde9570dfea42c7bcc699458bf43c37706cb4c2f6475a247",
503-
"size": 2237976
500+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-macos-0.12.0-esp32-20230921.tar.gz",
501+
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20230921.tar.gz",
502+
"checksum": "SHA-256:0a4f764934f488af18cdac2a0d152dd36b4870f3bec1a2d4e25b6b3b7a5258a0",
503+
"size": 2305832
504504
},
505505
{
506506
"host": "arm64-apple-darwin",
507-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-macos-arm64-0.12.0-esp32-20230419.tar.gz",
508-
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20230419.tar.gz",
509-
"checksum": "SHA-256:3af7eac3a7de3939731ec4c13fb5d72a8e6ce5e5d274bb9697f5d93039561e42",
510-
"size": 2270699
507+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-macos-arm64-0.12.0-esp32-20230921.tar.gz",
508+
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20230921.tar.gz",
509+
"checksum": "SHA-256:6dce89048f642eb0559a915b6e514f90feb2a95afe21b84f0b0ebf2b27824816",
510+
"size": 2341406
511511
},
512512
{
513513
"host": "i686-mingw32",
514-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-win32-0.12.0-esp32-20230419.zip",
515-
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230419.zip",
516-
"checksum": "SHA-256:f2cb3d9cacfe789c20d3272af846d726a062ce8f2e4ee142bddb27501d7dd7a7",
517-
"size": 2619680
514+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-win32-0.12.0-esp32-20230921.zip",
515+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230921.zip",
516+
"checksum": "SHA-256:ac9d522a63b0816f64d921547bd55c031788035ced85c067d8e7c2862cb1bd0d",
517+
"size": 2710475
518518
},
519519
{
520520
"host": "x86_64-mingw32",
521-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-win32-0.12.0-esp32-20230419.zip",
522-
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230419.zip",
523-
"checksum": "SHA-256:f2cb3d9cacfe789c20d3272af846d726a062ce8f2e4ee142bddb27501d7dd7a7",
524-
"size": 2619680
521+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-win32-0.12.0-esp32-20230921.zip",
522+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230921.zip",
523+
"checksum": "SHA-256:ac9d522a63b0816f64d921547bd55c031788035ced85c067d8e7c2862cb1bd0d",
524+
"size": 2710475
525525
}
526526
]
527527
},

‎platform.txt

+9-9
Large diffs are not rendered by default.

‎tools/platformio-build-esp32.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"-u", "_Z4loopv",
102102
"-u", "esp_app_desc",
103103
"-u", "pthread_include_pthread_impl",
104-
"-u", "pthread_include_pthread_cond_impl",
104+
"-u", "pthread_include_pthread_cond_var_impl",
105105
"-u", "pthread_include_pthread_local_storage_impl",
106106
"-u", "pthread_include_pthread_rwlock_impl",
107107
"-u", "include_esp_phy_override",
@@ -300,11 +300,17 @@
300300
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "math", "addc", "include"),
301301
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "math", "mulc", "include"),
302302
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "math", "sqrt", "include"),
303+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "matrix", "mul", "include"),
304+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "matrix", "add", "include"),
305+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "matrix", "addc", "include"),
306+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "matrix", "mulc", "include"),
307+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "matrix", "sub", "include"),
303308
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "matrix", "include"),
304309
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "fft", "include"),
305310
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "dct", "include"),
306311
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "conv", "include"),
307312
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "common", "include"),
313+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "matrix", "mul", "test", "include"),
308314
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "kalman", "ekf", "include"),
309315
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espressif__esp-dsp", "modules", "kalman", "ekf_imu13states", "include"),
310316
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "fb_gfx", "include"),
@@ -328,7 +334,7 @@
328334
"UNITY_INCLUDE_CONFIG_H",
329335
"WITH_POSIX",
330336
"_GNU_SOURCE",
331-
("IDF_VER", '\\"v4.4.6-dirty\\"'),
337+
("IDF_VER", '\\"v4.4.7-dirty\\"'),
332338
"ESP_PLATFORM",
333339
"_POSIX_READER_WRITER_LOCKS",
334340
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32c3.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"-u", "_Z4loopv",
104104
"-u", "esp_app_desc",
105105
"-u", "pthread_include_pthread_impl",
106-
"-u", "pthread_include_pthread_cond_impl",
106+
"-u", "pthread_include_pthread_cond_var_impl",
107107
"-u", "pthread_include_pthread_local_storage_impl",
108108
"-u", "pthread_include_pthread_rwlock_impl",
109109
"-u", "include_esp_phy_override",
@@ -297,11 +297,17 @@
297297
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "math", "addc", "include"),
298298
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "math", "mulc", "include"),
299299
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "math", "sqrt", "include"),
300+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "matrix", "mul", "include"),
301+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "matrix", "add", "include"),
302+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "matrix", "addc", "include"),
303+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "matrix", "mulc", "include"),
304+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "matrix", "sub", "include"),
300305
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "matrix", "include"),
301306
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "fft", "include"),
302307
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "dct", "include"),
303308
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "conv", "include"),
304309
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "common", "include"),
310+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "matrix", "mul", "test", "include"),
305311
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "kalman", "ekf", "include"),
306312
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espressif__esp-dsp", "modules", "kalman", "ekf_imu13states", "include"),
307313
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "fb_gfx", "include"),
@@ -325,7 +331,7 @@
325331
"UNITY_INCLUDE_CONFIG_H",
326332
"WITH_POSIX",
327333
"_GNU_SOURCE",
328-
("IDF_VER", '\\"v4.4.6-dirty\\"'),
334+
("IDF_VER", '\\"v4.4.7-dirty\\"'),
329335
"ESP_PLATFORM",
330336
"_POSIX_READER_WRITER_LOCKS",
331337
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s2.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"-u", "_Z4loopv",
100100
"-u", "esp_app_desc",
101101
"-u", "pthread_include_pthread_impl",
102-
"-u", "pthread_include_pthread_cond_impl",
102+
"-u", "pthread_include_pthread_cond_var_impl",
103103
"-u", "pthread_include_pthread_local_storage_impl",
104104
"-u", "pthread_include_pthread_rwlock_impl",
105105
"-u", "include_esp_phy_override",
@@ -283,11 +283,17 @@
283283
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "math", "addc", "include"),
284284
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "math", "mulc", "include"),
285285
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "math", "sqrt", "include"),
286+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "matrix", "mul", "include"),
287+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "matrix", "add", "include"),
288+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "matrix", "addc", "include"),
289+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "matrix", "mulc", "include"),
290+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "matrix", "sub", "include"),
286291
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "matrix", "include"),
287292
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "fft", "include"),
288293
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "dct", "include"),
289294
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "conv", "include"),
290295
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "common", "include"),
296+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "matrix", "mul", "test", "include"),
291297
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "kalman", "ekf", "include"),
292298
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espressif__esp-dsp", "modules", "kalman", "ekf_imu13states", "include"),
293299
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "fb_gfx", "include"),
@@ -311,7 +317,7 @@
311317
"UNITY_INCLUDE_CONFIG_H",
312318
"WITH_POSIX",
313319
"_GNU_SOURCE",
314-
("IDF_VER", '\\"v4.4.6-dirty\\"'),
320+
("IDF_VER", '\\"v4.4.7-dirty\\"'),
315321
"ESP_PLATFORM",
316322
"_POSIX_READER_WRITER_LOCKS",
317323
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s3.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"-u", "_Z4loopv",
9898
"-u", "esp_app_desc",
9999
"-u", "pthread_include_pthread_impl",
100-
"-u", "pthread_include_pthread_cond_impl",
100+
"-u", "pthread_include_pthread_cond_var_impl",
101101
"-u", "pthread_include_pthread_local_storage_impl",
102102
"-u", "pthread_include_pthread_rwlock_impl",
103103
"-u", "include_esp_phy_override",
@@ -299,11 +299,17 @@
299299
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "math", "addc", "include"),
300300
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "math", "mulc", "include"),
301301
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "math", "sqrt", "include"),
302+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "matrix", "mul", "include"),
303+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "matrix", "add", "include"),
304+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "matrix", "addc", "include"),
305+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "matrix", "mulc", "include"),
306+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "matrix", "sub", "include"),
302307
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "matrix", "include"),
303308
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "fft", "include"),
304309
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "dct", "include"),
305310
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "conv", "include"),
306311
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "common", "include"),
312+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "matrix", "mul", "test", "include"),
307313
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "kalman", "ekf", "include"),
308314
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "espressif__esp-dsp", "modules", "kalman", "ekf_imu13states", "include"),
309315
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "fb_gfx", "include"),
@@ -327,7 +333,7 @@
327333
"UNITY_INCLUDE_CONFIG_H",
328334
"WITH_POSIX",
329335
"_GNU_SOURCE",
330-
("IDF_VER", '\\"v4.4.6-dirty\\"'),
336+
("IDF_VER", '\\"v4.4.7-dirty\\"'),
331337
"ESP_PLATFORM",
332338
"_POSIX_READER_WRITER_LOCKS",
333339
"ARDUINO_ARCH_ESP32",

‎tools/sdk/esp32/bin/bootloader_dio_40m.elf

8.07 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_dio_80m.elf

8.07 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_dout_40m.elf

8.07 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_dout_80m.elf

8.07 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qio_40m.elf

8.32 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qio_80m.elf

8.33 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qout_40m.elf

8.32 KB
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qout_80m.elf

8.33 KB
Binary file not shown.

0 commit comments

Comments
 (0)