alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-28 04:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/sync_adc_changes_from_c3_to_master_last' into 'master'

Browse Source 
adc: sync adc changes from c3 to master (last time)

Closes IDF-2694

See merge request espressif/esp-idf!12134
This commit is contained in:
Michael (XIAO Xufeng)
2021-01-26 12:52:20 +08:00
parent 6938f7b30f 2b83418141
commit c99e891201
18 changed files with 322 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/hal/esp32s3/include/hal/adc_ll.h
View File

@@ -606,7 +606,7 @@ static inline void adc_ll_rtc_enable_channel(adc_ll_num_t adc_n, int channel)
* @param adc_n ADC unit.
* @param channel ADC channel number for each ADCn.
*/
static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n, int channel)
static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n)
{
if (adc_n == ADC_NUM_1) {
SENS.sar_meas1_ctrl2.sar1_en_pad = 0; //only one channel is selected.