Skip to content

Commit c10d3ac

Browse files
committed
Merge branch 'update/wifi_remote' into 'master'
change(examples): Re-enable examples which need esp_wifi_remote See merge request espressif/esp-idf!39067
2 parents 48b37dd + d49f4d3 commit c10d3ac

File tree

6 files changed

+7
-14
lines changed

6 files changed

+7
-14
lines changed

examples/protocols/.build-test-rules.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,6 @@ examples/protocols/mqtt/ssl_psk:
193193
<<: *mqtt_dependencies
194194
examples/protocols/mqtt/tcp:
195195
<<: *mqtt_dependencies
196-
disable+:
197-
- if: IDF_TARGET in ["esp32p4", "esp32h2"]
198-
temporary: true
199-
reason: need to update esp_wifi_remote component to support idf-v6.0
200196
disable_test:
201197
- if: IDF_TARGET != "esp32"
202198
reason: only test on esp32

examples/protocols/mqtt/tcp/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
33

44
# ESP-MQTT sample application
55
(See the README.md file in the upper level 'examples' directory for more information about examples.)

examples/protocols/mqtt/tcp/main/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ dependencies:
22
protocol_examples_common:
33
path: ${IDF_PATH}/examples/common_components/protocol_examples_common
44
espressif/esp_wifi_remote:
5-
version: ">=0.1.12"
5+
version: ">=0.10,<2.0"
66
rules:
77
- if: "target in [esp32p4, esp32h2]"

examples/wifi/.build-test-rules.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ examples/wifi/iperf:
3636
disable:
3737
- if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1)
3838
- if: (IDF_TARGET == "esp32p4") and CONFIG_NAME in ["defaults", "99"]
39-
- if: IDF_TARGET in ["esp32p4", "esp32h2"]
40-
temporary: true
41-
reason: need to update esp_wifi_remote component to support idf-v6.0
4239
disable_test:
4340
- if: IDF_TARGET not in ["esp32"]
4441
temporary: true

examples/wifi/iperf/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
33

44
# Iperf Example
55

examples/wifi/iperf/main/idf_component.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ dependencies:
88
esp-qa/ping-cmd:
99
version: "~1.0.0"
1010
espressif/esp_wifi_remote:
11-
version: "~0.5.3"
11+
version: ">=0.10,<2.0"
1212
rules:
1313
- if: "target in [esp32p4, esp32h2]"
1414
espressif/esp_hosted:
15-
version: "~1"
15+
version: "~2"
1616
rules:
1717
- if: "target in [esp32p4, esp32h2]"
1818
espressif/esp-extconn:

0 commit comments

Comments
 (0)