Skip to content

Commit c7cc5c9

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
authored
GPIO refactoring (espressif#6259)
* GPIO refactoring GPIO now using ESP-IDF API on all chips. LEDC interrupt fix removed - no longer needed. Edited pins_arduino.h in variants according to changes in gpio. * Edited analog channels functions
1 parent 70b7c3a commit c7cc5c9

File tree

124 files changed

+179
-517
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+179
-517
lines changed

‎cores/esp32/esp32-hal-gpio.c

+49-373
Large diffs are not rendered by default.

‎cores/esp32/esp32-hal-gpio.h

+7-15
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,11 @@ extern "C" {
6868
#define ONLOW_WE 0x0C
6969
#define ONHIGH_WE 0x0D
7070

71-
typedef struct {
72-
uint8_t reg; /*!< GPIO register offset from DR_REG_IO_MUX_BASE */
73-
int8_t rtc; /*!< RTC GPIO number (-1 if not RTC GPIO pin) */
74-
int8_t adc; /*!< ADC Channel number (-1 if not ADC pin) */
75-
int8_t touch; /*!< Touch Channel number (-1 if not Touch pin) */
76-
} esp32_gpioMux_t;
77-
78-
extern const esp32_gpioMux_t esp32_gpioMux[SOC_GPIO_PIN_COUNT];
79-
extern const int8_t esp32_adc2gpio[20];
80-
81-
#define digitalPinIsValid(pin) ((pin) < SOC_GPIO_PIN_COUNT && esp32_gpioMux[(pin)].reg)
82-
#define digitalPinCanOutput(pin) ((pin) < NUM_OUPUT_PINS && esp32_gpioMux[(pin)].reg)
83-
#define digitalPinToRtcPin(pin) (((pin) < SOC_GPIO_PIN_COUNT)?esp32_gpioMux[(pin)].rtc:-1)
84-
#define digitalPinToAnalogChannel(pin) (((pin) < SOC_GPIO_PIN_COUNT)?esp32_gpioMux[(pin)].adc:-1)
85-
#define digitalPinToDacChannel(pin) (((pin) == PIN_DAC1)?0:((pin) == PIN_DAC2)?1:-1)
71+
#define digitalPinIsValid(pin) GPIO_IS_VALID_GPIO(pin)
72+
#define digitalPinCanOutput(pin) GPIO_IS_VALID_OUTPUT_GPIO(pin)
73+
74+
#define digitalPinToRtcPin(pin) ((RTC_GPIO_IS_VALID_GPIO(pin))?rtc_io_number_get(pin):-1)
75+
#define digitalPinToDacChannel(pin) (((pin) == DAC_CHANNEL_1_GPIO_NUM)?0:((pin) == DAC_CHANNEL_2_GPIO_NUM)?1:-1)
8676

8777
void pinMode(uint8_t pin, uint8_t mode);
8878
void digitalWrite(uint8_t pin, uint8_t val);
@@ -93,6 +83,8 @@ void attachInterruptArg(uint8_t pin, void (*)(void*), void * arg, int mode);
9383
void detachInterrupt(uint8_t pin);
9484

9585
int8_t digitalPinToTouchChannel(uint8_t pin);
86+
int8_t digitalPinToAnalogChannel(uint8_t pin);
87+
int8_t analogChannelToDigitalPin(uint8_t channel);
9688

9789
#ifdef __cplusplus
9890
}

‎cores/esp32/esp32-hal-ledc.c

-6
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,6 @@ void ledcAttachPin(uint8_t pin, uint8_t chan)
168168
.hpoint = 0
169169
};
170170
ledc_channel_config(&ledc_channel);
171-
172-
//Making attachInterrupt to work.
173-
//WILL BE REMOVED AFTER REFACTORING GPIO to use ESP-IDF API
174-
#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
175-
pinMode(pin,OUTPUT);
176-
#endif
177171
}
178172

179173
void ledcDetachPin(uint8_t pin)

‎variants/ET-Board/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 7
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/Microduino-esp32/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 22
88
#define NUM_ANALOG_INPUTS 12
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/S_ODI_Ultra_v1/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/adafruit_feather_esp32_v2/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/adafruit_feather_esp32s2/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define NUM_DIGITAL_PINS 48
1616
#define NUM_ANALOG_INPUTS 20
1717

18-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
18+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1919
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2020
#define digitalPinHasPWM(p) (p < 46)
2121

‎variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define NUM_DIGITAL_PINS 48
1616
#define NUM_ANALOG_INPUTS 20
1717

18-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
18+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1919
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2020
#define digitalPinHasPWM(p) (p < 46)
2121

‎variants/adafruit_feather_esp32s2_tft/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define NUM_DIGITAL_PINS 48
1616
#define NUM_ANALOG_INPUTS 20
1717

18-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
18+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1919
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2020
#define digitalPinHasPWM(p) (p < 46)
2121

‎variants/adafruit_funhouse_esp32s2/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define NUM_DIGITAL_PINS 48
1616
#define NUM_ANALOG_INPUTS 20
1717

18-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
18+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1919
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2020
#define digitalPinHasPWM(p) (p < 46)
2121

‎variants/adafruit_magtag29_esp32s2/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define NUM_DIGITAL_PINS 48
1616
#define NUM_ANALOG_INPUTS 20
1717

18-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
18+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1919
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2020
#define digitalPinHasPWM(p) (p < 46)
2121

‎variants/adafruit_metro_esp32s2/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#define NUM_DIGITAL_PINS 48
1515
#define NUM_ANALOG_INPUTS 20
1616

17-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
17+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1818
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
1919
#define digitalPinHasPWM(p) (p < 46)
2020

‎variants/adafruit_qtpy_esp32/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/adafruit_qtpy_esp32c3/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 22
88
#define NUM_ANALOG_INPUTS 6
99

10-
#define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<NUM_DIGITAL_PINS)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < EXTERNAL_NUM_INTERRUPTS)
1313

‎variants/adafruit_qtpy_esp32s2/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define NUM_DIGITAL_PINS 48
1616
#define NUM_ANALOG_INPUTS 20
1717

18-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
18+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1919
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2020
#define digitalPinHasPWM(p) (p < 46)
2121

‎variants/alksesp32/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/atmegazero_esp32s2/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define NUM_DIGITAL_PINS 48
1414
#define NUM_ANALOG_INPUTS 20
1515

16-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
16+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1717
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
1818
#define digitalPinHasPWM(p) (p < 46)
1919

‎variants/bpi-bit/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
10+
#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
1111
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/ch_denky/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/d-duino-32/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/d32/d32_core.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#define NUM_DIGITAL_PINS 40
66
#define NUM_ANALOG_INPUTS 16
77

8-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
8+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
99
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1010
#define digitalPinHasPWM(p) (p < 34)
1111

‎variants/deneyapkart/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/deneyapmini/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 48
88
#define NUM_ANALOG_INPUTS 20
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 46)
1313

‎variants/doitESP32devkitV1/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/doitESPduino32/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/dpu_esp32/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/esp32-devkit-lipo/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/esp32-evb/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/esp32-gateway/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/esp32-poe-iso/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/esp32-poe/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/esp32-trueverit-iot-driver-mkii/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ static const uint8_t LED_BUILTIN = 18;
1010
#define NUM_DIGITAL_PINS 40
1111
#define NUM_ANALOG_INPUTS 16
1212

13-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
13+
#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
1414
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
1515
#define digitalPinHasPWM(p) (p < 34)
1616

‎variants/esp32-trueverit-iot-driver/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ static const uint8_t LED_BUILTIN = 18;
1010
#define NUM_DIGITAL_PINS 40
1111
#define NUM_ANALOG_INPUTS 16
1212

13-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
13+
#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
1414
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
1515
#define digitalPinHasPWM(p) (p < 34)
1616

‎variants/esp32/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/esp320/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 12
88
#define NUM_ANALOG_INPUTS 5
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/esp32c3/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 22
88
#define NUM_ANALOG_INPUTS 6
99

10-
#define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<NUM_DIGITAL_PINS)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < EXTERNAL_NUM_INTERRUPTS)
1313

‎variants/esp32micromod/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 40
88
#define NUM_ANALOG_INPUTS 16
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

‎variants/esp32s2/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 48
88
#define NUM_ANALOG_INPUTS 20
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 46)
1313

‎variants/esp32s2thing_plus/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define NUM_DIGITAL_PINS 48
1414
#define NUM_ANALOG_INPUTS 20
1515

16-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
16+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1717
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
1818
#define digitalPinHasPWM(p) (p < 46)
1919

‎variants/esp32s2usb/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#define NUM_DIGITAL_PINS 48
2525
#define NUM_ANALOG_INPUTS 20
2626

27-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
27+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
2828
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2929
#define digitalPinHasPWM(p) (p < 46)
3030

‎variants/esp32s3/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define NUM_DIGITAL_PINS 48
88
#define NUM_ANALOG_INPUTS 20
99

10-
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1111
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 46)
1313

0 commit comments

Comments
 (0)