diff --git a/components/soc/esp32/include/soc/adc_channel.h b/components/soc/esp32/include/soc/adc_channel.h index 08d551585a..c47b42c7b1 100644 --- a/components/soc/esp32/include/soc/adc_channel.h +++ b/components/soc/esp32/include/soc/adc_channel.h @@ -6,56 +6,56 @@ #pragma once -#define ADC1_GPIO36_CHANNEL ADC1_CHANNEL_0 +#define ADC1_GPIO36_CHANNEL 0 #define ADC1_CHANNEL_0_GPIO_NUM 36 -#define ADC1_GPIO37_CHANNEL ADC1_CHANNEL_1 +#define ADC1_GPIO37_CHANNEL 1 #define ADC1_CHANNEL_1_GPIO_NUM 37 -#define ADC1_GPIO38_CHANNEL ADC1_CHANNEL_2 +#define ADC1_GPIO38_CHANNEL 2 #define ADC1_CHANNEL_2_GPIO_NUM 38 -#define ADC1_GPIO39_CHANNEL ADC1_CHANNEL_3 +#define ADC1_GPIO39_CHANNEL 3 #define ADC1_CHANNEL_3_GPIO_NUM 39 -#define ADC1_GPIO32_CHANNEL ADC1_CHANNEL_4 +#define ADC1_GPIO32_CHANNEL 4 #define ADC1_CHANNEL_4_GPIO_NUM 32 -#define ADC1_GPIO33_CHANNEL ADC1_CHANNEL_5 +#define ADC1_GPIO33_CHANNEL 5 #define ADC1_CHANNEL_5_GPIO_NUM 33 -#define ADC1_GPIO34_CHANNEL ADC1_CHANNEL_6 +#define ADC1_GPIO34_CHANNEL 6 #define ADC1_CHANNEL_6_GPIO_NUM 34 -#define ADC1_GPIO35_CHANNEL ADC1_CHANNEL_7 +#define ADC1_GPIO35_CHANNEL 7 #define ADC1_CHANNEL_7_GPIO_NUM 35 -#define ADC2_GPIO4_CHANNEL ADC2_CHANNEL_0 +#define ADC2_GPIO4_CHANNEL 0 #define ADC2_CHANNEL_0_GPIO_NUM 4 -#define ADC2_GPIO0_CHANNEL ADC2_CHANNEL_1 +#define ADC2_GPIO0_CHANNEL 1 #define ADC2_CHANNEL_1_GPIO_NUM 0 -#define ADC2_GPIO2_CHANNEL ADC2_CHANNEL_2 +#define ADC2_GPIO2_CHANNEL 2 #define ADC2_CHANNEL_2_GPIO_NUM 2 -#define ADC2_GPIO15_CHANNEL ADC2_CHANNEL_3 +#define ADC2_GPIO15_CHANNEL 3 #define ADC2_CHANNEL_3_GPIO_NUM 15 -#define ADC2_GPIO13_CHANNEL ADC2_CHANNEL_4 +#define ADC2_GPIO13_CHANNEL 4 #define ADC2_CHANNEL_4_GPIO_NUM 13 -#define ADC2_GPIO12_CHANNEL ADC2_CHANNEL_5 +#define ADC2_GPIO12_CHANNEL 5 #define ADC2_CHANNEL_5_GPIO_NUM 12 -#define ADC2_GPIO14_CHANNEL ADC2_CHANNEL_6 +#define ADC2_GPIO14_CHANNEL 6 #define ADC2_CHANNEL_6_GPIO_NUM 14 -#define ADC2_GPIO27_CHANNEL ADC2_CHANNEL_7 +#define ADC2_GPIO27_CHANNEL 7 #define ADC2_CHANNEL_7_GPIO_NUM 27 -#define ADC2_GPIO25_CHANNEL ADC2_CHANNEL_8 +#define ADC2_GPIO25_CHANNEL 8 #define ADC2_CHANNEL_8_GPIO_NUM 25 -#define ADC2_GPIO26_CHANNEL ADC2_CHANNEL_9 +#define ADC2_GPIO26_CHANNEL 9 #define ADC2_CHANNEL_9_GPIO_NUM 26 diff --git a/components/soc/esp32c2/include/soc/adc_channel.h b/components/soc/esp32c2/include/soc/adc_channel.h index 747d8a4b13..dbaf294e0c 100644 --- a/components/soc/esp32c2/include/soc/adc_channel.h +++ b/components/soc/esp32c2/include/soc/adc_channel.h @@ -6,20 +6,20 @@ #pragma once -#define ADC1_GPIO0_CHANNEL ADC1_CHANNEL_0 +#define ADC1_GPIO0_CHANNEL 0 #define ADC1_CHANNEL_0_GPIO_NUM 0 -#define ADC1_GPIO1_CHANNEL ADC1_CHANNEL_1 +#define ADC1_GPIO1_CHANNEL 1 #define ADC1_CHANNEL_1_GPIO_NUM 1 -#define ADC1_GPIO2_CHANNEL ADC1_CHANNEL_2 +#define ADC1_GPIO2_CHANNEL 2 #define ADC1_CHANNEL_2_GPIO_NUM 2 -#define ADC1_GPIO3_CHANNEL ADC1_CHANNEL_3 +#define ADC1_GPIO3_CHANNEL 3 #define ADC1_CHANNEL_3_GPIO_NUM 3 -#define ADC1_GPIO4_CHANNEL ADC1_CHANNEL_4 +#define ADC1_GPIO4_CHANNEL 4 #define ADC1_CHANNEL_4_GPIO_NUM 4 -#define ADC2_GPIO5_CHANNEL ADC2_CHANNEL_0 +#define ADC2_GPIO5_CHANNEL 0 #define ADC2_CHANNEL_0_GPIO_NUM 5 diff --git a/components/soc/esp32c3/include/soc/adc_channel.h b/components/soc/esp32c3/include/soc/adc_channel.h index 747d8a4b13..dbaf294e0c 100644 --- a/components/soc/esp32c3/include/soc/adc_channel.h +++ b/components/soc/esp32c3/include/soc/adc_channel.h @@ -6,20 +6,20 @@ #pragma once -#define ADC1_GPIO0_CHANNEL ADC1_CHANNEL_0 +#define ADC1_GPIO0_CHANNEL 0 #define ADC1_CHANNEL_0_GPIO_NUM 0 -#define ADC1_GPIO1_CHANNEL ADC1_CHANNEL_1 +#define ADC1_GPIO1_CHANNEL 1 #define ADC1_CHANNEL_1_GPIO_NUM 1 -#define ADC1_GPIO2_CHANNEL ADC1_CHANNEL_2 +#define ADC1_GPIO2_CHANNEL 2 #define ADC1_CHANNEL_2_GPIO_NUM 2 -#define ADC1_GPIO3_CHANNEL ADC1_CHANNEL_3 +#define ADC1_GPIO3_CHANNEL 3 #define ADC1_CHANNEL_3_GPIO_NUM 3 -#define ADC1_GPIO4_CHANNEL ADC1_CHANNEL_4 +#define ADC1_GPIO4_CHANNEL 4 #define ADC1_CHANNEL_4_GPIO_NUM 4 -#define ADC2_GPIO5_CHANNEL ADC2_CHANNEL_0 +#define ADC2_GPIO5_CHANNEL 0 #define ADC2_CHANNEL_0_GPIO_NUM 5 diff --git a/components/soc/esp32h2/include/soc/adc_channel.h b/components/soc/esp32h2/include/soc/adc_channel.h index 747d8a4b13..dbaf294e0c 100644 --- a/components/soc/esp32h2/include/soc/adc_channel.h +++ b/components/soc/esp32h2/include/soc/adc_channel.h @@ -6,20 +6,20 @@ #pragma once -#define ADC1_GPIO0_CHANNEL ADC1_CHANNEL_0 +#define ADC1_GPIO0_CHANNEL 0 #define ADC1_CHANNEL_0_GPIO_NUM 0 -#define ADC1_GPIO1_CHANNEL ADC1_CHANNEL_1 +#define ADC1_GPIO1_CHANNEL 1 #define ADC1_CHANNEL_1_GPIO_NUM 1 -#define ADC1_GPIO2_CHANNEL ADC1_CHANNEL_2 +#define ADC1_GPIO2_CHANNEL 2 #define ADC1_CHANNEL_2_GPIO_NUM 2 -#define ADC1_GPIO3_CHANNEL ADC1_CHANNEL_3 +#define ADC1_GPIO3_CHANNEL 3 #define ADC1_CHANNEL_3_GPIO_NUM 3 -#define ADC1_GPIO4_CHANNEL ADC1_CHANNEL_4 +#define ADC1_GPIO4_CHANNEL 4 #define ADC1_CHANNEL_4_GPIO_NUM 4 -#define ADC2_GPIO5_CHANNEL ADC2_CHANNEL_0 +#define ADC2_GPIO5_CHANNEL 0 #define ADC2_CHANNEL_0_GPIO_NUM 5 diff --git a/components/soc/esp32s2/include/soc/adc_channel.h b/components/soc/esp32s2/include/soc/adc_channel.h index 69c6cff0c4..39ee17bc55 100644 --- a/components/soc/esp32s2/include/soc/adc_channel.h +++ b/components/soc/esp32s2/include/soc/adc_channel.h @@ -6,62 +6,62 @@ #pragma once -#define ADC1_GPIO1_CHANNEL ADC1_CHANNEL_0 +#define ADC1_GPIO1_CHANNEL 0 #define ADC1_CHANNEL_0_GPIO_NUM 1 -#define ADC1_GPIO2_CHANNEL ADC1_CHANNEL_1 +#define ADC1_GPIO2_CHANNEL 1 #define ADC1_CHANNEL_1_GPIO_NUM 2 -#define ADC1_GPIO3_CHANNEL ADC1_CHANNEL_2 +#define ADC1_GPIO3_CHANNEL 2 #define ADC1_CHANNEL_2_GPIO_NUM 3 -#define ADC1_GPIO4_CHANNEL ADC1_CHANNEL_3 +#define ADC1_GPIO4_CHANNEL 3 #define ADC1_CHANNEL_3_GPIO_NUM 4 -#define ADC1_GPIO5_CHANNEL ADC1_CHANNEL_4 +#define ADC1_GPIO5_CHANNEL 4 #define ADC1_CHANNEL_4_GPIO_NUM 5 -#define ADC1_GPIO6_CHANNEL ADC1_CHANNEL_5 +#define ADC1_GPIO6_CHANNEL 5 #define ADC1_CHANNEL_5_GPIO_NUM 6 -#define ADC1_GPIO7_CHANNEL ADC1_CHANNEL_6 +#define ADC1_GPIO7_CHANNEL 6 #define ADC1_CHANNEL_6_GPIO_NUM 7 -#define ADC1_GPIO8_CHANNEL ADC1_CHANNEL_7 +#define ADC1_GPIO8_CHANNEL 7 #define ADC1_CHANNEL_7_GPIO_NUM 8 -#define ADC1_GPIO9_CHANNEL ADC1_CHANNEL_8 +#define ADC1_GPIO9_CHANNEL 8 #define ADC1_CHANNEL_8_GPIO_NUM 9 -#define ADC1_GPIO10_CHANNEL ADC1_CHANNEL_9 +#define ADC1_GPIO10_CHANNEL 9 #define ADC1_CHANNEL_9_GPIO_NUM 10 -#define ADC2_GPIO11_CHANNEL ADC2_CHANNEL_0 +#define ADC2_GPIO11_CHANNEL 0 #define ADC2_CHANNEL_0_GPIO_NUM 11 -#define ADC2_GPIO12_CHANNEL ADC2_CHANNEL_1 +#define ADC2_GPIO12_CHANNEL 1 #define ADC2_CHANNEL_1_GPIO_NUM 12 -#define ADC2_GPIO13_CHANNEL ADC2_CHANNEL_2 +#define ADC2_GPIO13_CHANNEL 2 #define ADC2_CHANNEL_2_GPIO_NUM 13 -#define ADC2_GPIO14_CHANNEL ADC2_CHANNEL_3 +#define ADC2_GPIO14_CHANNEL 3 #define ADC2_CHANNEL_3_GPIO_NUM 14 -#define ADC2_GPIO15_CHANNEL ADC2_CHANNEL_4 +#define ADC2_GPIO15_CHANNEL 4 #define ADC2_CHANNEL_4_GPIO_NUM 15 -#define ADC2_GPIO16_CHANNEL ADC2_CHANNEL_5 +#define ADC2_GPIO16_CHANNEL 5 #define ADC2_CHANNEL_5_GPIO_NUM 16 -#define ADC2_GPIO17_CHANNEL ADC2_CHANNEL_6 +#define ADC2_GPIO17_CHANNEL 6 #define ADC2_CHANNEL_6_GPIO_NUM 17 -#define ADC2_GPIO18_CHANNEL ADC2_CHANNEL_7 +#define ADC2_GPIO18_CHANNEL 7 #define ADC2_CHANNEL_7_GPIO_NUM 18 -#define ADC2_GPIO19_CHANNEL ADC2_CHANNEL_8 +#define ADC2_GPIO19_CHANNEL 8 #define ADC2_CHANNEL_8_GPIO_NUM 19 -#define ADC2_GPIO20_CHANNEL ADC2_CHANNEL_9 +#define ADC2_GPIO20_CHANNEL 9 #define ADC2_CHANNEL_9_GPIO_NUM 20 diff --git a/components/soc/esp32s3/include/soc/adc_channel.h b/components/soc/esp32s3/include/soc/adc_channel.h index 69c6cff0c4..39ee17bc55 100644 --- a/components/soc/esp32s3/include/soc/adc_channel.h +++ b/components/soc/esp32s3/include/soc/adc_channel.h @@ -6,62 +6,62 @@ #pragma once -#define ADC1_GPIO1_CHANNEL ADC1_CHANNEL_0 +#define ADC1_GPIO1_CHANNEL 0 #define ADC1_CHANNEL_0_GPIO_NUM 1 -#define ADC1_GPIO2_CHANNEL ADC1_CHANNEL_1 +#define ADC1_GPIO2_CHANNEL 1 #define ADC1_CHANNEL_1_GPIO_NUM 2 -#define ADC1_GPIO3_CHANNEL ADC1_CHANNEL_2 +#define ADC1_GPIO3_CHANNEL 2 #define ADC1_CHANNEL_2_GPIO_NUM 3 -#define ADC1_GPIO4_CHANNEL ADC1_CHANNEL_3 +#define ADC1_GPIO4_CHANNEL 3 #define ADC1_CHANNEL_3_GPIO_NUM 4 -#define ADC1_GPIO5_CHANNEL ADC1_CHANNEL_4 +#define ADC1_GPIO5_CHANNEL 4 #define ADC1_CHANNEL_4_GPIO_NUM 5 -#define ADC1_GPIO6_CHANNEL ADC1_CHANNEL_5 +#define ADC1_GPIO6_CHANNEL 5 #define ADC1_CHANNEL_5_GPIO_NUM 6 -#define ADC1_GPIO7_CHANNEL ADC1_CHANNEL_6 +#define ADC1_GPIO7_CHANNEL 6 #define ADC1_CHANNEL_6_GPIO_NUM 7 -#define ADC1_GPIO8_CHANNEL ADC1_CHANNEL_7 +#define ADC1_GPIO8_CHANNEL 7 #define ADC1_CHANNEL_7_GPIO_NUM 8 -#define ADC1_GPIO9_CHANNEL ADC1_CHANNEL_8 +#define ADC1_GPIO9_CHANNEL 8 #define ADC1_CHANNEL_8_GPIO_NUM 9 -#define ADC1_GPIO10_CHANNEL ADC1_CHANNEL_9 +#define ADC1_GPIO10_CHANNEL 9 #define ADC1_CHANNEL_9_GPIO_NUM 10 -#define ADC2_GPIO11_CHANNEL ADC2_CHANNEL_0 +#define ADC2_GPIO11_CHANNEL 0 #define ADC2_CHANNEL_0_GPIO_NUM 11 -#define ADC2_GPIO12_CHANNEL ADC2_CHANNEL_1 +#define ADC2_GPIO12_CHANNEL 1 #define ADC2_CHANNEL_1_GPIO_NUM 12 -#define ADC2_GPIO13_CHANNEL ADC2_CHANNEL_2 +#define ADC2_GPIO13_CHANNEL 2 #define ADC2_CHANNEL_2_GPIO_NUM 13 -#define ADC2_GPIO14_CHANNEL ADC2_CHANNEL_3 +#define ADC2_GPIO14_CHANNEL 3 #define ADC2_CHANNEL_3_GPIO_NUM 14 -#define ADC2_GPIO15_CHANNEL ADC2_CHANNEL_4 +#define ADC2_GPIO15_CHANNEL 4 #define ADC2_CHANNEL_4_GPIO_NUM 15 -#define ADC2_GPIO16_CHANNEL ADC2_CHANNEL_5 +#define ADC2_GPIO16_CHANNEL 5 #define ADC2_CHANNEL_5_GPIO_NUM 16 -#define ADC2_GPIO17_CHANNEL ADC2_CHANNEL_6 +#define ADC2_GPIO17_CHANNEL 6 #define ADC2_CHANNEL_6_GPIO_NUM 17 -#define ADC2_GPIO18_CHANNEL ADC2_CHANNEL_7 +#define ADC2_GPIO18_CHANNEL 7 #define ADC2_CHANNEL_7_GPIO_NUM 18 -#define ADC2_GPIO19_CHANNEL ADC2_CHANNEL_8 +#define ADC2_GPIO19_CHANNEL 8 #define ADC2_CHANNEL_8_GPIO_NUM 19 -#define ADC2_GPIO20_CHANNEL ADC2_CHANNEL_9 +#define ADC2_GPIO20_CHANNEL 9 #define ADC2_CHANNEL_9_GPIO_NUM 20