From ec812c1370dd3573e2d66f0832f560571e8a58be Mon Sep 17 00:00:00 2001 From: laokaiyao Date: Fri, 23 Dec 2022 11:56:34 +0800 Subject: [PATCH] adc: add ADC target test for esp32c6 --- .gitlab/ci/rules.yml | 26 +++++++++++++++++++ .gitlab/ci/target-test.yml | 16 ++++++++++++ .../hal/include/hal/adc_types_private.h | 10 ++----- .../esp32c2/include/soc/Kconfig.soc_caps.in | 4 --- components/soc/esp32c2/include/soc/soc_caps.h | 1 - .../esp32c3/include/soc/Kconfig.soc_caps.in | 4 --- components/soc/esp32c3/include/soc/soc_caps.h | 1 - .../esp32c6/include/soc/Kconfig.soc_caps.in | 4 --- components/soc/esp32c6/include/soc/soc_caps.h | 1 - .../esp32h4/include/soc/Kconfig.soc_caps.in | 4 --- components/soc/esp32h4/include/soc/soc_caps.h | 1 - 11 files changed, 44 insertions(+), 28 deletions(-) diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 5257ad9b29..2e46d30b02 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -1754,6 +1754,19 @@ - <<: *if-dev-push changes: *patterns-component_ut +.rules:test:component_ut-esp32c6-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-component_ut + - <<: *if-label-component_ut_esp32c6 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc + .rules:test:component_ut-esp32h4-i154: rules: - <<: *if-revert-branch @@ -2072,6 +2085,19 @@ - <<: *if-dev-push changes: *patterns-example_test +.rules:test:example_test-esp32c6-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32c6 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-target_test-adc + .rules:test:example_test-esp32s2: rules: - <<: *if-revert-branch diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index aae47c9057..3b0d2c2281 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -336,6 +336,14 @@ example_test_pytest_esp32c2_adc: - build_pytest_examples_esp32c2 tags: [ esp32c2, adc, xtal_26mhz] +example_test_pytest_esp32c6_adc: + extends: + - .pytest_examples_dir_template + - .rules:test:example_test-esp32c6-adc + needs: + - build_pytest_examples_esp32c6 + tags: [ esp32c6, adc ] + .pytest_components_dir_template: extends: .pytest_template variables: @@ -673,6 +681,14 @@ component_ut_pytest_esp32c6_generic_multi_device: - build_pytest_components_esp32c6 tags: [ esp32c6, generic_multi_device ] +component_ut_pytest_esp32c6_adc: + extends: + - .pytest_components_dir_template + - .rules:test:component_ut-esp32c6-adc + needs: + - build_pytest_components_esp32c6 + tags: [ esp32c6, adc ] + component_ut_pytest_esp32h4_i154: extends: - .pytest_components_dir_template diff --git a/components/hal/include/hal/adc_types_private.h b/components/hal/include/hal/adc_types_private.h index fa0d07cad5..63c210261b 100644 --- a/components/hal/include/hal/adc_types_private.h +++ b/components/hal/include/hal/adc_types_private.h @@ -133,8 +133,6 @@ typedef enum { /** * @brief ADC digital controller (DMA mode) monitor configuration. * - * @note For ESP32-S2, The monitor object of the ADC is fixed. - * @note For ESP32-S2, The monitor object is always all enabled channels. */ typedef struct { adc_unit_t adc_unit; /*!