From e4b655a25293e1925ea42bbbee621ffcbe9aec72 Mon Sep 17 00:00:00 2001 From: morris Date: Sun, 4 Feb 2024 18:46:12 +0800 Subject: [PATCH] feat(blink): add sdkconfig defaults for each target based on devkit board design --- examples/get-started/.build-test-rules.yml | 8 +++++--- examples/get-started/blink/README.md | 4 ++-- examples/get-started/blink/main/Kconfig.projbuild | 6 +----- examples/get-started/blink/pytest_blink.py | 2 -- examples/get-started/blink/sdkconfig.ci.led_strip_spi | 2 -- examples/get-started/blink/sdkconfig.defaults | 2 ++ examples/get-started/blink/sdkconfig.defaults esp32h2 | 1 + examples/get-started/blink/sdkconfig.defaults.esp32 | 1 + examples/get-started/blink/sdkconfig.defaults.esp32c3 | 1 + examples/get-started/blink/sdkconfig.defaults.esp32c5 | 2 ++ examples/get-started/blink/sdkconfig.defaults.esp32c6 | 1 + examples/get-started/blink/sdkconfig.defaults.esp32s2 | 2 ++ examples/get-started/blink/sdkconfig.defaults.esp32s3 | 2 ++ 13 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 examples/get-started/blink/sdkconfig.ci.led_strip_spi create mode 100644 examples/get-started/blink/sdkconfig.defaults create mode 100644 examples/get-started/blink/sdkconfig.defaults esp32h2 create mode 100644 examples/get-started/blink/sdkconfig.defaults.esp32 create mode 100644 examples/get-started/blink/sdkconfig.defaults.esp32c3 create mode 100644 examples/get-started/blink/sdkconfig.defaults.esp32c5 create mode 100644 examples/get-started/blink/sdkconfig.defaults.esp32c6 create mode 100644 examples/get-started/blink/sdkconfig.defaults.esp32s2 create mode 100644 examples/get-started/blink/sdkconfig.defaults.esp32s3 diff --git a/examples/get-started/.build-test-rules.yml b/examples/get-started/.build-test-rules.yml index 2cf7304530..efdf667439 100644 --- a/examples/get-started/.build-test-rules.yml +++ b/examples/get-started/.build-test-rules.yml @@ -2,9 +2,11 @@ examples/get-started/blink: disable: - - if: IDF_TARGET in ["esp32p4", "esp32c5"] - temporary: true - reason: target esp32p4 and esp32c5 are not supported yet # TODO: IDF-8074, [ESP32C5] IDF-9006 + - if: SOC_GPSPI_SUPPORTED != 1 and SOC_RMT_SUPPORTED != 1 # The blink example relies on the RMT or GPSPI to drive the led strip + depends_components: + - esp_driver_gpio + - esp_driver_spi + - esp_driver_rmt examples/get-started/hello_world: enable: diff --git a/examples/get-started/blink/README.md b/examples/get-started/blink/README.md index 038ac35c9e..8e6e412305 100644 --- a/examples/get-started/blink/README.md +++ b/examples/get-started/blink/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | # Blink Example diff --git a/examples/get-started/blink/main/Kconfig.projbuild b/examples/get-started/blink/main/Kconfig.projbuild index d0cd42e602..58dad49e67 100644 --- a/examples/get-started/blink/main/Kconfig.projbuild +++ b/examples/get-started/blink/main/Kconfig.projbuild @@ -4,8 +4,7 @@ menu "Example Configuration" choice BLINK_LED prompt "Blink LED type" - default BLINK_LED_GPIO if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C2 - default BLINK_LED_STRIP + default BLINK_LED_GPIO help Select the LED type. A normal level controlled LED or an addressable LED strip. The default selection is based on the Espressif DevKit boards. @@ -35,9 +34,6 @@ menu "Example Configuration" config BLINK_GPIO int "Blink GPIO number" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX - default 5 if IDF_TARGET_ESP32 - default 18 if IDF_TARGET_ESP32S2 - default 48 if IDF_TARGET_ESP32S3 default 8 help GPIO number (IOxx) to blink on and off the LED. diff --git a/examples/get-started/blink/pytest_blink.py b/examples/get-started/blink/pytest_blink.py index 3c3916ed6c..8df33cfb83 100644 --- a/examples/get-started/blink/pytest_blink.py +++ b/examples/get-started/blink/pytest_blink.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 - import logging import os @@ -8,7 +7,6 @@ import pytest from pytest_embedded_idf.dut import IdfDut -@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='esp32p4 support TBD') # TODO: IDF-8988 @pytest.mark.supported_targets @pytest.mark.generic def test_blink(dut: IdfDut) -> None: diff --git a/examples/get-started/blink/sdkconfig.ci.led_strip_spi b/examples/get-started/blink/sdkconfig.ci.led_strip_spi deleted file mode 100644 index d41bc346d4..0000000000 --- a/examples/get-started/blink/sdkconfig.ci.led_strip_spi +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_BLINK_LED_STRIP=y -CONFIG_BLINK_LED_STRIP_BACKEND_SPI=y diff --git a/examples/get-started/blink/sdkconfig.defaults b/examples/get-started/blink/sdkconfig.defaults new file mode 100644 index 0000000000..66e7f245b5 --- /dev/null +++ b/examples/get-started/blink/sdkconfig.defaults @@ -0,0 +1,2 @@ +CONFIG_BLINK_LED_GPIO=y +CONFIG_BLINK_GPIO=8 diff --git a/examples/get-started/blink/sdkconfig.defaults esp32h2 b/examples/get-started/blink/sdkconfig.defaults esp32h2 new file mode 100644 index 0000000000..da04430453 --- /dev/null +++ b/examples/get-started/blink/sdkconfig.defaults esp32h2 @@ -0,0 +1 @@ +CONFIG_BLINK_LED_STRIP=y diff --git a/examples/get-started/blink/sdkconfig.defaults.esp32 b/examples/get-started/blink/sdkconfig.defaults.esp32 new file mode 100644 index 0000000000..263ec939b1 --- /dev/null +++ b/examples/get-started/blink/sdkconfig.defaults.esp32 @@ -0,0 +1 @@ +CONFIG_BLINK_GPIO=5 diff --git a/examples/get-started/blink/sdkconfig.defaults.esp32c3 b/examples/get-started/blink/sdkconfig.defaults.esp32c3 new file mode 100644 index 0000000000..da04430453 --- /dev/null +++ b/examples/get-started/blink/sdkconfig.defaults.esp32c3 @@ -0,0 +1 @@ +CONFIG_BLINK_LED_STRIP=y diff --git a/examples/get-started/blink/sdkconfig.defaults.esp32c5 b/examples/get-started/blink/sdkconfig.defaults.esp32c5 new file mode 100644 index 0000000000..053efed5b7 --- /dev/null +++ b/examples/get-started/blink/sdkconfig.defaults.esp32c5 @@ -0,0 +1,2 @@ +CONFIG_BLINK_GPIO=6 +CONFIG_BLINK_LED_STRIP=y diff --git a/examples/get-started/blink/sdkconfig.defaults.esp32c6 b/examples/get-started/blink/sdkconfig.defaults.esp32c6 new file mode 100644 index 0000000000..da04430453 --- /dev/null +++ b/examples/get-started/blink/sdkconfig.defaults.esp32c6 @@ -0,0 +1 @@ +CONFIG_BLINK_LED_STRIP=y diff --git a/examples/get-started/blink/sdkconfig.defaults.esp32s2 b/examples/get-started/blink/sdkconfig.defaults.esp32s2 new file mode 100644 index 0000000000..25fd93b023 --- /dev/null +++ b/examples/get-started/blink/sdkconfig.defaults.esp32s2 @@ -0,0 +1,2 @@ +CONFIG_BLINK_LED_STRIP=y +CONFIG_BLINK_GPIO=18 diff --git a/examples/get-started/blink/sdkconfig.defaults.esp32s3 b/examples/get-started/blink/sdkconfig.defaults.esp32s3 new file mode 100644 index 0000000000..5ac9d30b41 --- /dev/null +++ b/examples/get-started/blink/sdkconfig.defaults.esp32s3 @@ -0,0 +1,2 @@ +CONFIG_BLINK_LED_STRIP=y +CONFIG_BLINK_GPIO=48