fix(rgbled): variants - use RGB_LED naming

SuGlider · SuGlider · commit db59126fecbd · 2024-08-22T18:30:34.000-03:00
diff --git a/variants/Bee_Data_Logger/pins_arduino.h b/variants/Bee_Data_Logger/pins_arduino.h
@@ -65,9 +65,9 @@ static const uint8_t LDO2 = 34;
 static const uint8_t RGB_DATA = 40;
 static const uint8_t RGB_PWR = 34;
 
-#define PIN_NEOPIXEL RGB_DATA
+#define PIN_RGB_LED RGB_DATA
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/Bee_Motion_S3/pins_arduino.h b/variants/Bee_Motion_S3/pins_arduino.h
@@ -73,9 +73,9 @@ static const uint8_t LDO2 = 34;
 static const uint8_t RGB_DATA = 40;
 static const uint8_t RGB_PWR = 34;
 
-#define PIN_NEOPIXEL RGB_DATA
+#define PIN_RGB_LED RGB_DATA
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/Bee_S3/pins_arduino.h b/variants/Bee_S3/pins_arduino.h
@@ -62,9 +62,9 @@ static const uint8_t VBAT_VOLTAGE = 1;
 static const uint8_t RGB_DATA = 48;
 static const uint8_t RGB_PWR = 34;
 
-#define PIN_NEOPIXEL RGB_DATA
+#define PIN_RGB_LED RGB_DATA
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite
diff --git a/variants/bpi_leaf_s3/pins_arduino.h b/variants/bpi_leaf_s3/pins_arduino.h
@@ -13,9 +13,9 @@
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
 // and change this setup for the chosen pin (for example 38)
-#define PIN_NEOPIXEL 48
+#define PIN_RGB_LED 48
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/circuitart_zero_s3/pins_arduino.h b/variants/circuitart_zero_s3/pins_arduino.h
@@ -14,11 +14,11 @@
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 
 // Neopixel
-#define PIN_NEOPIXEL 47
+#define PIN_RGB_LED 47
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking
-#define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
+#define RGB_BUILTIN    (PIN_RGB_LED + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
-#define NEOPIXEL_NUM   1  // number of neopixels
+#define RGBLED_NUM   1  // number of RGB LEDs
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h
@@ -15,14 +15,14 @@
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 
 // Neopixel
-#define PIN_NEOPIXEL 33
+#define PIN_RGB_LED 33
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWritee() for blinking
-#define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
+#define RGB_BUILTIN    (PIN_RGB_LED + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
-#define NEOPIXEL_NUM       1     // number of neopixels
-#define NEOPIXEL_POWER     21    // power pin
-#define NEOPIXEL_POWER_ON  HIGH  // power pin state when on
+#define RGBLED_NUM       1     // number of RGB LEDs
+#define RGBLED_POWER     21    // power pin
+#define RGBLED_POWER_ON  HIGH  // power pin state when on
 #define PIN_SERVO          2     // servo pin
 #define PIN_ISOLATED_INPUT 40    // optocoupled input
 
diff --git a/variants/department_of_alchemy_minimain_esp32s2/variant.cpp b/variants/department_of_alchemy_minimain_esp32s2/variant.cpp
@@ -31,7 +31,7 @@ extern "C" {
 void initVariant(void) {
   // This board has a power control pin, and we must set it to output and high
   // in order to enable the NeoPixels.
-  pinMode(NEOPIXEL_POWER, OUTPUT);
-  digitalWrite(NEOPIXEL_POWER, HIGH);
+  pinMode(RGBLED_POWER, OUTPUT);
+  digitalWrite(RGBLED_POWER, HIGH);
 }
 }
diff --git a/variants/esp32c3/pins_arduino.h b/variants/esp32c3/pins_arduino.h
@@ -4,9 +4,9 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 8
+#define PIN_RGB_LED 8
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/esp32c6/pins_arduino.h b/variants/esp32c6/pins_arduino.h
@@ -4,9 +4,9 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 8
+#define PIN_RGB_LED 8
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/esp32h2-devkit-lipo/pins_arduino.h b/variants/esp32h2-devkit-lipo/pins_arduino.h
@@ -4,9 +4,9 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 8
+#define PIN_RGB_LED 8
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/esp32h2/pins_arduino.h b/variants/esp32h2/pins_arduino.h
@@ -4,9 +4,9 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 8
+#define PIN_RGB_LED 8
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite
diff --git a/variants/esp32s2-devkit-lipo-usb/pins_arduino.h b/variants/esp32s2-devkit-lipo-usb/pins_arduino.h
@@ -4,8 +4,8 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL   18
-#define RGB_BUILTIN    PIN_NEOPIXEL
+#define PIN_RGB_LED   18
+#define RGB_BUILTIN    PIN_RGB_LED
 #define RGB_BRIGHTNESS 64
 
 static const uint8_t BUT_BUILTIN = 0;
diff --git a/variants/esp32s2-devkit-lipo/pins_arduino.h b/variants/esp32s2-devkit-lipo/pins_arduino.h
@@ -4,8 +4,8 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL   18
-#define RGB_BUILTIN    PIN_NEOPIXEL
+#define PIN_RGB_LED   18
+#define RGB_BUILTIN    PIN_RGB_LED
 #define RGB_BRIGHTNESS 64
 
 static const uint8_t BUT_BUILTIN = 0;
diff --git a/variants/esp32s2/pins_arduino.h b/variants/esp32s2/pins_arduino.h
@@ -5,11 +5,11 @@
 #include "soc/soc_caps.h"
 
 // GPIO pin for Saola-1 & DevKitM-1 = 18
-#define PIN_NEOPIXEL 18
+#define PIN_RGB_LED 18
 // GPIO pin for Kaluga = 45
-//#define PIN_NEOPIXEL 45
+//#define PIN_RGB_LED 45
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/esp32s3/pins_arduino.h b/variants/esp32s3/pins_arduino.h
@@ -10,9 +10,9 @@
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
 // and change this setup for the chosen pin (for example 38)
-#define PIN_NEOPIXEL 48
+#define PIN_RGB_LED 48
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/franzininho_wifi_esp32s2/pins_arduino.h b/variants/franzininho_wifi_esp32s2/pins_arduino.h
@@ -11,9 +11,9 @@
 #define USB_SERIAL         "0"
 #define USB_WEBUSB_ENABLED false
 
-static const uint8_t PIN_NEOPIXEL = 18;
+static const uint8_t PIN_RGB_LED = 18;
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+static const uint8_t LED_BUILTIN = (PIN_RGB_LED + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
@@ -18,9 +18,9 @@
 #define USB_FW_MSC_VOLUME_NAME      "S2-Firmware"   //max 11 chars
 #define USB_FW_MSC_SERIAL_NUMBER    0x00000000
 
-static const uint8_t PIN_NEOPIXEL = 18;
+static const uint8_t PIN_RGB_LED = 18;
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+static const uint8_t LED_BUILTIN = (PIN_RGB_LED + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/gpy/pins_arduino.h b/variants/gpy/pins_arduino.h
@@ -16,8 +16,8 @@
 #define LTE_BAUD 921600
 
 // Neopixel
-#define PIN_NEOPIXEL 0  // ->2812 RGB !!!
-static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT;
+#define PIN_RGB_LED 0  // ->2812 RGB !!!
+static const uint8_t LED_BUILTIN = PIN_RGB_LED + SOC_GPIO_PIN_COUNT;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/lopy/pins_arduino.h b/variants/lopy/pins_arduino.h
@@ -16,8 +16,8 @@
 #define LORA_IO2  LORA_IRQ  // tied by diode to IO0
 
 // Neopixel
-#define PIN_NEOPIXEL 0  // ->2812 RGB !!!
-static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT;
+#define PIN_RGB_LED 0  // ->2812 RGB !!!
+static const uint8_t LED_BUILTIN = PIN_RGB_LED + SOC_GPIO_PIN_COUNT;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/lopy4/pins_arduino.h b/variants/lopy4/pins_arduino.h
@@ -16,8 +16,8 @@
 #define LORA_RST  NOT_A_PIN
 
 // Neopixel
-#define PIN_NEOPIXEL 0  // ->2812 RGB !!!
-static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT;
+#define PIN_RGB_LED 0  // ->2812 RGB !!!
+static const uint8_t LED_BUILTIN = PIN_RGB_LED + SOC_GPIO_PIN_COUNT;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/sensebox_mcu_esp32s2/pins_arduino.h b/variants/sensebox_mcu_esp32s2/pins_arduino.h
@@ -16,9 +16,9 @@
 #define USB_FW_MSC_VOLUME_NAME      "senseBox"        // max 11 chars
 #define USB_FW_MSC_SERIAL_NUMBER    0x00000000
 
-#define PIN_NEOPIXEL 1  // NeoPixel LED
-#define NEOPIXEL_PIN 1  // NeoPixel LED
-#define NEOPIXEL_NUM 1  // number of neopixels
+#define PIN_RGB_LED 1  // RGB LED
+#define RGBLED_PIN 1  // RGB LED
+#define RGBLED_NUM 1  // number of RGB LEDs
 
 // Default I2C QWIIC-Ports
 static const uint8_t SDA = 39;
diff --git a/variants/sensebox_mcu_esp32s2/variant.cpp b/variants/sensebox_mcu_esp32s2/variant.cpp
@@ -34,8 +34,8 @@ void initVariant(void) {
   digitalWrite(IO_ENABLE, LOW);
 
   //reset RGB
-  pinMode(PIN_NEOPIXEL, OUTPUT);
-  digitalWrite(PIN_NEOPIXEL, LOW);
+  pinMode(PIN_RGB_LED, OUTPUT);
+  digitalWrite(PIN_RGB_LED, LOW);
 
   //enable XBEE by default
   pinMode(PIN_XB1_ENABLE, OUTPUT);
diff --git a/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h b/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h
@@ -4,9 +4,9 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 23
+#define PIN_RGB_LED 23
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/thingpulse_epulse_feather_c6/pins_arduino.h b/variants/thingpulse_epulse_feather_c6/pins_arduino.h
@@ -4,9 +4,9 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 8
+#define PIN_RGB_LED 8
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()
diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h
@@ -5,9 +5,9 @@
 #include "soc/soc_caps.h"
 
 // Neopixel
-#define PIN_NEOPIXEL 0  // ->2812 RGB !!!
+#define PIN_RGB_LED 0  // ->2812 RGB !!!
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+static const uint8_t LED_BUILTIN = (PIN_RGB_LED + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite()

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ extern "C" {`
`31`	`31`	`void initVariant(void) {`
`32`	`32`	`// This board has a power control pin, and we must set it to output and high`
`33`	`33`	`// in order to enable the NeoPixels.`
`34`		`- pinMode(NEOPIXEL_POWER, OUTPUT);`
`35`		`- digitalWrite(NEOPIXEL_POWER, HIGH);`
	`34`	`+ pinMode(RGBLED_POWER, OUTPUT);`
	`35`	`+ digitalWrite(RGBLED_POWER, HIGH);`
`36`	`36`	`}`
`37`	`37`	`}`