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

adc_cal: fixed the assertion failure or returning wrong error code when ADC2 failed the arbitration

Browse Source 
Issue exist since first IDF version supporting ESP32-S2.
This commit is contained in:
Michael (XIAO Xufeng)
2022-01-17 13:58:56 +00:00
parent 472cbbe73b
commit 4e827ca09b
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_adc_cal/esp_adc_cal_common.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -34,7 +34,10 @@ esp_err_t esp_adc_cal_get_voltage(adc_channel_t channel,
ESP_RETURN_ON_FALSE(channel < SOC_ADC_CHANNEL_NUM(1), ESP_ERR_INVALID_ARG, TAG, "Invalid channel");
ret = adc2_get_raw(channel, chars->bit_width, &adc_reading);
}
*voltage = esp_adc_cal_raw_to_voltage((uint32_t)adc_reading, chars);
if (ret == ESP_OK) {
*voltage = esp_adc_cal_raw_to_voltage((uint32_t)adc_reading, chars);
}
return ret;
}

1
components/hal/CMakeLists.txt
View File

@ -63,7 +63,6 @@ if(NOT BOOTLOADER_BUILD)
"usb_hal.c"
"usb_phy_hal.c"
"xt_wdt_hal.c"
"esp32s2/adc_hal.c"
"esp32s2/brownout_hal.c"
"esp32s2/cp_dma_hal.c"
"esp32s2/touch_sensor_hal.c"

0
components/hal/esp32s2/adc_hal.c
View File