Skip to content

IDF release/v5.3 #10378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

IDF release/v5.3 #10378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f8227ab
IDF release/v5.3 707d097b
me-no-dev Sep 26, 2024
ca556ba
fix(5.1): ESP32 redefinition to ESP32
SuGlider Sep 26, 2024
7c9203e
fix(wps): fixes wps struct initialization
SuGlider Sep 26, 2024
51b52f0
fix(wps): adds memset to 0
SuGlider Sep 26, 2024
7028987
Fix build of camera web server
me-no-dev Oct 1, 2024
85d8a9e
Merge branch 'release/v3.1.x' into idf-release/v5.3
me-no-dev Oct 1, 2024
9b5405d
fix(psram): Do not abort if PSRAM is not found
me-no-dev Oct 1, 2024
f738a31
fix(psram): ESP32-S2 does not like to early debug log
me-no-dev Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion cores/esp32/esp32-hal-misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,20 @@ extern bool btInUse();
#if CONFIG_SPIRAM_SUPPORT || CONFIG_SPIRAM
#ifndef CONFIG_SPIRAM_BOOT_INIT
ESP_SYSTEM_INIT_FN(init_psram_new, CORE, BIT(0), 99) {
return psramInit() ? ESP_OK : ESP_FAIL;
psramInit();
return ESP_OK;
}
#endif
#endif

void initArduino() {
//init proper ref tick value for PLL (uncomment if REF_TICK is different than 1MHz)
//ESP_REG(APB_CTRL_PLL_TICK_CONF_REG) = APB_CLK_FREQ / REF_CLK_FREQ - 1;
#if CONFIG_SPIRAM_SUPPORT || CONFIG_SPIRAM
#ifndef CONFIG_SPIRAM_BOOT_INIT
psramAddToHeap();
#endif
#endif
#ifdef CONFIG_APP_ROLLBACK_ENABLE
if (!verifyRollbackLater()) {
const esp_partition_t *running = esp_ota_get_running_partition();
Expand Down
18 changes: 13 additions & 5 deletions cores/esp32/esp32-hal-psram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,25 @@ bool psramInit() {
ESP_EARLY_LOGE(TAG, "PSRAM test failed!");
return false;
}
//ESP_EARLY_LOGI(TAG, "PSRAM enabled");
#endif /* CONFIG_SPIRAM_BOOT_INIT */
spiramDetected = true;
return true;
}

bool psramAddToHeap() {
if (!spiramDetected) {
log_e("PSRAM not initialized!");
return false;
}
if (esp_psram_extram_add_to_heap_allocator() != ESP_OK) {
spiramFailed = true;
ESP_EARLY_LOGE(TAG, "PSRAM could not be added to the heap!");
log_e("PSRAM could not be added to the heap!");
return false;
}
#if CONFIG_SPIRAM_USE_MALLOC && !CONFIG_ARDUINO_ISR_IRAM
heap_caps_malloc_extmem_enable(CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL);
#endif
ESP_EARLY_LOGI(TAG, "PSRAM enabled");
#endif /* CONFIG_SPIRAM_BOOT_INIT */
spiramDetected = true;
log_i("PSRAM added to the heap.");
return true;
}

Expand Down
1 change: 1 addition & 0 deletions cores/esp32/esp32-hal-psram.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ extern "C" {
#endif

bool psramInit();
bool psramAddToHeap();
bool psramFound();

void *ps_malloc(size_t size);
Expand Down
15 changes: 15 additions & 0 deletions libraries/ESP32/examples/Camera/CameraWebServer/ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
{
"fqbn": {
"esp32": [
"espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=custom,FlashMode=dio",
"espressif:esp32:esp32:PSRAM=disabled,PartitionScheme=custom,FlashMode=dio"
],
"esp32s2": [
"espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=custom,FlashMode=dio",
"espressif:esp32:esp32s2:PSRAM=disabled,PartitionScheme=custom,FlashMode=dio"
],
"esp32s3": [
"espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=custom,FlashMode=qio",
"espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=custom,FlashMode=qio",
"espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=custom,FlashMode=qio"
]
},
"requires": [
"CONFIG_CAMERA_TASK_STACK_SIZE=[0-9]+"
]
Expand Down
5 changes: 3 additions & 2 deletions libraries/ESP32/examples/Camera/CameraWebServer/partitions.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x3d0000,
fr, data, , 0x3e0000, 0x20000,
app0, app, ota_0, 0x10000, 0x3c0000,
fr, data, , 0x3d0000, 0x20000,
coredump, data, coredump,0x3f0000, 0x10000,
10 changes: 9 additions & 1 deletion libraries/WiFi/examples/WPS/WPS.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,15 @@ WPS (pin is 00000000)
#define ESP_WPS_MODE WPS_TYPE_PBC

void wpsStart() {
esp_wps_config_t config = WPS_CONFIG_INIT_DEFAULT(ESP_WPS_MODE);
esp_wps_config_t config;
memset(&config, 0, sizeof(esp_wps_config_t));
//Same as config = WPS_CONFIG_INIT_DEFAULT(ESP_WPS_MODE);
config.wps_type = ESP_WPS_MODE;
strcpy(config.factory_info.manufacturer, "ESPRESSIF");
strcpy(config.factory_info.model_number, CONFIG_IDF_TARGET);
strcpy(config.factory_info.model_name, "ESPRESSIF IOT");
strcpy(config.factory_info.device_name, "ESP DEVICE");
strcpy(config.pin, "00000000");
esp_err_t err = esp_wifi_wps_enable(&config);
if (err != ESP_OK) {
Serial.printf("WPS Enable Failed: 0x%x: %s\n", err, esp_err_to_name(err));
Expand Down
68 changes: 34 additions & 34 deletions package/package_esp32_index.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
{
"packager": "esp32",
"name": "esp32-arduino-libs",
"version": "idf-release_v5.3-4d0db704"
"version": "idf-release_v5.3-707d097b"
},
{
"packager": "esp32",
Expand Down Expand Up @@ -95,63 +95,63 @@
"tools": [
{
"name": "esp32-arduino-libs",
"version": "idf-release_v5.3-4d0db704",
"version": "idf-release_v5.3-707d097b",
"systems": [
{
"host": "i686-mingw32",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"checksum": "SHA-256:645b7579d22e7de73c87cce1d52629f9780de9f18be5b5b066ac0f2c210e9bef",
"size": "360076736"
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:834dbb3f64462ac97e7d2bc1469376bc009657dd3a6b7f6659dedf4c6cce5aba",
"size": "391817410"
},
{
"host": "x86_64-mingw32",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"checksum": "SHA-256:645b7579d22e7de73c87cce1d52629f9780de9f18be5b5b066ac0f2c210e9bef",
"size": "360076736"
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:834dbb3f64462ac97e7d2bc1469376bc009657dd3a6b7f6659dedf4c6cce5aba",
"size": "391817410"
},
{
"host": "arm64-apple-darwin",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"checksum": "SHA-256:645b7579d22e7de73c87cce1d52629f9780de9f18be5b5b066ac0f2c210e9bef",
"size": "360076736"
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:834dbb3f64462ac97e7d2bc1469376bc009657dd3a6b7f6659dedf4c6cce5aba",
"size": "391817410"
},
{
"host": "x86_64-apple-darwin",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"checksum": "SHA-256:645b7579d22e7de73c87cce1d52629f9780de9f18be5b5b066ac0f2c210e9bef",
"size": "360076736"
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:834dbb3f64462ac97e7d2bc1469376bc009657dd3a6b7f6659dedf4c6cce5aba",
"size": "391817410"
},
{
"host": "x86_64-pc-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"checksum": "SHA-256:645b7579d22e7de73c87cce1d52629f9780de9f18be5b5b066ac0f2c210e9bef",
"size": "360076736"
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:834dbb3f64462ac97e7d2bc1469376bc009657dd3a6b7f6659dedf4c6cce5aba",
"size": "391817410"
},
{
"host": "i686-pc-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"checksum": "SHA-256:645b7579d22e7de73c87cce1d52629f9780de9f18be5b5b066ac0f2c210e9bef",
"size": "360076736"
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:834dbb3f64462ac97e7d2bc1469376bc009657dd3a6b7f6659dedf4c6cce5aba",
"size": "391817410"
},
{
"host": "aarch64-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"checksum": "SHA-256:645b7579d22e7de73c87cce1d52629f9780de9f18be5b5b066ac0f2c210e9bef",
"size": "360076736"
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:834dbb3f64462ac97e7d2bc1469376bc009657dd3a6b7f6659dedf4c6cce5aba",
"size": "391817410"
},
{
"host": "arm-linux-gnueabihf",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-4d0db704.zip",
"checksum": "SHA-256:645b7579d22e7de73c87cce1d52629f9780de9f18be5b5b066ac0f2c210e9bef",
"size": "360076736"
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.3/esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"archiveFileName": "esp32-arduino-libs-idf-release_v5.3-707d097b.zip",
"checksum": "SHA-256:834dbb3f64462ac97e7d2bc1469376bc009657dd3a6b7f6659dedf4c6cce5aba",
"size": "391817410"
}
]
},
Expand Down
Loading