adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

IDF master (#11342)

Browse source 
* fix(ci): ESP32-P4 hosted compile fail (#11341)

* fix(ci): Update changes for P4 and C5 builds with latest IDF

* IDF master aaebc374

* ci(pre-commit): Apply automatic fixes

---------

Co-authored-by: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
This commit is contained in:
Me No Dev 2025-05-07 16:24:33 +03:00 committed by GitHub
parent b115acea40
commit 602f1f6e7f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 81 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -362,7 +362,7 @@ set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hi
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread) if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread)
#if(CONFIG_SOC_IEEE802154_SUPPORTED) # Does not work! #if(CONFIG_SOC_IEEE802154_SUPPORTED) # Does not work!
#if(CONFIG_OPENTHREAD_ENABLED) # Does not work! #if(CONFIG_OPENTHREAD_ENABLED) # Does not work!
if(IDF_TARGET STREQUAL "esp32c6" OR IDF_TARGET STREQUAL "esp32h2") # Sadly only this works if(IDF_TARGET STREQUAL "esp32c6" OR IDF_TARGET STREQUAL "esp32h2" OR IDF_TARGET STREQUAL "esp32c5") # Sadly only this works
list(APPEND requires openthread) list(APPEND requires openthread)
endif() endif()
endif() endif()

7
cores/esp32/chip-debug-report.cpp
View file

@ -68,7 +68,8 @@ static void printPkgVersion(void) {
uint32_t pkg_ver = REG_GET_FIELD(EFUSE_RD_MAC_SYS_2_REG, EFUSE_PKG_VERSION); uint32_t pkg_ver = REG_GET_FIELD(EFUSE_RD_MAC_SYS_2_REG, EFUSE_PKG_VERSION);
chip_report_printf("%lu", pkg_ver); chip_report_printf("%lu", pkg_ver);
#elif CONFIG_IDF_TARGET_ESP32C5 #elif CONFIG_IDF_TARGET_ESP32C5
uint32_t pkg_ver = REG_GET_FIELD(EFUSE_RD_MAC_SYS2_REG, EFUSE_PKG_VERSION); // ToDo: Update this line when EFUSE_PKG_VERSION is available again for ESP32-C5
uint32_t pkg_ver = 0; //REG_GET_FIELD(EFUSE_RD_MAC_SYS2_REG, EFUSE_PKG_VERSION);
chip_report_printf("%lu", pkg_ver); chip_report_printf("%lu", pkg_ver);
#else #else
chip_report_printf("Unknown"); chip_report_printf("Unknown");
@ -92,11 +93,11 @@ static void printChipInfo(void) {
case CHIP_ESP32H2: chip_report_printf("ESP32-H2\n"); break; case CHIP_ESP32H2: chip_report_printf("ESP32-H2\n"); break;
case CHIP_ESP32P4: chip_report_printf("ESP32-P4\n"); break; case CHIP_ESP32P4: chip_report_printf("ESP32-P4\n"); break;
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
case CHIP_ESP32C5: chip_report_printf("ESP32-C5\n"); break; case CHIP_ESP32C5: chip_report_printf("ESP32-C5\n"); break;
case CHIP_ESP32C61: chip_report_printf("ESP32-C61\n"); break; case CHIP_ESP32C61: chip_report_printf("ESP32-C61\n"); break;
case CHIP_ESP32H21: chip_report_printf("ESP32-H21\n"); break; case CHIP_ESP32H21: chip_report_printf("ESP32-H21\n"); break;
#endif #endif
default: chip_report_printf("Unknown %d\n", info.model); break; default: chip_report_printf("Unknown %d\n", info.model); break;
} }
printPkgVersion(); printPkgVersion();
chip_report_printf(" Revision : %.2f\n", (float)(info.revision) / 100.0); chip_report_printf(" Revision : %.2f\n", (float)(info.revision) / 100.0);

2
idf_component.yml
View file

@ -105,7 +105,7 @@ dependencies:
rules: rules:
- if: "target in [esp32s3]" - if: "target in [esp32s3]"
espressif/esp_hosted: espressif/esp_hosted:
version: "^0.0.25" version: "^2.0.0"
rules: rules:
- if: "target == esp32p4" - if: "target == esp32p4"
espressif/esp_wifi_remote: espressif/esp_wifi_remote:

12
libraries/WiFi/src/WiFiGeneric.cpp
View file

@ -252,13 +252,23 @@ static bool wifiHostedInit() {
if (!hosted_initialized) { if (!hosted_initialized) {
hosted_initialized = true; hosted_initialized = true;
struct esp_hosted_sdio_config conf = INIT_DEFAULT_HOST_SDIO_CONFIG(); struct esp_hosted_sdio_config conf = INIT_DEFAULT_HOST_SDIO_CONFIG();
#ifdef BOARD_HAS_SDIO_ESP_HOSTED
conf.pin_clk.pin = BOARD_SDIO_ESP_HOSTED_CLK;
conf.pin_cmd.pin = BOARD_SDIO_ESP_HOSTED_CMD;
conf.pin_d0.pin = BOARD_SDIO_ESP_HOSTED_D0;
conf.pin_d1.pin = BOARD_SDIO_ESP_HOSTED_D1;
conf.pin_d2.pin = BOARD_SDIO_ESP_HOSTED_D2;
conf.pin_d3.pin = BOARD_SDIO_ESP_HOSTED_D3;
conf.pin_reset.pin = BOARD_SDIO_ESP_HOSTED_RESET;
#else
conf.pin_clk.pin = CONFIG_ESP_SDIO_PIN_CLK; conf.pin_clk.pin = CONFIG_ESP_SDIO_PIN_CLK;
conf.pin_cmd.pin = CONFIG_ESP_SDIO_PIN_CMD; conf.pin_cmd.pin = CONFIG_ESP_SDIO_PIN_CMD;
conf.pin_d0.pin = CONFIG_ESP_SDIO_PIN_D0; conf.pin_d0.pin = CONFIG_ESP_SDIO_PIN_D0;
conf.pin_d1.pin = CONFIG_ESP_SDIO_PIN_D1; conf.pin_d1.pin = CONFIG_ESP_SDIO_PIN_D1;
conf.pin_d2.pin = CONFIG_ESP_SDIO_PIN_D2; conf.pin_d2.pin = CONFIG_ESP_SDIO_PIN_D2;
conf.pin_d3.pin = CONFIG_ESP_SDIO_PIN_D3; conf.pin_d3.pin = CONFIG_ESP_SDIO_PIN_D3;
//conf.pin_rst.pin = CONFIG_ESP_SDIO_GPIO_RESET_SLAVE; conf.pin_reset.pin = CONFIG_ESP_SDIO_GPIO_RESET_SLAVE;
#endif
// esp_hosted_sdio_set_config() will fail on second attempt but here temporarily to not cause exception on reinit // esp_hosted_sdio_set_config() will fail on second attempt but here temporarily to not cause exception on reinit
if (esp_hosted_sdio_set_config(&conf) != ESP_OK || esp_hosted_init() != ESP_OK) { if (esp_hosted_sdio_set_config(&conf) != ESP_OK || esp_hosted_init() != ESP_OK) {
log_e("esp_hosted_init failed!"); log_e("esp_hosted_init failed!");

128
package/package_esp32_index.template.json
View file

@ -51,7 +51,7 @@
{ {
"packager": "esp32", "packager": "esp32",
"name": "esp32-arduino-libs", "name": "esp32-arduino-libs",
"version": "idf-master-38628f98-v1" "version": "idf-master-aaebc374-v1"
}, },
{ {
"packager": "esp32", "packager": "esp32",
@ -76,7 +76,7 @@
{ {
"packager": "esp32", "packager": "esp32",
"name": "openocd-esp32", "name": "openocd-esp32",
"version": "v0.12.0-esp32-20250226" "version": "v0.12.0-esp32-20250422"
}, },
{ {
"packager": "esp32", "packager": "esp32",
@ -104,63 +104,63 @@
"tools": [ "tools": [
{ {
"name": "esp32-arduino-libs", "name": "esp32-arduino-libs",
"version": "idf-master-38628f98-v1", "version": "idf-master-aaebc374-v1",
"systems": [ "systems": [
{ {
"host": "i686-mingw32", "host": "i686-mingw32",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf", "checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
"size": "398323971" "size": "404569749"
}, },
{ {
"host": "x86_64-mingw32", "host": "x86_64-mingw32",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf", "checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
"size": "398323971" "size": "404569749"
}, },
{ {
"host": "arm64-apple-darwin", "host": "arm64-apple-darwin",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf", "checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
"size": "398323971" "size": "404569749"
}, },
{ {
"host": "x86_64-apple-darwin", "host": "x86_64-apple-darwin",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf", "checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
"size": "398323971" "size": "404569749"
}, },
{ {
"host": "x86_64-pc-linux-gnu", "host": "x86_64-pc-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf", "checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
"size": "398323971" "size": "404569749"
}, },
{ {
"host": "i686-pc-linux-gnu", "host": "i686-pc-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf", "checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
"size": "398323971" "size": "404569749"
}, },
{ {
"host": "aarch64-linux-gnu", "host": "aarch64-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf", "checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
"size": "398323971" "size": "404569749"
}, },
{ {
"host": "arm-linux-gnueabihf", "host": "arm-linux-gnueabihf",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-aaebc374-v1.zip",
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf", "checksum": "SHA-256:5baa0bbeae58973fd6bd4004332eb554b723a1e67f1af389840fac8081c2e21e",
"size": "398323971" "size": "404569749"
} }
] ]
}, },
@ -414,56 +414,56 @@
}, },
{ {
"name": "openocd-esp32", "name": "openocd-esp32",
"version": "v0.12.0-esp32-20250226", "version": "v0.12.0-esp32-20250422",
"systems": [ "systems": [
{ {
"host": "x86_64-pc-linux-gnu", "host": "x86_64-pc-linux-gnu",
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-linux-amd64-0.12.0-esp32-20250226.tar.gz", "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",
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20250226.tar.gz", "archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20250422.tar.gz",
"checksum": "SHA-256:914c726342ba5828e53f41aa454f01f317c42d8e6772d3d874593a6960fc4729", "checksum": "SHA-256:eb1fa9b21c65b45a2200af6dcc2914e32335d37b6dbbd181778dcc0dc025e70a",
"size": "2414924" "size": "2445546"
}, },
{ {
"host": "aarch64-linux-gnu", "host": "aarch64-linux-gnu",
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-linux-arm64-0.12.0-esp32-20250226.tar.gz", "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",
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20250226.tar.gz", "archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20250422.tar.gz",
"checksum": "SHA-256:c44ee99a9209c0234dbbcec86339fd685f5c61a763b29c33eba590bf62db2296", "checksum": "SHA-256:f70334a9b12a75b4d943e09fa5db30973037c39dbb54d6fa9f1a7118228b3d1c",
"size": "2293923" "size": "2330926"
}, },
{ {
"host": "arm-linux-gnueabihf", "host": "arm-linux-gnueabihf",
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-linux-armel-0.12.0-esp32-20250226.tar.gz", "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",
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20250226.tar.gz", "archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20250422.tar.gz",
"checksum": "SHA-256:21ab6af3cf05f9290f4d59f1f381d5094dd2755fc528d3d2feb9334348fc0d8d", "checksum": "SHA-256:4ac34d6fd1af86aeda87c8318732f8d691c300c285c7fd2f5037c432c63fbbb3",
"size": "2436071" "size": "2470732"
}, },
{ {
"host": "x86_64-apple-darwin", "host": "x86_64-apple-darwin",
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-macos-0.12.0-esp32-20250226.tar.gz", "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-macos-0.12.0-esp32-20250422.tar.gz",
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20250226.tar.gz", "archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20250422.tar.gz",
"checksum": "SHA-256:0b5751699e93b6d101381611c96216ddff8c7dfd16425c610993fa27993f9a0a", "checksum": "SHA-256:9186a7a06304c6d9201cbce4ee3c7099b393bf8d329cda17a68874f92308f6ce",
"size": "2525387" "size": "2548730"
}, },
{ {
"host": "arm64-apple-darwin", "host": "arm64-apple-darwin",
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-macos-arm64-0.12.0-esp32-20250226.tar.gz", "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",
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20250226.tar.gz", "archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20250422.tar.gz",
"checksum": "SHA-256:8bffbbb594b27a4971a3922792135f8c836fff26991f7f450094386920263531", "checksum": "SHA-256:2cc39318d52f393233ff1f777871aebe5b97b3fbad29556a238489263401b774",
"size": "2568843" "size": "2593819"
}, },
{ {
"host": "i686-mingw32", "host": "i686-mingw32",
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-win32-0.12.0-esp32-20250226.zip", "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-win32-0.12.0-esp32-20250422.zip",
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20250226.zip", "archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20250422.zip",
"checksum": "SHA-256:aaf3c955bb4eb47805a1ba108dfd07a8a56ce720cb40194a354362b5f0961230", "checksum": "SHA-256:ecb4f8533fa9098d10000f5f7e8b8eaa8591015b824b481078ddb2b37e7aa6f2",
"size": "2960226" "size": "2988859"
}, },
{ {
"host": "x86_64-mingw32", "host": "x86_64-mingw32",
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250226/openocd-esp32-win64-0.12.0-esp32-20250226.zip", "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20250422/openocd-esp32-win64-0.12.0-esp32-20250422.zip",
"archiveFileName": "openocd-esp32-win64-0.12.0-esp32-20250226.zip", "archiveFileName": "openocd-esp32-win64-0.12.0-esp32-20250422.zip",
"checksum": "SHA-256:79baf35325117a53093b62f6b9bee677dd12275d7066e3f8a274d2a80e986b6e", "checksum": "SHA-256:e9eae8e1a8d0e030cd81dcb08394a9137cb7338a6211dfabcdbdfb37b58c5a23",
"size": "2960225" "size": "2988858"
} }
] ]
}, },