From 8fede49368860206cfb5e8695a8dc0d91cdc8ed2 Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Tue, 13 May 2025 09:52:42 +0200
Subject: [PATCH 1/2] change(examples): Re-enable examples which need
 esp_wifi_remote

This reverts commit 7023b489a73f8d0107698d1e6d4a39670d48e253.
---
 examples/protocols/.build-test-rules.yml | 4 ----
 examples/protocols/mqtt/tcp/README.md    | 4 ++--
 examples/wifi/.build-test-rules.yml      | 3 ---
 examples/wifi/iperf/README.md            | 4 ++--
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/examples/protocols/.build-test-rules.yml b/examples/protocols/.build-test-rules.yml
index e419264fa6..5ab7517de7 100644
--- a/examples/protocols/.build-test-rules.yml
+++ b/examples/protocols/.build-test-rules.yml
@@ -193,10 +193,6 @@ examples/protocols/mqtt/ssl_psk:
   <<: *mqtt_dependencies
 examples/protocols/mqtt/tcp:
   <<: *mqtt_dependencies
-  disable+:
-    - if: IDF_TARGET in ["esp32p4", "esp32h2"]
-      temporary: true
-      reason: need to update esp_wifi_remote component to support idf-v6.0
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
diff --git a/examples/protocols/mqtt/tcp/README.md b/examples/protocols/mqtt/tcp/README.md
index b77bfea24a..cb9f2cca07 100644
--- a/examples/protocols/mqtt/tcp/README.md
+++ b/examples/protocols/mqtt/tcp/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 # ESP-MQTT sample application
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/wifi/.build-test-rules.yml b/examples/wifi/.build-test-rules.yml
index 46164a8d84..f08a88aaa5 100644
--- a/examples/wifi/.build-test-rules.yml
+++ b/examples/wifi/.build-test-rules.yml
@@ -36,9 +36,6 @@ examples/wifi/iperf:
   disable:
     - if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1)
     - if: (IDF_TARGET == "esp32p4") and CONFIG_NAME in ["defaults", "99"]
-    - if: IDF_TARGET in ["esp32p4", "esp32h2"]
-      temporary: true
-      reason: need to update esp_wifi_remote component to support idf-v6.0
   disable_test:
     - if: IDF_TARGET not in ["esp32"]
       temporary: true
diff --git a/examples/wifi/iperf/README.md b/examples/wifi/iperf/README.md
index 99b17378b4..30998b94d6 100644
--- a/examples/wifi/iperf/README.md
+++ b/examples/wifi/iperf/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Iperf Example
 

From d49f4d31d0af081107e228110105f1c1c9ee0899 Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Tue, 13 May 2025 16:24:56 +0200
Subject: [PATCH 2/2] fix(examples): Update wifi-remote dependency to include
 IDF-v6

Use esp_wifi_remote version < v2.0
Planned release v1.0 to support remote and native coexistence, which
should be still compatible with IDFv5.x and IDFv6.x
---
 examples/protocols/mqtt/tcp/main/idf_component.yml | 2 +-
 examples/wifi/iperf/main/idf_component.yml         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/protocols/mqtt/tcp/main/idf_component.yml b/examples/protocols/mqtt/tcp/main/idf_component.yml
index 1b1f6dbd59..59805d8c7a 100644
--- a/examples/protocols/mqtt/tcp/main/idf_component.yml
+++ b/examples/protocols/mqtt/tcp/main/idf_component.yml
@@ -2,6 +2,6 @@ dependencies:
   protocol_examples_common:
     path: ${IDF_PATH}/examples/common_components/protocol_examples_common
   espressif/esp_wifi_remote:
-    version: ">=0.1.12"
+    version: ">=0.10,<2.0"
     rules:
       - if: "target in [esp32p4, esp32h2]"
diff --git a/examples/wifi/iperf/main/idf_component.yml b/examples/wifi/iperf/main/idf_component.yml
index 799450c85f..f12609af72 100644
--- a/examples/wifi/iperf/main/idf_component.yml
+++ b/examples/wifi/iperf/main/idf_component.yml
@@ -8,11 +8,11 @@ dependencies:
   esp-qa/ping-cmd:
     version: "~1.0.0"
   espressif/esp_wifi_remote:
-    version: "~0.5.3"
+    version: ">=0.10,<2.0"
     rules:
       - if: "target in [esp32p4, esp32h2]"
   espressif/esp_hosted:
-    version: "~1"
+    version: "~2"
     rules:
       - if: "target in [esp32p4, esp32h2]"
   espressif/esp-extconn: