diff --git a/variants/ESPDuino/pins_arduino.h b/variants/ESPDuino/pins_arduino.h
index 89de15782..f268ac53f 100644
--- a/variants/ESPDuino/pins_arduino.h
+++ b/variants/ESPDuino/pins_arduino.h
@@ -25,46 +25,12 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
-
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)  	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+#include "../generic/common.h"
 
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t LED_BUILTIN = 16;
-
 static const uint8_t BUILTIN_LED = 16;
 
-static const uint8_t A0 = 17;
-
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
-
 #endif /* Pins_Arduino_h */
diff --git a/variants/adafruit/pins_arduino.h b/variants/adafruit/pins_arduino.h
index 217317d03..6abf4d96a 100644
--- a/variants/adafruit/pins_arduino.h
+++ b/variants/adafruit/pins_arduino.h
@@ -1,6 +1,6 @@
 /*
   pins_arduino.h - Pin definition functions for Arduino
-  Part of Arduino - http://www.arduino.cc/
+  Part of ESP8266 core for Arduino - https://github.com/esp8266/Arduino
 
   Copyright (c) 2007 David A. Mellis
   Modified for ESP8266 platform by Ivan Grokhotkov, 2014-2015.
@@ -26,46 +26,12 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
-
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)  	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+#include "../generic/common.h"
 
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t LED_BUILTIN = 0;
 static const uint8_t BUILTIN_LED = 0;
 
-static const uint8_t A0 = 17;
-
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
-
 #endif /* Pins_Arduino_h */
-
diff --git a/variants/d1/pins_arduino.h b/variants/d1/pins_arduino.h
index 7139b381d..6afe224f8 100644
--- a/variants/d1/pins_arduino.h
+++ b/variants/d1/pins_arduino.h
@@ -26,27 +26,14 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
-
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)  	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+#include "../generic/common.h"
 
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t LED_BUILTIN = 2;//new ESP-12E GPIO2
 static const uint8_t BUILTIN_LED = 2;//new ESP-12E GPIO2
 
-static const uint8_t A0 = 17;
-
 static const uint8_t D0   = 3;
 static const uint8_t D1   = 1;
 static const uint8_t D2   = 16;
@@ -64,24 +51,4 @@ static const uint8_t D13  = 14;
 static const uint8_t D14  = 4;
 static const uint8_t D15  = 5;
 
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
-
 #endif /* Pins_Arduino_h */
diff --git a/variants/d1_mini/pins_arduino.h b/variants/d1_mini/pins_arduino.h
index 61ddbe820..97cdf487c 100644
--- a/variants/d1_mini/pins_arduino.h
+++ b/variants/d1_mini/pins_arduino.h
@@ -26,27 +26,14 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
-
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)    (((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+#include "../generic/common.h"
 
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t LED_BUILTIN = 2;
 static const uint8_t BUILTIN_LED = 2;
 
-static const uint8_t A0 = 17;
-
 static const uint8_t D0   = 16;
 static const uint8_t D1   = 5;
 static const uint8_t D2   = 4;
@@ -59,26 +46,4 @@ static const uint8_t D8   = 15;
 static const uint8_t RX   = 3;
 static const uint8_t TX   = 1;
 
-
-
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
-
 #endif /* Pins_Arduino_h */
diff --git a/variants/espino/pins_arduino.h b/variants/espino/pins_arduino.h
index 3ced0bf5b..7e62adfb2 100644
--- a/variants/espino/pins_arduino.h
+++ b/variants/espino/pins_arduino.h
@@ -26,22 +26,11 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
-
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)    (((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+#include "../generic/common.h"
 
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t LED_BUILTIN = 2;
 static const uint8_t LED_BUILTIN_R = 2;
 static const uint8_t LED_BUILTIN_G = 4;
@@ -53,26 +42,4 @@ static const uint8_t BUILTIN_LEDG = 4;
 static const uint8_t BUILTIN_LEDB = 5;
 static const uint8_t BUILTIN_BUTTON = 0;
 
-static const uint8_t A0 = 17;
-
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
-
 #endif /* Pins_Arduino_h */
diff --git a/variants/espinotee/pins_arduino.h b/variants/espinotee/pins_arduino.h
index b6a279515..5d1abee97 100644
--- a/variants/espinotee/pins_arduino.h
+++ b/variants/espinotee/pins_arduino.h
@@ -1,70 +1,37 @@
 /*
   pins_arduino.h - Pin definition functions for Arduino
   Part of Arduino - http://www.arduino.cc/
-  
+
   Copyright (c) 2007 David A. Mellis
   Modified for ESP8266 platform by Ivan Grokhotkov, 2014-2015.
-  
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
   version 2.1 of the License, or (at your option) any later version.
-  
+
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Lesser General Public License for more details.
-  
+
   You should have received a copy of the GNU Lesser General
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
-  
+
   $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
 */
 
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        11
-#define NUM_ANALOG_INPUTS       1
-
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)  	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+#include "../generic/common.h"
 
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t BUILTIN_LED = 16;
 static const uint8_t LED_BUILTIN = 16;
 
-static const uint8_t A0 = 17;
-
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
-
 #endif /* Pins_Arduino_h */
diff --git a/variants/espresso_lite_v1/pins_arduino.h b/variants/espresso_lite_v1/pins_arduino.h
index 7d8b8fdb0..6dcdf2855 100644
--- a/variants/espresso_lite_v1/pins_arduino.h
+++ b/variants/espresso_lite_v1/pins_arduino.h
@@ -26,46 +26,14 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
+#include "../generic/common.h"
 
 #define ESPRESSO_LITE_VERSION   1
 
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)  	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
-
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t LED_BUILTIN = 16;
-
-static const uint8_t A0 = 17;
-
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
+static const uint8_t BUILTIN_LED = 16;
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/espresso_lite_v2/pins_arduino.h b/variants/espresso_lite_v2/pins_arduino.h
index 6ba21ad93..c93c6fe15 100644
--- a/variants/espresso_lite_v2/pins_arduino.h
+++ b/variants/espresso_lite_v2/pins_arduino.h
@@ -26,46 +26,14 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
+#include "../generic/common.h"
 
 #define ESPRESSO_LITE_VERSION   2
 
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)  	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
-
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t LED_BUILTIN = 2;
-
-static const uint8_t A0 = 17;
-
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
+static const uint8_t BUILTIN_LED = 2;
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/generic/common.h b/variants/generic/common.h
new file mode 100644
index 000000000..c0029a70a
--- /dev/null
+++ b/variants/generic/common.h
@@ -0,0 +1,67 @@
+/*
+  common.h - Commoon pin definition functions for ESP8266 boards
+  Part of Arduino - http://www.arduino.cc/
+
+  Copyright (c) 2007 David A. Mellis
+  Modified for ESP8266 platform by Ivan Grokhotkov, 2014-2016.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+
+  $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
+*/
+
+#ifndef GENERIC_COMMON_H
+#define GENERIC_COMMON_H
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        17
+#define NUM_ANALOG_INPUTS       1
+
+// TODO: this should be <= 9 if flash is in DIO mode
+#define isFlashInterfacePin(p)      ((p) >= 6 && (p) <= 11)
+
+#define analogInputToDigitalPin(p)  ((p > 0) ? NOT_A_PIN : 0)
+#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;
+
+static const uint8_t A0 = 17;
+
+// 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
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_MONITOR        Serial
+#define SERIAL_PORT_USBVIRTUAL     Serial
+#define SERIAL_PORT_HARDWARE       Serial
+#define SERIAL_PORT_HARDWARE_OPEN  Serial1
+
+#endif /* GENERIC_COMMON_H */
diff --git a/variants/generic/pins_arduino.h b/variants/generic/pins_arduino.h
index f5483bda0..0541019da 100644
--- a/variants/generic/pins_arduino.h
+++ b/variants/generic/pins_arduino.h
@@ -26,45 +26,12 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
-
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)  	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+#include "common.h"
 
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t BUILTIN_LED = 1;
 static const uint8_t LED_BUILTIN = 1;
 
-static const uint8_t A0 = 17;
-
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
-
 #endif /* Pins_Arduino_h */
diff --git a/variants/nodemcu/pins_arduino.h b/variants/nodemcu/pins_arduino.h
index ecfa07c75..b803092b1 100644
--- a/variants/nodemcu/pins_arduino.h
+++ b/variants/nodemcu/pins_arduino.h
@@ -26,27 +26,14 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
-
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)  	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+#include "../generic/common.h"
 
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t LED_BUILTIN = 16;
 static const uint8_t BUILTIN_LED = 16;
 
-static const uint8_t A0 = 17;
-
 static const uint8_t D0   = 16;
 static const uint8_t D1   = 5;
 static const uint8_t D2   = 4;
@@ -59,24 +46,4 @@ static const uint8_t D8   = 15;
 static const uint8_t D9   = 3;
 static const uint8_t D10  = 1;
 
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
-
 #endif /* Pins_Arduino_h */
diff --git a/variants/thing/pins_arduino.h b/variants/thing/pins_arduino.h
index 8c73b2fe0..ba8e9f8b9 100644
--- a/variants/thing/pins_arduino.h
+++ b/variants/thing/pins_arduino.h
@@ -26,47 +26,12 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
-
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)  	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+#include "../generic/common.h"
 
 static const uint8_t SDA = 2;
 static const uint8_t SCL = 14;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t LED_BUILTIN = 5;
-
 static const uint8_t BUILTIN_LED = 5;
 
-static const uint8_t A0 = 17;
-
-
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
-
 #endif /* Pins_Arduino_h */
diff --git a/variants/wifinfo/pins_arduino.h b/variants/wifinfo/pins_arduino.h
index 69549b5ef..e7219abe6 100644
--- a/variants/wifinfo/pins_arduino.h
+++ b/variants/wifinfo/pins_arduino.h
@@ -31,27 +31,14 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
-
-#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)  	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+#include "../generic/common.h"
 
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 static const uint8_t LED_BUILTIN = 12;
 static const uint8_t BUILTIN_LED = 12;
 
-static const uint8_t A0 = 17;
-
 static const uint8_t D0   = 16;
 static const uint8_t D1   = 5;
 static const uint8_t D2   = 4;
@@ -64,24 +51,4 @@ static const uint8_t D8   = 15;
 static const uint8_t D9   = 3;
 static const uint8_t D10  = 1;
 
-// 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
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial1
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
-
 #endif /* Pins_Arduino_h */