Added to all pins_arduino.h that need it. Fixes espressif#4134

lbernstone · lbernstone · commit b6402ad1cd64 · 2020-11-10T07:16:40.000-07:00
diff --git a/variants/Microduino-esp32/pins_arduino.h b/variants/Microduino-esp32/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = -1;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 #define MTDO 15
 #define MTDI 12
diff --git a/variants/S_ODI_Ultra_v1/pins_arduino.h b/variants/S_ODI_Ultra_v1/pins_arduino.h
@@ -14,7 +14,9 @@
 static const uint8_t LED_BUILTIN = 2;
 static const uint8_t LED_BUILTINB = 4;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 #define BUILTIN_LED2  LED_BUILTINB
+#define LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/alksesp32/pins_arduino.h b/variants/alksesp32/pins_arduino.h
@@ -15,6 +15,7 @@
 
 static const uint8_t LED_BUILTIN = 23;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/d1_mini32/pins_arduino.h b/variants/d1_mini32/pins_arduino.h
@@ -6,6 +6,7 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 static const uint8_t _VBAT = 35; // battery voltage
 
 #define PIN_WIRE_SDA SDA // backward compatibility
diff --git a/variants/d32/pins_arduino.h b/variants/d32/pins_arduino.h
@@ -6,6 +6,7 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 static const uint8_t _VBAT = 35; // battery voltage
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/d32_pro/pins_arduino.h b/variants/d32_pro/pins_arduino.h
@@ -6,6 +6,7 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 static const uint8_t _VBAT = 35; // battery voltage
 
 
diff --git a/variants/doitESP32devkitV1/pins_arduino.h b/variants/doitESP32devkitV1/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/doitESPduino32/pins_arduino.h b/variants/doitESPduino32/pins_arduino.h
@@ -0,0 +1,62 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        40
+#define NUM_ANALOG_INPUTS       16
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 34)
+
+static const uint8_t LED_BUILTIN = 2;
+#define BUILTIN_LED LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
+
+
+static const uint8_t SDA = 21;
+static const uint8_t SCL = 22;
+
+//SPI
+static const uint8_t IO5    = 5; //SS
+static const uint8_t IO23  = 23; //MOSI
+static const uint8_t IO19  = 19; //MISO
+static const uint8_t IO18   = 18; //SCK
+
+//ANALOG
+static const uint8_t IO36 = 36;
+static const uint8_t IO39 = 39;
+static const uint8_t IO4 = 4;
+static const uint8_t IO2 = 2;
+static const uint8_t IO35 = 35;
+//ANALOG+
+static const uint8_t IO15 = 15;
+static const uint8_t IO33 = 33;
+static const uint8_t IO32 = 32;
+static const uint8_t IO0 = 0;
+
+//DIGITAL
+static const uint8_t IO13 = 13;
+static const uint8_t IO12 = 12;
+static const uint8_t IO14 = 14;
+static const uint8_t IO27 = 27;
+static const uint8_t IO16 = 16;
+static const uint8_t IO17 = 17;
+static const uint8_t IO25 = 25;
+static const uint8_t IO26 = 26;
+static const uint8_t TX0 = 1;
+static const uint8_t RX0 = 3;
+//TFlash(uSD)
+static const uint8_t SD2 = 9;
+static const uint8_t SD3 = 10;
+static const uint8_t CMD = 11;
+static const uint8_t CLK = 6;
+static const uint8_t SD0 = 7;
+static const uint8_t SD1 = 8;
+
+// ESP-WROOM-32 does not have GPIO 14, 20(NC), 24, 28, 29, 30, 31, 36, 37, 38, 40+
+// All pins should be PWM capable. The board is a clone of WeMos D1 R32.
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/esp32-gateway/pins_arduino.h b/variants/esp32-gateway/pins_arduino.h
@@ -18,6 +18,7 @@
 
 static const uint8_t LED_BUILTIN = 33;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 34;
 
diff --git a/variants/esp320/pins_arduino.h b/variants/esp320/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 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
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/esp32thing_plus/pins_arduino.h b/variants/esp32thing_plus/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t TX = 17;
 static const uint8_t RX = 16;
diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/espectro32/pins_arduino.h b/variants/espectro32/pins_arduino.h
@@ -17,6 +17,7 @@
 
 static const uint8_t LED_BUILTIN = 15;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/espino32/pins_arduino.h b/variants/espino32/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 16;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t BUILTIN_KEY = 0;
 
diff --git a/variants/feather_esp32/pins_arduino.h b/variants/feather_esp32/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t TX = 17;
 static const uint8_t RX = 16;
diff --git a/variants/firebeetle32/pins_arduino.h b/variants/firebeetle32/pins_arduino.h
@@ -15,6 +15,7 @@ typedef unsigned char uint8_t;
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 
 
diff --git a/variants/fm-devkit/pins_arduino.h b/variants/fm-devkit/pins_arduino.h
@@ -16,6 +16,8 @@ static const uint8_t RX = 3;
 
 // IO
 static const uint8_t LED_BUILTIN = 5;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 static const uint8_t SW1 = 4;
 static const uint8_t SW2 = 18;
 static const uint8_t SW3 = 19;
diff --git a/variants/gpy/pins_arduino.h b/variants/gpy/pins_arduino.h
@@ -24,6 +24,7 @@
 
 static const uint8_t LED_BUILTIN = 0; // ->2812 RGB !!!
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 #define ANT_SELECT 21   // GPIO21 - WiFi external / internal antenna switch
 
diff --git a/variants/healthypi4/pins_arduino.h b/variants/healthypi4/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 15;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 17;
 
diff --git a/variants/heltec_wifi_kit_32/pins_arduino.h b/variants/heltec_wifi_kit_32/pins_arduino.h
@@ -17,6 +17,7 @@
 
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/heltec_wifi_lora_32/pins_arduino.h b/variants/heltec_wifi_lora_32/pins_arduino.h
@@ -17,6 +17,7 @@
 
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/heltec_wifi_lora_32_V2/pins_arduino.h b/variants/heltec_wifi_lora_32_V2/pins_arduino.h
@@ -17,6 +17,7 @@
 
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/heltec_wireless_stick/pins_arduino.h b/variants/heltec_wireless_stick/pins_arduino.h
@@ -17,6 +17,7 @@
 
 static const uint8_t LED_BUILTIN = 25;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/honeylemon/pins_arduino.h b/variants/honeylemon/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t BUILTIN_KEY = 0;
 
diff --git a/variants/hornbill32dev/pins_arduino.h b/variants/hornbill32dev/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/imbrios-logsens-v1p1/pins_arduino.h b/variants/imbrios-logsens-v1p1/pins_arduino.h
@@ -23,6 +23,7 @@
 /* LED_BUILTIN is kept for compatibility reason; mapped to LED2 on the LogSens V1.1 Board */
 static const uint8_t LED_BUILTIN = 33;
 #define BUILTIN_LED  LED_BUILTIN 	// backward compatibility
+#define LED_BUILTIN
 
 /* UART0: Serial Port for Programming and Debugging on the LogSens V1.1 Board */
 static const uint8_t TX = 1;
diff --git a/variants/intorobot-fig/pins_arduino.h b/variants/intorobot-fig/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 4;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t RGB_R_BUILTIN = 27;
 static const uint8_t RGB_G_BUILTIN = 21;
diff --git a/variants/lolin32/pins_arduino.h b/variants/lolin32/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 
 
diff --git a/variants/lopy/pins_arduino.h b/variants/lopy/pins_arduino.h
@@ -24,6 +24,7 @@
 
 static const uint8_t LED_BUILTIN = 0; // ->2812 RGB !!!
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 #define ANT_SELECT 16   // GPIO16 - External Antenna Switch
 
diff --git a/variants/lopy4/pins_arduino.h b/variants/lopy4/pins_arduino.h
@@ -24,6 +24,7 @@
 
 static const uint8_t LED_BUILTIN = 0; // ->2812 RGB !!!
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 #define ANT_SELECT 21   // GPIO21 - External Antenna Switch
 
diff --git a/variants/magicbit/pins_arduino.h b/variants/magicbit/pins_arduino.h
@@ -67,5 +67,7 @@ static const uint8_t MOTOR1B = 18;
 static const uint8_t MOTOR2A = 16;
 static const uint8_t MOTOR2B = 17;
 static const uint8_t LED_BUILTIN=16;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/metro_esp-32/pins_arduino.h b/variants/metro_esp-32/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/mgbot-iotik32a/pins_arduino.h b/variants/mgbot-iotik32a/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 4;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/mgbot-iotik32b/pins_arduino.h b/variants/mgbot-iotik32b/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 // IR receiver
 static const uint8_t IR = 27;
diff --git a/variants/mhetesp32devkit/pins_arduino.h b/variants/mhetesp32devkit/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN 
+#define LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/mhetesp32minikit/pins_arduino.h b/variants/mhetesp32minikit/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN 
+#define LED_BUILTIN
 
 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
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 16;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t BUILTIN_KEY = 0;
 
diff --git a/variants/node32s/pins_arduino.h b/variants/node32s/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/nodemcu-32s/pins_arduino.h b/variants/nodemcu-32s/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/odroid_esp32/pins_arduino.h b/variants/odroid_esp32/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/onehorse32dev/pins_arduino.h b/variants/onehorse32dev/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/openkb/pins_arduino.h b/variants/openkb/pins_arduino.h
diff --git a/variants/oroca_edubot/pins_arduino.h b/variants/oroca_edubot/pins_arduino.h
diff --git a/variants/piranha_esp-32/pins_arduino.h b/variants/piranha_esp-32/pins_arduino.h
diff --git a/variants/pocket_32/pins_arduino.h b/variants/pocket_32/pins_arduino.h
diff --git a/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h b/variants/sparkfun_lora_gateway_1-channel/pins_arduino.h
diff --git a/variants/tbeam/pins_arduino.h b/variants/tbeam/pins_arduino.h
diff --git a/variants/ttgo-lora32-v1/pins_arduino.h b/variants/ttgo-lora32-v1/pins_arduino.h
diff --git a/variants/ttgo-lora32-v2/pins_arduino.h b/variants/ttgo-lora32-v2/pins_arduino.h
diff --git a/variants/ttgo-lora32-v21new/pins_arduino.h b/variants/ttgo-lora32-v21new/pins_arduino.h
diff --git a/variants/ttgo-t1/pins_arduino.h b/variants/ttgo-t1/pins_arduino.h
diff --git a/variants/turta_iot_node/pins_arduino.h b/variants/turta_iot_node/pins_arduino.h
diff --git a/variants/vintlabsdevkitv1/pins_arduino.h b/variants/vintlabsdevkitv1/pins_arduino.h
diff --git a/variants/widora-air/pins_arduino.h b/variants/widora-air/pins_arduino.h
diff --git a/variants/wifiduino32/pins_arduino.h b/variants/wifiduino32/pins_arduino.h
diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h
diff --git a/variants/xinabox/pins_arduino.h b/variants/xinabox/pins_arduino.h

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ typedef unsigned char uint8_t;`
`15`	`15`
`16`	`16`	`static const uint8_t LED_BUILTIN = 2;`
`17`	`17`	`#define BUILTIN_LED LED_BUILTIN // backward compatibility`
	`18`	`+#define LED_BUILTIN`
`18`	`19`
`19`	`20`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`static const uint8_t LED_BUILTIN = 5;`
`15`	`15`	`#define BUILTIN_LED LED_BUILTIN // backward compatibility`
	`16`	`+#define LED_BUILTIN`
`16`	`17`
`17`	`18`
`18`	`19`