From 6d6f22e6bed0a592bd985781fa061a9ed68a5fc8 Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Wed, 26 Oct 2016 01:29:14 -0500 Subject: [PATCH] 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: https://github.com/felis/USB_Host_Shield_2.0/commit/231fb542a8f42d5ada6325bdb5a3a2e1d8d37348 --- variants/ESPDuino/pins_arduino.h | 7 ++-- variants/adafruit/pins_arduino.h | 7 ++-- variants/d1/pins_arduino.h | 7 ++-- variants/d1_mini/pins_arduino.h | 7 ++-- variants/espino/pins_arduino.h | 7 ++-- variants/espinotee/pins_arduino.h | 7 ++-- variants/espresso_lite_v1/pins_arduino.h | 7 ++-- variants/espresso_lite_v2/pins_arduino.h | 7 ++-- variants/generic/common.h | 17 ++++++--- variants/generic/pins_arduino.h | 7 ++-- variants/nodemcu/pins_arduino.h | 7 ++-- variants/phoenix_v1/pins_arduino.h | 7 ++-- variants/phoenix_v2/pins_arduino.h | 7 ++-- variants/thing/pins_arduino.h | 7 ++-- variants/wifinfo/pins_arduino.h | 7 ++-- variants/wifio/pins_arduino.h | 45 ++++++++++++++++-------- 16 files changed, 113 insertions(+), 47 deletions(-) diff --git a/variants/ESPDuino/pins_arduino.h b/variants/ESPDuino/pins_arduino.h index f268ac53f..e56734634 100644 --- a/variants/ESPDuino/pins_arduino.h +++ b/variants/ESPDuino/pins_arduino.h @@ -27,8 +27,11 @@ #include "../generic/common.h" -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 16; static const uint8_t BUILTIN_LED = 16; diff --git a/variants/adafruit/pins_arduino.h b/variants/adafruit/pins_arduino.h index 6abf4d96a..9efe3188e 100644 --- a/variants/adafruit/pins_arduino.h +++ b/variants/adafruit/pins_arduino.h @@ -28,8 +28,11 @@ #include "../generic/common.h" -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 0; static const uint8_t BUILTIN_LED = 0; diff --git a/variants/d1/pins_arduino.h b/variants/d1/pins_arduino.h index 6afe224f8..76848c0e3 100644 --- a/variants/d1/pins_arduino.h +++ b/variants/d1/pins_arduino.h @@ -28,8 +28,11 @@ #include "../generic/common.h" -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 2;//new ESP-12E GPIO2 static const uint8_t BUILTIN_LED = 2;//new ESP-12E GPIO2 diff --git a/variants/d1_mini/pins_arduino.h b/variants/d1_mini/pins_arduino.h index 97cdf487c..d29bf0030 100644 --- a/variants/d1_mini/pins_arduino.h +++ b/variants/d1_mini/pins_arduino.h @@ -28,8 +28,11 @@ #include "../generic/common.h" -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 2; static const uint8_t BUILTIN_LED = 2; diff --git a/variants/espino/pins_arduino.h b/variants/espino/pins_arduino.h index 7e62adfb2..a7ccf5225 100644 --- a/variants/espino/pins_arduino.h +++ b/variants/espino/pins_arduino.h @@ -28,8 +28,11 @@ #include "../generic/common.h" -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 2; static const uint8_t LED_BUILTIN_R = 2; diff --git a/variants/espinotee/pins_arduino.h b/variants/espinotee/pins_arduino.h index 5d1abee97..a178763ce 100644 --- a/variants/espinotee/pins_arduino.h +++ b/variants/espinotee/pins_arduino.h @@ -28,8 +28,11 @@ #include "../generic/common.h" -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t BUILTIN_LED = 16; static const uint8_t LED_BUILTIN = 16; diff --git a/variants/espresso_lite_v1/pins_arduino.h b/variants/espresso_lite_v1/pins_arduino.h index 6dcdf2855..6034b3c5d 100644 --- a/variants/espresso_lite_v1/pins_arduino.h +++ b/variants/espresso_lite_v1/pins_arduino.h @@ -30,8 +30,11 @@ #define ESPRESSO_LITE_VERSION 1 -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 16; static const uint8_t BUILTIN_LED = 16; diff --git a/variants/espresso_lite_v2/pins_arduino.h b/variants/espresso_lite_v2/pins_arduino.h index c93c6fe15..debc5930c 100644 --- a/variants/espresso_lite_v2/pins_arduino.h +++ b/variants/espresso_lite_v2/pins_arduino.h @@ -30,8 +30,11 @@ #define ESPRESSO_LITE_VERSION 2 -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 2; static const uint8_t BUILTIN_LED = 2; diff --git a/variants/generic/common.h b/variants/generic/common.h index c0029a70a..af9f3ac94 100644 --- a/variants/generic/common.h +++ b/variants/generic/common.h @@ -37,12 +37,19 @@ #define digitalPinToInterrupt(p) (((p) < EXTERNAL_NUM_INTERRUPTS)? (p) : NOT_AN_INTERRUPT) #define digitalPinHasPWM(p) (((p) < NUM_DIGITAL_PINS && !isFlashInterfacePin(p))? 1 : 0) -static const uint8_t SS = 15; -static const uint8_t MOSI = 13; -static const uint8_t MISO = 12; -static const uint8_t SCK = 14; +#define PIN_SPI_SS (15) +#define PIN_SPI_MOSI (13) +#define PIN_SPI_MISO (12) +#define PIN_SPI_SCK (14) -static const uint8_t A0 = 17; +static const uint8_t SS = PIN_SPI_SS; +static const uint8_t MOSI = PIN_SPI_MOSI; +static const uint8_t MISO = PIN_SPI_MISO; +static const uint8_t SCK = PIN_SPI_SCK; + +#define PIN_A0 (17) + +static const uint8_t A0 = PIN_A0; // These serial port names are intended to allow libraries and architecture-neutral // sketches to automatically default to the correct port name for a particular type diff --git a/variants/generic/pins_arduino.h b/variants/generic/pins_arduino.h index 0541019da..95897aecb 100644 --- a/variants/generic/pins_arduino.h +++ b/variants/generic/pins_arduino.h @@ -28,8 +28,11 @@ #include "common.h" -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t BUILTIN_LED = 1; static const uint8_t LED_BUILTIN = 1; diff --git a/variants/nodemcu/pins_arduino.h b/variants/nodemcu/pins_arduino.h index b803092b1..0c14b3057 100644 --- a/variants/nodemcu/pins_arduino.h +++ b/variants/nodemcu/pins_arduino.h @@ -28,8 +28,11 @@ #include "../generic/common.h" -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 16; static const uint8_t BUILTIN_LED = 16; diff --git a/variants/phoenix_v1/pins_arduino.h b/variants/phoenix_v1/pins_arduino.h index 129653e92..8627f88df 100644 --- a/variants/phoenix_v1/pins_arduino.h +++ b/variants/phoenix_v1/pins_arduino.h @@ -30,8 +30,11 @@ #define PHOENIX_VERSION 1 -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 16; static const uint8_t BUILTIN_LED = 16; diff --git a/variants/phoenix_v2/pins_arduino.h b/variants/phoenix_v2/pins_arduino.h index 7ae98fe36..08e015e07 100644 --- a/variants/phoenix_v2/pins_arduino.h +++ b/variants/phoenix_v2/pins_arduino.h @@ -30,8 +30,11 @@ #define PHOENIX_VERSION 2 -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 2; static const uint8_t BUILTIN_LED = 2; diff --git a/variants/thing/pins_arduino.h b/variants/thing/pins_arduino.h index ba8e9f8b9..d85294743 100644 --- a/variants/thing/pins_arduino.h +++ b/variants/thing/pins_arduino.h @@ -28,8 +28,11 @@ #include "../generic/common.h" -static const uint8_t SDA = 2; -static const uint8_t SCL = 14; +#define PIN_WIRE_SDA (2) +#define PIN_WIRE_SCL (14) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 5; static const uint8_t BUILTIN_LED = 5; diff --git a/variants/wifinfo/pins_arduino.h b/variants/wifinfo/pins_arduino.h index e7219abe6..fc89b66f5 100644 --- a/variants/wifinfo/pins_arduino.h +++ b/variants/wifinfo/pins_arduino.h @@ -33,8 +33,11 @@ #include "../generic/common.h" -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t LED_BUILTIN = 12; static const uint8_t BUILTIN_LED = 12; diff --git a/variants/wifio/pins_arduino.h b/variants/wifio/pins_arduino.h index 24635b37c..0a5842c18 100644 --- a/variants/wifio/pins_arduino.h +++ b/variants/wifio/pins_arduino.h @@ -30,22 +30,39 @@ #define NUM_ANALOG_INPUTS 1 #define ESP_PINS_OFFSET 20 -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; +#define PIN_WIRE_SDA (4) +#define PIN_WIRE_SCL (5) -static const uint8_t SS = 12; -static const uint8_t MOSI = 13; -static const uint8_t MISO = 14; -static const uint8_t SCK = 15; +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; -static const uint8_t A0 = 14; -static const uint8_t A1 = 15; -static const uint8_t A2 = 16; -static const uint8_t A3 = 17; -static const uint8_t A4 = 18; -static const uint8_t A5 = 19; -static const uint8_t A6 = 20; -static const uint8_t A7 = 21; +#define PIN_SPI_SS (12) +#define PIN_SPI_MOSI (13) +#define PIN_SPI_MISO (14) +#define PIN_SPI_SCK (15) + +static const uint8_t SS = PIN_SPI_SS; +static const uint8_t MOSI = PIN_SPI_MOSI; +static const uint8_t MISO = PIN_SPI_MISO; +static const uint8_t SCK = PIN_SPI_SCK; + +#define PIN_A0 (14) +#define PIN_A1 (15) +#define PIN_A2 (16) +#define PIN_A3 (17) +#define PIN_A4 (18) +#define PIN_A5 (19) +#define PIN_A6 (20) +#define PIN_A7 (21) + +static const uint8_t A0 = PIN_A0; +static const uint8_t A1 = PIN_A1; +static const uint8_t A2 = PIN_A2; +static const uint8_t A3 = PIN_A3; +static const uint8_t A4 = PIN_A4; +static const uint8_t A5 = PIN_A5; +static const uint8_t A6 = PIN_A6; +static const uint8_t A7 = PIN_A7; static const uint8_t E0 = ESP_PINS_OFFSET + 0; static const uint8_t E1 = ESP_PINS_OFFSET + 1;