From 7c92d98c0469a38b1519df8dbb0cc1dede0dc7fa Mon Sep 17 00:00:00 2001 From: Chen Yu Dong Date: Fri, 26 Jul 2024 17:31:05 +0800 Subject: [PATCH] fix(ci): update iperf build ci condition Co-authored-by: Chen Yu Dong --- components/esp_wifi/esp32p4/esp_adapter.c | 7 +++++++ examples/wifi/.build-test-rules.yml | 4 ++-- examples/wifi/iperf/README.md | 4 ++-- examples/wifi/iperf/main/idf_component.yml | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/components/esp_wifi/esp32p4/esp_adapter.c b/components/esp_wifi/esp32p4/esp_adapter.c index 7ac4d7157d..74bc498cc4 100644 --- a/components/esp_wifi/esp32p4/esp_adapter.c +++ b/components/esp_wifi/esp32p4/esp_adapter.c @@ -53,7 +53,9 @@ extern void wifi_apb80m_request(void); extern void wifi_apb80m_release(void); #endif +#if CONFIG_ESP_EXT_CONN_ENABLE extern uint8_t *esp_extconn_get_mac(void); +#endif IRAM_ATTR void *wifi_malloc(size_t size) { @@ -410,7 +412,12 @@ static esp_err_t esp_read_mac_wrapper(uint8_t *mac, unsigned int type) } // get mac address from target +#if CONFIG_ESP_EXT_CONN_ENABLE memcpy(mac, esp_extconn_get_mac(), 6); +#else + ESP_LOGE(TAG, "Not support read mac"); + return ESP_FAIL; +#endif if (type == ESP_MAC_WIFI_SOFTAP) { mac[5] += 1; diff --git a/examples/wifi/.build-test-rules.yml b/examples/wifi/.build-test-rules.yml index 0de54fbf24..ae0f4542cb 100644 --- a/examples/wifi/.build-test-rules.yml +++ b/examples/wifi/.build-test-rules.yml @@ -38,9 +38,9 @@ examples/wifi/getting_started: examples/wifi/iperf: disable: - - if: SOC_WIFI_SUPPORTED != 1 + - if: (SOC_WIFI_SUPPORTED != 1) and (IDF_TARGET != "esp32p4") disable_test: - - if: IDF_TARGET not in ["esp32", "esp32p4"] + - if: IDF_TARGET not in ["esp32"] temporary: true reason: lack of runners depends_components: diff --git a/examples/wifi/iperf/README.md b/examples/wifi/iperf/README.md index 3e1188a3e5..42fa051845 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 diff --git a/examples/wifi/iperf/main/idf_component.yml b/examples/wifi/iperf/main/idf_component.yml index 9dc9a28ce9..fdb795321d 100644 --- a/examples/wifi/iperf/main/idf_component.yml +++ b/examples/wifi/iperf/main/idf_component.yml @@ -7,7 +7,7 @@ dependencies: version: "~0.1.0" esp-qa/ping-cmd: version: "~0.0.1" - espressif/esp_extconn: - version: "~0.0.1" + espressif/esp-extconn: + version: "~0.1.0" rules: - if: "target in [esp32p4]"