From 7865ace1cb9c9d08be1ae29445159023d7d22da5 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 15:53:41 +0100 Subject: [PATCH 01/23] changed BUILTIN_LED to LED_BUILTIN --- variants/d1_mini/pins_arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/d1_mini/pins_arduino.h b/variants/d1_mini/pins_arduino.h index 40a16f2b58..c0eb6a524e 100644 --- a/variants/d1_mini/pins_arduino.h +++ b/variants/d1_mini/pins_arduino.h @@ -42,7 +42,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 = 2; +static const uint8_t LED_BUILTIN = 2; static const uint8_t A0 = 17; From a25e4aaf9519d350c0aa5295ac373f6be9235825 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 15:54:11 +0100 Subject: [PATCH 02/23] changed BUILTIN_LED to LED_BUILTIN --- variants/adafruit/pins_arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/adafruit/pins_arduino.h b/variants/adafruit/pins_arduino.h index aeb20d43be..d8d4c0f089 100644 --- a/variants/adafruit/pins_arduino.h +++ b/variants/adafruit/pins_arduino.h @@ -42,7 +42,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 = 0; +static const uint8_t LED_BUILTIN = 0; static const uint8_t A0 = 17; From d0557ddfa4b15f67d0a7016b3aad3fc3423cfbeb Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 15:54:41 +0100 Subject: [PATCH 03/23] changed BUILTIN_LED to LED_BUILTIN --- variants/nodemcu/pins_arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/nodemcu/pins_arduino.h b/variants/nodemcu/pins_arduino.h index 25d2877710..34ee1992d6 100644 --- a/variants/nodemcu/pins_arduino.h +++ b/variants/nodemcu/pins_arduino.h @@ -42,7 +42,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 = 16; +static const uint8_t LED_BUILTIN = 16; static const uint8_t A0 = 17; From b735737bfee2046c7b3a80f91dd9e952e39533ce Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 15:55:08 +0100 Subject: [PATCH 04/23] changed BUILTIN_LED to LED_BUILTIN --- variants/generic/pins_arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/generic/pins_arduino.h b/variants/generic/pins_arduino.h index b2ff8f1cd7..ac8799881e 100644 --- a/variants/generic/pins_arduino.h +++ b/variants/generic/pins_arduino.h @@ -42,7 +42,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 = 1; +static const uint8_t LED_BUILTIN = 1; static const uint8_t A0 = 17; From fb9e977b06e76635ef64eaf4a9af97aaa68ca0f1 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 15:55:30 +0100 Subject: [PATCH 05/23] changed BUILTIN_LED to LED_BUILTIN --- variants/d1/pins_arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/d1/pins_arduino.h b/variants/d1/pins_arduino.h index ddab599ba4..c302db7afa 100644 --- a/variants/d1/pins_arduino.h +++ b/variants/d1/pins_arduino.h @@ -42,7 +42,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 = 2;//new ESP-12E GPIO2 +static const uint8_t LED_BUILTIN = 2;//new ESP-12E GPIO2 static const uint8_t A0 = 17; From 1eb74d595657fbb2574f0d469e10d16b315b02b4 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 15:56:04 +0100 Subject: [PATCH 06/23] changed BUILTIN_LED to LED_BUILTIN --- variants/wifinfo/pins_arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/wifinfo/pins_arduino.h b/variants/wifinfo/pins_arduino.h index f4000865cf..d2c24de3b3 100644 --- a/variants/wifinfo/pins_arduino.h +++ b/variants/wifinfo/pins_arduino.h @@ -47,7 +47,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 = 12; +static const uint8_t LED_BUILTIN = 12; static const uint8_t A0 = 17; From df2659b9c6c777d02596ec3cf7364c1126ee7852 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 15:57:02 +0100 Subject: [PATCH 07/23] changed BUILTIN_LED to LED_BUILTIN --- variants/espino/pins_arduino.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/variants/espino/pins_arduino.h b/variants/espino/pins_arduino.h index 2efad2db3f..6b8ef394ea 100644 --- a/variants/espino/pins_arduino.h +++ b/variants/espino/pins_arduino.h @@ -42,10 +42,10 @@ static const uint8_t MOSI = 13; static const uint8_t MISO = 12; static const uint8_t SCK = 14; -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 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_BUTTON = 0; static const uint8_t A0 = 17; From faae74208da6fb333f3f346ad25935461c78de95 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 15:57:48 +0100 Subject: [PATCH 08/23] changed BUILTIN_LED to LED_BUILTIN --- variants/thing/pins_arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/thing/pins_arduino.h b/variants/thing/pins_arduino.h index 72d0aaea15..4340ec49ed 100644 --- a/variants/thing/pins_arduino.h +++ b/variants/thing/pins_arduino.h @@ -42,7 +42,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; static const uint8_t A0 = 17; From 8645bd598e4ef83354ec16496af0f22a159773d6 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 15:58:48 +0100 Subject: [PATCH 09/23] changed BUILTIN_LED to LED_BUILTIN --- variants/ESPDuino/pins_arduino.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variants/ESPDuino/pins_arduino.h b/variants/ESPDuino/pins_arduino.h index ca32bcef7c..7c75ab365b 100644 --- a/variants/ESPDuino/pins_arduino.h +++ b/variants/ESPDuino/pins_arduino.h @@ -41,7 +41,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 = 16; +static const uint8_t LED_BUILTIN = 16; static const uint8_t A0 = 17; @@ -65,4 +65,4 @@ static const uint8_t A0 = 17; #define SERIAL_PORT_HARDWARE Serial #define SERIAL_PORT_HARDWARE_OPEN Serial -#endif /* Pins_Arduino_h */ \ No newline at end of file +#endif /* Pins_Arduino_h */ From 5e11c4379c02ee1e13eb1afb30622071b4289f24 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 15:59:34 +0100 Subject: [PATCH 10/23] changed BUILTIN_LED to LED_BUILTIN --- .../esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino b/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino index 740211d6d1..64609a2d0d 100644 --- a/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino +++ b/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino @@ -16,7 +16,7 @@ unsigned long previousMillis = 0; const long interval = 1000; void setup() { - pinMode(BUILTIN_LED, OUTPUT); + pinMode(LED_BUILTIN, OUTPUT); } void loop() From cf3f6da0f2a1811a519ccb82ceadd4bf111c0a43 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 15:59:53 +0100 Subject: [PATCH 11/23] changed BUILTIN_LED to LED_BUILTIN --- .../esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino b/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino index 64609a2d0d..1e27fe1dc3 100644 --- a/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino +++ b/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino @@ -7,7 +7,7 @@ The blue LED on the ESP-01 module is connected to GPIO1 (which is also the TXD pin; so we cannot use Serial.print() at the same time) - Note that this sketch uses BUILTIN_LED to find the pin with the internal LED + Note that this sketch uses LED_BUILTIN to find the pin with the internal LED */ int ledState = LOW; From 7008a279df11a8b93d2447a795dc17fe24950147 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 16:00:21 +0100 Subject: [PATCH 12/23] changed BUILTIN_LED to LED_BUILTIN --- .../esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino b/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino index 1e27fe1dc3..ccff3fd74c 100644 --- a/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino +++ b/libraries/esp8266/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino @@ -28,6 +28,6 @@ void loop() ledState = HIGH; // Note that this switches the LED *off* else ledState = LOW; // Note that this switches the LED *on* - digitalWrite(BUILTIN_LED, ledState); + digitalWrite(LED_BUILTIN, ledState); } } From ebc2667d1546b700a89089f294c7b9b9b18e32fb Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 2 Feb 2016 16:00:56 +0100 Subject: [PATCH 13/23] changed BUILTIN_LED to LED_BUILTIN --- libraries/esp8266/examples/Blink/Blink.ino | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/esp8266/examples/Blink/Blink.ino b/libraries/esp8266/examples/Blink/Blink.ino index 578f368864..6391632a58 100644 --- a/libraries/esp8266/examples/Blink/Blink.ino +++ b/libraries/esp8266/examples/Blink/Blink.ino @@ -6,19 +6,19 @@ The blue LED on the ESP-01 module is connected to GPIO1 (which is also the TXD pin; so we cannot use Serial.print() at the same time) - Note that this sketch uses BUILTIN_LED to find the pin with the internal LED + Note that this sketch uses LED_BUILTIN to find the pin with the internal LED */ void setup() { - pinMode(BUILTIN_LED, OUTPUT); // Initialize the BUILTIN_LED pin as an output + pinMode(LED_BUILTIN, OUTPUT); // Initialize the LED_BUILTIN pin as an output } // the loop function runs over and over again forever void loop() { - digitalWrite(BUILTIN_LED, LOW); // Turn the LED on (Note that LOW is the voltage level + digitalWrite(LED_BUILTIN, LOW); // Turn the LED on (Note that LOW is the voltage level // but actually the LED is on; this is because // it is acive low on the ESP-01) delay(1000); // Wait for a second - digitalWrite(BUILTIN_LED, HIGH); // Turn the LED off by making the voltage HIGH + digitalWrite(LED_BUILTIN, HIGH); // Turn the LED off by making the voltage HIGH delay(2000); // Wait for two seconds (to demonstrate the active low LED) } From 1d97cac6599c540d30837f9b240ac9f86b734087 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Feb 2016 13:38:26 +0100 Subject: [PATCH 14/23] keep arduino incompatible BUILTIN_LED --- variants/generic/pins_arduino.h | 1 + 1 file changed, 1 insertion(+) diff --git a/variants/generic/pins_arduino.h b/variants/generic/pins_arduino.h index ac8799881e..f5483bda0c 100644 --- a/variants/generic/pins_arduino.h +++ b/variants/generic/pins_arduino.h @@ -42,6 +42,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 = 1; static const uint8_t LED_BUILTIN = 1; static const uint8_t A0 = 17; From b871b1ba8d652a66f0e65821e3c27886e60629fa Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Feb 2016 13:39:22 +0100 Subject: [PATCH 15/23] keep arduino incompatible BUILTIN_LED --- variants/espino/pins_arduino.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/variants/espino/pins_arduino.h b/variants/espino/pins_arduino.h index 6b8ef394ea..3ced0bf5b5 100644 --- a/variants/espino/pins_arduino.h +++ b/variants/espino/pins_arduino.h @@ -46,6 +46,11 @@ static const uint8_t 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; static const uint8_t A0 = 17; From 220b02aa8736fc15e56ef049ed55fa72821e6cad Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Feb 2016 13:39:59 +0100 Subject: [PATCH 16/23] keep arduino incompatible BUILTIN_LED --- variants/thing/pins_arduino.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/variants/thing/pins_arduino.h b/variants/thing/pins_arduino.h index 4340ec49ed..8c73b2fe08 100644 --- a/variants/thing/pins_arduino.h +++ b/variants/thing/pins_arduino.h @@ -44,6 +44,8 @@ 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; From fd6f7c046a7784a5aa201880eed750a3bbc0de77 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Feb 2016 13:40:31 +0100 Subject: [PATCH 17/23] keep arduino incompatible BUILTIN_LED --- variants/ESPDuino/pins_arduino.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/variants/ESPDuino/pins_arduino.h b/variants/ESPDuino/pins_arduino.h index 7c75ab365b..89de157822 100644 --- a/variants/ESPDuino/pins_arduino.h +++ b/variants/ESPDuino/pins_arduino.h @@ -43,6 +43,8 @@ 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 From ff62bfb34ddd3910e85e9c2d069f0a952279badf Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Feb 2016 13:41:10 +0100 Subject: [PATCH 18/23] keep arduino incompatible BUILTIN_LED --- variants/wifinfo/pins_arduino.h | 1 + 1 file changed, 1 insertion(+) diff --git a/variants/wifinfo/pins_arduino.h b/variants/wifinfo/pins_arduino.h index d2c24de3b3..69549b5ef1 100644 --- a/variants/wifinfo/pins_arduino.h +++ b/variants/wifinfo/pins_arduino.h @@ -48,6 +48,7 @@ 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; From cca2714f9dd3afc431236a4314ee18bd5d4e5593 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Feb 2016 13:41:41 +0100 Subject: [PATCH 19/23] keep arduino incompatible BUILTIN_LED --- variants/wifio/pins_arduino.h | 1 + 1 file changed, 1 insertion(+) diff --git a/variants/wifio/pins_arduino.h b/variants/wifio/pins_arduino.h index c2a2f986d4..24635b37c3 100644 --- a/variants/wifio/pins_arduino.h +++ b/variants/wifio/pins_arduino.h @@ -60,6 +60,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 SERIAL_PORT_MONITOR Serial From 0095de6041ad3821bebc4817fe3b471c9383b450 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Feb 2016 13:42:10 +0100 Subject: [PATCH 20/23] keep arduino incompatible BUILTIN_LED --- variants/d1/pins_arduino.h | 1 + 1 file changed, 1 insertion(+) diff --git a/variants/d1/pins_arduino.h b/variants/d1/pins_arduino.h index c302db7afa..7139b381db 100644 --- a/variants/d1/pins_arduino.h +++ b/variants/d1/pins_arduino.h @@ -43,6 +43,7 @@ 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; From 18dab661dbfeca76bdce578c620aebc4876a5273 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Feb 2016 13:42:36 +0100 Subject: [PATCH 21/23] keep arduino incompatible BUILTIN_LED --- variants/adafruit/pins_arduino.h | 1 + 1 file changed, 1 insertion(+) diff --git a/variants/adafruit/pins_arduino.h b/variants/adafruit/pins_arduino.h index d8d4c0f089..217317d030 100644 --- a/variants/adafruit/pins_arduino.h +++ b/variants/adafruit/pins_arduino.h @@ -43,6 +43,7 @@ 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; From e124f9c3ee4194d8ab3a1dd5611bee265e71c58f Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Feb 2016 13:42:59 +0100 Subject: [PATCH 22/23] keep arduino incompatible BUILTIN_LED --- variants/nodemcu/pins_arduino.h | 1 + 1 file changed, 1 insertion(+) diff --git a/variants/nodemcu/pins_arduino.h b/variants/nodemcu/pins_arduino.h index 34ee1992d6..ecfa07c756 100644 --- a/variants/nodemcu/pins_arduino.h +++ b/variants/nodemcu/pins_arduino.h @@ -43,6 +43,7 @@ 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; From 0c5a8a46b11ce3baf23df4958df3186aa0e2359e Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Feb 2016 13:43:23 +0100 Subject: [PATCH 23/23] keep arduino incompatible BUILTIN_LED --- variants/d1_mini/pins_arduino.h | 1 + 1 file changed, 1 insertion(+) diff --git a/variants/d1_mini/pins_arduino.h b/variants/d1_mini/pins_arduino.h index c0eb6a524e..61ddbe8200 100644 --- a/variants/d1_mini/pins_arduino.h +++ b/variants/d1_mini/pins_arduino.h @@ -43,6 +43,7 @@ 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;