From 140a4f291e7676a3af08b99f50c3d4908f9cac07 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Thu, 22 Aug 2024 17:52:00 -0300 Subject: [PATCH 01/21] fix(rgbled): fixes core rgbledWrite() --- cores/esp32/esp32-hal-gpio.c | 2 +- cores/esp32/io_pin_remap.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/esp32/esp32-hal-gpio.c b/cores/esp32/esp32-hal-gpio.c index 98dc26599be..74a56a4950d 100644 --- a/cores/esp32/esp32-hal-gpio.c +++ b/cores/esp32/esp32-hal-gpio.c @@ -166,7 +166,7 @@ extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val) { //use RMT to set all channels on/off RGB_BUILTIN_storage = val; const uint8_t comm_val = val != 0 ? RGB_BRIGHTNESS : 0; - neopixelWrite(RGB_BUILTIN, comm_val, comm_val, comm_val); + rgbledWrite(RGB_BUILTIN, comm_val, comm_val, comm_val); return; } #endif // RGB_BUILTIN diff --git a/cores/esp32/io_pin_remap.h b/cores/esp32/io_pin_remap.h index 4e422632ea4..93a07b0b855 100644 --- a/cores/esp32/io_pin_remap.h +++ b/cores/esp32/io_pin_remap.h @@ -77,7 +77,7 @@ int8_t gpioNumberToDigitalPin(int8_t gpioNumber); #define pinMatrixOutDetach(pin, invertOut, invertEnable) pinMatrixOutDetach(digitalPinToGPIONumber(pin), invertOut, invertEnable) // cores/esp32/esp32-hal-rgb-led.h -#define neopixelWrite(pin, red_val, green_val, blue_val) neopixelWrite(digitalPinToGPIONumber(pin), red_val, green_val, blue_val) +#define rgbledWrite(pin, red_val, green_val, blue_val) rgbledWrite(digitalPinToGPIONumber(pin), red_val, green_val, blue_val) // cores/esp32/esp32-hal-rmt.h #define rmtInit(pin, channel_direction, memsize, frequency_Hz) rmtInit(digitalPinToGPIONumber(pin), channel_direction, memsize, frequency_Hz) From 5cc9b8b3855f6f0098d5d3f896bbc1e16b23cb49 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Thu, 22 Aug 2024 17:53:00 -0300 Subject: [PATCH 02/21] fix(rgbled): fixes examples - rgbledWrite() --- .../ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino | 10 +++++----- .../Legacy_RMT_Driver_Compatible.ino | 2 +- .../RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino | 14 +++++++------- .../Zigbee/Zigbee_Light_Bulb/README.md | 2 +- .../Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino | 4 ++-- .../examples/COAP/coap_lamp/coap_lamp.ino | 18 +++++++++--------- .../examples/COAP/coap_switch/coap_switch.ino | 12 ++++++------ 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino b/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino index fa4e7596099..105ae392ca0 100644 --- a/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino +++ b/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino @@ -6,7 +6,7 @@ Calling digitalWrite(RGB_BUILTIN, HIGH) will use hidden RGB driver. RGBLedWrite demonstrates control of each channel: - void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) + void rgbledWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) WARNING: After using digitalWrite to drive RGB LED it will be impossible to drive the same pin with normal HIGH/LOW level @@ -27,13 +27,13 @@ void loop() { digitalWrite(RGB_BUILTIN, LOW); // Turn the RGB LED off delay(1000); - neopixelWrite(RGB_BUILTIN, RGB_BRIGHTNESS, 0, 0); // Red + rgbledWrite(RGB_BUILTIN, RGB_BRIGHTNESS, 0, 0); // Red delay(1000); - neopixelWrite(RGB_BUILTIN, 0, RGB_BRIGHTNESS, 0); // Green + rgbledWrite(RGB_BUILTIN, 0, RGB_BRIGHTNESS, 0); // Green delay(1000); - neopixelWrite(RGB_BUILTIN, 0, 0, RGB_BRIGHTNESS); // Blue + rgbledWrite(RGB_BUILTIN, 0, 0, RGB_BRIGHTNESS); // Blue delay(1000); - neopixelWrite(RGB_BUILTIN, 0, 0, 0); // Off / black + rgbledWrite(RGB_BUILTIN, 0, 0, 0); // Off / black delay(1000); #endif } diff --git a/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino b/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino index 74578f755dc..c34fe38a87b 100644 --- a/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino +++ b/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino @@ -17,7 +17,7 @@ #else // add the file "build_opt.h" to your Arduino project folder with "-DESP32_ARDUINO_NO_RGB_BUILTIN" to use the RMT Legacy driver -// neoPixelWrite() is a function that writes to the RGB LED and it won't be available here +// rgbledWrite() is a function that writes to the RGB LED and it won't be available here #include "driver/rmt.h" bool installed = false; diff --git a/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino b/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino index 93ab0182802..39b21b7adb0 100644 --- a/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino +++ b/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino @@ -17,7 +17,7 @@ * that RMT works on any CPU/APB Frequency. * * It uses an ESP32 Arduino builtin RGB NeoLED function based on RMT: - * void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) + * void rgbledWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) * * The output is a visual WS2812 RGB LED color change routine using each time a * different CPU Frequency, just to illustrate how it works. Serial output indicates @@ -65,22 +65,22 @@ void loop() { Serial.updateBaudRate(115200); Serial.printf("\n--changed CPU Frequency to %lu MHz\n", getCpuFrequencyMhz()); - neopixelWrite(RGB_LED_GPIO, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS); // White + rgbledWrite(RGB_LED_GPIO, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS); // White Serial.println("White"); delay(1000); - neopixelWrite(RGB_LED_GPIO, 0, 0, 0); // Off + rgbledWrite(RGB_LED_GPIO, 0, 0, 0); // Off Serial.println("Off"); delay(1000); - neopixelWrite(RGB_LED_GPIO, BRIGHTNESS, 0, 0); // Red + rgbledWrite(RGB_LED_GPIO, BRIGHTNESS, 0, 0); // Red Serial.println("Red"); delay(1000); - neopixelWrite(RGB_LED_GPIO, 0, BRIGHTNESS, 0); // Green + rgbledWrite(RGB_LED_GPIO, 0, BRIGHTNESS, 0); // Green Serial.println("Green"); delay(1000); - neopixelWrite(RGB_LED_GPIO, 0, 0, BRIGHTNESS); // Blue + rgbledWrite(RGB_LED_GPIO, 0, 0, BRIGHTNESS); // Blue Serial.println("Blue"); delay(1000); - neopixelWrite(RGB_LED_GPIO, 0, 0, 0); // Off + rgbledWrite(RGB_LED_GPIO, 0, 0, 0); // Off Serial.println("Off"); delay(1000); } diff --git a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md index cccc97aec98..b3d2ceca1a2 100644 --- a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md +++ b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md @@ -20,7 +20,7 @@ Currently, this example supports the following targets. ### Configure the Project Set the LED GPIO by changing the `LED_PIN` definition. By default, the LED_PIN is `RGB_BUILTIN`. -By default, the `neoPixelWrite` function is used to control the LED. You can change it to digitalWrite to control a simple LED. +By default, the `rgbledWrite` function is used to control the LED. You can change it to digitalWrite to control a simple LED. #### Using Arduino IDE diff --git a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino index 67b9123c937..9a1b0524b70 100644 --- a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino +++ b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino @@ -155,7 +155,7 @@ static esp_err_t zb_attribute_handler(const esp_zb_zcl_set_attr_value_message_t if (message->attribute.id == ESP_ZB_ZCL_ATTR_ON_OFF_ON_OFF_ID && message->attribute.data.type == ESP_ZB_ZCL_ATTR_TYPE_BOOL) { light_state = message->attribute.data.value ? *(bool *)message->attribute.data.value : light_state; log_i("Light sets to %s", light_state ? "On" : "Off"); - neopixelWrite(LED_PIN, 255 * light_state, 255 * light_state, 255 * light_state); // Toggle light + rgbledWrite(LED_PIN, 255 * light_state, 255 * light_state, 255 * light_state); // Toggle light } } } @@ -172,7 +172,7 @@ void setup() { ESP_ERROR_CHECK(esp_zb_platform_config(&config)); // Init RMT and leave light OFF - neopixelWrite(LED_PIN, 0, 0, 0); + rgbledWrite(LED_PIN, 0, 0, 0); // Start Zigbee task xTaskCreate(esp_zb_task, "Zigbee_main", 4096, NULL, 5, NULL); diff --git a/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino b/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino index 81d9b35e48f..ca31ad1fba4 100644 --- a/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino +++ b/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino @@ -55,7 +55,7 @@ bool otDeviceSetup(const char **otSetupCmds, uint8_t nCmds1, const char **otCoap } if (i != nCmds1) { log_e("Sorry, OpenThread Network setup failed!"); - neopixelWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.println("OpenThread started.\r\nWaiting for activating correct Device Role."); @@ -69,7 +69,7 @@ bool otDeviceSetup(const char **otSetupCmds, uint8_t nCmds1, const char **otCoap Serial.println(); if (!tries) { log_e("Sorry, Device Role failed by timeout! Current Role: %s.", otGetStringDeviceRole()); - neopixelWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.printf("Device is %s.\r\n", otGetStringDeviceRole()); @@ -80,12 +80,12 @@ bool otDeviceSetup(const char **otSetupCmds, uint8_t nCmds1, const char **otCoap } if (i != nCmds2) { log_e("Sorry, OpenThread CoAP setup failed!"); - neopixelWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.println("OpenThread setup done. Node is ready."); // all fine! LED goes Green - neopixelWrite(RGB_BUILTIN, 0, 64, 8); // GREEN ... Lamp is ready! + rgbledWrite(RGB_BUILTIN, 0, 64, 8); // GREEN ... Lamp is ready! return true; } @@ -118,16 +118,16 @@ void otCOAPListen() { log_i("CoAP PUT [%s]\r\n", payload == '0' ? "OFF" : "ON"); if (payload == '0') { for (int16_t c = 248; c > 16; c -= 8) { - neopixelWrite(RGB_BUILTIN, c, c, c); // ramp down + rgbledWrite(RGB_BUILTIN, c, c, c); // ramp down delay(5); } - neopixelWrite(RGB_BUILTIN, 0, 0, 0); // Lamp Off + rgbledWrite(RGB_BUILTIN, 0, 0, 0); // Lamp Off } else { for (int16_t c = 16; c < 248; c += 8) { - neopixelWrite(RGB_BUILTIN, c, c, c); // ramp up + rgbledWrite(RGB_BUILTIN, c, c, c); // ramp up delay(5); } - neopixelWrite(RGB_BUILTIN, 255, 255, 255); // Lamp On + rgbledWrite(RGB_BUILTIN, 255, 255, 255); // Lamp On } } } @@ -136,7 +136,7 @@ void otCOAPListen() { void setup() { Serial.begin(115200); // LED starts RED, indicating not connected to Thread network. - neopixelWrite(RGB_BUILTIN, 64, 0, 0); + rgbledWrite(RGB_BUILTIN, 64, 0, 0); OThreadCLI.begin(false); // No AutoStart is necessary OThreadCLI.setTimeout(250); // waits 250ms for the OpenThread CLI response setupNode(); diff --git a/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino b/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino index 37942dcf576..d27cc3dd333 100644 --- a/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino +++ b/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino @@ -49,7 +49,7 @@ bool otDeviceSetup( } if (i != nCmds1) { log_e("Sorry, OpenThread Network setup failed!"); - neopixelWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.println("OpenThread started.\r\nWaiting for activating correct Device Role."); @@ -63,7 +63,7 @@ bool otDeviceSetup( Serial.println(); if (!tries) { log_e("Sorry, Device Role failed by timeout! Current Role: %s.", otGetStringDeviceRole()); - neopixelWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.printf("Device is %s.\r\n", otGetStringDeviceRole()); @@ -74,12 +74,12 @@ bool otDeviceSetup( } if (i != nCmds2) { log_e("Sorry, OpenThread CoAP setup failed!"); - neopixelWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.println("OpenThread setup done. Node is ready."); // all fine! LED goes and stays Blue - neopixelWrite(RGB_BUILTIN, 0, 0, 64); // BLUE ... Swtich is ready! + rgbledWrite(RGB_BUILTIN, 0, 0, 64); // BLUE ... Swtich is ready! return true; } @@ -149,7 +149,7 @@ void checkUserButton() { lastLampState = !lastLampState; if (!otCoapPUT(lastLampState)) { // failed: Lamp Node is not responding due to be off or unreachable // timeout from the CoAP PUT message... restart the node. - neopixelWrite(RGB_BUILTIN, 255, 0, 0); // RED ... something failed! + rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... something failed! Serial.println("Reseting the Node as Switch... wait."); // start over... setupNode(); @@ -161,7 +161,7 @@ void checkUserButton() { void setup() { Serial.begin(115200); // LED starts RED, indicating not connected to Thread network. - neopixelWrite(RGB_BUILTIN, 64, 0, 0); + rgbledWrite(RGB_BUILTIN, 64, 0, 0); OThreadCLI.begin(false); // No AutoStart is necessary OThreadCLI.setTimeout(250); // waits 250ms for the OpenThread CLI response setupNode(); From c18b017a8c5611707af03866dd0baddd238e82e0 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Thu, 22 Aug 2024 17:53:45 -0300 Subject: [PATCH 03/21] fix(rgbled): fixes variants commetaries - rgbledWrite() --- variants/Bee_Data_Logger/pins_arduino.h | 2 +- variants/Bee_Motion_S3/pins_arduino.h | 2 +- variants/Bee_S3/pins_arduino.h | 2 +- variants/adafruit_camera_esp32s3/pins_arduino.h | 2 +- variants/adafruit_feather_esp32_v2/pins_arduino.h | 2 +- variants/adafruit_feather_esp32c6/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s2/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s2_tft/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s3/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s3_tft/pins_arduino.h | 2 +- variants/adafruit_itsybitsy_esp32/pins_arduino.h | 2 +- variants/adafruit_magtag29_esp32s2/pins_arduino.h | 2 +- variants/adafruit_matrixportal_esp32s3/pins_arduino.h | 2 +- variants/adafruit_metro_esp32s2/pins_arduino.h | 2 +- variants/adafruit_metro_esp32s3/pins_arduino.h | 2 +- variants/adafruit_qtpy_esp32/pins_arduino.h | 2 +- variants/adafruit_qtpy_esp32c3/pins_arduino.h | 2 +- variants/adafruit_qtpy_esp32s2/pins_arduino.h | 2 +- variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h | 2 +- variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h | 2 +- variants/atmegazero_esp32s2/pins_arduino.h | 2 +- variants/bpi-bit/pins_arduino.h | 2 +- variants/bpi_leaf_s3/pins_arduino.h | 2 +- variants/circuitart_zero_s3/pins_arduino.h | 2 +- variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h | 2 +- variants/esp32c3/pins_arduino.h | 2 +- variants/esp32c6/pins_arduino.h | 2 +- variants/esp32h2-devkit-lipo/pins_arduino.h | 2 +- variants/esp32h2/pins_arduino.h | 2 +- variants/esp32s2/pins_arduino.h | 2 +- variants/esp32s3/pins_arduino.h | 2 +- variants/esp32thing_plus_c/pins_arduino.h | 2 +- variants/franzininho_wifi_esp32s2/pins_arduino.h | 2 +- variants/franzininho_wifi_msc_esp32s2/pins_arduino.h | 2 +- variants/gpy/pins_arduino.h | 2 +- variants/lopy/pins_arduino.h | 2 +- variants/lopy4/pins_arduino.h | 2 +- variants/micro_s2/pins_arduino.h | 2 +- variants/sparkfun_esp32c6_thing_plus/pins_arduino.h | 2 +- variants/thingpulse_epulse_feather_c6/pins_arduino.h | 2 +- variants/uPesy_esp32s3_basic/pins_arduino.h | 2 +- variants/um_bling/pins_arduino.h | 2 +- variants/um_feathers2neo/pins_arduino.h | 2 +- variants/um_feathers3/pins_arduino.h | 2 +- variants/um_feathers3neo/pins_arduino.h | 2 +- variants/um_nanos3/pins_arduino.h | 2 +- variants/um_pros3/pins_arduino.h | 2 +- variants/um_tinyc6/pins_arduino.h | 2 +- variants/um_tinys2/pins_arduino.h | 2 +- variants/um_tinys3/pins_arduino.h | 2 +- variants/wipy3/pins_arduino.h | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/variants/Bee_Data_Logger/pins_arduino.h b/variants/Bee_Data_Logger/pins_arduino.h index 9924e2eb38a..65b98a4d351 100644 --- a/variants/Bee_Data_Logger/pins_arduino.h +++ b/variants/Bee_Data_Logger/pins_arduino.h @@ -70,7 +70,7 @@ static const uint8_t RGB_PWR = 34; static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/Bee_Motion_S3/pins_arduino.h b/variants/Bee_Motion_S3/pins_arduino.h index a319f5ec161..1e0aa89bb6e 100644 --- a/variants/Bee_Motion_S3/pins_arduino.h +++ b/variants/Bee_Motion_S3/pins_arduino.h @@ -78,7 +78,7 @@ static const uint8_t RGB_PWR = 34; static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/Bee_S3/pins_arduino.h b/variants/Bee_S3/pins_arduino.h index b8bdd7f1d3b..83087177c3e 100644 --- a/variants/Bee_S3/pins_arduino.h +++ b/variants/Bee_S3/pins_arduino.h @@ -67,7 +67,7 @@ static const uint8_t RGB_PWR = 34; static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_camera_esp32s3/pins_arduino.h b/variants/adafruit_camera_esp32s3/pins_arduino.h index 8560b44f4fb..1c125c15921 100644 --- a/variants/adafruit_camera_esp32s3/pins_arduino.h +++ b/variants/adafruit_camera_esp32s3/pins_arduino.h @@ -18,7 +18,7 @@ static const uint8_t NEOPIXEL_PIN = 1; static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + 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 neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32_v2/pins_arduino.h b/variants/adafruit_feather_esp32_v2/pins_arduino.h index 89bd844e3b5..ac20694d2a5 100644 --- a/variants/adafruit_feather_esp32_v2/pins_arduino.h +++ b/variants/adafruit_feather_esp32_v2/pins_arduino.h @@ -46,7 +46,7 @@ static const uint8_t LED_BUILTIN = 13; // Neopixel #define PIN_NEOPIXEL 0 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32c6/pins_arduino.h b/variants/adafruit_feather_esp32c6/pins_arduino.h index f8a7b112161..fd0713afd87 100644 --- a/variants/adafruit_feather_esp32c6/pins_arduino.h +++ b/variants/adafruit_feather_esp32c6/pins_arduino.h @@ -9,7 +9,7 @@ static const uint8_t LED_BUILTIN = 15; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL) #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s2/pins_arduino.h b/variants/adafruit_feather_esp32s2/pins_arduino.h index 2e04e95e605..165867e1457 100644 --- a/variants/adafruit_feather_esp32s2/pins_arduino.h +++ b/variants/adafruit_feather_esp32s2/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h index 22c9e938007..77aa8c959fd 100644 --- a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h +++ b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h index 2717d441f7c..486731309f5 100644 --- a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h +++ b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s3/pins_arduino.h b/variants/adafruit_feather_esp32s3/pins_arduino.h index 679014b4df5..ad285df307c 100644 --- a/variants/adafruit_feather_esp32s3/pins_arduino.h +++ b/variants/adafruit_feather_esp32s3/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h index 0fd8b1e91ba..5ce4b64be13 100644 --- a/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h +++ b/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h index 4f76626a50b..7e006cc8782 100644 --- a/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h +++ b/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s3_tft/pins_arduino.h b/variants/adafruit_feather_esp32s3_tft/pins_arduino.h index 25cc9f785bc..7939e1f7c95 100644 --- a/variants/adafruit_feather_esp32s3_tft/pins_arduino.h +++ b/variants/adafruit_feather_esp32s3_tft/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_itsybitsy_esp32/pins_arduino.h b/variants/adafruit_itsybitsy_esp32/pins_arduino.h index bd7a09562e3..1b097352d64 100644 --- a/variants/adafruit_itsybitsy_esp32/pins_arduino.h +++ b/variants/adafruit_itsybitsy_esp32/pins_arduino.h @@ -11,7 +11,7 @@ static const uint8_t LED_BUILTIN = 13; // Neopixel static const uint8_t PIN_NEOPIXEL = 0; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_magtag29_esp32s2/pins_arduino.h b/variants/adafruit_magtag29_esp32s2/pins_arduino.h index 97977a0a6bc..fdaf4d147d6 100644 --- a/variants/adafruit_magtag29_esp32s2/pins_arduino.h +++ b/variants/adafruit_magtag29_esp32s2/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 1 // D1 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_matrixportal_esp32s3/pins_arduino.h b/variants/adafruit_matrixportal_esp32s3/pins_arduino.h index 9d5dd018b74..0a8ae5b1b0d 100644 --- a/variants/adafruit_matrixportal_esp32s3/pins_arduino.h +++ b/variants/adafruit_matrixportal_esp32s3/pins_arduino.h @@ -16,7 +16,7 @@ #define PIN_NEOPIXEL 4 #define NEOPIXEL_PIN 4 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_metro_esp32s2/pins_arduino.h b/variants/adafruit_metro_esp32s2/pins_arduino.h index 89235f5ab15..870866495c3 100644 --- a/variants/adafruit_metro_esp32s2/pins_arduino.h +++ b/variants/adafruit_metro_esp32s2/pins_arduino.h @@ -15,7 +15,7 @@ // Neopixel #define PIN_NEOPIXEL 45 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_metro_esp32s3/pins_arduino.h b/variants/adafruit_metro_esp32s3/pins_arduino.h index 80beb123e58..58cbdc537ca 100644 --- a/variants/adafruit_metro_esp32s3/pins_arduino.h +++ b/variants/adafruit_metro_esp32s3/pins_arduino.h @@ -15,7 +15,7 @@ // Neopixel #define PIN_NEOPIXEL 46 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_qtpy_esp32/pins_arduino.h b/variants/adafruit_qtpy_esp32/pins_arduino.h index 6080527cdda..699deb8abed 100644 --- a/variants/adafruit_qtpy_esp32/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32/pins_arduino.h @@ -11,7 +11,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_qtpy_esp32c3/pins_arduino.h b/variants/adafruit_qtpy_esp32c3/pins_arduino.h index 71affaad7d7..b0cc97179e2 100644 --- a/variants/adafruit_qtpy_esp32c3/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32c3/pins_arduino.h @@ -13,7 +13,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_qtpy_esp32s2/pins_arduino.h b/variants/adafruit_qtpy_esp32s2/pins_arduino.h index 9eb04c70467..b98d2a36e3d 100644 --- a/variants/adafruit_qtpy_esp32s2/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32s2/pins_arduino.h @@ -15,7 +15,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h index dc68c1f6998..ec3562976cc 100644 --- a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h @@ -18,7 +18,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h index 2c42f8c8db8..cfc8391fe07 100644 --- a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h @@ -18,7 +18,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/atmegazero_esp32s2/pins_arduino.h b/variants/atmegazero_esp32s2/pins_arduino.h index c28126dd397..ba31b59eb38 100644 --- a/variants/atmegazero_esp32s2/pins_arduino.h +++ b/variants/atmegazero_esp32s2/pins_arduino.h @@ -15,7 +15,7 @@ static const uint8_t NEOPIXEL = 40; static const uint8_t LED_BUILTIN = (NEOPIXEL + 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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/bpi-bit/pins_arduino.h b/variants/bpi-bit/pins_arduino.h index b6247c12ae9..58290f4de08 100644 --- a/variants/bpi-bit/pins_arduino.h +++ b/variants/bpi-bit/pins_arduino.h @@ -15,7 +15,7 @@ static const uint8_t RGB_LED = 4; // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino #define LED_BUILTIN (RGB_LED + SOC_GPIO_PIN_COUNT) // Just a single LED in the Matrix #define BUILTIN_LED LED_BUILTIN // backward compatibility -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 static const uint8_t LIGHT_SENSOR1 = 36; diff --git a/variants/bpi_leaf_s3/pins_arduino.h b/variants/bpi_leaf_s3/pins_arduino.h index 68083e2e1ea..046c52345e9 100644 --- a/variants/bpi_leaf_s3/pins_arduino.h +++ b/variants/bpi_leaf_s3/pins_arduino.h @@ -18,7 +18,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 25 diff --git a/variants/circuitart_zero_s3/pins_arduino.h b/variants/circuitart_zero_s3/pins_arduino.h index 6de73a7aecc..64f8419e13e 100644 --- a/variants/circuitart_zero_s3/pins_arduino.h +++ b/variants/circuitart_zero_s3/pins_arduino.h @@ -15,7 +15,7 @@ // Neopixel #define PIN_NEOPIXEL 47 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 #define NEOPIXEL_NUM 1 // number of neopixels diff --git a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h index c7ce982ff79..996e8cc557a 100644 --- a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h +++ b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/esp32c3/pins_arduino.h b/variants/esp32c3/pins_arduino.h index 9ad2102955c..855fb5d5268 100644 --- a/variants/esp32c3/pins_arduino.h +++ b/variants/esp32c3/pins_arduino.h @@ -9,7 +9,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32c6/pins_arduino.h b/variants/esp32c6/pins_arduino.h index 705c2b4d9ce..43ce8944216 100644 --- a/variants/esp32c6/pins_arduino.h +++ b/variants/esp32c6/pins_arduino.h @@ -9,7 +9,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32h2-devkit-lipo/pins_arduino.h b/variants/esp32h2-devkit-lipo/pins_arduino.h index 534b6d64fe1..fcf1322fc65 100644 --- a/variants/esp32h2-devkit-lipo/pins_arduino.h +++ b/variants/esp32h2-devkit-lipo/pins_arduino.h @@ -9,7 +9,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32h2/pins_arduino.h b/variants/esp32h2/pins_arduino.h index 99a6b1152c9..e782887f07c 100644 --- a/variants/esp32h2/pins_arduino.h +++ b/variants/esp32h2/pins_arduino.h @@ -9,7 +9,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32s2/pins_arduino.h b/variants/esp32s2/pins_arduino.h index 95ece4649c8..e09a677e92e 100644 --- a/variants/esp32s2/pins_arduino.h +++ b/variants/esp32s2/pins_arduino.h @@ -12,7 +12,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32s3/pins_arduino.h b/variants/esp32s3/pins_arduino.h index de3a6f975ce..313d879728f 100644 --- a/variants/esp32s3/pins_arduino.h +++ b/variants/esp32s3/pins_arduino.h @@ -15,7 +15,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32thing_plus_c/pins_arduino.h b/variants/esp32thing_plus_c/pins_arduino.h index 6d154a402d6..140f4eebe79 100644 --- a/variants/esp32thing_plus_c/pins_arduino.h +++ b/variants/esp32thing_plus_c/pins_arduino.h @@ -8,7 +8,7 @@ static const uint8_t LED_BUILTIN = 13; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() static const uint8_t RGB_BUILTIN = SOC_GPIO_PIN_COUNT + 2; #define RGB_BUILTIN RGB_BUILTIN // necessary to make digitalWrite/digitalMode find it #define RGB_BRIGHTNESS 64 diff --git a/variants/franzininho_wifi_esp32s2/pins_arduino.h b/variants/franzininho_wifi_esp32s2/pins_arduino.h index 94d64aa18fb..6b2a4f0404a 100644 --- a/variants/franzininho_wifi_esp32s2/pins_arduino.h +++ b/variants/franzininho_wifi_esp32s2/pins_arduino.h @@ -16,7 +16,7 @@ static const uint8_t PIN_NEOPIXEL = 18; static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + 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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h index 5e301876c19..d3edcd79612 100644 --- a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h +++ b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h @@ -23,7 +23,7 @@ static const uint8_t PIN_NEOPIXEL = 18; static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + 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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/gpy/pins_arduino.h b/variants/gpy/pins_arduino.h index 02ee758e1a3..7af7689854c 100644 --- a/variants/gpy/pins_arduino.h +++ b/variants/gpy/pins_arduino.h @@ -20,7 +20,7 @@ static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + 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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/lopy/pins_arduino.h b/variants/lopy/pins_arduino.h index a648c529c46..da266a04076 100644 --- a/variants/lopy/pins_arduino.h +++ b/variants/lopy/pins_arduino.h @@ -20,7 +20,7 @@ static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + 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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/lopy4/pins_arduino.h b/variants/lopy4/pins_arduino.h index 4ac91267e69..16d7c49756b 100644 --- a/variants/lopy4/pins_arduino.h +++ b/variants/lopy4/pins_arduino.h @@ -20,7 +20,7 @@ static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + 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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/micro_s2/pins_arduino.h b/variants/micro_s2/pins_arduino.h index 5b3d3964917..31c981af879 100644 --- a/variants/micro_s2/pins_arduino.h +++ b/variants/micro_s2/pins_arduino.h @@ -66,7 +66,7 @@ static const uint8_t LED_BUILTIN = 21; #define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN static const uint8_t PIXEL_BUILTIN = 33; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (PIXEL_BUILTIN + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 diff --git a/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h b/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h index 53724f067f4..35ae536952e 100644 --- a/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h +++ b/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h @@ -9,7 +9,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/thingpulse_epulse_feather_c6/pins_arduino.h b/variants/thingpulse_epulse_feather_c6/pins_arduino.h index 705c2b4d9ce..43ce8944216 100644 --- a/variants/thingpulse_epulse_feather_c6/pins_arduino.h +++ b/variants/thingpulse_epulse_feather_c6/pins_arduino.h @@ -9,7 +9,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/uPesy_esp32s3_basic/pins_arduino.h b/variants/uPesy_esp32s3_basic/pins_arduino.h index f2566444276..eede430d65f 100644 --- a/variants/uPesy_esp32s3_basic/pins_arduino.h +++ b/variants/uPesy_esp32s3_basic/pins_arduino.h @@ -11,7 +11,7 @@ #define USB_SERIAL "" static const uint8_t RGB_DATA = 38; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 diff --git a/variants/um_bling/pins_arduino.h b/variants/um_bling/pins_arduino.h index bd5b4a07b38..5cb5c18cc99 100644 --- a/variants/um_bling/pins_arduino.h +++ b/variants/um_bling/pins_arduino.h @@ -67,7 +67,7 @@ static const uint8_t I2S_AMP_WS = 1; static const uint8_t RTC_INT = 7; static const uint8_t RGB_DATA = 18; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_feathers2neo/pins_arduino.h b/variants/um_feathers2neo/pins_arduino.h index ff3398de910..1f810f96f1b 100644 --- a/variants/um_feathers2neo/pins_arduino.h +++ b/variants/um_feathers2neo/pins_arduino.h @@ -54,7 +54,7 @@ static const uint8_t NEOPIXEL_MATRIX_DATA = 21; static const uint8_t NEOPIXEL_MATRIX_PWR = 4; static const uint8_t NEOPIXEL_DATA = 40; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (NEOPIXEL_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_feathers3/pins_arduino.h b/variants/um_feathers3/pins_arduino.h index 4d68148ac92..0d8dadde0e8 100644 --- a/variants/um_feathers3/pins_arduino.h +++ b/variants/um_feathers3/pins_arduino.h @@ -57,7 +57,7 @@ static const uint8_t VBUS_SENSE = 34; #define BUILTIN_LED LED_BUILTIN // backward compatibility static const uint8_t RGB_DATA = 40; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 diff --git a/variants/um_feathers3neo/pins_arduino.h b/variants/um_feathers3neo/pins_arduino.h index c0a1aae867e..6023a930890 100644 --- a/variants/um_feathers3neo/pins_arduino.h +++ b/variants/um_feathers3neo/pins_arduino.h @@ -57,7 +57,7 @@ static const uint8_t VBUS_SENSE = 15; #define BUILTIN_LED LED_BUILTIN // backward compatibility static const uint8_t RGB_DATA = 40; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 diff --git a/variants/um_nanos3/pins_arduino.h b/variants/um_nanos3/pins_arduino.h index 0db14ebf792..28deed54112 100644 --- a/variants/um_nanos3/pins_arduino.h +++ b/variants/um_nanos3/pins_arduino.h @@ -44,7 +44,7 @@ static const uint8_t T8 = 8; static const uint8_t T9 = 9; static const uint8_t RGB_DATA = 41; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_pros3/pins_arduino.h b/variants/um_pros3/pins_arduino.h index 7a8921bacb7..7edfb51d956 100644 --- a/variants/um_pros3/pins_arduino.h +++ b/variants/um_pros3/pins_arduino.h @@ -55,7 +55,7 @@ static const uint8_t VBAT_SENSE = 10; static const uint8_t VBUS_SENSE = 33; static const uint8_t RGB_DATA = 18; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_tinyc6/pins_arduino.h b/variants/um_tinyc6/pins_arduino.h index 1afb1d5cc17..ab2f8b41196 100644 --- a/variants/um_tinyc6/pins_arduino.h +++ b/variants/um_tinyc6/pins_arduino.h @@ -47,7 +47,7 @@ static const uint8_t VBAT_SENSE = 4; static const uint8_t VBUS_SENSE = 10; static const uint8_t RGB_DATA = 23; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_tinys2/pins_arduino.h b/variants/um_tinys2/pins_arduino.h index 1a725f58686..c1680c81feb 100644 --- a/variants/um_tinys2/pins_arduino.h +++ b/variants/um_tinys2/pins_arduino.h @@ -66,7 +66,7 @@ static const uint8_t VBAT_SENSE = 3; static const uint8_t VBUS_SENSE = 21; static const uint8_t RGB_DATA = 1; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_tinys3/pins_arduino.h b/variants/um_tinys3/pins_arduino.h index 7168669caf9..23603d83af0 100644 --- a/variants/um_tinys3/pins_arduino.h +++ b/variants/um_tinys3/pins_arduino.h @@ -47,7 +47,7 @@ static const uint8_t VBAT_SENSE = 10; static const uint8_t VBUS_SENSE = 33; static const uint8_t RGB_DATA = 18; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h index 54e565d862f..fca977cc031 100644 --- a/variants/wipy3/pins_arduino.h +++ b/variants/wipy3/pins_arduino.h @@ -10,7 +10,7 @@ static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + 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 neopixelWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 From 8e37c99f8617c74d20a818fada881a9572ccaf9c Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Thu, 22 Aug 2024 18:06:49 -0300 Subject: [PATCH 04/21] fix(rgbled): examples and doc - use RGB_LED naming --- docs/en/api/rmt.rst | 2 +- .../RMTWrite_LED_RGB.ino} | 10 +++++----- .../examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) rename libraries/ESP32/examples/RMT/{RMTWriteNeoPixel/RMTWriteNeoPixel.ino => RMTWrite_LED_RGB/RMTWrite_LED_RGB.ino} (93%) diff --git a/docs/en/api/rmt.rst b/docs/en/api/rmt.rst index 0a348592766..b51d67e331b 100644 --- a/docs/en/api/rmt.rst +++ b/docs/en/api/rmt.rst @@ -17,7 +17,7 @@ To get started with RMT, you can try: RMT Write Neo Pixel ******************* -.. literalinclude:: ../../../libraries/ESP32/examples/RMT/RMTWriteNeoPixel/RMTWriteNeoPixel.ino +.. literalinclude:: ../../../libraries/ESP32/examples/RMT/RMTWrite_RGB_LED/RMTWrite_RGB_LED.ino :language: arduino diff --git a/libraries/ESP32/examples/RMT/RMTWriteNeoPixel/RMTWriteNeoPixel.ino b/libraries/ESP32/examples/RMT/RMTWrite_LED_RGB/RMTWrite_LED_RGB.ino similarity index 93% rename from libraries/ESP32/examples/RMT/RMTWriteNeoPixel/RMTWriteNeoPixel.ino rename to libraries/ESP32/examples/RMT/RMTWrite_LED_RGB/RMTWrite_LED_RGB.ino index 0a8b8b8269f..74f0ac4f6b1 100644 --- a/libraries/ESP32/examples/RMT/RMTWriteNeoPixel/RMTWriteNeoPixel.ino +++ b/libraries/ESP32/examples/RMT/RMTWrite_LED_RGB/RMTWrite_LED_RGB.ino @@ -1,4 +1,4 @@ -// Copyright 2023 Espressif Systems (Shanghai) PTE LTD +// Copyright 2024 Espressif Systems (Shanghai) PTE LTD // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,17 +20,17 @@ */ // The effect seen in (Espressif devkits) ESP32C6, ESP32H2, ESP32C3, ESP32S2 and ESP32S3 is like a Blink of RGB LED -#ifdef PIN_NEOPIXEL -#define BUILTIN_RGBLED_PIN PIN_NEOPIXEL +#ifdef PIN_LED_RGB +#define BUILTIN_RGBLED_PIN PIN_LED_RGB #else -#define BUILTIN_RGBLED_PIN 21 // ESP32 has no builtin RGB LED (PIN_NEOPIXEL) +#define BUILTIN_RGBLED_PIN 21 // ESP32 has no builtin RGB LED (PIN_LED_RGB) #endif #define NR_OF_LEDS 8 * 4 #define NR_OF_ALL_BITS 24 * NR_OF_LEDS // -// Note: This example uses Neopixel LED board, 32 LEDs chained one +// Note: This example uses a board with 32 WS2812b LEDs chained one // after another, each RGB LED has its 24 bit value // for color configuration (8b for each color) // diff --git a/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino b/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino index 39b21b7adb0..4accfc4674b 100644 --- a/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino +++ b/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino @@ -26,10 +26,10 @@ // Default DevKit RGB LED GPIOs: // The effect seen in (Espressif devkits) ESP32C6, ESP32H2, ESP32C3, ESP32S2 and ESP32S3 is like a Blink of RGB LED -#ifdef PIN_NEOPIXEL -#define MY_LED_GPIO PIN_NEOPIXEL +#ifdef PIN_RGB_LED +#define MY_LED_GPIO PIN_RGB_LED #else -#define MY_LED_GPIO 21 // ESP32 has no builtin RGB LED (PIN_NEOPIXEL) +#define MY_LED_GPIO 21 // ESP32 has no builtin RGB LED (PIN_RGB_LED) #endif // Set the correct GPIO to any necessary by changing RGB_LED_GPIO value From db59126fecbd9e1b6e94b2da44d77c1f522a65b4 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Thu, 22 Aug 2024 18:30:34 -0300 Subject: [PATCH 05/21] fix(rgbled): variants - use RGB_LED naming --- variants/Bee_Data_Logger/pins_arduino.h | 4 ++-- variants/Bee_Motion_S3/pins_arduino.h | 4 ++-- variants/Bee_S3/pins_arduino.h | 4 ++-- variants/bpi_leaf_s3/pins_arduino.h | 4 ++-- variants/circuitart_zero_s3/pins_arduino.h | 6 +++--- .../pins_arduino.h | 10 +++++----- .../department_of_alchemy_minimain_esp32s2/variant.cpp | 4 ++-- variants/esp32c3/pins_arduino.h | 4 ++-- variants/esp32c6/pins_arduino.h | 4 ++-- variants/esp32h2-devkit-lipo/pins_arduino.h | 4 ++-- variants/esp32h2/pins_arduino.h | 4 ++-- variants/esp32s2-devkit-lipo-usb/pins_arduino.h | 4 ++-- variants/esp32s2-devkit-lipo/pins_arduino.h | 4 ++-- variants/esp32s2/pins_arduino.h | 6 +++--- variants/esp32s3/pins_arduino.h | 4 ++-- variants/franzininho_wifi_esp32s2/pins_arduino.h | 4 ++-- variants/franzininho_wifi_msc_esp32s2/pins_arduino.h | 4 ++-- variants/gpy/pins_arduino.h | 4 ++-- variants/lopy/pins_arduino.h | 4 ++-- variants/lopy4/pins_arduino.h | 4 ++-- variants/sensebox_mcu_esp32s2/pins_arduino.h | 6 +++--- variants/sensebox_mcu_esp32s2/variant.cpp | 4 ++-- variants/sparkfun_esp32c6_thing_plus/pins_arduino.h | 4 ++-- variants/thingpulse_epulse_feather_c6/pins_arduino.h | 4 ++-- variants/wipy3/pins_arduino.h | 4 ++-- 25 files changed, 56 insertions(+), 56 deletions(-) diff --git a/variants/Bee_Data_Logger/pins_arduino.h b/variants/Bee_Data_Logger/pins_arduino.h index 65b98a4d351..1c3e17df10e 100644 --- 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 index 1e0aa89bb6e..6216b33c74b 100644 --- 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 index 83087177c3e..e7ae4fc407a 100644 --- 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 index 046c52345e9..8b38dffff0e 100644 --- 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 index 64f8419e13e..be30de573ff 100644 --- 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 index 996e8cc557a..6ffb7b8e9e6 100644 --- 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 index 7809ec26f46..49fc5a1f65b 100644 --- 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 index 855fb5d5268..3caeb35556a 100644 --- a/variants/esp32c3/pins_arduino.h +++ b/variants/esp32c3/pins_arduino.h @@ -4,9 +4,9 @@ #include #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 index 43ce8944216..2c64de2e329 100644 --- a/variants/esp32c6/pins_arduino.h +++ b/variants/esp32c6/pins_arduino.h @@ -4,9 +4,9 @@ #include #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 index fcf1322fc65..4d9c50f9d97 100644 --- a/variants/esp32h2-devkit-lipo/pins_arduino.h +++ b/variants/esp32h2-devkit-lipo/pins_arduino.h @@ -4,9 +4,9 @@ #include #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 index e782887f07c..a4c29321956 100644 --- a/variants/esp32h2/pins_arduino.h +++ b/variants/esp32h2/pins_arduino.h @@ -4,9 +4,9 @@ #include #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 index 3d5f92aa46f..3f7db9a842e 100644 --- a/variants/esp32s2-devkit-lipo-usb/pins_arduino.h +++ b/variants/esp32s2-devkit-lipo-usb/pins_arduino.h @@ -4,8 +4,8 @@ #include #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 index 04c89f4d5d6..cbbd0cd5a91 100644 --- a/variants/esp32s2-devkit-lipo/pins_arduino.h +++ b/variants/esp32s2-devkit-lipo/pins_arduino.h @@ -4,8 +4,8 @@ #include #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 index e09a677e92e..9654cecd67e 100644 --- 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 index 313d879728f..0eac8828f23 100644 --- 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 index 6b2a4f0404a..29c01afc1de 100644 --- 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 index d3edcd79612..a0ef10c9289 100644 --- 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 index 7af7689854c..904edbd0dec 100644 --- 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 index da266a04076..a2756fb5d08 100644 --- 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 index 16d7c49756b..b689f912f87 100644 --- 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 index c3d03784964..87aee7274e4 100644 --- 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 index 59e187b2a7f..0c58ef2cbe2 100644 --- 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 index 35ae536952e..f439d40f2fc 100644 --- a/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h +++ b/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h @@ -4,9 +4,9 @@ #include #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 index 43ce8944216..2c64de2e329 100644 --- a/variants/thingpulse_epulse_feather_c6/pins_arduino.h +++ b/variants/thingpulse_epulse_feather_c6/pins_arduino.h @@ -4,9 +4,9 @@ #include #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 index fca977cc031..606d48287b5 100644 --- 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() From dd6d597673b24728e2db7970823cb356cb137371 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Thu, 22 Aug 2024 19:41:02 -0300 Subject: [PATCH 06/21] fix(rgbled): other places for RGB LED naming --- variants/atmegazero_esp32s2/pins_arduino.h | 4 ++-- variants/bpi-bit/pins_arduino.h | 2 +- variants/circuitart_zero_s3/pins_arduino.h | 2 +- variants/cytron_maker_feather_aiot_s3/pins_arduino.h | 2 +- .../department_of_alchemy_minimain_esp32s2/pins_arduino.h | 2 +- variants/department_of_alchemy_minimain_esp32s2/variant.cpp | 2 +- variants/gpy/pins_arduino.h | 2 +- variants/lopy/pins_arduino.h | 2 +- variants/lopy4/pins_arduino.h | 2 +- variants/wipy3/pins_arduino.h | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/variants/atmegazero_esp32s2/pins_arduino.h b/variants/atmegazero_esp32s2/pins_arduino.h index ba31b59eb38..2250169a25e 100644 --- a/variants/atmegazero_esp32s2/pins_arduino.h +++ b/variants/atmegazero_esp32s2/pins_arduino.h @@ -10,9 +10,9 @@ #define USB_PRODUCT "ATMZ-ESP32S2" #define USB_SERIAL "" -static const uint8_t NEOPIXEL = 40; +static const uint8_t RGB_LED_PIN = 40; // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino -static const uint8_t LED_BUILTIN = (NEOPIXEL + SOC_GPIO_PIN_COUNT); +static const uint8_t LED_BUILTIN = (RGB_LED_PIN + 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/bpi-bit/pins_arduino.h b/variants/bpi-bit/pins_arduino.h index 58290f4de08..cc86b1f2574 100644 --- a/variants/bpi-bit/pins_arduino.h +++ b/variants/bpi-bit/pins_arduino.h @@ -9,7 +9,7 @@ static const uint8_t BUZZER = 25; static const uint8_t BUTTON_A = 35; static const uint8_t BUTTON_B = 27; -// NeoPixel Matrix 5 x 5 +// RGB LED Matrix 5 x 5 static const uint8_t RGB_LED = 4; // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/circuitart_zero_s3/pins_arduino.h b/variants/circuitart_zero_s3/pins_arduino.h index be30de573ff..843294408f8 100644 --- a/variants/circuitart_zero_s3/pins_arduino.h +++ b/variants/circuitart_zero_s3/pins_arduino.h @@ -13,7 +13,7 @@ #define LED_BUILTIN 46 #define BUILTIN_LED LED_BUILTIN // backward compatibility -// Neopixel +// RGB LED #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_RGB_LED + SOC_GPIO_PIN_COUNT) diff --git a/variants/cytron_maker_feather_aiot_s3/pins_arduino.h b/variants/cytron_maker_feather_aiot_s3/pins_arduino.h index 9f27ff8ecf7..9f7475294e8 100644 --- a/variants/cytron_maker_feather_aiot_s3/pins_arduino.h +++ b/variants/cytron_maker_feather_aiot_s3/pins_arduino.h @@ -19,7 +19,7 @@ static const uint8_t RGB_BUILTIN = SOC_GPIO_PIN_COUNT + 46; // RGB LED. #define LED LED_BUILTIN #define RGB RGB_BUILTIN -#define NEOPIXEL RGB_BUILTIN +#define RGB_LED_PIN RGB_BUILTIN #define RGB_BRIGHTNESS 65 #define VP_EN 11 // V Peripheral Enable. diff --git a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h index 6ffb7b8e9e6..b1ff7052f0e 100644 --- a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h +++ b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h @@ -14,7 +14,7 @@ #define LED_BUILTIN 13 #define BUILTIN_LED LED_BUILTIN // backward compatibility -// Neopixel +// RGB LED #define PIN_RGB_LED 33 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWritee() for blinking #define RGB_BUILTIN (PIN_RGB_LED + SOC_GPIO_PIN_COUNT) diff --git a/variants/department_of_alchemy_minimain_esp32s2/variant.cpp b/variants/department_of_alchemy_minimain_esp32s2/variant.cpp index 49fc5a1f65b..ee4eaa8df2b 100644 --- a/variants/department_of_alchemy_minimain_esp32s2/variant.cpp +++ b/variants/department_of_alchemy_minimain_esp32s2/variant.cpp @@ -30,7 +30,7 @@ extern "C" { // Initialize variant/board, called before setup() 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. + // in order to enable the RGB LEDs. pinMode(RGBLED_POWER, OUTPUT); digitalWrite(RGBLED_POWER, HIGH); } diff --git a/variants/gpy/pins_arduino.h b/variants/gpy/pins_arduino.h index 904edbd0dec..a8d67f67ff1 100644 --- a/variants/gpy/pins_arduino.h +++ b/variants/gpy/pins_arduino.h @@ -15,7 +15,7 @@ #define LTE_WAKE 27 // GPIO27 - Sequans modem wake-up interrupt #define LTE_BAUD 921600 -// Neopixel +// RGB LED #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 diff --git a/variants/lopy/pins_arduino.h b/variants/lopy/pins_arduino.h index a2756fb5d08..12ff6736728 100644 --- a/variants/lopy/pins_arduino.h +++ b/variants/lopy/pins_arduino.h @@ -15,7 +15,7 @@ #define LORA_IO1 LORA_IRQ // tied by diode to IO0 #define LORA_IO2 LORA_IRQ // tied by diode to IO0 -// Neopixel +// RGB LED #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 diff --git a/variants/lopy4/pins_arduino.h b/variants/lopy4/pins_arduino.h index b689f912f87..a22d411aa3d 100644 --- a/variants/lopy4/pins_arduino.h +++ b/variants/lopy4/pins_arduino.h @@ -15,7 +15,7 @@ #define LORA_IO2 LORA_IRQ // tied by diode to IO0 #define LORA_RST NOT_A_PIN -// Neopixel +// RGB LED #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 diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h index 606d48287b5..dc521872083 100644 --- a/variants/wipy3/pins_arduino.h +++ b/variants/wipy3/pins_arduino.h @@ -4,7 +4,7 @@ #include #include "soc/soc_caps.h" -// Neopixel +// RGB LED #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_RGB_LED + SOC_GPIO_PIN_COUNT); From 2948fb3942ba11e40f7c4ecb5d8be182e8c8f748 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Thu, 22 Aug 2024 20:01:31 -0300 Subject: [PATCH 07/21] fix(typo): cores - rgbLed instead of rgbled --- cores/esp32/esp32-hal-gpio.c | 2 +- cores/esp32/io_pin_remap.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/esp32/esp32-hal-gpio.c b/cores/esp32/esp32-hal-gpio.c index 74a56a4950d..b11636daf81 100644 --- a/cores/esp32/esp32-hal-gpio.c +++ b/cores/esp32/esp32-hal-gpio.c @@ -166,7 +166,7 @@ extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val) { //use RMT to set all channels on/off RGB_BUILTIN_storage = val; const uint8_t comm_val = val != 0 ? RGB_BRIGHTNESS : 0; - rgbledWrite(RGB_BUILTIN, comm_val, comm_val, comm_val); + rgbLedWrite(RGB_BUILTIN, comm_val, comm_val, comm_val); return; } #endif // RGB_BUILTIN diff --git a/cores/esp32/io_pin_remap.h b/cores/esp32/io_pin_remap.h index 93a07b0b855..73789a585e3 100644 --- a/cores/esp32/io_pin_remap.h +++ b/cores/esp32/io_pin_remap.h @@ -77,7 +77,7 @@ int8_t gpioNumberToDigitalPin(int8_t gpioNumber); #define pinMatrixOutDetach(pin, invertOut, invertEnable) pinMatrixOutDetach(digitalPinToGPIONumber(pin), invertOut, invertEnable) // cores/esp32/esp32-hal-rgb-led.h -#define rgbledWrite(pin, red_val, green_val, blue_val) rgbledWrite(digitalPinToGPIONumber(pin), red_val, green_val, blue_val) +#define rgbLedWrite(pin, red_val, green_val, blue_val) rgbLedWrite(digitalPinToGPIONumber(pin), red_val, green_val, blue_val) // cores/esp32/esp32-hal-rmt.h #define rmtInit(pin, channel_direction, memsize, frequency_Hz) rmtInit(digitalPinToGPIONumber(pin), channel_direction, memsize, frequency_Hz) From ca9f3ac9d113336fabb0aeec8628c1b140d46313 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Thu, 22 Aug 2024 20:01:49 -0300 Subject: [PATCH 08/21] fix(typo): examples - rgbLed instead of rgbled --- .../ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino | 10 +++++----- .../Legacy_RMT_Driver_Compatible.ino | 2 +- .../RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino | 14 +++++++------- .../Zigbee/Zigbee_Light_Bulb/README.md | 2 +- .../Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino | 4 ++-- .../examples/COAP/coap_lamp/coap_lamp.ino | 18 +++++++++--------- .../examples/COAP/coap_switch/coap_switch.ino | 12 ++++++------ 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino b/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino index 105ae392ca0..9544ce7cc25 100644 --- a/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino +++ b/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino @@ -6,7 +6,7 @@ Calling digitalWrite(RGB_BUILTIN, HIGH) will use hidden RGB driver. RGBLedWrite demonstrates control of each channel: - void rgbledWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) + void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) WARNING: After using digitalWrite to drive RGB LED it will be impossible to drive the same pin with normal HIGH/LOW level @@ -27,13 +27,13 @@ void loop() { digitalWrite(RGB_BUILTIN, LOW); // Turn the RGB LED off delay(1000); - rgbledWrite(RGB_BUILTIN, RGB_BRIGHTNESS, 0, 0); // Red + rgbLedWrite(RGB_BUILTIN, RGB_BRIGHTNESS, 0, 0); // Red delay(1000); - rgbledWrite(RGB_BUILTIN, 0, RGB_BRIGHTNESS, 0); // Green + rgbLedWrite(RGB_BUILTIN, 0, RGB_BRIGHTNESS, 0); // Green delay(1000); - rgbledWrite(RGB_BUILTIN, 0, 0, RGB_BRIGHTNESS); // Blue + rgbLedWrite(RGB_BUILTIN, 0, 0, RGB_BRIGHTNESS); // Blue delay(1000); - rgbledWrite(RGB_BUILTIN, 0, 0, 0); // Off / black + rgbLedWrite(RGB_BUILTIN, 0, 0, 0); // Off / black delay(1000); #endif } diff --git a/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino b/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino index c34fe38a87b..f00e1dce92e 100644 --- a/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino +++ b/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino @@ -17,7 +17,7 @@ #else // add the file "build_opt.h" to your Arduino project folder with "-DESP32_ARDUINO_NO_RGB_BUILTIN" to use the RMT Legacy driver -// rgbledWrite() is a function that writes to the RGB LED and it won't be available here +// rgbLedWrite() is a function that writes to the RGB LED and it won't be available here #include "driver/rmt.h" bool installed = false; diff --git a/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino b/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino index 4accfc4674b..900f0f064f3 100644 --- a/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino +++ b/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino @@ -17,7 +17,7 @@ * that RMT works on any CPU/APB Frequency. * * It uses an ESP32 Arduino builtin RGB NeoLED function based on RMT: - * void rgbledWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) + * void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) * * The output is a visual WS2812 RGB LED color change routine using each time a * different CPU Frequency, just to illustrate how it works. Serial output indicates @@ -65,22 +65,22 @@ void loop() { Serial.updateBaudRate(115200); Serial.printf("\n--changed CPU Frequency to %lu MHz\n", getCpuFrequencyMhz()); - rgbledWrite(RGB_LED_GPIO, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS); // White + rgbLedWrite(RGB_LED_GPIO, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS); // White Serial.println("White"); delay(1000); - rgbledWrite(RGB_LED_GPIO, 0, 0, 0); // Off + rgbLedWrite(RGB_LED_GPIO, 0, 0, 0); // Off Serial.println("Off"); delay(1000); - rgbledWrite(RGB_LED_GPIO, BRIGHTNESS, 0, 0); // Red + rgbLedWrite(RGB_LED_GPIO, BRIGHTNESS, 0, 0); // Red Serial.println("Red"); delay(1000); - rgbledWrite(RGB_LED_GPIO, 0, BRIGHTNESS, 0); // Green + rgbLedWrite(RGB_LED_GPIO, 0, BRIGHTNESS, 0); // Green Serial.println("Green"); delay(1000); - rgbledWrite(RGB_LED_GPIO, 0, 0, BRIGHTNESS); // Blue + rgbLedWrite(RGB_LED_GPIO, 0, 0, BRIGHTNESS); // Blue Serial.println("Blue"); delay(1000); - rgbledWrite(RGB_LED_GPIO, 0, 0, 0); // Off + rgbLedWrite(RGB_LED_GPIO, 0, 0, 0); // Off Serial.println("Off"); delay(1000); } diff --git a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md index b3d2ceca1a2..d3441c3523b 100644 --- a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md +++ b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md @@ -20,7 +20,7 @@ Currently, this example supports the following targets. ### Configure the Project Set the LED GPIO by changing the `LED_PIN` definition. By default, the LED_PIN is `RGB_BUILTIN`. -By default, the `rgbledWrite` function is used to control the LED. You can change it to digitalWrite to control a simple LED. +By default, the `rgbLedWrite` function is used to control the LED. You can change it to digitalWrite to control a simple LED. #### Using Arduino IDE diff --git a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino index 9a1b0524b70..b98b67cb475 100644 --- a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino +++ b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino @@ -155,7 +155,7 @@ static esp_err_t zb_attribute_handler(const esp_zb_zcl_set_attr_value_message_t if (message->attribute.id == ESP_ZB_ZCL_ATTR_ON_OFF_ON_OFF_ID && message->attribute.data.type == ESP_ZB_ZCL_ATTR_TYPE_BOOL) { light_state = message->attribute.data.value ? *(bool *)message->attribute.data.value : light_state; log_i("Light sets to %s", light_state ? "On" : "Off"); - rgbledWrite(LED_PIN, 255 * light_state, 255 * light_state, 255 * light_state); // Toggle light + rgbLedWrite(LED_PIN, 255 * light_state, 255 * light_state, 255 * light_state); // Toggle light } } } @@ -172,7 +172,7 @@ void setup() { ESP_ERROR_CHECK(esp_zb_platform_config(&config)); // Init RMT and leave light OFF - rgbledWrite(LED_PIN, 0, 0, 0); + rgbLedWrite(LED_PIN, 0, 0, 0); // Start Zigbee task xTaskCreate(esp_zb_task, "Zigbee_main", 4096, NULL, 5, NULL); diff --git a/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino b/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino index ca31ad1fba4..0e6504757ce 100644 --- a/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino +++ b/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino @@ -55,7 +55,7 @@ bool otDeviceSetup(const char **otSetupCmds, uint8_t nCmds1, const char **otCoap } if (i != nCmds1) { log_e("Sorry, OpenThread Network setup failed!"); - rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbLedWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.println("OpenThread started.\r\nWaiting for activating correct Device Role."); @@ -69,7 +69,7 @@ bool otDeviceSetup(const char **otSetupCmds, uint8_t nCmds1, const char **otCoap Serial.println(); if (!tries) { log_e("Sorry, Device Role failed by timeout! Current Role: %s.", otGetStringDeviceRole()); - rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbLedWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.printf("Device is %s.\r\n", otGetStringDeviceRole()); @@ -80,12 +80,12 @@ bool otDeviceSetup(const char **otSetupCmds, uint8_t nCmds1, const char **otCoap } if (i != nCmds2) { log_e("Sorry, OpenThread CoAP setup failed!"); - rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbLedWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.println("OpenThread setup done. Node is ready."); // all fine! LED goes Green - rgbledWrite(RGB_BUILTIN, 0, 64, 8); // GREEN ... Lamp is ready! + rgbLedWrite(RGB_BUILTIN, 0, 64, 8); // GREEN ... Lamp is ready! return true; } @@ -118,16 +118,16 @@ void otCOAPListen() { log_i("CoAP PUT [%s]\r\n", payload == '0' ? "OFF" : "ON"); if (payload == '0') { for (int16_t c = 248; c > 16; c -= 8) { - rgbledWrite(RGB_BUILTIN, c, c, c); // ramp down + rgbLedWrite(RGB_BUILTIN, c, c, c); // ramp down delay(5); } - rgbledWrite(RGB_BUILTIN, 0, 0, 0); // Lamp Off + rgbLedWrite(RGB_BUILTIN, 0, 0, 0); // Lamp Off } else { for (int16_t c = 16; c < 248; c += 8) { - rgbledWrite(RGB_BUILTIN, c, c, c); // ramp up + rgbLedWrite(RGB_BUILTIN, c, c, c); // ramp up delay(5); } - rgbledWrite(RGB_BUILTIN, 255, 255, 255); // Lamp On + rgbLedWrite(RGB_BUILTIN, 255, 255, 255); // Lamp On } } } @@ -136,7 +136,7 @@ void otCOAPListen() { void setup() { Serial.begin(115200); // LED starts RED, indicating not connected to Thread network. - rgbledWrite(RGB_BUILTIN, 64, 0, 0); + rgbLedWrite(RGB_BUILTIN, 64, 0, 0); OThreadCLI.begin(false); // No AutoStart is necessary OThreadCLI.setTimeout(250); // waits 250ms for the OpenThread CLI response setupNode(); diff --git a/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino b/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino index d27cc3dd333..37e5baa675c 100644 --- a/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino +++ b/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino @@ -49,7 +49,7 @@ bool otDeviceSetup( } if (i != nCmds1) { log_e("Sorry, OpenThread Network setup failed!"); - rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbLedWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.println("OpenThread started.\r\nWaiting for activating correct Device Role."); @@ -63,7 +63,7 @@ bool otDeviceSetup( Serial.println(); if (!tries) { log_e("Sorry, Device Role failed by timeout! Current Role: %s.", otGetStringDeviceRole()); - rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbLedWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.printf("Device is %s.\r\n", otGetStringDeviceRole()); @@ -74,12 +74,12 @@ bool otDeviceSetup( } if (i != nCmds2) { log_e("Sorry, OpenThread CoAP setup failed!"); - rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! + rgbLedWrite(RGB_BUILTIN, 255, 0, 0); // RED ... failed! return false; } Serial.println("OpenThread setup done. Node is ready."); // all fine! LED goes and stays Blue - rgbledWrite(RGB_BUILTIN, 0, 0, 64); // BLUE ... Swtich is ready! + rgbLedWrite(RGB_BUILTIN, 0, 0, 64); // BLUE ... Swtich is ready! return true; } @@ -149,7 +149,7 @@ void checkUserButton() { lastLampState = !lastLampState; if (!otCoapPUT(lastLampState)) { // failed: Lamp Node is not responding due to be off or unreachable // timeout from the CoAP PUT message... restart the node. - rgbledWrite(RGB_BUILTIN, 255, 0, 0); // RED ... something failed! + rgbLedWrite(RGB_BUILTIN, 255, 0, 0); // RED ... something failed! Serial.println("Reseting the Node as Switch... wait."); // start over... setupNode(); @@ -161,7 +161,7 @@ void checkUserButton() { void setup() { Serial.begin(115200); // LED starts RED, indicating not connected to Thread network. - rgbledWrite(RGB_BUILTIN, 64, 0, 0); + rgbLedWrite(RGB_BUILTIN, 64, 0, 0); OThreadCLI.begin(false); // No AutoStart is necessary OThreadCLI.setTimeout(250); // waits 250ms for the OpenThread CLI response setupNode(); From 760686083e2993ad76bf5f0651134d174f9d48ca Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Thu, 22 Aug 2024 20:02:05 -0300 Subject: [PATCH 09/21] fix(typo): variants commentaties - rgbLed instead of rgbled --- variants/Bee_Data_Logger/pins_arduino.h | 2 +- variants/Bee_Motion_S3/pins_arduino.h | 2 +- variants/Bee_S3/pins_arduino.h | 2 +- variants/adafruit_camera_esp32s3/pins_arduino.h | 2 +- variants/adafruit_feather_esp32_v2/pins_arduino.h | 2 +- variants/adafruit_feather_esp32c6/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s2/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s2_tft/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s3/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h | 2 +- variants/adafruit_feather_esp32s3_tft/pins_arduino.h | 2 +- variants/adafruit_itsybitsy_esp32/pins_arduino.h | 2 +- variants/adafruit_magtag29_esp32s2/pins_arduino.h | 2 +- variants/adafruit_matrixportal_esp32s3/pins_arduino.h | 2 +- variants/adafruit_metro_esp32s2/pins_arduino.h | 2 +- variants/adafruit_metro_esp32s3/pins_arduino.h | 2 +- variants/adafruit_qtpy_esp32/pins_arduino.h | 2 +- variants/adafruit_qtpy_esp32c3/pins_arduino.h | 2 +- variants/adafruit_qtpy_esp32s2/pins_arduino.h | 2 +- variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h | 2 +- variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h | 2 +- variants/atmegazero_esp32s2/pins_arduino.h | 2 +- variants/bpi-bit/pins_arduino.h | 2 +- variants/bpi_leaf_s3/pins_arduino.h | 2 +- variants/circuitart_zero_s3/pins_arduino.h | 2 +- variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h | 2 +- variants/esp32c3/pins_arduino.h | 2 +- variants/esp32c6/pins_arduino.h | 2 +- variants/esp32h2-devkit-lipo/pins_arduino.h | 2 +- variants/esp32h2/pins_arduino.h | 2 +- variants/esp32s2/pins_arduino.h | 2 +- variants/esp32s3/pins_arduino.h | 2 +- variants/esp32thing_plus_c/pins_arduino.h | 2 +- variants/franzininho_wifi_esp32s2/pins_arduino.h | 2 +- variants/franzininho_wifi_msc_esp32s2/pins_arduino.h | 2 +- variants/gpy/pins_arduino.h | 2 +- variants/lopy/pins_arduino.h | 2 +- variants/lopy4/pins_arduino.h | 2 +- variants/micro_s2/pins_arduino.h | 2 +- variants/sparkfun_esp32c6_thing_plus/pins_arduino.h | 2 +- variants/thingpulse_epulse_feather_c6/pins_arduino.h | 2 +- variants/uPesy_esp32s3_basic/pins_arduino.h | 2 +- variants/um_bling/pins_arduino.h | 2 +- variants/um_feathers2neo/pins_arduino.h | 2 +- variants/um_feathers3/pins_arduino.h | 2 +- variants/um_feathers3neo/pins_arduino.h | 2 +- variants/um_nanos3/pins_arduino.h | 2 +- variants/um_pros3/pins_arduino.h | 2 +- variants/um_tinyc6/pins_arduino.h | 2 +- variants/um_tinys2/pins_arduino.h | 2 +- variants/um_tinys3/pins_arduino.h | 2 +- variants/wipy3/pins_arduino.h | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/variants/Bee_Data_Logger/pins_arduino.h b/variants/Bee_Data_Logger/pins_arduino.h index 1c3e17df10e..1114ff0bdd3 100644 --- a/variants/Bee_Data_Logger/pins_arduino.h +++ b/variants/Bee_Data_Logger/pins_arduino.h @@ -70,7 +70,7 @@ static const uint8_t RGB_PWR = 34; 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/Bee_Motion_S3/pins_arduino.h b/variants/Bee_Motion_S3/pins_arduino.h index 6216b33c74b..45f73b56ba0 100644 --- a/variants/Bee_Motion_S3/pins_arduino.h +++ b/variants/Bee_Motion_S3/pins_arduino.h @@ -78,7 +78,7 @@ static const uint8_t RGB_PWR = 34; 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/Bee_S3/pins_arduino.h b/variants/Bee_S3/pins_arduino.h index e7ae4fc407a..9e76fff803e 100644 --- a/variants/Bee_S3/pins_arduino.h +++ b/variants/Bee_S3/pins_arduino.h @@ -67,7 +67,7 @@ static const uint8_t RGB_PWR = 34; 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 +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_camera_esp32s3/pins_arduino.h b/variants/adafruit_camera_esp32s3/pins_arduino.h index 1c125c15921..447204f7345 100644 --- a/variants/adafruit_camera_esp32s3/pins_arduino.h +++ b/variants/adafruit_camera_esp32s3/pins_arduino.h @@ -18,7 +18,7 @@ static const uint8_t NEOPIXEL_PIN = 1; static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + 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() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32_v2/pins_arduino.h b/variants/adafruit_feather_esp32_v2/pins_arduino.h index ac20694d2a5..f4af72aa98b 100644 --- a/variants/adafruit_feather_esp32_v2/pins_arduino.h +++ b/variants/adafruit_feather_esp32_v2/pins_arduino.h @@ -46,7 +46,7 @@ static const uint8_t LED_BUILTIN = 13; // Neopixel #define PIN_NEOPIXEL 0 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32c6/pins_arduino.h b/variants/adafruit_feather_esp32c6/pins_arduino.h index fd0713afd87..c4ae4bab3fe 100644 --- a/variants/adafruit_feather_esp32c6/pins_arduino.h +++ b/variants/adafruit_feather_esp32c6/pins_arduino.h @@ -9,7 +9,7 @@ static const uint8_t LED_BUILTIN = 15; #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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL) #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s2/pins_arduino.h b/variants/adafruit_feather_esp32s2/pins_arduino.h index 165867e1457..72ab65a8d33 100644 --- a/variants/adafruit_feather_esp32s2/pins_arduino.h +++ b/variants/adafruit_feather_esp32s2/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h index 77aa8c959fd..92902cc1622 100644 --- a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h +++ b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h index 486731309f5..8c3059acb6e 100644 --- a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h +++ b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s3/pins_arduino.h b/variants/adafruit_feather_esp32s3/pins_arduino.h index ad285df307c..991a57c9eba 100644 --- a/variants/adafruit_feather_esp32s3/pins_arduino.h +++ b/variants/adafruit_feather_esp32s3/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h index 5ce4b64be13..34fe2ebae2c 100644 --- a/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h +++ b/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h index 7e006cc8782..ea955ff54f5 100644 --- a/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h +++ b/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_feather_esp32s3_tft/pins_arduino.h b/variants/adafruit_feather_esp32s3_tft/pins_arduino.h index 7939e1f7c95..3e007c7706d 100644 --- a/variants/adafruit_feather_esp32s3_tft/pins_arduino.h +++ b/variants/adafruit_feather_esp32s3_tft/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_itsybitsy_esp32/pins_arduino.h b/variants/adafruit_itsybitsy_esp32/pins_arduino.h index 1b097352d64..801dc15da57 100644 --- a/variants/adafruit_itsybitsy_esp32/pins_arduino.h +++ b/variants/adafruit_itsybitsy_esp32/pins_arduino.h @@ -11,7 +11,7 @@ static const uint8_t LED_BUILTIN = 13; // Neopixel static const uint8_t PIN_NEOPIXEL = 0; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_magtag29_esp32s2/pins_arduino.h b/variants/adafruit_magtag29_esp32s2/pins_arduino.h index fdaf4d147d6..197f2e4c1aa 100644 --- a/variants/adafruit_magtag29_esp32s2/pins_arduino.h +++ b/variants/adafruit_magtag29_esp32s2/pins_arduino.h @@ -16,7 +16,7 @@ // Neopixel #define PIN_NEOPIXEL 1 // D1 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_matrixportal_esp32s3/pins_arduino.h b/variants/adafruit_matrixportal_esp32s3/pins_arduino.h index 0a8ae5b1b0d..9843c54c1cd 100644 --- a/variants/adafruit_matrixportal_esp32s3/pins_arduino.h +++ b/variants/adafruit_matrixportal_esp32s3/pins_arduino.h @@ -16,7 +16,7 @@ #define PIN_NEOPIXEL 4 #define NEOPIXEL_PIN 4 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_metro_esp32s2/pins_arduino.h b/variants/adafruit_metro_esp32s2/pins_arduino.h index 870866495c3..cef937d3662 100644 --- a/variants/adafruit_metro_esp32s2/pins_arduino.h +++ b/variants/adafruit_metro_esp32s2/pins_arduino.h @@ -15,7 +15,7 @@ // Neopixel #define PIN_NEOPIXEL 45 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_metro_esp32s3/pins_arduino.h b/variants/adafruit_metro_esp32s3/pins_arduino.h index 58cbdc537ca..9e2cff7e651 100644 --- a/variants/adafruit_metro_esp32s3/pins_arduino.h +++ b/variants/adafruit_metro_esp32s3/pins_arduino.h @@ -15,7 +15,7 @@ // Neopixel #define PIN_NEOPIXEL 46 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// 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_BRIGHTNESS 64 diff --git a/variants/adafruit_qtpy_esp32/pins_arduino.h b/variants/adafruit_qtpy_esp32/pins_arduino.h index 699deb8abed..b422377d981 100644 --- a/variants/adafruit_qtpy_esp32/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32/pins_arduino.h @@ -11,7 +11,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_qtpy_esp32c3/pins_arduino.h b/variants/adafruit_qtpy_esp32c3/pins_arduino.h index b0cc97179e2..92d2591a806 100644 --- a/variants/adafruit_qtpy_esp32c3/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32c3/pins_arduino.h @@ -13,7 +13,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_qtpy_esp32s2/pins_arduino.h b/variants/adafruit_qtpy_esp32s2/pins_arduino.h index b98d2a36e3d..3baf0808db1 100644 --- a/variants/adafruit_qtpy_esp32s2/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32s2/pins_arduino.h @@ -15,7 +15,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h index ec3562976cc..1202ad1caca 100644 --- a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h @@ -18,7 +18,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h index cfc8391fe07..55b4f4355a9 100644 --- a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h +++ b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h @@ -18,7 +18,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL; #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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/atmegazero_esp32s2/pins_arduino.h b/variants/atmegazero_esp32s2/pins_arduino.h index 2250169a25e..dda442c20e2 100644 --- a/variants/atmegazero_esp32s2/pins_arduino.h +++ b/variants/atmegazero_esp32s2/pins_arduino.h @@ -15,7 +15,7 @@ static const uint8_t RGB_LED_PIN = 40; static const uint8_t LED_BUILTIN = (RGB_LED_PIN + 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/bpi-bit/pins_arduino.h b/variants/bpi-bit/pins_arduino.h index cc86b1f2574..42a820a0b26 100644 --- a/variants/bpi-bit/pins_arduino.h +++ b/variants/bpi-bit/pins_arduino.h @@ -15,7 +15,7 @@ static const uint8_t RGB_LED = 4; // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino #define LED_BUILTIN (RGB_LED + SOC_GPIO_PIN_COUNT) // Just a single LED in the Matrix #define BUILTIN_LED LED_BUILTIN // backward compatibility -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 static const uint8_t LIGHT_SENSOR1 = 36; diff --git a/variants/bpi_leaf_s3/pins_arduino.h b/variants/bpi_leaf_s3/pins_arduino.h index 8b38dffff0e..3a22a46bfc1 100644 --- a/variants/bpi_leaf_s3/pins_arduino.h +++ b/variants/bpi_leaf_s3/pins_arduino.h @@ -18,7 +18,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 25 diff --git a/variants/circuitart_zero_s3/pins_arduino.h b/variants/circuitart_zero_s3/pins_arduino.h index 843294408f8..73c5cb38e8a 100644 --- a/variants/circuitart_zero_s3/pins_arduino.h +++ b/variants/circuitart_zero_s3/pins_arduino.h @@ -15,7 +15,7 @@ // RGB LED #define PIN_RGB_LED 47 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() and digitalWrite() for blinking +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking #define RGB_BUILTIN (PIN_RGB_LED + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 #define RGBLED_NUM 1 // number of RGB LEDs diff --git a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h index b1ff7052f0e..cb404a508cd 100644 --- a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h +++ b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h @@ -16,7 +16,7 @@ // RGB LED #define PIN_RGB_LED 33 -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWritee() for blinking +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWritee() for blinking #define RGB_BUILTIN (PIN_RGB_LED + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32c3/pins_arduino.h b/variants/esp32c3/pins_arduino.h index 3caeb35556a..179ce636ea5 100644 --- a/variants/esp32c3/pins_arduino.h +++ b/variants/esp32c3/pins_arduino.h @@ -9,7 +9,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32c6/pins_arduino.h b/variants/esp32c6/pins_arduino.h index 2c64de2e329..55afea91565 100644 --- a/variants/esp32c6/pins_arduino.h +++ b/variants/esp32c6/pins_arduino.h @@ -9,7 +9,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32h2-devkit-lipo/pins_arduino.h b/variants/esp32h2-devkit-lipo/pins_arduino.h index 4d9c50f9d97..bb15be3e871 100644 --- a/variants/esp32h2-devkit-lipo/pins_arduino.h +++ b/variants/esp32h2-devkit-lipo/pins_arduino.h @@ -9,7 +9,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32h2/pins_arduino.h b/variants/esp32h2/pins_arduino.h index a4c29321956..108d874699b 100644 --- a/variants/esp32h2/pins_arduino.h +++ b/variants/esp32h2/pins_arduino.h @@ -9,7 +9,7 @@ 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 +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32s2/pins_arduino.h b/variants/esp32s2/pins_arduino.h index 9654cecd67e..27391ef22ab 100644 --- a/variants/esp32s2/pins_arduino.h +++ b/variants/esp32s2/pins_arduino.h @@ -12,7 +12,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32s3/pins_arduino.h b/variants/esp32s3/pins_arduino.h index 0eac8828f23..623d684e20f 100644 --- a/variants/esp32s3/pins_arduino.h +++ b/variants/esp32s3/pins_arduino.h @@ -15,7 +15,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32thing_plus_c/pins_arduino.h b/variants/esp32thing_plus_c/pins_arduino.h index 140f4eebe79..ca7b6c65d45 100644 --- a/variants/esp32thing_plus_c/pins_arduino.h +++ b/variants/esp32thing_plus_c/pins_arduino.h @@ -8,7 +8,7 @@ static const uint8_t LED_BUILTIN = 13; #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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() static const uint8_t RGB_BUILTIN = SOC_GPIO_PIN_COUNT + 2; #define RGB_BUILTIN RGB_BUILTIN // necessary to make digitalWrite/digitalMode find it #define RGB_BRIGHTNESS 64 diff --git a/variants/franzininho_wifi_esp32s2/pins_arduino.h b/variants/franzininho_wifi_esp32s2/pins_arduino.h index 29c01afc1de..b75fcc768d7 100644 --- a/variants/franzininho_wifi_esp32s2/pins_arduino.h +++ b/variants/franzininho_wifi_esp32s2/pins_arduino.h @@ -16,7 +16,7 @@ static const uint8_t PIN_RGB_LED = 18; 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h index a0ef10c9289..db213cb97d4 100644 --- a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h +++ b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h @@ -23,7 +23,7 @@ static const uint8_t PIN_RGB_LED = 18; 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/gpy/pins_arduino.h b/variants/gpy/pins_arduino.h index a8d67f67ff1..93d3e5bfa1d 100644 --- a/variants/gpy/pins_arduino.h +++ b/variants/gpy/pins_arduino.h @@ -20,7 +20,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/lopy/pins_arduino.h b/variants/lopy/pins_arduino.h index 12ff6736728..f7e2ee02476 100644 --- a/variants/lopy/pins_arduino.h +++ b/variants/lopy/pins_arduino.h @@ -20,7 +20,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/lopy4/pins_arduino.h b/variants/lopy4/pins_arduino.h index a22d411aa3d..eb36b3008e6 100644 --- a/variants/lopy4/pins_arduino.h +++ b/variants/lopy4/pins_arduino.h @@ -20,7 +20,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/micro_s2/pins_arduino.h b/variants/micro_s2/pins_arduino.h index 31c981af879..422799478fc 100644 --- a/variants/micro_s2/pins_arduino.h +++ b/variants/micro_s2/pins_arduino.h @@ -66,7 +66,7 @@ static const uint8_t LED_BUILTIN = 21; #define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN static const uint8_t PIXEL_BUILTIN = 33; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (PIXEL_BUILTIN + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 diff --git a/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h b/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h index f439d40f2fc..61c939a32a9 100644 --- a/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h +++ b/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h @@ -9,7 +9,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/thingpulse_epulse_feather_c6/pins_arduino.h b/variants/thingpulse_epulse_feather_c6/pins_arduino.h index 2c64de2e329..55afea91565 100644 --- a/variants/thingpulse_epulse_feather_c6/pins_arduino.h +++ b/variants/thingpulse_epulse_feather_c6/pins_arduino.h @@ -9,7 +9,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 diff --git a/variants/uPesy_esp32s3_basic/pins_arduino.h b/variants/uPesy_esp32s3_basic/pins_arduino.h index eede430d65f..85d9c2ccb00 100644 --- a/variants/uPesy_esp32s3_basic/pins_arduino.h +++ b/variants/uPesy_esp32s3_basic/pins_arduino.h @@ -11,7 +11,7 @@ #define USB_SERIAL "" static const uint8_t RGB_DATA = 38; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 diff --git a/variants/um_bling/pins_arduino.h b/variants/um_bling/pins_arduino.h index 5cb5c18cc99..590eec5efea 100644 --- a/variants/um_bling/pins_arduino.h +++ b/variants/um_bling/pins_arduino.h @@ -67,7 +67,7 @@ static const uint8_t I2S_AMP_WS = 1; static const uint8_t RTC_INT = 7; static const uint8_t RGB_DATA = 18; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_feathers2neo/pins_arduino.h b/variants/um_feathers2neo/pins_arduino.h index 1f810f96f1b..92c9cd1a099 100644 --- a/variants/um_feathers2neo/pins_arduino.h +++ b/variants/um_feathers2neo/pins_arduino.h @@ -54,7 +54,7 @@ static const uint8_t NEOPIXEL_MATRIX_DATA = 21; static const uint8_t NEOPIXEL_MATRIX_PWR = 4; static const uint8_t NEOPIXEL_DATA = 40; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (NEOPIXEL_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_feathers3/pins_arduino.h b/variants/um_feathers3/pins_arduino.h index 0d8dadde0e8..8de87c688a9 100644 --- a/variants/um_feathers3/pins_arduino.h +++ b/variants/um_feathers3/pins_arduino.h @@ -57,7 +57,7 @@ static const uint8_t VBUS_SENSE = 34; #define BUILTIN_LED LED_BUILTIN // backward compatibility static const uint8_t RGB_DATA = 40; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 diff --git a/variants/um_feathers3neo/pins_arduino.h b/variants/um_feathers3neo/pins_arduino.h index 6023a930890..94d546d22c2 100644 --- a/variants/um_feathers3neo/pins_arduino.h +++ b/variants/um_feathers3neo/pins_arduino.h @@ -57,7 +57,7 @@ static const uint8_t VBUS_SENSE = 15; #define BUILTIN_LED LED_BUILTIN // backward compatibility static const uint8_t RGB_DATA = 40; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 diff --git a/variants/um_nanos3/pins_arduino.h b/variants/um_nanos3/pins_arduino.h index 28deed54112..66aef214c47 100644 --- a/variants/um_nanos3/pins_arduino.h +++ b/variants/um_nanos3/pins_arduino.h @@ -44,7 +44,7 @@ static const uint8_t T8 = 8; static const uint8_t T9 = 9; static const uint8_t RGB_DATA = 41; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_pros3/pins_arduino.h b/variants/um_pros3/pins_arduino.h index 7edfb51d956..4b9bc8de6aa 100644 --- a/variants/um_pros3/pins_arduino.h +++ b/variants/um_pros3/pins_arduino.h @@ -55,7 +55,7 @@ static const uint8_t VBAT_SENSE = 10; static const uint8_t VBUS_SENSE = 33; static const uint8_t RGB_DATA = 18; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_tinyc6/pins_arduino.h b/variants/um_tinyc6/pins_arduino.h index ab2f8b41196..6505e1ed50e 100644 --- a/variants/um_tinyc6/pins_arduino.h +++ b/variants/um_tinyc6/pins_arduino.h @@ -47,7 +47,7 @@ static const uint8_t VBAT_SENSE = 4; static const uint8_t VBUS_SENSE = 10; static const uint8_t RGB_DATA = 23; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_tinys2/pins_arduino.h b/variants/um_tinys2/pins_arduino.h index c1680c81feb..2a6e03aa078 100644 --- a/variants/um_tinys2/pins_arduino.h +++ b/variants/um_tinys2/pins_arduino.h @@ -66,7 +66,7 @@ static const uint8_t VBAT_SENSE = 3; static const uint8_t VBUS_SENSE = 21; static const uint8_t RGB_DATA = 1; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/um_tinys3/pins_arduino.h b/variants/um_tinys3/pins_arduino.h index 23603d83af0..24742781dce 100644 --- a/variants/um_tinys3/pins_arduino.h +++ b/variants/um_tinys3/pins_arduino.h @@ -47,7 +47,7 @@ static const uint8_t VBAT_SENSE = 10; static const uint8_t VBUS_SENSE = 33; static const uint8_t RGB_DATA = 18; -// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbledWrite() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h index dc521872083..a9fda1ecaa3 100644 --- a/variants/wipy3/pins_arduino.h +++ b/variants/wipy3/pins_arduino.h @@ -10,7 +10,7 @@ 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() +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() #define RGB_BUILTIN LED_BUILTIN #define RGB_BRIGHTNESS 64 From 835a3f9f6d3598189aafc1e77915eefa31911d10 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Thu, 22 Aug 2024 20:30:57 -0300 Subject: [PATCH 10/21] fix(rgbled): bad file name --- .../RMTWrite_RGB_LED.ino} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename libraries/ESP32/examples/RMT/{RMTWrite_LED_RGB/RMTWrite_LED_RGB.ino => RMTWrite_RGB_LED/RMTWrite_RGB_LED.ino} (100%) diff --git a/libraries/ESP32/examples/RMT/RMTWrite_LED_RGB/RMTWrite_LED_RGB.ino b/libraries/ESP32/examples/RMT/RMTWrite_RGB_LED/RMTWrite_RGB_LED.ino similarity index 100% rename from libraries/ESP32/examples/RMT/RMTWrite_LED_RGB/RMTWrite_LED_RGB.ino rename to libraries/ESP32/examples/RMT/RMTWrite_RGB_LED/RMTWrite_RGB_LED.ino From 0aa58463615304dd4e509c5b63104341c47f1c5c Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 26 Aug 2024 11:14:08 -0300 Subject: [PATCH 11/21] fix(typo): typo and commentaries Co-authored-by: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com> --- docs/en/api/rmt.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/api/rmt.rst b/docs/en/api/rmt.rst index b51d67e331b..530c3e10ec6 100644 --- a/docs/en/api/rmt.rst +++ b/docs/en/api/rmt.rst @@ -14,7 +14,7 @@ Example To get started with RMT, you can try: -RMT Write Neo Pixel +RMT Write RGB LED ******************* .. literalinclude:: ../../../libraries/ESP32/examples/RMT/RMTWrite_RGB_LED/RMTWrite_RGB_LED.ino From 367cf32f05608e56bf3b12f2fef8b8574e30abac Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 26 Aug 2024 11:24:45 -0300 Subject: [PATCH 12/21] fix(rgbled): deprecating neopixelWrite() --- cores/esp32/esp32-hal-rgb-led.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cores/esp32/esp32-hal-rgb-led.h b/cores/esp32/esp32-hal-rgb-led.h index 84e5498abd7..fe3f8eb26cd 100644 --- a/cores/esp32/esp32-hal-rgb-led.h +++ b/cores/esp32/esp32-hal-rgb-led.h @@ -30,7 +30,11 @@ void rgbLedWriteOrdered(uint8_t pin, rgb_led_color_order_t order, uint8_t red_va void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val); // Backward compatibility -#define neopixelWrite(p, r, g, b) rgbLedWrite(p, r, g, b) +void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) __attribute__((deprecated("Use rgbLedWrite()."))) +{ + log_w("neopixelWrite() is deprecated. Use rgbLedWrite()."); + rgbLedWrite(pin, red_val, green_val, blue_val); +} #ifdef __cplusplus } From 9626e0d87cff621a8a6f0d241cb10e35745cfd55 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 26 Aug 2024 11:25:28 -0300 Subject: [PATCH 13/21] fix(rgbled): use RGB LED naming --- variants/sparkfun_esp32_iot_redboard/pins_arduino.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variants/sparkfun_esp32_iot_redboard/pins_arduino.h b/variants/sparkfun_esp32_iot_redboard/pins_arduino.h index 3c84fa89da5..f6226fdf286 100644 --- a/variants/sparkfun_esp32_iot_redboard/pins_arduino.h +++ b/variants/sparkfun_esp32_iot_redboard/pins_arduino.h @@ -8,8 +8,8 @@ static const uint8_t LED_BUILTIN = 18; #define BUILTIN_LED LED_BUILTIN // backward compatibility #define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN -#define NEO_PIXEL 2 //WS2812 LED -static const uint8_t RGB_BUILTIN = (SOC_GPIO_PIN_COUNT + NEO_PIXEL); +#define RGB_LED_PIN 2 //WS2812 LED +static const uint8_t RGB_BUILTIN = (SOC_GPIO_PIN_COUNT + RGB_LED_PIN); #define RGB_BUILTIN RGB_BUILTIN // necessary to make digitalWrite/digitalMode find it #define RGB_BRIGHTNESS 64 From 6dfb92d08bf02ade1430c0d8e2d7b512b253c09f Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 26 Aug 2024 11:27:04 -0300 Subject: [PATCH 14/21] fix(rgbled): document formatting --- docs/en/api/rmt.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/api/rmt.rst b/docs/en/api/rmt.rst index 530c3e10ec6..6f87054a9c2 100644 --- a/docs/en/api/rmt.rst +++ b/docs/en/api/rmt.rst @@ -15,7 +15,7 @@ Example To get started with RMT, you can try: RMT Write RGB LED -******************* +***************** .. literalinclude:: ../../../libraries/ESP32/examples/RMT/RMTWrite_RGB_LED/RMTWrite_RGB_LED.ino :language: arduino From 9b16112310e64e2b9b998658b6ac25d434d76903 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 26 Aug 2024 11:58:38 -0300 Subject: [PATCH 15/21] fix(rgbled): neopixelWrite() is now deprecated --- cores/esp32/esp32-hal-rgb-led.c | 7 +++++++ cores/esp32/esp32-hal-rgb-led.h | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cores/esp32/esp32-hal-rgb-led.c b/cores/esp32/esp32-hal-rgb-led.c index 5afec10f89b..d91f993a929 100644 --- a/cores/esp32/esp32-hal-rgb-led.c +++ b/cores/esp32/esp32-hal-rgb-led.c @@ -16,6 +16,13 @@ #include "esp32-hal-rgb-led.h" +// Backward compatibility - Deprecated. It will be removed in future releases. +void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) __attribute__((deprecated("Use rgbLedWrite()."))) +{ + log_w("neopixelWrite() is deprecated. Use rgbLedWrite()."); + rgbLedWrite(pin, red_val, green_val, blue_val); +} + void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) { rgbLedWriteOrdered(pin, RGB_BUILTIN_LED_COLOR_ORDER, red_val, green_val, blue_val); } diff --git a/cores/esp32/esp32-hal-rgb-led.h b/cores/esp32/esp32-hal-rgb-led.h index fe3f8eb26cd..c14b97ff98b 100644 --- a/cores/esp32/esp32-hal-rgb-led.h +++ b/cores/esp32/esp32-hal-rgb-led.h @@ -29,12 +29,8 @@ void rgbLedWriteOrdered(uint8_t pin, rgb_led_color_order_t order, uint8_t red_va // Will use RGB_BUILTIN_LED_COLOR_ORDER void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val); -// Backward compatibility -void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) __attribute__((deprecated("Use rgbLedWrite()."))) -{ - log_w("neopixelWrite() is deprecated. Use rgbLedWrite()."); - rgbLedWrite(pin, red_val, green_val, blue_val); -} +// Backward compatibility - Deprecated. It will be removed in future releases. +void neopixelWrite(uint8_t p, uint8_t r, uint8_t g, uint8_t b) __attribute__((deprecated("Use rgbLedWrite()."))); #ifdef __cplusplus } From b5a2560d64cb87d730c69ff4cb8ed217e7191a76 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 26 Aug 2024 12:28:11 -0300 Subject: [PATCH 16/21] fix(rgbled): removed attribute in wrong place --- cores/esp32/esp32-hal-rgb-led.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp32/esp32-hal-rgb-led.c b/cores/esp32/esp32-hal-rgb-led.c index d91f993a929..742902560a8 100644 --- a/cores/esp32/esp32-hal-rgb-led.c +++ b/cores/esp32/esp32-hal-rgb-led.c @@ -17,7 +17,7 @@ #include "esp32-hal-rgb-led.h" // Backward compatibility - Deprecated. It will be removed in future releases. -void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) __attribute__((deprecated("Use rgbLedWrite()."))) +void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) { log_w("neopixelWrite() is deprecated. Use rgbLedWrite()."); rgbLedWrite(pin, red_val, green_val, blue_val); From b516c1fc363d2bba0eadc2d06d323a835a7d53ce Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 27 Aug 2024 11:05:16 -0300 Subject: [PATCH 17/21] just a git push test --- test_git.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test_git.txt diff --git a/test_git.txt b/test_git.txt new file mode 100644 index 00000000000..7e775fcad4d --- /dev/null +++ b/test_git.txt @@ -0,0 +1 @@ +just a push test From 3f3c0ae7f54b0d52727ca2eaa5f9e70e37ee8bf7 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 27 Aug 2024 11:06:46 -0300 Subject: [PATCH 18/21] restart git bash test --- test_git.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_git.txt b/test_git.txt index 7e775fcad4d..4119c9add51 100644 --- a/test_git.txt +++ b/test_git.txt @@ -1 +1 @@ -just a push test +just a push test2 From 003288614673c3edaa6ac34a1806e470a6f5e961 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:05:02 +0000 Subject: [PATCH 19/21] ci(pre-commit): Apply automatic fixes --- cores/esp32/esp32-hal-rgb-led.c | 3 +-- variants/circuitart_zero_s3/pins_arduino.h | 2 +- .../department_of_alchemy_minimain_esp32s2/pins_arduino.h | 6 +++--- variants/esp32s2-devkit-lipo-usb/pins_arduino.h | 2 +- variants/esp32s2-devkit-lipo/pins_arduino.h | 2 +- variants/sensebox_mcu_esp32s2/pins_arduino.h | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/cores/esp32/esp32-hal-rgb-led.c b/cores/esp32/esp32-hal-rgb-led.c index 742902560a8..d47dde53664 100644 --- a/cores/esp32/esp32-hal-rgb-led.c +++ b/cores/esp32/esp32-hal-rgb-led.c @@ -17,8 +17,7 @@ #include "esp32-hal-rgb-led.h" // Backward compatibility - Deprecated. It will be removed in future releases. -void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) -{ +void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) { log_w("neopixelWrite() is deprecated. Use rgbLedWrite()."); rgbLedWrite(pin, red_val, green_val, blue_val); } diff --git a/variants/circuitart_zero_s3/pins_arduino.h b/variants/circuitart_zero_s3/pins_arduino.h index 73c5cb38e8a..930a081e0fc 100644 --- a/variants/circuitart_zero_s3/pins_arduino.h +++ b/variants/circuitart_zero_s3/pins_arduino.h @@ -18,7 +18,7 @@ // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking #define RGB_BUILTIN (PIN_RGB_LED + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 -#define RGBLED_NUM 1 // number of RGB LEDs +#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 index cb404a508cd..7f053b3f600 100644 --- a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h +++ b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h @@ -20,9 +20,9 @@ #define RGB_BUILTIN (PIN_RGB_LED + SOC_GPIO_PIN_COUNT) #define RGB_BRIGHTNESS 64 -#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 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/esp32s2-devkit-lipo-usb/pins_arduino.h b/variants/esp32s2-devkit-lipo-usb/pins_arduino.h index 3f7db9a842e..6dba09dbe43 100644 --- a/variants/esp32s2-devkit-lipo-usb/pins_arduino.h +++ b/variants/esp32s2-devkit-lipo-usb/pins_arduino.h @@ -4,7 +4,7 @@ #include #include "soc/soc_caps.h" -#define PIN_RGB_LED 18 +#define PIN_RGB_LED 18 #define RGB_BUILTIN PIN_RGB_LED #define RGB_BRIGHTNESS 64 diff --git a/variants/esp32s2-devkit-lipo/pins_arduino.h b/variants/esp32s2-devkit-lipo/pins_arduino.h index cbbd0cd5a91..98116754f5a 100644 --- a/variants/esp32s2-devkit-lipo/pins_arduino.h +++ b/variants/esp32s2-devkit-lipo/pins_arduino.h @@ -4,7 +4,7 @@ #include #include "soc/soc_caps.h" -#define PIN_RGB_LED 18 +#define PIN_RGB_LED 18 #define RGB_BUILTIN PIN_RGB_LED #define RGB_BRIGHTNESS 64 diff --git a/variants/sensebox_mcu_esp32s2/pins_arduino.h b/variants/sensebox_mcu_esp32s2/pins_arduino.h index 87aee7274e4..62acb6a13f4 100644 --- a/variants/sensebox_mcu_esp32s2/pins_arduino.h +++ b/variants/sensebox_mcu_esp32s2/pins_arduino.h @@ -17,8 +17,8 @@ #define USB_FW_MSC_SERIAL_NUMBER 0x00000000 #define PIN_RGB_LED 1 // RGB LED -#define RGBLED_PIN 1 // RGB LED -#define RGBLED_NUM 1 // number of RGB LEDs +#define RGBLED_PIN 1 // RGB LED +#define RGBLED_NUM 1 // number of RGB LEDs // Default I2C QWIIC-Ports static const uint8_t SDA = 39; From 20a7f759341e236b34fcee4e62c2dec7795eaec9 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 27 Aug 2024 12:59:06 -0300 Subject: [PATCH 20/21] removed wrong test file --- test_git.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test_git.txt diff --git a/test_git.txt b/test_git.txt deleted file mode 100644 index 4119c9add51..00000000000 --- a/test_git.txt +++ /dev/null @@ -1 +0,0 @@ -just a push test2 From 22cd73396769397cad4271b00b2d7cf1ba8bac19 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 27 Aug 2024 15:03:21 -0300 Subject: [PATCH 21/21] fix(rgbled): new Arduino style depreacted attribute --- cores/esp32/esp32-hal-rgb-led.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cores/esp32/esp32-hal-rgb-led.h b/cores/esp32/esp32-hal-rgb-led.h index c14b97ff98b..b151732e565 100644 --- a/cores/esp32/esp32-hal-rgb-led.h +++ b/cores/esp32/esp32-hal-rgb-led.h @@ -30,7 +30,8 @@ void rgbLedWriteOrdered(uint8_t pin, rgb_led_color_order_t order, uint8_t red_va void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val); // Backward compatibility - Deprecated. It will be removed in future releases. -void neopixelWrite(uint8_t p, uint8_t r, uint8_t g, uint8_t b) __attribute__((deprecated("Use rgbLedWrite()."))); +[[deprecated("Use rgbLedWrite() instead.")]] +void neopixelWrite(uint8_t p, uint8_t r, uint8_t g, uint8_t b); #ifdef __cplusplus }