Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-03 03:31:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci/move_adc_runner_to_generic' into 'master'

Browse Source 
ci(adc): move all ADC runners to generic

See merge request espressif/esp-idf!49581
This commit is contained in:
Gao Xu
2026-06-18 10:32:02 +08:00
parent e389f3e4df b856c54e38
commit 3b3b62adee
6 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_adc/test_apps/adc/main/test_common_adc.h
+2 -2
View File
@@ -43,7 +43,7 @@ extern "C" {
#elif CONFIG_IDF_TARGET_ESP32S2 #elif CONFIG_IDF_TARGET_ESP32S2
#define ADC_TEST_LOW_VAL 0 #define ADC_TEST_LOW_VAL 0
#define ADC_TEST_LOW_THRESH 35 #define ADC_TEST_LOW_THRESH 80
#define ADC_TEST_HIGH_VAL 8191 #define ADC_TEST_HIGH_VAL 8191
#define ADC_TEST_HIGH_VAL_DMA 4095 #define ADC_TEST_HIGH_VAL_DMA 4095
@@ -67,7 +67,7 @@ extern "C" {
#elif CONFIG_IDF_TARGET_ESP32C2 #elif CONFIG_IDF_TARGET_ESP32C2
#define ADC_TEST_LOW_VAL 0 #define ADC_TEST_LOW_VAL 0
#define ADC_TEST_LOW_THRESH 15 #define ADC_TEST_LOW_THRESH 30
#define ADC_TEST_HIGH_VAL 3400 #define ADC_TEST_HIGH_VAL 3400
#define ADC_TEST_HIGH_THRESH 200 #define ADC_TEST_HIGH_THRESH 200
components/esp_adc/test_apps/adc/pytest_adc.py
+4 -4
View File
@@ -1,11 +1,11 @@
# SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2021-2026 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
import pytest import pytest
from pytest_embedded import Dut from pytest_embedded import Dut
from pytest_embedded_idf.utils import idf_parametrize from pytest_embedded_idf.utils import idf_parametrize
@pytest.mark.adc @pytest.mark.generic
@pytest.mark.parametrize('config', ['iram_safe', 'release', 'pm_enable'], indirect=True) @pytest.mark.parametrize('config', ['iram_safe', 'release', 'pm_enable'], indirect=True)
@idf_parametrize( @idf_parametrize(
'target', 'target',
@@ -17,7 +17,7 @@ def test_adc(dut: Dut) -> None:
# No PM test, as C2 doesn't support ADC continuous mode # No PM test, as C2 doesn't support ADC continuous mode
@pytest.mark.adc @pytest.mark.generic
@pytest.mark.xtal_26mhz @pytest.mark.xtal_26mhz
@pytest.mark.parametrize( @pytest.mark.parametrize(
'config, baud', 'config, baud',
@@ -34,7 +34,7 @@ def test_adc_esp32c2_xtal_26mhz(dut: Dut) -> None:
# TODO: IDF-15005 # TODO: IDF-15005
# P4 REV2 adc # P4 REV2 adc
# @pytest.mark.adc # @pytest.mark.generic
# @pytest.mark.esp32p4_rev1 # @pytest.mark.esp32p4_rev1
# @pytest.mark.parametrize('config', ['esp32p4_rev1'], indirect=True) # @pytest.mark.parametrize('config', ['esp32p4_rev1'], indirect=True)
# @idf_parametrize( # @idf_parametrize(
examples/peripherals/adc/continuous_read/pytest_adc_continuous.py
+1 -1
View File
@@ -5,7 +5,7 @@ from pytest_embedded.dut import Dut
from pytest_embedded_idf.utils import idf_parametrize from pytest_embedded_idf.utils import idf_parametrize
@pytest.mark.adc @pytest.mark.generic
@idf_parametrize( @idf_parametrize(
'target', 'target',
['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5', 'esp32p4', 'esp32c61', 'esp32s31'], ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5', 'esp32p4', 'esp32c61', 'esp32s31'],
examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py
+2 -2
View File
@@ -5,7 +5,7 @@ from pytest_embedded.dut import Dut
from pytest_embedded_idf.utils import idf_parametrize from pytest_embedded_idf.utils import idf_parametrize
@pytest.mark.adc @pytest.mark.generic
@idf_parametrize( @idf_parametrize(
'target', 'target',
['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5', 'esp32p4', 'esp32c61', 'esp32s31'], ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5', 'esp32p4', 'esp32c61', 'esp32s31'],
@@ -15,7 +15,7 @@ def test_adc_oneshot(dut: Dut) -> None:
dut.expect(r'EXAMPLE: ADC1 Channel\[(\d+)\] Raw Data: (\d+)', timeout=5) dut.expect(r'EXAMPLE: ADC1 Channel\[(\d+)\] Raw Data: (\d+)', timeout=5)
@pytest.mark.adc @pytest.mark.generic
@pytest.mark.xtal_26mhz @pytest.mark.xtal_26mhz
@pytest.mark.parametrize( @pytest.mark.parametrize(
'config, baud', 'config, baud',
examples/peripherals/dac/dac_cosine_wave/pytest_dac_cosine_wave.py
+2 -2
View File
@@ -5,7 +5,7 @@ from pytest_embedded import Dut
from pytest_embedded_idf.utils import idf_parametrize from pytest_embedded_idf.utils import idf_parametrize
@pytest.mark.adc @pytest.mark.generic
@idf_parametrize('target', ['esp32'], indirect=['target']) @idf_parametrize('target', ['esp32'], indirect=['target'])
def test_dac_cosine_wave_example_with_12bit_adc(dut: Dut) -> None: def test_dac_cosine_wave_example_with_12bit_adc(dut: Dut) -> None:
res = [] res = []
@@ -19,7 +19,7 @@ def test_dac_cosine_wave_example_with_12bit_adc(dut: Dut) -> None:
assert max(chan0_val) - min(chan0_val) > 1000 assert max(chan0_val) - min(chan0_val) > 1000
@pytest.mark.adc @pytest.mark.generic
@idf_parametrize('target', ['esp32s2'], indirect=['target']) @idf_parametrize('target', ['esp32s2'], indirect=['target'])
def test_dac_cosine_wave_example_with_13bit_adc(dut: Dut) -> None: def test_dac_cosine_wave_example_with_13bit_adc(dut: Dut) -> None:
res = [] res = []
pytest.ini
-1
View File
@@ -95,7 +95,6 @@ env_markers =
flash_120m: runner with 120M supported Flash flash_120m: runner with 120M supported Flash
jtag: runner where the chip is accessible through JTAG as well jtag: runner where the chip is accessible through JTAG as well
usb_serial_jtag: runner where the chip is accessible through builtin JTAG as well usb_serial_jtag: runner where the chip is accessible through builtin JTAG as well
adc: ADC related tests should run on adc runners
xtal32k: Runner with external 32k crystal connected xtal32k: Runner with external 32k crystal connected
no32kXtal: Runner with no external 32k crystal connected no32kXtal: Runner with no external 32k crystal connected
psramv0: Runner with PSRAM version 0 psramv0: Runner with PSRAM version 0