adc: add ADC target test for esp32c6

.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

.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

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;            /*!<Set adc unit number for monitor.
@@ -142,12 +140,8 @@ typedef struct {
     adc_channel_t channel;          /*!<Set adc channel number for monitor.
                                         For ESP32-S2, it's always `ADC_CHANNEL_MAX` */
     adc_digi_monitor_mode_t mode;   /*!<Set adc monitor mode. See ``adc_digi_monitor_mode_t``. */
-#if SOC_ADC_DIGI_SEGMENTED_THRESH
-    uint32_t h_threshold;             /*!<Set monitor threshold of adc digital controller. */
-    uint32_t l_threshold;             /*!<Set monitor threshold of adc digital controller. */
-#else
-    uint32_t threshold;             /*!<Set monitor threshold of adc digital controller. */
-#endif
+    uint32_t h_threshold;           /*!<Set monitor threshold of adc digital controller. */
+    uint32_t l_threshold;           /*!<Set monitor threshold of adc digital controller. */
 } adc_digi_monitor_t;
 #endif  //#if SOC_ADC_MONITOR_SUPPORTED
 

components/soc/esp32c2/include/soc/Kconfig.soc_caps.in

@@ -103,10 +103,6 @@ config SOC_ADC_ATTEN_NUM
     int
     default 4
 
-config SOC_ADC_DIGI_SEGMENTED_THRESH
-    bool
-    default y
-
 config SOC_ADC_DIGI_CONTROLLER_NUM
     int
     default 1

components/soc/esp32c2/include/soc/soc_caps.h

@@ -59,7 +59,6 @@
 #define SOC_ADC_ATTEN_NUM                       (4)
 
 /*!< Digital */
-#define SOC_ADC_DIGI_SEGMENTED_THRESH           1
 #define SOC_ADC_DIGI_CONTROLLER_NUM             (1U)
 #define SOC_ADC_PATT_LEN_MAX                    (8) /*!< One pattern table, each contains 8 items. Each item takes 1 byte */
 #define SOC_ADC_DIGI_MIN_BITWIDTH               (12)

components/soc/esp32c3/include/soc/Kconfig.soc_caps.in

@@ -175,10 +175,6 @@ config SOC_ADC_ATTEN_NUM
     int
     default 4
 
-config SOC_ADC_DIGI_SEGMENTED_THRESH
-    bool
-    default y
-
 config SOC_ADC_DIGI_CONTROLLER_NUM
     int
     default 1

components/soc/esp32c3/include/soc/soc_caps.h

@@ -85,7 +85,6 @@
 #define SOC_ADC_ATTEN_NUM                       (4)
 
 /*!< Digital */
-#define SOC_ADC_DIGI_SEGMENTED_THRESH           1
 #define SOC_ADC_DIGI_CONTROLLER_NUM             (1U)
 #define SOC_ADC_PATT_LEN_MAX                    (8) /*!< One pattern table, each contains 8 items. Each item takes 1 byte */
 #define SOC_ADC_DIGI_MIN_BITWIDTH               (12)

components/soc/esp32c6/include/soc/Kconfig.soc_caps.in

@@ -155,10 +155,6 @@ config SOC_ADC_ATTEN_NUM
     int
     default 4
 
-config SOC_ADC_DIGI_SEGMENTED_THRESH
-    bool
-    default y
-
 config SOC_ADC_DIGI_CONTROLLER_NUM
     int
     default 1

components/soc/esp32c6/include/soc/soc_caps.h

@@ -85,7 +85,6 @@
 #define SOC_ADC_ATTEN_NUM                       (4)
 
 /*!< Digital */
-#define SOC_ADC_DIGI_SEGMENTED_THRESH           1
 #define SOC_ADC_DIGI_CONTROLLER_NUM             (1U)
 #define SOC_ADC_PATT_LEN_MAX                    (8) /*!< Two pattern tables, each contains 4 items. Each item takes 1 byte */
 #define SOC_ADC_DIGI_MAX_BITWIDTH               (12)

components/soc/esp32h4/include/soc/Kconfig.soc_caps.in

@@ -163,10 +163,6 @@ config SOC_ADC_ATTEN_NUM
     int
     default 4
 
-config SOC_ADC_DIGI_SEGMENTED_THRESH
-    bool
-    default y
-
 config SOC_ADC_DIGI_CONTROLLER_NUM
     int
     default 1

components/soc/esp32h4/include/soc/soc_caps.h

@@ -87,7 +87,6 @@
 #define SOC_ADC_ATTEN_NUM                       (4)
 
 /*!< Digital */
-#define SOC_ADC_DIGI_SEGMENTED_THRESH           1
 #define SOC_ADC_DIGI_CONTROLLER_NUM             (1U)
 #define SOC_ADC_PATT_LEN_MAX                    (8) /*!< One pattern table, each contains 8 items. Each item takes 1 byte */
 #define SOC_ADC_DIGI_MIN_BITWIDTH               (12)