espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 02:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/fix_adc_cali_check_scheme_api_issue_v5.2' into 'release/v5.2'

Browse Source 
adc: fixed adc_cali_check_scheme wrong return on c2/h2/c6 (v5.2)

See merge request espressif/esp-idf!35720
This commit is contained in:
morris
2024-12-20 10:19:12 +08:00
parent 4a4849597e a71b7550e3
commit 44f29fb208
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_adc/adc_cali.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -15,6 +15,7 @@
#include "hal/adc_types.h"
#include "esp_adc/adc_cali.h"
#include "adc_cali_interface.h"
#include "adc_cali_schemes.h"
const __attribute__((unused)) static char *TAG = "adc_cali";
@ -22,9 +23,9 @@ esp_err_t adc_cali_check_scheme(adc_cali_scheme_ver_t *scheme_mask)
{
ESP_RETURN_ON_FALSE(scheme_mask, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
*scheme_mask = 0;
#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
#if ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED
*scheme_mask |= ADC_CALI_SCHEME_VER_LINE_FITTING;
#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
#elif ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
*scheme_mask |= ADC_CALI_SCHEME_VER_CURVE_FITTING;
#endif