From 97b6f8e545790f22e1a74002a06ad30d8e93fe30 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Mon, 1 Sep 2025 11:10:25 +0300 Subject: [PATCH] feat(sr): Update ESP-SR to 2.x and enable it for ESP32-P4 --- idf_component.yml | 4 ++-- libraries/ESP_SR/src/ESP_SR.cpp | 2 +- libraries/ESP_SR/src/ESP_SR.h | 2 +- libraries/ESP_SR/src/esp32-hal-sr.c | 2 +- libraries/ESP_SR/src/esp32-hal-sr.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/idf_component.yml b/idf_component.yml index 58377fab952..eac9eaa4da5 100644 --- a/idf_component.yml +++ b/idf_component.yml @@ -103,9 +103,9 @@ dependencies: - if: "target not in [esp32c2, esp32p4]" # RainMaker End espressif/esp-sr: - version: "^1.4.2" + version: "^2.1.5" rules: - - if: "target in [esp32s3]" + - if: "target in [esp32s3, esp32p4]" espressif/esp_hosted: version: "^2.0.12" rules: diff --git a/libraries/ESP_SR/src/ESP_SR.cpp b/libraries/ESP_SR/src/ESP_SR.cpp index a149c1490e1..8d90c0fff11 100644 --- a/libraries/ESP_SR/src/ESP_SR.cpp +++ b/libraries/ESP_SR/src/ESP_SR.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ #include "sdkconfig.h" -#if CONFIG_IDF_TARGET_ESP32S3 && (CONFIG_USE_WAKENET || CONFIG_USE_MULTINET) +#if (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32P4) && (CONFIG_USE_WAKENET || CONFIG_USE_MULTINET) #include "ESP_SR.h" static esp_err_t on_sr_fill(void *arg, void *out, size_t len, size_t *bytes_read, uint32_t timeout_ms) { diff --git a/libraries/ESP_SR/src/ESP_SR.h b/libraries/ESP_SR/src/ESP_SR.h index 28fb68c1eb0..13fe22a4b12 100644 --- a/libraries/ESP_SR/src/ESP_SR.h +++ b/libraries/ESP_SR/src/ESP_SR.h @@ -6,7 +6,7 @@ #pragma once #include "sdkconfig.h" -#if CONFIG_IDF_TARGET_ESP32S3 && (CONFIG_USE_WAKENET || CONFIG_USE_MULTINET) +#if (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32P4) && (CONFIG_USE_WAKENET || CONFIG_USE_MULTINET) #include "ESP_I2S.h" #include "esp32-hal-sr.h" diff --git a/libraries/ESP_SR/src/esp32-hal-sr.c b/libraries/ESP_SR/src/esp32-hal-sr.c index eb87ef636c1..80295d41f5a 100644 --- a/libraries/ESP_SR/src/esp32-hal-sr.c +++ b/libraries/ESP_SR/src/esp32-hal-sr.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ #include "sdkconfig.h" -#if CONFIG_IDF_TARGET_ESP32S3 && (CONFIG_USE_WAKENET || CONFIG_USE_MULTINET) +#if (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32P4) && (CONFIG_USE_WAKENET || CONFIG_USE_MULTINET) #if !defined(ARDUINO_PARTITION_esp_sr_32) && !defined(ARDUINO_PARTITION_esp_sr_16) && !defined(ARDUINO_PARTITION_esp_sr_8) #warning Compatible partition must be selected for ESP_SR to work diff --git a/libraries/ESP_SR/src/esp32-hal-sr.h b/libraries/ESP_SR/src/esp32-hal-sr.h index 894390634e0..6bdd9e89a44 100644 --- a/libraries/ESP_SR/src/esp32-hal-sr.h +++ b/libraries/ESP_SR/src/esp32-hal-sr.h @@ -6,7 +6,7 @@ #pragma once #include "sdkconfig.h" -#if CONFIG_IDF_TARGET_ESP32S3 && (CONFIG_USE_WAKENET || CONFIG_USE_MULTINET) +#if (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32P4) && (CONFIG_USE_WAKENET || CONFIG_USE_MULTINET) #include "driver/i2s_types.h" #include "esp_err.h"