From 4e10048400943c99a13e37a720e5bdb46fd71c5d Mon Sep 17 00:00:00 2001 From: Ondrej Kosta Date: Mon, 19 Jun 2023 16:09:28 +0200 Subject: [PATCH 1/2] Moved 'eth2ap' example to /examples/network folder Ethernet related .build-test-rules.yml cleanup --- examples/ethernet/.build-test-rules.yml | 6 ------ examples/network/.build-test-rules.yml | 8 +++++++- .../{ethernet => network}/eth2ap/CMakeLists.txt | 0 examples/{ethernet => network}/eth2ap/README.md | 0 examples/{ethernet => network}/eth2ap/eth2ap.png | Bin .../eth2ap/main/CMakeLists.txt | 0 .../eth2ap/main/Kconfig.projbuild | 0 .../eth2ap/main/ethernet_example_main.c | 5 +++++ 8 files changed, 12 insertions(+), 7 deletions(-) rename examples/{ethernet => network}/eth2ap/CMakeLists.txt (100%) rename examples/{ethernet => network}/eth2ap/README.md (100%) rename examples/{ethernet => network}/eth2ap/eth2ap.png (100%) rename examples/{ethernet => network}/eth2ap/main/CMakeLists.txt (100%) rename examples/{ethernet => network}/eth2ap/main/Kconfig.projbuild (100%) rename examples/{ethernet => network}/eth2ap/main/ethernet_example_main.c (98%) diff --git a/examples/ethernet/.build-test-rules.yml b/examples/ethernet/.build-test-rules.yml index e86b80bcd5..dedd053158 100644 --- a/examples/ethernet/.build-test-rules.yml +++ b/examples/ethernet/.build-test-rules.yml @@ -1,11 +1,5 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -examples/ethernet/eth2ap: - disable: - - if: IDF_TARGET == "esp32h2" - temporary: true - reason: esp32h2 is not supported - examples/ethernet/iperf: disable_test: - if: IDF_TARGET not in ["esp32"] diff --git a/examples/network/.build-test-rules.yml b/examples/network/.build-test-rules.yml index 2d2e70f24d..f65e03fe62 100644 --- a/examples/network/.build-test-rules.yml +++ b/examples/network/.build-test-rules.yml @@ -4,13 +4,19 @@ examples/network/bridge: disable_test: - if: IDF_TARGET != "esp32" reason: Generic functionality, no need to be run on specific targets + +examples/network/eth2ap: + disable: + - if: SOC_WIFI_SUPPORTED != 1 + examples/network/simple_sniffer: disable: - - if: IDF_TARGET in ["esp32h2"] + - if: SOC_WIFI_SUPPORTED != 1 disable_test: - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"] temporary: true reason: lack of runners + examples/network/sta_to_eth: disable: - if: SOC_WIFI_SUPPORTED != 1 diff --git a/examples/ethernet/eth2ap/CMakeLists.txt b/examples/network/eth2ap/CMakeLists.txt similarity index 100% rename from examples/ethernet/eth2ap/CMakeLists.txt rename to examples/network/eth2ap/CMakeLists.txt diff --git a/examples/ethernet/eth2ap/README.md b/examples/network/eth2ap/README.md similarity index 100% rename from examples/ethernet/eth2ap/README.md rename to examples/network/eth2ap/README.md diff --git a/examples/ethernet/eth2ap/eth2ap.png b/examples/network/eth2ap/eth2ap.png similarity index 100% rename from examples/ethernet/eth2ap/eth2ap.png rename to examples/network/eth2ap/eth2ap.png diff --git a/examples/ethernet/eth2ap/main/CMakeLists.txt b/examples/network/eth2ap/main/CMakeLists.txt similarity index 100% rename from examples/ethernet/eth2ap/main/CMakeLists.txt rename to examples/network/eth2ap/main/CMakeLists.txt diff --git a/examples/ethernet/eth2ap/main/Kconfig.projbuild b/examples/network/eth2ap/main/Kconfig.projbuild similarity index 100% rename from examples/ethernet/eth2ap/main/Kconfig.projbuild rename to examples/network/eth2ap/main/Kconfig.projbuild diff --git a/examples/ethernet/eth2ap/main/ethernet_example_main.c b/examples/network/eth2ap/main/ethernet_example_main.c similarity index 98% rename from examples/ethernet/eth2ap/main/ethernet_example_main.c rename to examples/network/eth2ap/main/ethernet_example_main.c index afccd20451..27ed39a3b5 100644 --- a/examples/ethernet/eth2ap/main/ethernet_example_main.c +++ b/examples/network/eth2ap/main/ethernet_example_main.c @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ /* eth2ap (Ethernet to Wi-Fi AP packet forwarding) Example This example code is in the Public Domain (or CC0 licensed, at your option.) From b7ba0c610c5448e880ded377ecabff50543ae90a Mon Sep 17 00:00:00 2001 From: Ondrej Kosta Date: Tue, 20 Jun 2023 08:55:51 +0200 Subject: [PATCH 2/2] renamed 'sta_to_eth' example to 'sta2eth' --- examples/network/.build-test-rules.yml | 2 +- examples/network/{sta_to_eth => sta2eth}/CMakeLists.txt | 0 examples/network/{sta_to_eth => sta2eth}/README.md | 0 examples/network/{sta_to_eth => sta2eth}/main/CMakeLists.txt | 2 +- examples/network/{sta_to_eth => sta2eth}/main/Kconfig.projbuild | 0 examples/network/{sta_to_eth => sta2eth}/main/ethernet_iface.c | 0 examples/network/{sta_to_eth => sta2eth}/main/idf_component.yml | 0 examples/network/{sta_to_eth => sta2eth}/main/manual_config.c | 0 examples/network/{sta_to_eth => sta2eth}/main/provisioning.c | 0 examples/network/{sta_to_eth => sta2eth}/main/provisioning.h | 0 .../network/{sta_to_eth => sta2eth}/main/scheme_generic_httpd.c | 0 .../main/sta_to_eth_main.c => sta2eth/main/sta2eth_main.c} | 0 examples/network/{sta_to_eth => sta2eth}/main/usb_ncm_iface.c | 0 examples/network/{sta_to_eth => sta2eth}/main/wired_iface.h | 0 examples/network/{sta_to_eth => sta2eth}/sdkconfig.defaults | 0 .../network/{sta_to_eth => sta2eth}/sdkconfig.defaults.esp32s2 | 0 .../network/{sta_to_eth => sta2eth}/sdkconfig.defaults.esp32s3 | 0 17 files changed, 2 insertions(+), 2 deletions(-) rename examples/network/{sta_to_eth => sta2eth}/CMakeLists.txt (100%) rename examples/network/{sta_to_eth => sta2eth}/README.md (100%) rename examples/network/{sta_to_eth => sta2eth}/main/CMakeLists.txt (90%) rename examples/network/{sta_to_eth => sta2eth}/main/Kconfig.projbuild (100%) rename examples/network/{sta_to_eth => sta2eth}/main/ethernet_iface.c (100%) rename examples/network/{sta_to_eth => sta2eth}/main/idf_component.yml (100%) rename examples/network/{sta_to_eth => sta2eth}/main/manual_config.c (100%) rename examples/network/{sta_to_eth => sta2eth}/main/provisioning.c (100%) rename examples/network/{sta_to_eth => sta2eth}/main/provisioning.h (100%) rename examples/network/{sta_to_eth => sta2eth}/main/scheme_generic_httpd.c (100%) rename examples/network/{sta_to_eth/main/sta_to_eth_main.c => sta2eth/main/sta2eth_main.c} (100%) rename examples/network/{sta_to_eth => sta2eth}/main/usb_ncm_iface.c (100%) rename examples/network/{sta_to_eth => sta2eth}/main/wired_iface.h (100%) rename examples/network/{sta_to_eth => sta2eth}/sdkconfig.defaults (100%) rename examples/network/{sta_to_eth => sta2eth}/sdkconfig.defaults.esp32s2 (100%) rename examples/network/{sta_to_eth => sta2eth}/sdkconfig.defaults.esp32s3 (100%) diff --git a/examples/network/.build-test-rules.yml b/examples/network/.build-test-rules.yml index f65e03fe62..49df9e206e 100644 --- a/examples/network/.build-test-rules.yml +++ b/examples/network/.build-test-rules.yml @@ -17,6 +17,6 @@ examples/network/simple_sniffer: temporary: true reason: lack of runners -examples/network/sta_to_eth: +examples/network/sta2eth: disable: - if: SOC_WIFI_SUPPORTED != 1 diff --git a/examples/network/sta_to_eth/CMakeLists.txt b/examples/network/sta2eth/CMakeLists.txt similarity index 100% rename from examples/network/sta_to_eth/CMakeLists.txt rename to examples/network/sta2eth/CMakeLists.txt diff --git a/examples/network/sta_to_eth/README.md b/examples/network/sta2eth/README.md similarity index 100% rename from examples/network/sta_to_eth/README.md rename to examples/network/sta2eth/README.md diff --git a/examples/network/sta_to_eth/main/CMakeLists.txt b/examples/network/sta2eth/main/CMakeLists.txt similarity index 90% rename from examples/network/sta_to_eth/main/CMakeLists.txt rename to examples/network/sta2eth/main/CMakeLists.txt index 58873dfd47..8ed65161d4 100644 --- a/examples/network/sta_to_eth/main/CMakeLists.txt +++ b/examples/network/sta2eth/main/CMakeLists.txt @@ -10,7 +10,7 @@ else() set(wired_iface usb_ncm_iface.c) endif() -idf_component_register(SRCS sta_to_eth_main.c +idf_component_register(SRCS sta2eth_main.c ${wired_iface} ${config_method} INCLUDE_DIRS "") diff --git a/examples/network/sta_to_eth/main/Kconfig.projbuild b/examples/network/sta2eth/main/Kconfig.projbuild similarity index 100% rename from examples/network/sta_to_eth/main/Kconfig.projbuild rename to examples/network/sta2eth/main/Kconfig.projbuild diff --git a/examples/network/sta_to_eth/main/ethernet_iface.c b/examples/network/sta2eth/main/ethernet_iface.c similarity index 100% rename from examples/network/sta_to_eth/main/ethernet_iface.c rename to examples/network/sta2eth/main/ethernet_iface.c diff --git a/examples/network/sta_to_eth/main/idf_component.yml b/examples/network/sta2eth/main/idf_component.yml similarity index 100% rename from examples/network/sta_to_eth/main/idf_component.yml rename to examples/network/sta2eth/main/idf_component.yml diff --git a/examples/network/sta_to_eth/main/manual_config.c b/examples/network/sta2eth/main/manual_config.c similarity index 100% rename from examples/network/sta_to_eth/main/manual_config.c rename to examples/network/sta2eth/main/manual_config.c diff --git a/examples/network/sta_to_eth/main/provisioning.c b/examples/network/sta2eth/main/provisioning.c similarity index 100% rename from examples/network/sta_to_eth/main/provisioning.c rename to examples/network/sta2eth/main/provisioning.c diff --git a/examples/network/sta_to_eth/main/provisioning.h b/examples/network/sta2eth/main/provisioning.h similarity index 100% rename from examples/network/sta_to_eth/main/provisioning.h rename to examples/network/sta2eth/main/provisioning.h diff --git a/examples/network/sta_to_eth/main/scheme_generic_httpd.c b/examples/network/sta2eth/main/scheme_generic_httpd.c similarity index 100% rename from examples/network/sta_to_eth/main/scheme_generic_httpd.c rename to examples/network/sta2eth/main/scheme_generic_httpd.c diff --git a/examples/network/sta_to_eth/main/sta_to_eth_main.c b/examples/network/sta2eth/main/sta2eth_main.c similarity index 100% rename from examples/network/sta_to_eth/main/sta_to_eth_main.c rename to examples/network/sta2eth/main/sta2eth_main.c diff --git a/examples/network/sta_to_eth/main/usb_ncm_iface.c b/examples/network/sta2eth/main/usb_ncm_iface.c similarity index 100% rename from examples/network/sta_to_eth/main/usb_ncm_iface.c rename to examples/network/sta2eth/main/usb_ncm_iface.c diff --git a/examples/network/sta_to_eth/main/wired_iface.h b/examples/network/sta2eth/main/wired_iface.h similarity index 100% rename from examples/network/sta_to_eth/main/wired_iface.h rename to examples/network/sta2eth/main/wired_iface.h diff --git a/examples/network/sta_to_eth/sdkconfig.defaults b/examples/network/sta2eth/sdkconfig.defaults similarity index 100% rename from examples/network/sta_to_eth/sdkconfig.defaults rename to examples/network/sta2eth/sdkconfig.defaults diff --git a/examples/network/sta_to_eth/sdkconfig.defaults.esp32s2 b/examples/network/sta2eth/sdkconfig.defaults.esp32s2 similarity index 100% rename from examples/network/sta_to_eth/sdkconfig.defaults.esp32s2 rename to examples/network/sta2eth/sdkconfig.defaults.esp32s2 diff --git a/examples/network/sta_to_eth/sdkconfig.defaults.esp32s3 b/examples/network/sta2eth/sdkconfig.defaults.esp32s3 similarity index 100% rename from examples/network/sta_to_eth/sdkconfig.defaults.esp32s3 rename to examples/network/sta2eth/sdkconfig.defaults.esp32s3