Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-08-13 04:42:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/esp32p4_eco5_adc_cali' into 'master'

Browse Source 
feat(adc): support ADC calibration on ESP32P4 ECO5

Closes IDF-14357

See merge request espressif/esp-idf!43685
This commit is contained in:
morris
2025-11-26 12:22:20 +08:00
parent 4186f75296 c5c586af3e
commit c68237f5fa
6 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/efuse/esp32p4/esp_efuse_rtc_calib.c
View File

@@ -22,7 +22,7 @@ int esp_efuse_rtc_calib_get_ver(void)
{
uint32_t cali_version = 0;
uint32_t blk_ver = efuse_hal_blk_version();
if (blk_ver >= 1 && blk_ver < 100) {
if (blk_ver >= 1) {
cali_version = ESP_EFUSE_ADC_CALIB_VER1;
} else {
ESP_LOGW("eFuse", "calibration efuse version does not match, set default version to 0");

4
components/esp_adc/test_apps/.build-test-rules.yml
View File

@@ -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 == "esp32p4" and CONFIG_NAME != "esp32p4_eco4"
temporary: true
reason: p4 rev3 migration # TODO: IDF-14357
depends_components:
- esp_adc
- esp_driver_gpio

1
components/esp_adc/test_apps/adc/pytest_adc.py
View File

@@ -12,7 +12,6 @@ from pytest_embedded_idf.utils import idf_parametrize
['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5', 'esp32p4', 'esp32c61'],
indirect=['target'],
)
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='p4 rev3 migration # TODO: IDF-14357')
def test_adc(dut: Dut) -> None:
dut.run_all_single_board_cases(timeout=120, reset=True)

8
examples/peripherals/.build-test-rules.yml
View File

@@ -10,19 +10,11 @@
examples/peripherals/adc/continuous_read:
disable:
- if: SOC_ADC_DMA_SUPPORTED != 1
disable_test:
- if: IDF_TARGET == "esp32p4"
temporary: true
reason: p4 rev3 migration # TODO: IDF-14357
<<: *adc_dependencies
examples/peripherals/adc/oneshot_read:
disable:
- if: SOC_ADC_SUPPORTED != 1
disable_test:
- if: IDF_TARGET == "esp32p4"
temporary: true
reason: p4 rev3 migration # TODO: IDF-14357
<<: *adc_dependencies
examples/peripherals/analog_comparator:

1
examples/peripherals/adc/continuous_read/pytest_adc_continuous.py
View File

@@ -11,7 +11,6 @@ from pytest_embedded_idf.utils import idf_parametrize
['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5', 'esp32p4', 'esp32c61'],
indirect=['target'],
)
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='p4 rev3 migration # TODO: IDF-14357')
def test_adc_continuous(dut: Dut) -> None:
res = dut.expect(r'TASK: ret is 0, ret_num is (\d+) bytes')
num = res.group(1).decode('utf8')

1
examples/peripherals/adc/oneshot_read/pytest_adc_oneshot.py
View File

@@ -11,7 +11,6 @@ from pytest_embedded_idf.utils import idf_parametrize
['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c5', 'esp32p4', 'esp32c61'],
indirect=['target'],
)
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='p4 rev3 migration # TODO: IDF-14357')
def test_adc_oneshot(dut: Dut) -> None:
dut.expect(r'EXAMPLE: ADC1 Channel\[(\d+)\] Raw Data: (\d+)', timeout=5)