From 8694a1ea0cde0b19a5748d6ee8e7b54c384f982e Mon Sep 17 00:00:00 2001 From: AndriiFilippov Date: Tue, 9 May 2023 12:21:09 +0200 Subject: [PATCH] update default pins for Ethernet basic and enc28j60 examples update .yml files --- examples/ethernet/.build-test-rules.yml | 16 +++------------- .../components/ethernet_init/Kconfig.projbuild | 18 ++++++++++-------- examples/ethernet/enc28j60/README.md | 4 ++-- .../ethernet/enc28j60/main/Kconfig.projbuild | 11 ++++++----- examples/ethernet/eth2ap/README.md | 4 ++-- examples/ethernet/iperf/README.md | 4 ++-- examples/network/.build-test-rules.yml | 4 ---- examples/network/network_tests/README.md | 4 ++-- examples/network/vlan_support/README.md | 4 ++-- 9 files changed, 29 insertions(+), 40 deletions(-) diff --git a/examples/ethernet/.build-test-rules.yml b/examples/ethernet/.build-test-rules.yml index 6e99c336b4..e86b80bcd5 100644 --- a/examples/ethernet/.build-test-rules.yml +++ b/examples/ethernet/.build-test-rules.yml @@ -1,23 +1,13 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -examples/ethernet/enc28j60: - disable: - - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" #Depends on IDF-6245 - temporary: true - reason: target esp32c6, esp32h2 is not supported yet - examples/ethernet/eth2ap: disable: - - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" + - if: IDF_TARGET == "esp32h2" temporary: true - reason: target esp32c6, esp32h2 is not supported yet + reason: esp32h2 is not supported examples/ethernet/iperf: - disable: - - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" - temporary: true - reason: target esp32c6 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32c3", "esp32c2", "esp32s2", "esp32s3"] + - if: IDF_TARGET not in ["esp32"] temporary: true reason: lack of runners diff --git a/examples/ethernet/basic/components/ethernet_init/Kconfig.projbuild b/examples/ethernet/basic/components/ethernet_init/Kconfig.projbuild index a3d7b9cf22..3e9a1b40ae 100644 --- a/examples/ethernet/basic/components/ethernet_init/Kconfig.projbuild +++ b/examples/ethernet/basic/components/ethernet_init/Kconfig.projbuild @@ -141,7 +141,7 @@ menu "Example Ethernet Configuration" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX default 14 if IDF_TARGET_ESP32 default 12 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 - default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 default 4 if IDF_TARGET_ESP32H2 help Set the GPIO number used by SPI SCLK. @@ -151,7 +151,7 @@ menu "Example Ethernet Configuration" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX default 13 if IDF_TARGET_ESP32 default 11 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 - default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 default 5 if IDF_TARGET_ESP32H2 help Set the GPIO number used by SPI MOSI. @@ -161,7 +161,7 @@ menu "Example Ethernet Configuration" range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX default 12 if IDF_TARGET_ESP32 default 13 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 - default 2 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + default 2 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 default 0 if IDF_TARGET_ESP32H2 help Set the GPIO number used by SPI MISO. @@ -169,8 +169,7 @@ menu "Example Ethernet Configuration" config EXAMPLE_ETH_SPI_CLOCK_MHZ int "SPI clock speed (MHz)" range 5 80 - default 12 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 - default 36 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 + default 16 help Set the clock speed (MHz) of SPI interface. @@ -179,6 +178,7 @@ menu "Example Ethernet Configuration" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX default 15 if IDF_TARGET_ESP32 default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C2 + default 3 if IDF_TARGET_ESP32C6 default 1 if IDF_TARGET_ESP32H2 help Set the GPIO number used by SPI CS0, i.e. Chip Select associated with the first SPI Eth module). @@ -190,6 +190,7 @@ menu "Example Ethernet Configuration" default 32 if IDF_TARGET_ESP32 default 7 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 default 8 if IDF_TARGET_ESP32C3 + default 21 if IDF_TARGET_ESP32C6 default 3 if IDF_TARGET_ESP32C2 default 11 if IDF_TARGET_ESP32H2 help @@ -199,8 +200,8 @@ menu "Example Ethernet Configuration" int "Interrupt GPIO number SPI Ethernet module #1" range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX default 4 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 - default 4 if IDF_TARGET_ESP32C2 - default 9 if IDF_TARGET_ESP32H2 + default 4 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 + default 10 if IDF_TARGET_ESP32H2 help Set the GPIO number used by the first SPI Ethernet module interrupt line. @@ -210,7 +211,8 @@ menu "Example Ethernet Configuration" range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX default 33 if IDF_TARGET_ESP32 default 5 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C2 - default 10 if IDF_TARGET_ESP32H2 + default 5 if IDF_TARGET_ESP32C6 + default 9 if IDF_TARGET_ESP32H2 help Set the GPIO number used by the second SPI Ethernet module interrupt line. diff --git a/examples/ethernet/enc28j60/README.md b/examples/ethernet/enc28j60/README.md index 751db55bfd..53124764d1 100644 --- a/examples/ethernet/enc28j60/README.md +++ b/examples/ethernet/enc28j60/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # ENC28J60 Example (See the README.md file in the upper level 'examples' directory for more information about examples.) diff --git a/examples/ethernet/enc28j60/main/Kconfig.projbuild b/examples/ethernet/enc28j60/main/Kconfig.projbuild index c33f4b97e7..3fe17bff57 100644 --- a/examples/ethernet/enc28j60/main/Kconfig.projbuild +++ b/examples/ethernet/enc28j60/main/Kconfig.projbuild @@ -14,7 +14,7 @@ menu "Example Configuration" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX default 14 if IDF_TARGET_ESP32 default 12 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 - default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 default 4 if IDF_TARGET_ESP32H2 help Set the GPIO number used by SPI SCLK. @@ -24,7 +24,7 @@ menu "Example Configuration" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX default 13 if IDF_TARGET_ESP32 default 11 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 - default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 default 5 if IDF_TARGET_ESP32H2 help Set the GPIO number used by SPI MOSI. @@ -34,7 +34,7 @@ menu "Example Configuration" range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX default 12 if IDF_TARGET_ESP32 default 13 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 - default 2 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + default 2 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 default 0 if IDF_TARGET_ESP32H2 help Set the GPIO number used by SPI MISO. @@ -44,6 +44,7 @@ menu "Example Configuration" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX default 15 if IDF_TARGET_ESP32 default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C2 + default 3 if IDF_TARGET_ESP32C6 default 1 if IDF_TARGET_ESP32H2 help Set the GPIO number used by SPI CS. @@ -59,8 +60,8 @@ menu "Example Configuration" int "Interrupt GPIO number" range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX default 4 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 - default 4 if IDF_TARGET_ESP32C2 - default 9 if IDF_TARGET_ESP32H2 + default 4 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 + default 10 if IDF_TARGET_ESP32H2 help Set the GPIO number used by ENC28J60 interrupt. diff --git a/examples/ethernet/eth2ap/README.md b/examples/ethernet/eth2ap/README.md index f6e53ff3f5..861ddc872c 100644 --- a/examples/ethernet/eth2ap/README.md +++ b/examples/ethernet/eth2ap/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # eth2ap Example (See the README.md file in the upper level 'examples' directory for more information about examples. To try a more complex application about Ethernet to WiFi data forwarding, please go to [iot-solution](https://github.com/espressif/esp-iot-solution/tree/release/v1.0/examples/eth2wifi).) diff --git a/examples/ethernet/iperf/README.md b/examples/ethernet/iperf/README.md index 3188533f2f..329c7773e8 100644 --- a/examples/ethernet/iperf/README.md +++ b/examples/ethernet/iperf/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Ethernet iperf Example diff --git a/examples/network/.build-test-rules.yml b/examples/network/.build-test-rules.yml index ddc6721a10..7bbb24e350 100644 --- a/examples/network/.build-test-rules.yml +++ b/examples/network/.build-test-rules.yml @@ -1,9 +1,5 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -examples/network: - disable: - - if: IDF_TARGET in ["esp32h2"] - examples/network/bridge: disable_test: - if: IDF_TARGET != "esp32" diff --git a/examples/network/network_tests/README.md b/examples/network/network_tests/README.md index d61fe2ba19..25c7dbdb27 100644 --- a/examples/network/network_tests/README.md +++ b/examples/network/network_tests/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Intel net test suite for LwIP network stack diff --git a/examples/network/vlan_support/README.md b/examples/network/vlan_support/README.md index b50ed2092e..d6bc48d8f2 100644 --- a/examples/network/vlan_support/README.md +++ b/examples/network/vlan_support/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Ethernet VLAN Support Example