Skip to content

Commit 4caf487

Browse files
d-a-vdevyte
d-a-v
authored and
devyte
committed
LED_BUILTIN should be a #define (#4276)
* 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)
1 parent b15102a commit 4caf487

File tree

21 files changed

+61
-76
lines changed

21 files changed

+61
-76
lines changed

‎boards.txt

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -180,37 +180,37 @@ generic.menu.FlashSize.16M15M.build.spiffs_start=0x100000
180180
generic.menu.FlashSize.16M15M.build.spiffs_end=0xFFB000
181181
generic.menu.FlashSize.16M15M.build.spiffs_blocksize=8192
182182
generic.menu.led.2=2
183-
generic.menu.led.2.build.led=-DUSERLED=2
183+
generic.menu.led.2.build.led=-DLED_BUILTIN=2
184184
generic.menu.led.0=0
185-
generic.menu.led.0.build.led=-DUSERLED=0
185+
generic.menu.led.0.build.led=-DLED_BUILTIN=0
186186
generic.menu.led.1=1
187-
generic.menu.led.1.build.led=-DUSERLED=1
187+
generic.menu.led.1.build.led=-DLED_BUILTIN=1
188188
generic.menu.led.3=3
189-
generic.menu.led.3.build.led=-DUSERLED=3
189+
generic.menu.led.3.build.led=-DLED_BUILTIN=3
190190
generic.menu.led.4=4
191-
generic.menu.led.4.build.led=-DUSERLED=4
191+
generic.menu.led.4.build.led=-DLED_BUILTIN=4
192192
generic.menu.led.5=5
193-
generic.menu.led.5.build.led=-DUSERLED=5
193+
generic.menu.led.5.build.led=-DLED_BUILTIN=5
194194
generic.menu.led.6=6
195-
generic.menu.led.6.build.led=-DUSERLED=6
195+
generic.menu.led.6.build.led=-DLED_BUILTIN=6
196196
generic.menu.led.7=7
197-
generic.menu.led.7.build.led=-DUSERLED=7
197+
generic.menu.led.7.build.led=-DLED_BUILTIN=7
198198
generic.menu.led.8=8
199-
generic.menu.led.8.build.led=-DUSERLED=8
199+
generic.menu.led.8.build.led=-DLED_BUILTIN=8
200200
generic.menu.led.9=9
201-
generic.menu.led.9.build.led=-DUSERLED=9
201+
generic.menu.led.9.build.led=-DLED_BUILTIN=9
202202
generic.menu.led.10=10
203-
generic.menu.led.10.build.led=-DUSERLED=10
203+
generic.menu.led.10.build.led=-DLED_BUILTIN=10
204204
generic.menu.led.11=11
205-
generic.menu.led.11.build.led=-DUSERLED=11
205+
generic.menu.led.11.build.led=-DLED_BUILTIN=11
206206
generic.menu.led.12=12
207-
generic.menu.led.12.build.led=-DUSERLED=12
207+
generic.menu.led.12.build.led=-DLED_BUILTIN=12
208208
generic.menu.led.13=13
209-
generic.menu.led.13.build.led=-DUSERLED=13
209+
generic.menu.led.13.build.led=-DLED_BUILTIN=13
210210
generic.menu.led.14=14
211-
generic.menu.led.14.build.led=-DUSERLED=14
211+
generic.menu.led.14.build.led=-DLED_BUILTIN=14
212212
generic.menu.led.15=15
213-
generic.menu.led.15.build.led=-DUSERLED=15
213+
generic.menu.led.15.build.led=-DLED_BUILTIN=15
214214
generic.menu.LwIPVariant.v2mss536=v2 Lower Memory
215215
generic.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
216216
generic.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
@@ -394,37 +394,37 @@ esp8285.menu.FlashSize.1M512.build.spiffs_start=0x7B000
394394
esp8285.menu.FlashSize.1M512.build.spiffs_end=0xFB000
395395
esp8285.menu.FlashSize.1M512.build.spiffs_blocksize=8192
396396
esp8285.menu.led.2=2
397-
esp8285.menu.led.2.build.led=-DUSERLED=2
397+
esp8285.menu.led.2.build.led=-DLED_BUILTIN=2
398398
esp8285.menu.led.0=0
399-
esp8285.menu.led.0.build.led=-DUSERLED=0
399+
esp8285.menu.led.0.build.led=-DLED_BUILTIN=0
400400
esp8285.menu.led.1=1
401-
esp8285.menu.led.1.build.led=-DUSERLED=1
401+
esp8285.menu.led.1.build.led=-DLED_BUILTIN=1
402402
esp8285.menu.led.3=3
403-
esp8285.menu.led.3.build.led=-DUSERLED=3
403+
esp8285.menu.led.3.build.led=-DLED_BUILTIN=3
404404
esp8285.menu.led.4=4
405-
esp8285.menu.led.4.build.led=-DUSERLED=4
405+
esp8285.menu.led.4.build.led=-DLED_BUILTIN=4
406406
esp8285.menu.led.5=5
407-
esp8285.menu.led.5.build.led=-DUSERLED=5
407+
esp8285.menu.led.5.build.led=-DLED_BUILTIN=5
408408
esp8285.menu.led.6=6
409-
esp8285.menu.led.6.build.led=-DUSERLED=6
409+
esp8285.menu.led.6.build.led=-DLED_BUILTIN=6
410410
esp8285.menu.led.7=7
411-
esp8285.menu.led.7.build.led=-DUSERLED=7
411+
esp8285.menu.led.7.build.led=-DLED_BUILTIN=7
412412
esp8285.menu.led.8=8
413-
esp8285.menu.led.8.build.led=-DUSERLED=8
413+
esp8285.menu.led.8.build.led=-DLED_BUILTIN=8
414414
esp8285.menu.led.9=9
415-
esp8285.menu.led.9.build.led=-DUSERLED=9
415+
esp8285.menu.led.9.build.led=-DLED_BUILTIN=9
416416
esp8285.menu.led.10=10
417-
esp8285.menu.led.10.build.led=-DUSERLED=10
417+
esp8285.menu.led.10.build.led=-DLED_BUILTIN=10
418418
esp8285.menu.led.11=11
419-
esp8285.menu.led.11.build.led=-DUSERLED=11
419+
esp8285.menu.led.11.build.led=-DLED_BUILTIN=11
420420
esp8285.menu.led.12=12
421-
esp8285.menu.led.12.build.led=-DUSERLED=12
421+
esp8285.menu.led.12.build.led=-DLED_BUILTIN=12
422422
esp8285.menu.led.13=13
423-
esp8285.menu.led.13.build.led=-DUSERLED=13
423+
esp8285.menu.led.13.build.led=-DLED_BUILTIN=13
424424
esp8285.menu.led.14=14
425-
esp8285.menu.led.14.build.led=-DUSERLED=14
425+
esp8285.menu.led.14.build.led=-DLED_BUILTIN=14
426426
esp8285.menu.led.15=15
427-
esp8285.menu.led.15.build.led=-DUSERLED=15
427+
esp8285.menu.led.15.build.led=-DLED_BUILTIN=15
428428
esp8285.menu.LwIPVariant.v2mss536=v2 Lower Memory
429429
esp8285.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
430430
esp8285.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2

‎tools/boards.txt.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,14 +1062,14 @@ def all_flash_size ():
10621062
def led (default,max):
10631063
led = collections.OrderedDict([
10641064
('.menu.led.' + str(default), str(default)),
1065-
('.menu.led.' + str(default) + '.build.led', '-DUSERLED=' + str(default)),
1065+
('.menu.led.' + str(default) + '.build.led', '-DLED_BUILTIN=' + str(default)),
10661066
]);
10671067
for i in range(0,max):
10681068
if not i == default:
10691069
led.update(
10701070
collections.OrderedDict([
10711071
('.menu.led.' + str(i), str(i)),
1072-
('.menu.led.' + str(i) + '.build.led', '-DUSERLED=' + str(i)),
1072+
('.menu.led.' + str(i) + '.build.led', '-DLED_BUILTIN=' + str(i)),
10731073
]))
10741074
return { 'led': led }
10751075

‎variants/ESPDuino/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
static const uint8_t SDA = PIN_WIRE_SDA;
3434
static const uint8_t SCL = PIN_WIRE_SCL;
3535

36-
static const uint8_t LED_BUILTIN = 16;
37-
static const uint8_t BUILTIN_LED = 16;
36+
#define LED_BUILTIN 16
3837

3938
#endif /* Pins_Arduino_h */

‎variants/adafruit/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
static const uint8_t SDA = PIN_WIRE_SDA;
3535
static const uint8_t SCL = PIN_WIRE_SCL;
3636

37-
static const uint8_t LED_BUILTIN = 0;
38-
static const uint8_t BUILTIN_LED = 0;
37+
#define LED_BUILTIN 0
3938

4039
#endif /* Pins_Arduino_h */

‎variants/arduino_spi/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

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

36-
static const uint8_t LED_BUILTIN = 2;
37-
static const uint8_t BUILTIN_LED = 2;
36+
#define LED_BUILTIN 2
3837

3938
#endif /* Pins_Arduino_h */

‎variants/arduino_uart/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

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

36-
static const uint8_t LED_BUILTIN = 14;
37-
static const uint8_t BUILTIN_LED = 14;
36+
#define LED_BUILTIN 14
3837

3938
#endif /* Pins_Arduino_h */

‎variants/d1/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
static const uint8_t SDA = PIN_WIRE_SDA;
3535
static const uint8_t SCL = PIN_WIRE_SCL;
3636

37-
static const uint8_t LED_BUILTIN = 2;//new ESP-12E GPIO2
38-
static const uint8_t BUILTIN_LED = 2;//new ESP-12E GPIO2
37+
#define LED_BUILTIN 2 //new ESP-12E GPIO2
3938

4039
static const uint8_t D0 = 3;
4140
static const uint8_t D1 = 1;

‎variants/d1_mini/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
static const uint8_t SDA = PIN_WIRE_SDA;
3535
static const uint8_t SCL = PIN_WIRE_SCL;
3636

37-
static const uint8_t LED_BUILTIN = 2;
38-
static const uint8_t BUILTIN_LED = 2;
37+
#define LED_BUILTIN 2
3938

4039
static const uint8_t D0 = 16;
4140
static const uint8_t D1 = 5;

‎variants/espino/pins_arduino.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,11 @@
3434
static const uint8_t SDA = PIN_WIRE_SDA;
3535
static const uint8_t SCL = PIN_WIRE_SCL;
3636

37-
static const uint8_t LED_BUILTIN = 2;
37+
#define LED_BUILTIN 2
3838
static const uint8_t LED_BUILTIN_R = 2;
3939
static const uint8_t LED_BUILTIN_G = 4;
4040
static const uint8_t LED_BUILTIN_B = 5;
41+
static const uint8_t BUTTON_BUILTIN = 0;
4142

42-
static const uint8_t BUILTIN_LED = 2;
43-
static const uint8_t BUILTIN_LEDR = 2;
44-
static const uint8_t BUILTIN_LEDG = 4;
45-
static const uint8_t BUILTIN_LEDB = 5;
46-
static const uint8_t BUILTIN_BUTTON = 0;
4743

4844
#endif /* Pins_Arduino_h */

‎variants/espinotee/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
static const uint8_t SDA = PIN_WIRE_SDA;
3535
static const uint8_t SCL = PIN_WIRE_SCL;
3636

37-
static const uint8_t BUILTIN_LED = 16;
38-
static const uint8_t LED_BUILTIN = 16;
37+
#define LED_BUILTIN 16
3938

4039
#endif /* Pins_Arduino_h */

‎variants/espresso_lite_v1/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
static const uint8_t SDA = PIN_WIRE_SDA;
3737
static const uint8_t SCL = PIN_WIRE_SCL;
3838

39-
static const uint8_t LED_BUILTIN = 16;
40-
static const uint8_t BUILTIN_LED = 16;
39+
#define LED_BUILTIN 16
4140

4241
#endif /* Pins_Arduino_h */

‎variants/espresso_lite_v2/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
static const uint8_t SDA = PIN_WIRE_SDA;
3737
static const uint8_t SCL = PIN_WIRE_SCL;
3838

39-
static const uint8_t LED_BUILTIN = 2;
40-
static const uint8_t BUILTIN_LED = 2;
39+
#define LED_BUILTIN 2
4140

4241
#endif /* Pins_Arduino_h */

‎variants/generic/common.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,11 @@ static const uint8_t A0 = PIN_A0;
7171
#define SERIAL_PORT_HARDWARE Serial
7272
#define SERIAL_PORT_HARDWARE_OPEN Serial1
7373

74+
#ifdef LED_BUILTIN
75+
#ifdef __cplusplus
76+
extern "C"
77+
#endif
78+
const int BUILTIN_LED __attribute__((deprecated, weak)) = LED_BUILTIN;
79+
#endif
80+
7481
#endif /* GENERIC_COMMON_H */

‎variants/generic/pins_arduino.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,8 @@
3434
static const uint8_t SDA = PIN_WIRE_SDA;
3535
static const uint8_t SCL = PIN_WIRE_SCL;
3636

37-
#ifndef USERLED
38-
#define USERLED 1
37+
#ifndef LED_BUILTIN
38+
#define LED_BUILTIN 1
3939
#endif
40-
static const uint8_t BUILTIN_LED = USERLED;
41-
static const uint8_t LED_BUILTIN = USERLED;
4240

4341
#endif /* Pins_Arduino_h */

‎variants/nodemcu/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
static const uint8_t SDA = PIN_WIRE_SDA;
3535
static const uint8_t SCL = PIN_WIRE_SCL;
3636

37-
static const uint8_t LED_BUILTIN = 16;
38-
static const uint8_t BUILTIN_LED = 16;
37+
#define LED_BUILTIN 16
3938

4039
static const uint8_t D0 = 16;
4140
static const uint8_t D1 = 5;

‎variants/oak/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ static const uint8_t MOSI = 13;
5252
static const uint8_t MISO = 12;
5353
static const uint8_t SCK = 14;
5454

55-
static const uint8_t BUILTIN_LED = 5;
56-
static const uint8_t LED_BUILTIN = 5;
55+
#define LED_BUILTIN 5
5756

5857
static const uint8_t A0 = 17;
5958

‎variants/phoenix_v1/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
static const uint8_t SDA = PIN_WIRE_SDA;
3737
static const uint8_t SCL = PIN_WIRE_SCL;
3838

39-
static const uint8_t LED_BUILTIN = 16;
40-
static const uint8_t BUILTIN_LED = 16;
39+
#define LED_BUILTIN 16
4140

4241
#endif /* Pins_Arduino_h */

‎variants/phoenix_v2/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
static const uint8_t SDA = PIN_WIRE_SDA;
3737
static const uint8_t SCL = PIN_WIRE_SCL;
3838

39-
static const uint8_t LED_BUILTIN = 2;
40-
static const uint8_t BUILTIN_LED = 2;
39+
#define LED_BUILTIN 2
4140

4241
#endif /* Pins_Arduino_h */

‎variants/thing/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
static const uint8_t SDA = PIN_WIRE_SDA;
3535
static const uint8_t SCL = PIN_WIRE_SCL;
3636

37-
static const uint8_t LED_BUILTIN = 5;
38-
static const uint8_t BUILTIN_LED = 5;
37+
#define LED_BUILTIN 5
3938

4039
#endif /* Pins_Arduino_h */

‎variants/wifinfo/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
static const uint8_t SDA = PIN_WIRE_SDA;
4040
static const uint8_t SCL = PIN_WIRE_SCL;
4141

42-
static const uint8_t LED_BUILTIN = 12;
43-
static const uint8_t BUILTIN_LED = 12;
42+
#define LED_BUILTIN 12
4443

4544
static const uint8_t D0 = 16;
4645
static const uint8_t D1 = 5;

‎variants/wifio/pins_arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ static const uint8_t E14 = ESP_PINS_OFFSET + 14;
7777
static const uint8_t E15 = ESP_PINS_OFFSET + 15;
7878
static const uint8_t E16 = ESP_PINS_OFFSET + 16;
7979

80-
static const uint8_t LED_BUILTIN_LED = 2;
81-
static const uint8_t BUILTIN_LED = 2;
80+
#define LED_BUILTIN 2
8281

8382
#define SERIAL_PORT_MONITOR Serial
8483
#define SERIAL_PORT_USBVIRTUAL Serial

0 commit comments

Comments
 (0)