arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

fix board common variant inclusion for deprecated BUILTIN_LED (#4366)

Browse Source
This commit is contained in:
david gauchard 2018-02-17 02:40:25 +01:00 committed by Develo
parent 5328a8b91e
commit d0f220fb54
18 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
variants/ESPDuino/pins_arduino.h
View File

@ -25,8 +25,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
#define PIN_WIRE_SCL (5) #define PIN_WIRE_SCL (5)
@ -35,4 +33,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
#define LED_BUILTIN 16 #define LED_BUILTIN 16
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/adafruit/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
#define PIN_WIRE_SCL (5) #define PIN_WIRE_SCL (5)
@ -36,4 +34,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
#define LED_BUILTIN 0 #define LED_BUILTIN 0
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/arduino_spi/pins_arduino.h
View File

@ -31,8 +31,8 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define LED_BUILTIN 2 #define LED_BUILTIN 2
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/arduino_uart/pins_arduino.h
View File

@ -31,8 +31,8 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define LED_BUILTIN 14 #define LED_BUILTIN 14
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/d1/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
#define PIN_WIRE_SCL (5) #define PIN_WIRE_SCL (5)
@ -53,4 +51,6 @@ static const uint8_t D13 = 14;
static const uint8_t D14 = 4; static const uint8_t D14 = 4;
static const uint8_t D15 = 5; static const uint8_t D15 = 5;
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/d1_mini/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
#define PIN_WIRE_SCL (5) #define PIN_WIRE_SCL (5)
@ -48,4 +46,6 @@ static const uint8_t D8 = 15;
static const uint8_t RX = 3; static const uint8_t RX = 3;
static const uint8_t TX = 1; static const uint8_t TX = 1;
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

3
variants/espino/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
#define PIN_WIRE_SCL (5) #define PIN_WIRE_SCL (5)
@ -40,5 +38,6 @@ static const uint8_t LED_BUILTIN_G = 4;
static const uint8_t LED_BUILTIN_B = 5; static const uint8_t LED_BUILTIN_B = 5;
static const uint8_t BUTTON_BUILTIN = 0; static const uint8_t BUTTON_BUILTIN = 0;
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/espinotee/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
#define PIN_WIRE_SCL (5) #define PIN_WIRE_SCL (5)
@ -36,4 +34,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
#define LED_BUILTIN 16 #define LED_BUILTIN 16
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/espresso_lite_v1/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define ESPRESSO_LITE_VERSION 1 #define ESPRESSO_LITE_VERSION 1
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
@ -38,4 +36,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
#define LED_BUILTIN 16 #define LED_BUILTIN 16
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/espresso_lite_v2/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define ESPRESSO_LITE_VERSION 2 #define ESPRESSO_LITE_VERSION 2
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
@ -38,4 +36,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
#define LED_BUILTIN 2 #define LED_BUILTIN 2
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/generic/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "common.h"
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
#define PIN_WIRE_SCL (5) #define PIN_WIRE_SCL (5)
@ -38,4 +36,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
#define LED_BUILTIN 1 #define LED_BUILTIN 1
#endif #endif
#include "common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/nodemcu/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
#define PIN_WIRE_SCL (5) #define PIN_WIRE_SCL (5)
@ -48,4 +46,6 @@ static const uint8_t D8 = 15;
static const uint8_t D9 = 3; static const uint8_t D9 = 3;
static const uint8_t D10 = 1; static const uint8_t D10 = 1;
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

9
variants/oak/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PIN_WIRE_SDA (2) #define PIN_WIRE_SDA (2)
#define PIN_WIRE_SCL (0) #define PIN_WIRE_SCL (0)
@ -47,13 +45,8 @@ static const uint8_t P11 = 17;
static const uint8_t SDA = PIN_WIRE_SDA; static const uint8_t SDA = PIN_WIRE_SDA;
static const uint8_t SCL = PIN_WIRE_SCL; static const uint8_t SCL = PIN_WIRE_SCL;
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 LED_BUILTIN 5 #define LED_BUILTIN 5
static const uint8_t A0 = 17; #include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/phoenix_v1/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PHOENIX_VERSION 1 #define PHOENIX_VERSION 1
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
@ -38,4 +36,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
#define LED_BUILTIN 16 #define LED_BUILTIN 16
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/phoenix_v2/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PHOENIX_VERSION 2 #define PHOENIX_VERSION 2
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
@ -38,4 +36,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
#define LED_BUILTIN 2 #define LED_BUILTIN 2
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/thing/pins_arduino.h
View File

@ -26,8 +26,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PIN_WIRE_SDA (2) #define PIN_WIRE_SDA (2)
#define PIN_WIRE_SCL (14) #define PIN_WIRE_SCL (14)
@ -36,4 +34,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
#define LED_BUILTIN 5 #define LED_BUILTIN 5
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

4
variants/wifinfo/pins_arduino.h
View File

@ -31,8 +31,6 @@
#ifndef Pins_Arduino_h #ifndef Pins_Arduino_h
#define Pins_Arduino_h #define Pins_Arduino_h
#include "../generic/common.h"
#define PIN_WIRE_SDA (4) #define PIN_WIRE_SDA (4)
#define PIN_WIRE_SCL (5) #define PIN_WIRE_SCL (5)
@ -53,4 +51,6 @@ static const uint8_t D8 = 15;
static const uint8_t D9 = 3; static const uint8_t D9 = 3;
static const uint8_t D10 = 1; static const uint8_t D10 = 1;
#include "../generic/common.h"
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */

7
variants/wifio/pins_arduino.h
View File

@ -84,4 +84,11 @@ static const uint8_t E16 = ESP_PINS_OFFSET + 16;
#define SERIAL_PORT_HARDWARE Serial #define SERIAL_PORT_HARDWARE Serial
#define SERIAL_PORT_HARDWARE_OPEN Serial #define SERIAL_PORT_HARDWARE_OPEN Serial
#ifdef LED_BUILTIN
#ifdef __cplusplus
extern "C"
#endif
const int BUILTIN_LED __attribute__((deprecated, weak)) = LED_BUILTIN;
#endif
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */