Merge branch 'master' into release/v3.1.x

Author: me-no-dev

boards.txt

@@ -262,13 +262,13 @@ const char *EspClass::getChipModel(void) {
   uint32_t pkg_ver = chip_ver & 0x7;
   switch (pkg_ver) {
     case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ6:
-      if (getChipRevision() == 3) {
+      if ((getChipRevision() / 100) == 3) {
         return "ESP32-D0WDQ6-V3";
       } else {
         return "ESP32-D0WDQ6";
       }
     case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ5:
-      if (getChipRevision() == 3) {
+      if ((getChipRevision() / 100) == 3) {
         return "ESP32-D0WD-V3";
       } else {
         return "ESP32-D0WD";

cores/esp32/Esp.cpp

@@ -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

cores/esp32/esp32-hal-gpio.c

@@ -16,6 +16,12 @@
 
 #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) {
+  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);
 }

cores/esp32/esp32-hal-rgb-led.c

@@ -29,8 +29,9 @@ 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
-#define neopixelWrite(p, r, g, b) rgbLedWrite(p, r, g, b)
+// Backward compatibility - Deprecated. It will be removed in future releases.
+[[deprecated("Use rgbLedWrite() instead.")]]
+void neopixelWrite(uint8_t p, uint8_t r, uint8_t g, uint8_t b);
 
 #ifdef __cplusplus
 }

cores/esp32/esp32-hal-rgb-led.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)

cores/esp32/io_pin_remap.h

@@ -14,10 +14,10 @@ Example
 
 To get started with RMT, you can try:
 
-RMT Write Neo Pixel
-*******************
+RMT Write RGB LED
+*****************
 
-.. literalinclude:: ../../../libraries/ESP32/examples/RMT/RMTWriteNeoPixel/RMTWriteNeoPixel.ino
+.. literalinclude:: ../../../libraries/ESP32/examples/RMT/RMTWrite_RGB_LED/RMTWrite_RGB_LED.ino
     :language: arduino
 
 

docs/en/api/rmt.rst

@@ -376,7 +376,7 @@ void ArduinoOTAClass::handle() {
   if (_udp_ota.parsePacket()) {
     _onRx();
   }
-  _udp_ota.flush();  // always flush, even zero length packets must be flushed.
+  _udp_ota.clear();  // always clear, even zero length packets must be cleared.
 }
 
 int ArduinoOTAClass::getCommand() {

libraries/ArduinoOTA/src/ArduinoOTA.cpp

@@ -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
 }

libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.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;