diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index df86dae667..5257ad9b29 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -255,13 +255,14 @@ - "components/hal/esp32s*/include/hal/usb*.h" - "components/usb/**/*" -# for jobs: component_ut_pytest_esp32x_adc: -.patterns-component_ut-adc: &patterns-component_ut-adc +# for jobs: *_pytest_esp32x_adc: +.patterns-target_test-adc: &patterns-target_test-adc - "components/esp_adc/**/*" - "components/driver/**/*" - "components/hal/**/*" - "components/esp_hw_support/**/*" - "components/efuse/**/*" + - "examples/peripherals/adc/**/*" ############## # if anchors # @@ -562,12 +563,12 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -591,12 +592,12 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -619,12 +620,12 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -647,12 +648,12 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -675,12 +676,12 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -703,12 +704,12 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -731,12 +732,12 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -759,12 +760,12 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -794,6 +795,8 @@ changes: *patterns-custom_test - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -817,6 +820,8 @@ changes: *patterns-custom_test - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -839,6 +844,8 @@ changes: *patterns-custom_test - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -861,6 +868,8 @@ changes: *patterns-custom_test - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -883,6 +892,8 @@ changes: *patterns-custom_test - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -905,6 +916,8 @@ changes: *patterns-custom_test - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -927,6 +940,8 @@ changes: *patterns-custom_test - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -949,6 +964,8 @@ changes: *patterns-custom_test - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1007,6 +1024,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1043,6 +1062,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1077,6 +1098,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1112,6 +1135,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1146,6 +1171,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1180,6 +1207,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1214,6 +1243,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1248,6 +1279,8 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1341,8 +1374,6 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-usb - <<: *if-dev-push @@ -1365,6 +1396,8 @@ changes: *patterns-integration_test-ble - <<: *if-dev-push changes: *patterns-integration_test-wifi + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1396,6 +1429,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1421,6 +1456,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1445,6 +1482,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1469,6 +1508,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1493,6 +1534,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1517,6 +1560,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1541,6 +1586,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-downloadable-tools + - <<: *if-dev-push + changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-i154 - <<: *if-dev-push @@ -1608,7 +1655,7 @@ - <<: *if-label-component_ut_esp32 - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-component_ut-adc + changes: *patterns-target_test-adc .rules:test:component_ut-esp32-wifi: rules: @@ -1649,7 +1696,7 @@ - <<: *if-label-component_ut_esp32c2 - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-component_ut-adc + changes: *patterns-target_test-adc .rules:test:component_ut-esp32c3: rules: @@ -1677,7 +1724,7 @@ - <<: *if-label-component_ut_esp32c3 - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-component_ut-adc + changes: *patterns-target_test-adc .rules:test:component_ut-esp32c3-wifi: rules: @@ -1746,7 +1793,7 @@ - <<: *if-label-component_ut_esp32s2 - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-component_ut-adc + changes: *patterns-target_test-adc .rules:test:component_ut-esp32s3: rules: @@ -1774,7 +1821,7 @@ - <<: *if-label-component_ut_esp32s3 - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-component_ut-adc + changes: *patterns-target_test-adc .rules:test:component_ut-esp32s3-usb: rules: @@ -1882,6 +1929,19 @@ - <<: *if-dev-push changes: *patterns-example_test +.rules:test:example_test-esp32-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc + .rules:test:example_test-esp32-bt: rules: - <<: *if-revert-branch @@ -1947,6 +2007,19 @@ - <<: *if-dev-push changes: *patterns-example_test +.rules:test:example_test-esp32c2-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32c2 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc + .rules:test:example_test-esp32c3: rules: - <<: *if-revert-branch @@ -1962,6 +2035,19 @@ - <<: *if-dev-push changes: *patterns-example_test +.rules:test:example_test-esp32c3-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32c3 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc + .rules:test:example_test-esp32c3-include_nightly_run-rule: rules: - <<: *if-revert-branch @@ -2001,6 +2087,19 @@ - <<: *if-dev-push changes: *patterns-example_test +.rules:test:example_test-esp32s2-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32s2 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc + .rules:test:example_test-esp32s2-usb: rules: - <<: *if-revert-branch @@ -2029,6 +2128,19 @@ - <<: *if-dev-push changes: *patterns-example_test +.rules:test:example_test-esp32s3-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32s3 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc + .rules:test:example_test-i154: rules: - <<: *if-revert-branch diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index fd3169847e..aae47c9057 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -296,6 +296,46 @@ example_test_pytest_esp32_extflash: - build_pytest_examples_esp32 tags: [ esp32, external_flash ] +example_test_pytest_esp32_adc: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32-adc + needs: + - build_pytest_examples_esp32 + tags: [ esp32, adc ] + +example_test_pytest_esp32s2_adc: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32s2-adc + needs: + - build_pytest_examples_esp32s2 + tags: [ esp32s2, adc ] + +example_test_pytest_esp32s3_adc: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32s3-adc + needs: + - build_pytest_examples_esp32s3 + tags: [ esp32s3, adc ] + +example_test_pytest_esp32c3_adc: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32c3-adc + needs: + - build_pytest_examples_esp32c3 + tags: [ esp32c3, adc ] + +example_test_pytest_esp32c2_adc: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32c2-adc + needs: + - build_pytest_examples_esp32c2 + tags: [ esp32c2, adc, xtal_26mhz] + .pytest_components_dir_template: extends: .pytest_template variables: diff --git a/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py b/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py index 92fd226664..c4156a7865 100644 --- a/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py +++ b/examples/peripherals/adc/continuous_read/pytest_adc_continuous.py @@ -9,6 +9,7 @@ from pytest_embedded.dut import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.adc def test_adc_continuous(dut: Dut) -> None: res = dut.expect(r'TASK: ret is 0, ret_num is (\d+)') num = res.group(1).decode('utf8') diff --git a/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py b/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py index 562a3a800d..8f2c266e99 100644 --- a/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py +++ b/examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py @@ -9,6 +9,20 @@ from pytest_embedded.dut import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 -@pytest.mark.esp32c2 +@pytest.mark.adc def test_adc_oneshot(dut: Dut) -> None: - dut.expect(r'ADC_ONESHOT: ADC1 Channel\[(\d+)]\ Raw Data: (\d+)', timeout=5) + dut.expect(r'EXAMPLE: ADC1 Channel\[(\d+)\] Raw Data: (\d+)', timeout=5) + + +@pytest.mark.esp32c2 +@pytest.mark.adc +@pytest.mark.xtal_26mhz +@pytest.mark.parametrize( + 'config, baud', + [ + ('esp32c2_xtal26m', '74880'), + ], + indirect=True, +) +def test_adc_oneshot_esp32c2_xtal_26mhz(dut: Dut) -> None: + dut.expect(r'EXAMPLE: ADC1 Channel\[(\d+)\] Raw Data: (\d+)', timeout=5) diff --git a/examples/peripherals/adc/oneshot_read/sdkconfig.ci.esp32c2_xtal26m b/examples/peripherals/adc/oneshot_read/sdkconfig.ci.esp32c2_xtal26m new file mode 100644 index 0000000000..172f022b67 --- /dev/null +++ b/examples/peripherals/adc/oneshot_read/sdkconfig.ci.esp32c2_xtal26m @@ -0,0 +1,2 @@ +CONFIG_IDF_TARGET="esp32c2" +CONFIG_XTAL_FREQ_26=y