Skip to content

Commit 6d6f22e

Browse files
LauszusLauszus
committed
Add PIN defines, so the pins can easily be used by external libraries
See: arduino/Arduino#4814 For instance this is used by the USB Host library: felis/USB_Host_Shield_2.0@231fb54
1 parent 4897e00 commit 6d6f22e

File tree

16 files changed

+115
-49
lines changed

16 files changed

+115
-49
lines changed

‎variants/ESPDuino/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@
2727

2828
#include "../generic/common.h"
2929

30-
static const uint8_t SDA = 4;
31-
static const uint8_t SCL = 5;
30+
#define PIN_WIRE_SDA (4)
31+
#define PIN_WIRE_SCL (5)
32+
33+
static const uint8_t SDA = PIN_WIRE_SDA;
34+
static const uint8_t SCL = PIN_WIRE_SCL;
3235

3336
static const uint8_t LED_BUILTIN = 16;
3437
static const uint8_t BUILTIN_LED = 16;

‎variants/adafruit/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
2828

2929
#include "../generic/common.h"
3030

31-
static const uint8_t SDA = 4;
32-
static const uint8_t SCL = 5;
31+
#define PIN_WIRE_SDA (4)
32+
#define PIN_WIRE_SCL (5)
33+
34+
static const uint8_t SDA = PIN_WIRE_SDA;
35+
static const uint8_t SCL = PIN_WIRE_SCL;
3336

3437
static const uint8_t LED_BUILTIN = 0;
3538
static const uint8_t BUILTIN_LED = 0;

‎variants/d1/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
2828

2929
#include "../generic/common.h"
3030

31-
static const uint8_t SDA = 4;
32-
static const uint8_t SCL = 5;
31+
#define PIN_WIRE_SDA (4)
32+
#define PIN_WIRE_SCL (5)
33+
34+
static const uint8_t SDA = PIN_WIRE_SDA;
35+
static const uint8_t SCL = PIN_WIRE_SCL;
3336

3437
static const uint8_t LED_BUILTIN = 2;//new ESP-12E GPIO2
3538
static const uint8_t BUILTIN_LED = 2;//new ESP-12E GPIO2

‎variants/d1_mini/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
2828

2929
#include "../generic/common.h"
3030

31-
static const uint8_t SDA = 4;
32-
static const uint8_t SCL = 5;
31+
#define PIN_WIRE_SDA (4)
32+
#define PIN_WIRE_SCL (5)
33+
34+
static const uint8_t SDA = PIN_WIRE_SDA;
35+
static const uint8_t SCL = PIN_WIRE_SCL;
3336

3437
static const uint8_t LED_BUILTIN = 2;
3538
static const uint8_t BUILTIN_LED = 2;

‎variants/espino/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
2828

2929
#include "../generic/common.h"
3030

31-
static const uint8_t SDA = 4;
32-
static const uint8_t SCL = 5;
31+
#define PIN_WIRE_SDA (4)
32+
#define PIN_WIRE_SCL (5)
33+
34+
static const uint8_t SDA = PIN_WIRE_SDA;
35+
static const uint8_t SCL = PIN_WIRE_SCL;
3336

3437
static const uint8_t LED_BUILTIN = 2;
3538
static const uint8_t LED_BUILTIN_R = 2;

‎variants/espinotee/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
2828

2929
#include "../generic/common.h"
3030

31-
static const uint8_t SDA = 4;
32-
static const uint8_t SCL = 5;
31+
#define PIN_WIRE_SDA (4)
32+
#define PIN_WIRE_SCL (5)
33+
34+
static const uint8_t SDA = PIN_WIRE_SDA;
35+
static const uint8_t SCL = PIN_WIRE_SCL;
3336

3437
static const uint8_t BUILTIN_LED = 16;
3538
static const uint8_t LED_BUILTIN = 16;

‎variants/espresso_lite_v1/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@
3030

3131
#define ESPRESSO_LITE_VERSION 1
3232

33-
static const uint8_t SDA = 4;
34-
static const uint8_t SCL = 5;
33+
#define PIN_WIRE_SDA (4)
34+
#define PIN_WIRE_SCL (5)
35+
36+
static const uint8_t SDA = PIN_WIRE_SDA;
37+
static const uint8_t SCL = PIN_WIRE_SCL;
3538

3639
static const uint8_t LED_BUILTIN = 16;
3740
static const uint8_t BUILTIN_LED = 16;

‎variants/espresso_lite_v2/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@
3030

3131
#define ESPRESSO_LITE_VERSION 2
3232

33-
static const uint8_t SDA = 4;
34-
static const uint8_t SCL = 5;
33+
#define PIN_WIRE_SDA (4)
34+
#define PIN_WIRE_SCL (5)
35+
36+
static const uint8_t SDA = PIN_WIRE_SDA;
37+
static const uint8_t SCL = PIN_WIRE_SCL;
3538

3639
static const uint8_t LED_BUILTIN = 2;
3740
static const uint8_t BUILTIN_LED = 2;

‎variants/generic/common.h

+12-5
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,19 @@
3737
#define digitalPinToInterrupt(p) (((p) < EXTERNAL_NUM_INTERRUPTS)? (p) : NOT_AN_INTERRUPT)
3838
#define digitalPinHasPWM(p) (((p) < NUM_DIGITAL_PINS && !isFlashInterfacePin(p))? 1 : 0)
3939

40-
static const uint8_t SS = 15;
41-
static const uint8_t MOSI = 13;
42-
static const uint8_t MISO = 12;
43-
static const uint8_t SCK = 14;
40+
#define PIN_SPI_SS (15)
41+
#define PIN_SPI_MOSI (13)
42+
#define PIN_SPI_MISO (12)
43+
#define PIN_SPI_SCK (14)
4444

45-
static const uint8_t A0 = 17;
45+
static const uint8_t SS = PIN_SPI_SS;
46+
static const uint8_t MOSI = PIN_SPI_MOSI;
47+
static const uint8_t MISO = PIN_SPI_MISO;
48+
static const uint8_t SCK = PIN_SPI_SCK;
49+
50+
#define PIN_A0 (17)
51+
52+
static const uint8_t A0 = PIN_A0;
4653

4754
// These serial port names are intended to allow libraries and architecture-neutral
4855
// sketches to automatically default to the correct port name for a particular type

‎variants/generic/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
2828

2929
#include "common.h"
3030

31-
static const uint8_t SDA = 4;
32-
static const uint8_t SCL = 5;
31+
#define PIN_WIRE_SDA (4)
32+
#define PIN_WIRE_SCL (5)
33+
34+
static const uint8_t SDA = PIN_WIRE_SDA;
35+
static const uint8_t SCL = PIN_WIRE_SCL;
3336

3437
static const uint8_t BUILTIN_LED = 1;
3538
static const uint8_t LED_BUILTIN = 1;

‎variants/nodemcu/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
2828

2929
#include "../generic/common.h"
3030

31-
static const uint8_t SDA = 4;
32-
static const uint8_t SCL = 5;
31+
#define PIN_WIRE_SDA (4)
32+
#define PIN_WIRE_SCL (5)
33+
34+
static const uint8_t SDA = PIN_WIRE_SDA;
35+
static const uint8_t SCL = PIN_WIRE_SCL;
3336

3437
static const uint8_t LED_BUILTIN = 16;
3538
static const uint8_t BUILTIN_LED = 16;

‎variants/phoenix_v1/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@
3030

3131
#define PHOENIX_VERSION 1
3232

33-
static const uint8_t SDA = 4;
34-
static const uint8_t SCL = 5;
33+
#define PIN_WIRE_SDA (4)
34+
#define PIN_WIRE_SCL (5)
35+
36+
static const uint8_t SDA = PIN_WIRE_SDA;
37+
static const uint8_t SCL = PIN_WIRE_SCL;
3538

3639
static const uint8_t LED_BUILTIN = 16;
3740
static const uint8_t BUILTIN_LED = 16;

‎variants/phoenix_v2/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@
3030

3131
#define PHOENIX_VERSION 2
3232

33-
static const uint8_t SDA = 4;
34-
static const uint8_t SCL = 5;
33+
#define PIN_WIRE_SDA (4)
34+
#define PIN_WIRE_SCL (5)
35+
36+
static const uint8_t SDA = PIN_WIRE_SDA;
37+
static const uint8_t SCL = PIN_WIRE_SCL;
3538

3639
static const uint8_t LED_BUILTIN = 2;
3740
static const uint8_t BUILTIN_LED = 2;

‎variants/thing/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
2828

2929
#include "../generic/common.h"
3030

31-
static const uint8_t SDA = 2;
32-
static const uint8_t SCL = 14;
31+
#define PIN_WIRE_SDA (2)
32+
#define PIN_WIRE_SCL (14)
33+
34+
static const uint8_t SDA = PIN_WIRE_SDA;
35+
static const uint8_t SCL = PIN_WIRE_SCL;
3336

3437
static const uint8_t LED_BUILTIN = 5;
3538
static const uint8_t BUILTIN_LED = 5;

‎variants/wifinfo/pins_arduino.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@
3333

3434
#include "../generic/common.h"
3535

36-
static const uint8_t SDA = 4;
37-
static const uint8_t SCL = 5;
36+
#define PIN_WIRE_SDA (4)
37+
#define PIN_WIRE_SCL (5)
38+
39+
static const uint8_t SDA = PIN_WIRE_SDA;
40+
static const uint8_t SCL = PIN_WIRE_SCL;
3841

3942
static const uint8_t LED_BUILTIN = 12;
4043
static const uint8_t BUILTIN_LED = 12;

‎variants/wifio/pins_arduino.h

+33-16
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,39 @@
3030
#define NUM_ANALOG_INPUTS 1
3131
#define ESP_PINS_OFFSET 20
3232

33-
static const uint8_t SDA = 4;
34-
static const uint8_t SCL = 5;
35-
36-
static const uint8_t SS = 12;
37-
static const uint8_t MOSI = 13;
38-
static const uint8_t MISO = 14;
39-
static const uint8_t SCK = 15;
40-
41-
static const uint8_t A0 = 14;
42-
static const uint8_t A1 = 15;
43-
static const uint8_t A2 = 16;
44-
static const uint8_t A3 = 17;
45-
static const uint8_t A4 = 18;
46-
static const uint8_t A5 = 19;
47-
static const uint8_t A6 = 20;
48-
static const uint8_t A7 = 21;
33+
#define PIN_WIRE_SDA (4)
34+
#define PIN_WIRE_SCL (5)
35+
36+
static const uint8_t SDA = PIN_WIRE_SDA;
37+
static const uint8_t SCL = PIN_WIRE_SCL;
38+
39+
#define PIN_SPI_SS (12)
40+
#define PIN_SPI_MOSI (13)
41+
#define PIN_SPI_MISO (14)
42+
#define PIN_SPI_SCK (15)
43+
44+
static const uint8_t SS = PIN_SPI_SS;
45+
static const uint8_t MOSI = PIN_SPI_MOSI;
46+
static const uint8_t MISO = PIN_SPI_MISO;
47+
static const uint8_t SCK = PIN_SPI_SCK;
48+
49+
#define PIN_A0 (14)
50+
#define PIN_A1 (15)
51+
#define PIN_A2 (16)
52+
#define PIN_A3 (17)
53+
#define PIN_A4 (18)
54+
#define PIN_A5 (19)
55+
#define PIN_A6 (20)
56+
#define PIN_A7 (21)
57+
58+
static const uint8_t A0 = PIN_A0;
59+
static const uint8_t A1 = PIN_A1;
60+
static const uint8_t A2 = PIN_A2;
61+
static const uint8_t A3 = PIN_A3;
62+
static const uint8_t A4 = PIN_A4;
63+
static const uint8_t A5 = PIN_A5;
64+
static const uint8_t A6 = PIN_A6;
65+
static const uint8_t A7 = PIN_A7;
4966

5067
static const uint8_t E0 = ESP_PINS_OFFSET + 0;
5168
static const uint8_t E1 = ESP_PINS_OFFSET + 1;

0 commit comments

Comments
 (0)