espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-02 01:50:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fix(adc): fix ESP32-C2/P4 wrong adc periph num (v5.2)

See merge request espressif/esp-idf!41539
This commit is contained in:
Jiang Jiang Jian
2025-08-29 10:30:34 +08:00
parent 9740e64dad 046bb819dd
commit 44ac6ead8a
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/soc/esp32c2/include/soc/adc_channel.h
View File

@@ -20,6 +20,3 @@
#define ADC1_GPIO4_CHANNEL 4 #define ADC1_GPIO4_CHANNEL 4
#define ADC1_CHANNEL_4_GPIO_NUM 4 #define ADC1_CHANNEL_4_GPIO_NUM 4
#define ADC2_GPIO5_CHANNEL 0
#define ADC2_CHANNEL_0_GPIO_NUM 5

12
docs/en/api-reference/peripherals/gpio/esp32p4.inc
View File

@@ -268,32 +268,32 @@ The table below provides more information on pin usage, and please note the comm
- -
* - GPIO49 * - GPIO49
- ADC1_CH8 - ADC2_CH0
- -
- -
* - GPIO50 * - GPIO50
- ADC1_CH9 - ADC2_CH1
- -
- -
* - GPIO51 * - GPIO51
- ADC1_CH10, ANA_CMPR_CH0 reference voltage - ADC2_CH2, ANA_CMPR_CH0 reference voltage
- -
- -
* - GPIO52 * - GPIO52
- ADC1_CH11, ANA_CMPR_CH0 input (non-inverting) - ADC2_CH3, ANA_CMPR_CH0 input (non-inverting)
- -
- -
* - GPIO53 * - GPIO53
- ADC1_CH12, ANA_CMPR_CH1 reference voltage - ADC2_CH4, ANA_CMPR_CH1 reference voltage
- -
- -
* - GPIO54 * - GPIO54
- ADC1_CH13, ANA_CMPR_CH1 input (non-inverting) - ADC2_CH5, ANA_CMPR_CH1 input (non-inverting)
- -
- -

12
docs/zh_CN/api-reference/peripherals/gpio/esp32p4.inc
View File

@@ -270,32 +270,32 @@
- -
* - GPIO49 * - GPIO49
- ADC1_CH8 - ADC2_CH0
- -
- -
* - GPIO50 * - GPIO50
- ADC1_CH9 - ADC2_CH1
- -
- -
* - GPIO51 * - GPIO51
- ADC1_CH10，ANA_CMPR_CH0 外部参考电压 - ADC2_CH2，ANA_CMPR_CH0 外部参考电压
- -
- -
* - GPIO52 * - GPIO52
- ADC1_CH11，ANA_CMPR_CH0 同相输入 - ADC2_CH3，ANA_CMPR_CH0 同相输入
- -
- -
* - GPIO53 * - GPIO53
- ADC1_CH12，ANA_CMPR_CH1 外部参考电压 - ADC2_CH4，ANA_CMPR_CH1 外部参考电压
- -
- -
* - GPIO54 * - GPIO54
- ADC1_CH13，ANA_CMPR_CH1 同相输入 - ADC2_CH5，ANA_CMPR_CH1 同相输入
- -
- -