From 0d7e6f639f020effc1579e802dd8e305bedb52ee Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Mon, 5 Feb 2018 14:07:01 +0100 Subject: [PATCH 1/3] LED_BUILTIN should be a #define deduplicate and hide BUILTIN_LED as a deprecated constant --- boards.txt | 64 ++++++++++++------------ tools/boards.txt.py | 4 +- variants/ESPDuino/pins_arduino.h | 3 +- variants/adafruit/pins_arduino.h | 3 +- variants/arduino_spi/pins_arduino.h | 3 +- variants/arduino_uart/pins_arduino.h | 3 +- variants/d1/pins_arduino.h | 3 +- variants/d1_mini/pins_arduino.h | 3 +- variants/espino/pins_arduino.h | 5 +- variants/espinotee/pins_arduino.h | 3 +- variants/espresso_lite_v1/pins_arduino.h | 3 +- variants/espresso_lite_v2/pins_arduino.h | 3 +- variants/generic/common.h | 5 ++ variants/generic/pins_arduino.h | 6 +-- variants/nodemcu/pins_arduino.h | 3 +- variants/oak/pins_arduino.h | 3 +- variants/phoenix_v1/pins_arduino.h | 3 +- variants/phoenix_v2/pins_arduino.h | 3 +- variants/thing/pins_arduino.h | 3 +- variants/wifinfo/pins_arduino.h | 3 +- variants/wifio/pins_arduino.h | 3 +- 21 files changed, 60 insertions(+), 72 deletions(-) diff --git a/boards.txt b/boards.txt index 56014dbf66..5ff39ed91e 100644 --- a/boards.txt +++ b/boards.txt @@ -180,37 +180,37 @@ generic.menu.FlashSize.16M15M.build.spiffs_start=0x100000 generic.menu.FlashSize.16M15M.build.spiffs_end=0xFFB000 generic.menu.FlashSize.16M15M.build.spiffs_blocksize=8192 generic.menu.led.2=2 -generic.menu.led.2.build.led=-DUSERLED=2 +generic.menu.led.2.build.led=-DLED_BUILTIN=2 generic.menu.led.0=0 -generic.menu.led.0.build.led=-DUSERLED=0 +generic.menu.led.0.build.led=-DLED_BUILTIN=0 generic.menu.led.1=1 -generic.menu.led.1.build.led=-DUSERLED=1 +generic.menu.led.1.build.led=-DLED_BUILTIN=1 generic.menu.led.3=3 -generic.menu.led.3.build.led=-DUSERLED=3 +generic.menu.led.3.build.led=-DLED_BUILTIN=3 generic.menu.led.4=4 -generic.menu.led.4.build.led=-DUSERLED=4 +generic.menu.led.4.build.led=-DLED_BUILTIN=4 generic.menu.led.5=5 -generic.menu.led.5.build.led=-DUSERLED=5 +generic.menu.led.5.build.led=-DLED_BUILTIN=5 generic.menu.led.6=6 -generic.menu.led.6.build.led=-DUSERLED=6 +generic.menu.led.6.build.led=-DLED_BUILTIN=6 generic.menu.led.7=7 -generic.menu.led.7.build.led=-DUSERLED=7 +generic.menu.led.7.build.led=-DLED_BUILTIN=7 generic.menu.led.8=8 -generic.menu.led.8.build.led=-DUSERLED=8 +generic.menu.led.8.build.led=-DLED_BUILTIN=8 generic.menu.led.9=9 -generic.menu.led.9.build.led=-DUSERLED=9 +generic.menu.led.9.build.led=-DLED_BUILTIN=9 generic.menu.led.10=10 -generic.menu.led.10.build.led=-DUSERLED=10 +generic.menu.led.10.build.led=-DLED_BUILTIN=10 generic.menu.led.11=11 -generic.menu.led.11.build.led=-DUSERLED=11 +generic.menu.led.11.build.led=-DLED_BUILTIN=11 generic.menu.led.12=12 -generic.menu.led.12.build.led=-DUSERLED=12 +generic.menu.led.12.build.led=-DLED_BUILTIN=12 generic.menu.led.13=13 -generic.menu.led.13.build.led=-DUSERLED=13 +generic.menu.led.13.build.led=-DLED_BUILTIN=13 generic.menu.led.14=14 -generic.menu.led.14.build.led=-DUSERLED=14 +generic.menu.led.14.build.led=-DLED_BUILTIN=14 generic.menu.led.15=15 -generic.menu.led.15.build.led=-DUSERLED=15 +generic.menu.led.15.build.led=-DLED_BUILTIN=15 generic.menu.LwIPVariant.v2mss536=v2 Lower Memory generic.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include generic.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 @@ -394,37 +394,37 @@ esp8285.menu.FlashSize.1M512.build.spiffs_start=0x7B000 esp8285.menu.FlashSize.1M512.build.spiffs_end=0xFB000 esp8285.menu.FlashSize.1M512.build.spiffs_blocksize=8192 esp8285.menu.led.2=2 -esp8285.menu.led.2.build.led=-DUSERLED=2 +esp8285.menu.led.2.build.led=-DLED_BUILTIN=2 esp8285.menu.led.0=0 -esp8285.menu.led.0.build.led=-DUSERLED=0 +esp8285.menu.led.0.build.led=-DLED_BUILTIN=0 esp8285.menu.led.1=1 -esp8285.menu.led.1.build.led=-DUSERLED=1 +esp8285.menu.led.1.build.led=-DLED_BUILTIN=1 esp8285.menu.led.3=3 -esp8285.menu.led.3.build.led=-DUSERLED=3 +esp8285.menu.led.3.build.led=-DLED_BUILTIN=3 esp8285.menu.led.4=4 -esp8285.menu.led.4.build.led=-DUSERLED=4 +esp8285.menu.led.4.build.led=-DLED_BUILTIN=4 esp8285.menu.led.5=5 -esp8285.menu.led.5.build.led=-DUSERLED=5 +esp8285.menu.led.5.build.led=-DLED_BUILTIN=5 esp8285.menu.led.6=6 -esp8285.menu.led.6.build.led=-DUSERLED=6 +esp8285.menu.led.6.build.led=-DLED_BUILTIN=6 esp8285.menu.led.7=7 -esp8285.menu.led.7.build.led=-DUSERLED=7 +esp8285.menu.led.7.build.led=-DLED_BUILTIN=7 esp8285.menu.led.8=8 -esp8285.menu.led.8.build.led=-DUSERLED=8 +esp8285.menu.led.8.build.led=-DLED_BUILTIN=8 esp8285.menu.led.9=9 -esp8285.menu.led.9.build.led=-DUSERLED=9 +esp8285.menu.led.9.build.led=-DLED_BUILTIN=9 esp8285.menu.led.10=10 -esp8285.menu.led.10.build.led=-DUSERLED=10 +esp8285.menu.led.10.build.led=-DLED_BUILTIN=10 esp8285.menu.led.11=11 -esp8285.menu.led.11.build.led=-DUSERLED=11 +esp8285.menu.led.11.build.led=-DLED_BUILTIN=11 esp8285.menu.led.12=12 -esp8285.menu.led.12.build.led=-DUSERLED=12 +esp8285.menu.led.12.build.led=-DLED_BUILTIN=12 esp8285.menu.led.13=13 -esp8285.menu.led.13.build.led=-DUSERLED=13 +esp8285.menu.led.13.build.led=-DLED_BUILTIN=13 esp8285.menu.led.14=14 -esp8285.menu.led.14.build.led=-DUSERLED=14 +esp8285.menu.led.14.build.led=-DLED_BUILTIN=14 esp8285.menu.led.15=15 -esp8285.menu.led.15.build.led=-DUSERLED=15 +esp8285.menu.led.15.build.led=-DLED_BUILTIN=15 esp8285.menu.LwIPVariant.v2mss536=v2 Lower Memory esp8285.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include esp8285.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 602f069e5c..783fd41d9b 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1062,14 +1062,14 @@ def all_flash_size (): def led (default,max): led = collections.OrderedDict([ ('.menu.led.' + str(default), str(default)), - ('.menu.led.' + str(default) + '.build.led', '-DUSERLED=' + str(default)), + ('.menu.led.' + str(default) + '.build.led', '-DLED_BUILTIN=' + str(default)), ]); for i in range(0,max): if not i == default: led.update( collections.OrderedDict([ ('.menu.led.' + str(i), str(i)), - ('.menu.led.' + str(i) + '.build.led', '-DUSERLED=' + str(i)), + ('.menu.led.' + str(i) + '.build.led', '-DLED_BUILTIN=' + str(i)), ])) return { 'led': led } diff --git a/variants/ESPDuino/pins_arduino.h b/variants/ESPDuino/pins_arduino.h index e567346344..2f2e810ce0 100644 --- a/variants/ESPDuino/pins_arduino.h +++ b/variants/ESPDuino/pins_arduino.h @@ -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 */ diff --git a/variants/adafruit/pins_arduino.h b/variants/adafruit/pins_arduino.h index 9efe3188e7..8e8d55df7d 100644 --- a/variants/adafruit/pins_arduino.h +++ b/variants/adafruit/pins_arduino.h @@ -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 */ diff --git a/variants/arduino_spi/pins_arduino.h b/variants/arduino_spi/pins_arduino.h index 69513edbb5..a06f298e47 100644 --- a/variants/arduino_spi/pins_arduino.h +++ b/variants/arduino_spi/pins_arduino.h @@ -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 */ diff --git a/variants/arduino_uart/pins_arduino.h b/variants/arduino_uart/pins_arduino.h index b64249bd30..50cad09358 100644 --- a/variants/arduino_uart/pins_arduino.h +++ b/variants/arduino_uart/pins_arduino.h @@ -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 */ diff --git a/variants/d1/pins_arduino.h b/variants/d1/pins_arduino.h index 76848c0e38..6e15f366e2 100644 --- a/variants/d1/pins_arduino.h +++ b/variants/d1/pins_arduino.h @@ -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; diff --git a/variants/d1_mini/pins_arduino.h b/variants/d1_mini/pins_arduino.h index d29bf00307..8d89f9fca2 100644 --- a/variants/d1_mini/pins_arduino.h +++ b/variants/d1_mini/pins_arduino.h @@ -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; diff --git a/variants/espino/pins_arduino.h b/variants/espino/pins_arduino.h index a7ccf52253..c713db4fc4 100644 --- a/variants/espino/pins_arduino.h +++ b/variants/espino/pins_arduino.h @@ -34,15 +34,16 @@ 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 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 */ diff --git a/variants/espinotee/pins_arduino.h b/variants/espinotee/pins_arduino.h index a178763ce6..12db2f5741 100644 --- a/variants/espinotee/pins_arduino.h +++ b/variants/espinotee/pins_arduino.h @@ -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 */ diff --git a/variants/espresso_lite_v1/pins_arduino.h b/variants/espresso_lite_v1/pins_arduino.h index 6034b3c5d8..addbbe90c6 100644 --- a/variants/espresso_lite_v1/pins_arduino.h +++ b/variants/espresso_lite_v1/pins_arduino.h @@ -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 */ diff --git a/variants/espresso_lite_v2/pins_arduino.h b/variants/espresso_lite_v2/pins_arduino.h index debc5930cb..8d03252647 100644 --- a/variants/espresso_lite_v2/pins_arduino.h +++ b/variants/espresso_lite_v2/pins_arduino.h @@ -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 */ diff --git a/variants/generic/common.h b/variants/generic/common.h index af9f3ac944..85661e3a48 100644 --- a/variants/generic/common.h +++ b/variants/generic/common.h @@ -71,4 +71,9 @@ static const uint8_t A0 = PIN_A0; #define SERIAL_PORT_HARDWARE Serial #define SERIAL_PORT_HARDWARE_OPEN Serial1 +#ifdef __cplusplus +extern "C" +#endif +const int BUILTIN_LED __attribute__((deprecated, weak)) = LED_BUILTIN; + #endif /* GENERIC_COMMON_H */ diff --git a/variants/generic/pins_arduino.h b/variants/generic/pins_arduino.h index 6d9ec74a00..dcb8ec7be8 100644 --- a/variants/generic/pins_arduino.h +++ b/variants/generic/pins_arduino.h @@ -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 */ diff --git a/variants/nodemcu/pins_arduino.h b/variants/nodemcu/pins_arduino.h index 0c14b30575..ff71048734 100644 --- a/variants/nodemcu/pins_arduino.h +++ b/variants/nodemcu/pins_arduino.h @@ -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; diff --git a/variants/oak/pins_arduino.h b/variants/oak/pins_arduino.h index 8108506d22..9cd30fd5af 100644 --- a/variants/oak/pins_arduino.h +++ b/variants/oak/pins_arduino.h @@ -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; diff --git a/variants/phoenix_v1/pins_arduino.h b/variants/phoenix_v1/pins_arduino.h index 8627f88dfd..7c6a02c8d4 100644 --- a/variants/phoenix_v1/pins_arduino.h +++ b/variants/phoenix_v1/pins_arduino.h @@ -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 */ diff --git a/variants/phoenix_v2/pins_arduino.h b/variants/phoenix_v2/pins_arduino.h index 08e015e07a..f5b61a49b0 100644 --- a/variants/phoenix_v2/pins_arduino.h +++ b/variants/phoenix_v2/pins_arduino.h @@ -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 */ diff --git a/variants/thing/pins_arduino.h b/variants/thing/pins_arduino.h index d852947433..a6e65aa1a1 100644 --- a/variants/thing/pins_arduino.h +++ b/variants/thing/pins_arduino.h @@ -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 */ diff --git a/variants/wifinfo/pins_arduino.h b/variants/wifinfo/pins_arduino.h index fc89b66f5f..68ae7de63e 100644 --- a/variants/wifinfo/pins_arduino.h +++ b/variants/wifinfo/pins_arduino.h @@ -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; diff --git a/variants/wifio/pins_arduino.h b/variants/wifio/pins_arduino.h index 0a5842c181..55832dff5f 100644 --- a/variants/wifio/pins_arduino.h +++ b/variants/wifio/pins_arduino.h @@ -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 From 300c56f7ee939f249816e18c9375f8c316bc5555 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Mon, 5 Feb 2018 14:12:59 +0100 Subject: [PATCH 2/3] test for LED_BUILTIN existence --- variants/generic/common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/variants/generic/common.h b/variants/generic/common.h index 85661e3a48..d9e862b6a7 100644 --- a/variants/generic/common.h +++ b/variants/generic/common.h @@ -71,9 +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 */ From 57d2fd82e8e40a4dd1d80aaa4044c4a34b0e136e Mon Sep 17 00:00:00 2001 From: david gauchard Date: Wed, 7 Feb 2018 01:08:11 +0100 Subject: [PATCH 3/3] board:espino:variant: rename button macro (naming coherence) --- variants/espino/pins_arduino.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/variants/espino/pins_arduino.h b/variants/espino/pins_arduino.h index c713db4fc4..6ec3a78b72 100644 --- a/variants/espino/pins_arduino.h +++ b/variants/espino/pins_arduino.h @@ -38,12 +38,7 @@ static const uint8_t SCL = PIN_WIRE_SCL; 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_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 */