Merge pull request espressif#11785 from espressif/feature/esp-sr-2

feat(sr): Update ESP-SR to 2.x and enable it for ESP32-P4

Author: me-no-dev

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:

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) {

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"

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

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"