arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-27 18:02:17 +03:00
Code Activity

LED_BUILTIN should be a #define (#4276)

Browse Source 
* LED_BUILTIN should be a #define
deduplicate and hide BUILTIN_LED as a deprecated constant

* test for LED_BUILTIN existence

* board:espino:variant: rename button macro (naming coherence)
This commit is contained in:
david gauchard
2018-02-07 14:42:57 +01:00
committed by Develo
parent b15102ad28
commit 4caf4878c7
21 changed files with 61 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
variants/ESPDuino/pins_arduino.h
View File

@ -33,7 +33,6 @@
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;
#define LED_BUILTIN 16
#endif /* Pins_Arduino_h */

3
variants/adafruit/pins_arduino.h
View File

@ -34,7 +34,6 @@
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;
#define LED_BUILTIN 0
#endif /* Pins_Arduino_h */

3
variants/arduino_spi/pins_arduino.h
View File

@ -33,7 +33,6 @@
#include "../generic/common.h"
static const uint8_t LED_BUILTIN = 2;
static const uint8_t BUILTIN_LED = 2;
#define LED_BUILTIN 2
#endif /* Pins_Arduino_h */

3
variants/arduino_uart/pins_arduino.h
View File

@ -33,7 +33,6 @@
#include "../generic/common.h"
static const uint8_t LED_BUILTIN = 14;
static const uint8_t BUILTIN_LED = 14;
#define LED_BUILTIN 14
#endif /* Pins_Arduino_h */

3
variants/d1/pins_arduino.h
View File

@ -34,8 +34,7 @@
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
#define LED_BUILTIN 2 //new ESP-12E GPIO2
static const uint8_t D0 = 3;
static const uint8_t D1 = 1;

3
variants/d1_mini/pins_arduino.h
View File

@ -34,8 +34,7 @@
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;
#define LED_BUILTIN 2
static const uint8_t D0 = 16;
static const uint8_t D1 = 5;

8
variants/espino/pins_arduino.h
View File

@ -34,15 +34,11 @@
static const uint8_t SDA = PIN_WIRE_SDA;
static const uint8_t SCL = PIN_WIRE_SCL;
static const uint8_t LED_BUILTIN = 2;
#define LED_BUILTIN 2
static const uint8_t LED_BUILTIN_R = 2;
static const uint8_t LED_BUILTIN_G = 4;
static const uint8_t LED_BUILTIN_B = 5;
static const uint8_t BUTTON_BUILTIN = 0;
static const uint8_t BUILTIN_LED = 2;
static const uint8_t BUILTIN_LEDR = 2;
static const uint8_t BUILTIN_LEDG = 4;
static const uint8_t BUILTIN_LEDB = 5;
static const uint8_t BUILTIN_BUTTON = 0;
#endif /* Pins_Arduino_h */

3
variants/espinotee/pins_arduino.h
View File

@ -34,7 +34,6 @@
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;
#define LED_BUILTIN 16
#endif /* Pins_Arduino_h */

3
variants/espresso_lite_v1/pins_arduino.h
View File

@ -36,7 +36,6 @@
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;
#define LED_BUILTIN 16
#endif /* Pins_Arduino_h */

3
variants/espresso_lite_v2/pins_arduino.h
View File

@ -36,7 +36,6 @@
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;
#define LED_BUILTIN 2
#endif /* Pins_Arduino_h */

7
variants/generic/common.h
View File

@ -71,4 +71,11 @@ static const uint8_t A0 = PIN_A0;
#define SERIAL_PORT_HARDWARE Serial
#define SERIAL_PORT_HARDWARE_OPEN Serial1
#ifdef LED_BUILTIN
#ifdef __cplusplus
extern "C"
#endif
const int BUILTIN_LED __attribute__((deprecated, weak)) = LED_BUILTIN;
#endif
#endif /* GENERIC_COMMON_H */

6
variants/generic/pins_arduino.h
View File

@ -34,10 +34,8 @@
static const uint8_t SDA = PIN_WIRE_SDA;
static const uint8_t SCL = PIN_WIRE_SCL;
#ifndef USERLED
#define USERLED 1
#ifndef LED_BUILTIN
#define LED_BUILTIN 1
#endif
static const uint8_t BUILTIN_LED = USERLED;
static const uint8_t LED_BUILTIN = USERLED;
#endif /* Pins_Arduino_h */

3
variants/nodemcu/pins_arduino.h
View File

@ -34,8 +34,7 @@
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;
#define LED_BUILTIN 16
static const uint8_t D0 = 16;
static const uint8_t D1 = 5;

3
variants/oak/pins_arduino.h
View File

@ -52,8 +52,7 @@ static const uint8_t MOSI = 13;
static const uint8_t MISO = 12;
static const uint8_t SCK = 14;
static const uint8_t BUILTIN_LED = 5;
static const uint8_t LED_BUILTIN = 5;
#define LED_BUILTIN 5
static const uint8_t A0 = 17;

3
variants/phoenix_v1/pins_arduino.h
View File

@ -36,7 +36,6 @@
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;
#define LED_BUILTIN 16
#endif /* Pins_Arduino_h */

3
variants/phoenix_v2/pins_arduino.h
View File

@ -36,7 +36,6 @@
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;
#define LED_BUILTIN 2
#endif /* Pins_Arduino_h */

3
variants/thing/pins_arduino.h
View File

@ -34,7 +34,6 @@
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;
#define LED_BUILTIN 5
#endif /* Pins_Arduino_h */

3
variants/wifinfo/pins_arduino.h
View File

@ -39,8 +39,7 @@
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;
#define LED_BUILTIN 12
static const uint8_t D0 = 16;
static const uint8_t D1 = 5;

3
variants/wifio/pins_arduino.h
View File

@ -77,8 +77,7 @@ static const uint8_t E14 = ESP_PINS_OFFSET + 14;
static const uint8_t E15 = ESP_PINS_OFFSET + 15;
static const uint8_t E16 = ESP_PINS_OFFSET + 16;
static const uint8_t LED_BUILTIN_LED = 2;
static const uint8_t BUILTIN_LED = 2;
#define LED_BUILTIN 2
#define SERIAL_PORT_MONITOR Serial
#define SERIAL_PORT_USBVIRTUAL Serial