From 8a61bdbfee66f5851dec18104f9215c2136416dc Mon Sep 17 00:00:00 2001 From: Arcao Date: Mon, 6 Feb 2017 17:57:04 +0100 Subject: [PATCH 1/2] Added boards constants for LED_BUILTIN and KEY_BUILTIN Sources: * esp320: http://wiki.sweetpeas.se/index.php?title=ESP320#Developing_using_the_Arduino_IDE * esp32thing: https://cdn.sparkfun.com/assets/learn_tutorials/5/0/7/esp32-thing-schematic.pdf * espea32: https://github.com/AprilBrother/ESPea32/blob/master/hardware/ESPea32-schematic.pdf * hornbill32dev: https://github.com/ExploreEmbedded/Hornbill-ESP32-DEV/blob/master/Design%20Files/Schematic/Hornbill%20Devboard.pdf * lolin32: values from existing header * nano32: http://iot-bits.com/closer-look-esp32-nano32/ * node32s: https://github.com/lamloei/node32s-book/blob/master/ch01/node32s-schematic.pdf --- variants/esp320/pins_arduino.h | 6 ++++++ variants/esp32thing/pins_arduino.h | 5 +++++ variants/espea32/pins_arduino.h | 5 ++++- variants/hornbill32dev/pins_arduino.h | 7 ++++++- variants/lolin32/pins_arduino.h | 6 ++++-- variants/nano32/pins_arduino.h | 5 ++++- variants/node32s/pins_arduino.h | 5 +++++ 7 files changed, 34 insertions(+), 5 deletions(-) diff --git a/variants/esp320/pins_arduino.h b/variants/esp320/pins_arduino.h index 3883918849f..66176f5eac0 100644 --- a/variants/esp320/pins_arduino.h +++ b/variants/esp320/pins_arduino.h @@ -9,6 +9,12 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) +static const uint8_t LED_BUILTIN = 5; +static const uint8_t BUILTIN_LED = 5; + +static const uint8_t TX = 1; +static const uint8_t RX = 3; + static const uint8_t SDA = 2; static const uint8_t SCL = 14; diff --git a/variants/esp32thing/pins_arduino.h b/variants/esp32thing/pins_arduino.h index 6485bc09763..96e255e2b9c 100644 --- a/variants/esp32thing/pins_arduino.h +++ b/variants/esp32thing/pins_arduino.h @@ -9,6 +9,11 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) +static const uint8_t LED_BUILTIN = 5; +static const uint8_t BUILTIN_LED = 5; + +static const uint8_t KEY_BUILTIN = 0; + static const uint8_t TX = 1; static const uint8_t RX = 3; diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h index c87e1a23cb5..a756fa998d2 100644 --- a/variants/espea32/pins_arduino.h +++ b/variants/espea32/pins_arduino.h @@ -9,7 +9,10 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) -#define LED_BUILTIN 5 +static const uint8_t LED_BUILTIN = 5; +static const uint8_t BUILTIN_LED = 5; + +static const uint8_t KEY_BUILTIN = 0; static const uint8_t TX = 1; static const uint8_t RX = 3; diff --git a/variants/hornbill32dev/pins_arduino.h b/variants/hornbill32dev/pins_arduino.h index a76095fe06d..99a2127aa7a 100644 --- a/variants/hornbill32dev/pins_arduino.h +++ b/variants/hornbill32dev/pins_arduino.h @@ -9,7 +9,12 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) -static const uint8_t TX = 1; +static const uint8_t LED_BUILTIN = 13; +static const uint8_t BUILTIN_LED = 13; + +static const uint8_t KEY_BUILTIN = 0; + +static const uint8_t TX = 1; static const uint8_t RX = 3; static const uint8_t SDA = 21; diff --git a/variants/lolin32/pins_arduino.h b/variants/lolin32/pins_arduino.h index cde7c0b4107..b651a3de4b6 100644 --- a/variants/lolin32/pins_arduino.h +++ b/variants/lolin32/pins_arduino.h @@ -9,8 +9,10 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) -#define LED_BUILTIN 2 -#define KEY_BUILTIN 0 +static const uint8_t LED_BUILTIN = 2; +static const uint8_t BUILTIN_LED = 2; + +static const uint8_t KEY_BUILTIN = 0; static const uint8_t TX = 1; static const uint8_t RX = 3; diff --git a/variants/nano32/pins_arduino.h b/variants/nano32/pins_arduino.h index 7a1cb982509..46b8764b9ab 100644 --- a/variants/nano32/pins_arduino.h +++ b/variants/nano32/pins_arduino.h @@ -9,7 +9,10 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) -#define LED_BUILTIN 16 +static const uint8_t LED_BUILTIN = 16; +static const uint8_t BUILTIN_LED = 16; + +static const uint8_t BUILTIN_KEY = 0; static const uint8_t TX = 1; static const uint8_t RX = 3; diff --git a/variants/node32s/pins_arduino.h b/variants/node32s/pins_arduino.h index 85452d36dd5..b651a3de4b6 100644 --- a/variants/node32s/pins_arduino.h +++ b/variants/node32s/pins_arduino.h @@ -9,6 +9,11 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) +static const uint8_t LED_BUILTIN = 2; +static const uint8_t BUILTIN_LED = 2; + +static const uint8_t KEY_BUILTIN = 0; + static const uint8_t TX = 1; static const uint8_t RX = 3; From 0761cb28565a0735231b9444dbf73e3ce9890ec0 Mon Sep 17 00:00:00 2001 From: Arcao Date: Mon, 6 Feb 2017 19:55:53 +0100 Subject: [PATCH 2/2] Replace BUILTIN_LED constant with #define --- variants/esp320/pins_arduino.h | 2 +- variants/esp32thing/pins_arduino.h | 2 +- variants/espea32/pins_arduino.h | 2 +- variants/hornbill32dev/pins_arduino.h | 2 +- variants/lolin32/pins_arduino.h | 2 +- variants/nano32/pins_arduino.h | 2 +- variants/node32s/pins_arduino.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/variants/esp320/pins_arduino.h b/variants/esp320/pins_arduino.h index 66176f5eac0..f69cc98b0fe 100644 --- a/variants/esp320/pins_arduino.h +++ b/variants/esp320/pins_arduino.h @@ -10,7 +10,7 @@ #define digitalPinHasPWM(p) (p < 34) static const uint8_t LED_BUILTIN = 5; -static const uint8_t BUILTIN_LED = 5; +#define BUILTIN_LED LED_BUILTIN // backward compatibility static const uint8_t TX = 1; static const uint8_t RX = 3; diff --git a/variants/esp32thing/pins_arduino.h b/variants/esp32thing/pins_arduino.h index 96e255e2b9c..3da4bf2ba00 100644 --- a/variants/esp32thing/pins_arduino.h +++ b/variants/esp32thing/pins_arduino.h @@ -10,7 +10,7 @@ #define digitalPinHasPWM(p) (p < 34) static const uint8_t LED_BUILTIN = 5; -static const uint8_t BUILTIN_LED = 5; +#define BUILTIN_LED LED_BUILTIN // backward compatibility static const uint8_t KEY_BUILTIN = 0; diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h index a756fa998d2..8ce2507d627 100644 --- a/variants/espea32/pins_arduino.h +++ b/variants/espea32/pins_arduino.h @@ -10,7 +10,7 @@ #define digitalPinHasPWM(p) (p < 34) static const uint8_t LED_BUILTIN = 5; -static const uint8_t BUILTIN_LED = 5; +#define BUILTIN_LED LED_BUILTIN // backward compatibility static const uint8_t KEY_BUILTIN = 0; diff --git a/variants/hornbill32dev/pins_arduino.h b/variants/hornbill32dev/pins_arduino.h index 99a2127aa7a..ef100575594 100644 --- a/variants/hornbill32dev/pins_arduino.h +++ b/variants/hornbill32dev/pins_arduino.h @@ -10,7 +10,7 @@ #define digitalPinHasPWM(p) (p < 34) static const uint8_t LED_BUILTIN = 13; -static const uint8_t BUILTIN_LED = 13; +#define BUILTIN_LED LED_BUILTIN // backward compatibility static const uint8_t KEY_BUILTIN = 0; diff --git a/variants/lolin32/pins_arduino.h b/variants/lolin32/pins_arduino.h index b651a3de4b6..e341357b0c5 100644 --- a/variants/lolin32/pins_arduino.h +++ b/variants/lolin32/pins_arduino.h @@ -10,7 +10,7 @@ #define digitalPinHasPWM(p) (p < 34) static const uint8_t LED_BUILTIN = 2; -static const uint8_t BUILTIN_LED = 2; +#define BUILTIN_LED LED_BUILTIN // backward compatibility static const uint8_t KEY_BUILTIN = 0; diff --git a/variants/nano32/pins_arduino.h b/variants/nano32/pins_arduino.h index 46b8764b9ab..e50bd30d988 100644 --- a/variants/nano32/pins_arduino.h +++ b/variants/nano32/pins_arduino.h @@ -10,7 +10,7 @@ #define digitalPinHasPWM(p) (p < 34) static const uint8_t LED_BUILTIN = 16; -static const uint8_t BUILTIN_LED = 16; +#define BUILTIN_LED LED_BUILTIN // backward compatibility static const uint8_t BUILTIN_KEY = 0; diff --git a/variants/node32s/pins_arduino.h b/variants/node32s/pins_arduino.h index b651a3de4b6..e341357b0c5 100644 --- a/variants/node32s/pins_arduino.h +++ b/variants/node32s/pins_arduino.h @@ -10,7 +10,7 @@ #define digitalPinHasPWM(p) (p < 34) static const uint8_t LED_BUILTIN = 2; -static const uint8_t BUILTIN_LED = 2; +#define BUILTIN_LED LED_BUILTIN // backward compatibility static const uint8_t KEY_BUILTIN = 0;