From 33560f506e087a3b4c321af2a5f3a0883ad30b97 Mon Sep 17 00:00:00 2001 From: gaoxu Date: Mon, 14 Jul 2025 17:34:11 +0800 Subject: [PATCH] ci(adc): enable esp32c61 adc test --- components/esp_adc/test_apps/.build-test-rules.yml | 4 ---- components/esp_adc/test_apps/adc/pytest_adc.py | 2 +- examples/peripherals/.build-test-rules.yml | 14 -------------- .../adc/continuous_read/pytest_adc_continuous.py | 4 +++- .../adc/oneshot_read/pytest_adc_oneshot.py | 4 +++- 5 files changed, 7 insertions(+), 21 deletions(-) diff --git a/components/esp_adc/test_apps/.build-test-rules.yml b/components/esp_adc/test_apps/.build-test-rules.yml index 9416fa8438..aa97546c7d 100644 --- a/components/esp_adc/test_apps/.build-test-rules.yml +++ b/components/esp_adc/test_apps/.build-test-rules.yml @@ -4,10 +4,6 @@ components/esp_adc/test_apps/adc: disable: - if: SOC_ADC_SUPPORTED != 1 - if: CONFIG_NAME == "gdma_iram_safe" and IDF_TARGET in ["esp32", "esp32s2", "esp32c2"] - disable_test: - - if: IDF_TARGET == "esp32c61" - temporary: true - reason: not runners for ESP32C61 ADC depends_components: - esp_adc - esp_driver_gpio diff --git a/components/esp_adc/test_apps/adc/pytest_adc.py b/components/esp_adc/test_apps/adc/pytest_adc.py index 018f70ddb8..d44ee01691 100644 --- a/components/esp_adc/test_apps/adc/pytest_adc.py +++ b/components/esp_adc/test_apps/adc/pytest_adc.py @@ -9,7 +9,7 @@ from pytest_embedded_idf.utils import idf_parametrize @pytest.mark.parametrize('config', ['iram_safe', 'release', 'pm_enable'], indirect=True) @idf_parametrize( 'target', - ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5', 'esp32p4'], + ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5', 'esp32p4', 'esp32c61'], indirect=['target'], ) def test_adc(dut: Dut) -> None: diff --git a/examples/peripherals/.build-test-rules.yml b/examples/peripherals/.build-test-rules.yml index 0c2d1c4bf4..8ff60c3444 100644 --- a/examples/peripherals/.build-test-rules.yml +++ b/examples/peripherals/.build-test-rules.yml @@ -10,25 +10,11 @@ examples/peripherals/adc/continuous_read: disable: - if: SOC_ADC_DMA_SUPPORTED != 1 - disable_test: - - if: IDF_TARGET == "esp32p4" - temporary: true - reason: lack of runners, TODO IDF-9573 - - if: IDF_TARGET == "esp32c61" - temporary: true - reason: lack of runner <<: *adc_dependencies examples/peripherals/adc/oneshot_read: disable: - if: SOC_ADC_SUPPORTED != 1 - disable_test: - - if: IDF_TARGET == "esp32p4" - temporary: true - reason: lack of runner, TODO IDF-9573 - - if: IDF_TARGET == "esp32c61" - temporary: true - reason: lack of runner <<: *adc_dependencies examples/peripherals/analog_comparator: diff --git a/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py b/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py index 53dbbdb8ea..c7793c69a5 100644 --- a/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py +++ b/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py @@ -7,7 +7,9 @@ from pytest_embedded_idf.utils import idf_parametrize @pytest.mark.adc @idf_parametrize( - 'target', ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5'], indirect=['target'] + 'target', + ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5', 'esp32p4', 'esp32c61'], + indirect=['target'], ) def test_adc_continuous(dut: Dut) -> None: res = dut.expect(r'TASK: ret is 0, ret_num is (\d+) bytes') diff --git a/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py b/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py index 9702550ffa..17e15ba727 100644 --- a/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py +++ b/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py @@ -7,7 +7,9 @@ from pytest_embedded_idf.utils import idf_parametrize @pytest.mark.adc @idf_parametrize( - 'target', ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5'], indirect=['target'] + 'target', + ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5', 'esp32p4', 'esp32c61'], + indirect=['target'], ) def test_adc_oneshot(dut: Dut) -> None: dut.expect(r'EXAMPLE: ADC1 Channel\[(\d+)\] Raw Data: (\d+)', timeout=5)