|
17 | 17 |
|
18 | 18 | // Arduino style definitions (API uses Dx)
|
19 | 19 |
|
20 |
| -#define analogInputToDigitalPin(p) (p) |
21 |
| -#define digitalPinToInterrupt(p) ((((uint8_t)digitalPinToGPIONumber(p)) < 48)? digitalPinToGPIONumber(p) : -1) |
22 |
| -#define digitalPinHasPWM(p) (((uint8_t)digitalPinToGPIONumber(p)) < 46) |
| 20 | +#define NUM_DIGITAL_PINS 25 // 25 I/O lines exported |
| 21 | +#define NUM_ANALOG_INPUTS 20 // 20 CPU ADC inputs, not all exported |
| 22 | +#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs |
23 | 23 |
|
24 |
| -#define EXTERNAL_NUM_INTERRUPTS 46 |
25 |
| -#define NUM_DIGITAL_PINS 25 |
26 |
| -#define NUM_ANALOG_INPUTS 8 |
| 24 | +#define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1) |
| 25 | +#define digitalPinToInterrupt(p) (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT) |
| 26 | +#define digitalPinHasPWM(p) (p < NUM_DIGITAL_PINS) |
27 | 27 |
|
28 | 28 | static constexpr uint8_t D0 = 0; // also RX
|
29 | 29 | static constexpr uint8_t D1 = 1; // also TX
|
@@ -56,13 +56,13 @@ static constexpr uint8_t A7 = 24;
|
56 | 56 |
|
57 | 57 | // ESP32-style definitions (API uses GPIOx)
|
58 | 58 |
|
59 |
| -#define EXTERNAL_NUM_INTERRUPTS 46 |
60 |
| -#define NUM_DIGITAL_PINS 48 |
61 |
| -#define NUM_ANALOG_INPUTS 20 |
| 59 | +#define NUM_DIGITAL_PINS SOC_GPIO_PIN_COUNT // GPIO 0..48, not all exported |
| 60 | +#define NUM_ANALOG_INPUTS 20 // GPIO 1..20, not all exported |
| 61 | +#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs |
62 | 62 |
|
63 |
| -#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1) |
64 |
| -#define digitalPinToInterrupt(p) (((p)<48)?(p):-1) |
65 |
| -#define digitalPinHasPWM(p) (p < 46) |
| 63 | +#define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1) |
| 64 | +#define digitalPinToInterrupt(p) (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT) |
| 65 | +#define digitalPinHasPWM(p) (p < NUM_DIGITAL_PINS) |
66 | 66 |
|
67 | 67 | static constexpr uint8_t D0 = 44; // also RX
|
68 | 68 | static constexpr uint8_t D1 = 43; // also TX
|
|
0 commit comments