Add ESP32-P4 32MB support (eth&DDP only)

docs/esp32-p4-eth-network-compat.md

@@ -0,0 +1,39 @@
+# ESP32-P4 Ethernet network helper compatibility
+
+This branch keeps WLED's network helper on the unique symbol `WLEDNetwork` while preserving existing WLED source call sites that use `Network`.
+
+## What changed
+
+WLED previously had its own helper object named `Network`. The ESP32 Arduino 3.x / ESP-IDF 5 stack also provides a global `Network` object for its `NetworkManager`, which creates a name collision when building the ESP32-P4/V5 stack.
+
+To avoid that collision while minimizing churn in the branch:
+
+- WLED's helper class/object are named `WLEDNetworkClass` and `WLEDNetwork`.
+- `Network.h` maps legacy WLED helper calls with `#define Network WLEDNetwork` after including the framework WiFi/Ethernet headers.
+- `Network.cpp` defines the `WLEDNetwork` object rather than a WLED-owned object named `Network`.
+- The shared `DNSlookup` state used by `BusNetwork::resolveHostname()` is declared/defined so the current `bus_manager.cpp` code has a valid object to use.
+
+## Consequences and tradeoffs
+
+This is intended to keep both relevant ESP32 build stacks viable:
+
+- the older/current WLED ESP32 stack where WLED code historically used `Network`, and
+- the ESP32-P4/V5 stack where Arduino-ESP32 provides its own global `Network` object.
+
+The compatibility macro keeps the diff small because most WLED call sites can remain as `Network.isConnected()`, `Network.localIP()`, etc. Those calls are redirected to WLED's `WLEDNetwork` helper after `Network.h` is included.
+
+The main downside is that `Network` becomes a preprocessor alias in translation units that include WLED's `Network.h`. Code in those translation units that intentionally needs Arduino-ESP32's own `NetworkManager Network` after including WLED's helper header may need to include/use it before this header or locally `#undef Network`. This branch does not currently add such a use case.
+
+The helper object name exposed by WLED is now `WLEDNetwork`. Any external code or usermod that directly declared or linked against WLED's old `NetworkClass Network` symbol, instead of using normal WLED headers and call sites, may need adjustment.
+
+No runtime behavior change is intended for Wi-Fi, Ethernet, Art-Net, DDP, Improv, JSON info, or Espalexa. The change is primarily a build/link compatibility fix for the network helper name collision.
+
+## Test note
+
+ETH and DDP tested only.
+
+PlatformIO build validation should still be run for at least:
+
+- `esp32dev_V4`
+- `esp32dev`
+- `esp32p4_32MB`

platformio.ini

@@ -32,6 +32,7 @@ default_envs = nodemcuv2
                esp32s3dev_8MB_qspi
                esp32s3dev_8MB_none
                esp32s3_4M_qspi
+               esp32p4_32MB
                usermods
 
 src_dir  = ./wled00
@@ -383,6 +384,55 @@ board_build.partitions = ${esp32.large_partitions}   ;; default partioning for 8
 upload_speed = 921600
 monitor_filters = esp32_exception_decoder
 
+[esp32p4]
+;; generic definitions for ESP32-P4 boards. Uses pioarduino for IDF 5.5 based P4 support.
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
+platform_packages =
+build_unflags = ${common.build_unflags}
+  -D WLED_ENABLE_DMX_INPUT ;; esp_dmx is excluded for ESP32-P4
+  -D WLED_ENABLE_DMX       ;; DMX serial output needs ESP32-P4-specific adaptation
+build_flags = -g
+  -DARDUINO_ARCH_ESP32
+  -DARDUINO_ARCH_ESP32P4
+  -DCONFIG_IDF_TARGET_ESP32P4=1
+  -D CONFIG_ASYNC_TCP_USE_WDT=0
+  -D CONFIG_ASYNC_TCP_STACK_SIZE=8192
+  -D WLED_ENABLE_GIF
+  -DCO
+  -DARDUINO_USB_MODE=1
+  -D WLED_DISABLE_INFRARED
+  -D WLED_DISABLE_ESPNOW
+  -D WLED_DISABLE_MQTT
+  -D WLED_USE_SHARED_RMT
+  -D ESP32_ARDUINO_NO_RGB_BUILTIN
+lib_deps =
+  esp32async/AsyncTCP @ 3.4.10
+  bitbank2/AnimatedGIF@^1.4.7
+  https://github.com/Aircoookie/GifDecoder.git#bc3af189b6b1e06946569f6b4287f0b79a860f8e
+  NeoPixelBus = git+https://github.com/Makuna/NeoPixelBus#76afe832f74b0738a3fa1bba0caf389ade9e7693
+  crankyoldgit/IRremoteESP8266 @ 2.9.0
+  ESPAsyncWebServerWLED = git+https://github.com/Aircoookie/ESPAsyncWebServer#ac44e32abf2a69ae650412fb6bc193c59ccac38a
+  marvinroger/AsyncMqttClient @ 0.9.0
+  https://github.com/blazoncek/QuickESPNow.git#optional-debug
+lib_ignore =
+  NeoESP32RmtHI
+  IRremoteESP8266
+  QuickEspNow
+  esp_dmx
+
+[env:esp32p4_32MB]
+;; (experimental) ESP32-P4 with 32 MB flash and PSRAM
+extends = esp32p4
+board = esp32-p4-evboard
+board_build.flash_mode = qio
+board_build.partitions = tools/WLED_ESP32_32MB.csv
+build_unflags = ${esp32p4.build_unflags}
+build_flags = ${common.build_flags} ${esp32p4.build_flags}
+  -D WLED_RELEASE_NAME=\"ESP32-P4_32MB\"
+  -DBOARD_HAS_PSRAM
+upload_speed = 460800
+monitor_filters = esp32_exception_decoder
+
 
 # ------------------------------------------------------------------------------
 # WLED BUILDS

wled00/bus_manager.cpp

@@ -452,8 +452,12 @@ BusPwm::BusPwm(const BusConfig &bc)
       pinMode(_pins[i], OUTPUT);
       #else
       unsigned channel = _ledcStart + i;
+      #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
       ledcSetup(channel, _frequency, _depth - (dithering*4)); // with dithering _frequency doesn't really matter as resolution is 8 bit
       ledcAttachPin(_pins[i], channel);
+      #else
+      ledcAttachChannel(_pins[i], _frequency, _depth - (dithering*4), channel);
+      #endif
       // LEDC timer reset credit @dedehai
       uint8_t group = (channel / 8), timer = ((channel / 2) % 4); // same fromula as in ledcSetup()
       ledc_timer_rst((ledc_mode_t)group, (ledc_timer_t)timer); // reset timer so all timers are almost in sync (for phase shift)
@@ -585,10 +589,15 @@ void BusPwm::show() {
     unsigned ch = channel%8;  // group channel
     // directly write to LEDC struct as there is no HAL exposed function for dithering
     // duty has 20 bit resolution with 4 fractional bits (24 bits in total)
+    #if defined(CONFIG_IDF_TARGET_ESP32P4)
+    // TODO: find out if / how dithering support can be implemented on P4
+    ledc_set_duty_and_update((ledc_mode_t)gr, (ledc_channel_t)ch, duty >> bitShift, hPoint >> bitShift);
+    #else
     LEDC.channel_group[gr].channel[ch].duty.duty = duty << ((!dithering)*4);  // lowest 4 bits are used for dithering, shift by 4 bits if not using dithering
     LEDC.channel_group[gr].channel[ch].hpoint.hpoint = hPoint >> bitShift;    // hPoint is at _depth resolution (needs shifting if dithering)
     ledc_update_duty((ledc_mode_t)gr, (ledc_channel_t)ch);
     #endif
+    #endif
 
     if (!_reversed) hPoint += duty;
     hPoint += deadTime;        // offset to cascade the signals
@@ -623,7 +632,11 @@ void BusPwm::deallocatePins() {
     #ifdef ESP8266
     digitalWrite(_pins[i], LOW); //turn off PWM interrupt
     #else
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
     if (_ledcStart < WLED_MAX_ANALOG_CHANNELS) ledcDetachPin(_pins[i]);
+    #else
+    if (_ledcStart < WLED_MAX_ANALOG_CHANNELS) ledcDetach(_pins[i]);
+    #endif
     #endif
   }
   #ifdef ARDUINO_ARCH_ESP32
@@ -1285,6 +1298,10 @@ void BusManager::removeAll() {
 // since I2S outputs are known only during config of buses, lets just assume RMT is used for digital buses
 // unused RMT channels should have no effect
 void BusManager::esp32RMTInvertIdle() {
+#if defined(CONFIG_IDF_TARGET_ESP32P4)
+  // ESP32-P4 uses shared RMT method - idle level inversion not supported
+  return;
+#else
   bool idle_out;
   unsigned rmt = 0;
   unsigned u = 0;
@@ -1302,6 +1319,7 @@ void BusManager::esp32RMTInvertIdle() {
     rmt_set_idle_level(ch, idle_out, lvl);
     u++;
   }
+#endif
 }
 #endif
 

wled00/bus_wrapper.h

@@ -4,6 +4,7 @@
 
 //#define NPB_CONF_4STEP_CADENCE
 #include "NeoPixelBus.h"
+#include "wled_boards.h"
 
 //Hardware SPI Pins
 #define P_8266_HS_MOSI 13
@@ -204,6 +205,8 @@
 
 /*** ESP32 Neopixel methods ***/
 #ifdef ARDUINO_ARCH_ESP32
+#include <esp_arduino_version.h>
+
 // C3: I2S0 and I2S1 methods not supported (has one I2S bus)
 // S2: I2S0 methods supported (single & parallel), I2S1 methods not supported (has one I2S bus)
 // S3: I2S0 methods not supported, I2S1 supports LCD parallel methods (has two I2S buses)
@@ -231,7 +234,29 @@
   typedef NeoEsp32I2s0Apa106Method X1Apa106Method;
   typedef NeoEsp32I2s0Ws2805Method X1Ws2805Method;
   typedef NeoEsp32I2s0Tm1914Method X1Tm1914Method;
-#elif !defined(CONFIG_IDF_TARGET_ESP32C3)
+#elif defined(CONFIG_IDF_TARGET_ESP32P4)
+  // P4 has no I2S LED driver in NeoPixelBus; keep dormant I2S switch arms compileable.
+  // AI: below section was generated by an AI
+  typedef XWs2812xMethod X1Ws2812xMethod;
+  typedef XSk6812Method X1Sk6812Method;
+  typedef X400KbpsMethod X1400KbpsMethod;
+  typedef X800KbpsMethod X1800KbpsMethod;
+  typedef XTm1814Method X1Tm1814Method;
+  typedef XTm1829Method X1Tm1829Method;
+  typedef XApa106Method X1Apa106Method;
+  typedef XWs2805Method X1Ws2805Method;
+  typedef XTm1914Method X1Tm1914Method;
+  typedef XWs2812xMethod X8Ws2812xMethod;
+  typedef XSk6812Method X8Sk6812Method;
+  typedef X400KbpsMethod X8400KbpsMethod;
+  typedef X800KbpsMethod X8800KbpsMethod;
+  typedef XTm1814Method X8Tm1814Method;
+  typedef XTm1829Method X8Tm1829Method;
+  typedef XApa106Method X8Apa106Method;
+  typedef XWs2805Method X8Ws2805Method;
+  typedef XTm1914Method X8Tm1914Method;
+  // AI: end
+#elif defined(WLED_HAS_PARALLEL_I2S)
   // regular ESP32 will use I2S1
   typedef NeoEsp32I2s1Ws2812xMethod X1Ws2812xMethod;
   typedef NeoEsp32I2s1Sk6812Method X1Sk6812Method;
@@ -245,7 +270,9 @@
 #endif
 
 // RMT driver selection
-#if !defined(WLED_USE_SHARED_RMT)  && !defined(__riscv)
+#if ESP_ARDUINO_VERSION_MAJOR >= 3
+#define NeoEsp32RmtMethod(x) NeoEsp32RmtX ## x ## Method
+#elif !defined(WLED_USE_SHARED_RMT)  && !defined(__riscv)
 #include <NeoEsp32RmtHIMethod.h>
 #define NeoEsp32RmtMethod(x) NeoEsp32RmtHIN ## x ## Method
 #else
@@ -1345,10 +1372,15 @@ class PolyBus {
       #else //ESP32
       // dynamic channel allocation based on driver preference
       // determine which driver to use based on preference and availability. First I2S bus locks the I2S type, all subsequent I2S buses are assigned the same type (hardware restriction)
+      #ifdef WLED_HAS_PARALLEL_I2S
+      constexpr bool canUseI2S = true;
+      #else
+      constexpr bool canUseI2S = false;
+      #endif
       uint8_t offset = 0; // 0 = RMT, 1 = I2S/LCD
       if (driverPreference == 0 && _rmtChannelsAssigned < WLED_MAX_RMT_CHANNELS) {
         _rmtChannelsAssigned++;
-      } else if (_i2sChannelsAssigned < WLED_MAX_I2S_CHANNELS) {
+      } else if (canUseI2S && _i2sChannelsAssigned < WLED_MAX_I2S_CHANNELS) {
         offset = 1; // I2S requested or RMT full
         _i2sChannelsAssigned++;
       } else {

wled00/cfg.cpp

@@ -135,6 +135,9 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
 #ifdef WLED_USE_ETHERNET
   JsonObject ethernet = doc[F("eth")];
   CJSON(ethernetType, ethernet["type"]);
+  #if defined(WLED_ETHERNET_ONLY_BUILD) && defined(WLED_ETH_DEFAULT)
+  if (ethernetType == WLED_ETH_NONE) ethernetType = WLED_ETH_DEFAULT;
+  #endif
   // NOTE: Ethernet configuration takes priority over other use of pins
   initEthernet();
 #endif
@@ -922,18 +925,8 @@ void serializeConfig(JsonObject root) {
     if (ethernetBoards[ethernetType].eth_power>=0)     pins.add(ethernetBoards[ethernetType].eth_power);
     if (ethernetBoards[ethernetType].eth_mdc>=0)       pins.add(ethernetBoards[ethernetType].eth_mdc);
     if (ethernetBoards[ethernetType].eth_mdio>=0)      pins.add(ethernetBoards[ethernetType].eth_mdio);
-    switch (ethernetBoards[ethernetType].eth_clk_mode) {
-      case ETH_CLOCK_GPIO0_IN:
-      case ETH_CLOCK_GPIO0_OUT:
-        pins.add(0);
-        break;
-      case ETH_CLOCK_GPIO16_OUT:
-        pins.add(16);
-        break;
-      case ETH_CLOCK_GPIO17_OUT:
-        pins.add(17);
-        break;
-    }
+    managed_pin_type clockPin = ethernetClockPin(ethernetBoards[ethernetType]);
+    if (clockPin.pin >= 0) pins.add(clockPin.pin);
   }
 #endif
 

wled00/const.h

@@ -10,7 +10,6 @@ constexpr size_t FASTLED_PALETTE_COUNT = 7;   //  6-12 = sizeof(fastledPalettes)
 constexpr size_t GRADIENT_PALETTE_COUNT = 59; // 13-72 = sizeof(gGradientPalettes) / sizeof(gGradientPalettes[0]);
 constexpr size_t DYNAMIC_PALETTE_COUNT = 6;   //  0- 5 = dynamic palettes (0=default(virtual),1=random,2=primary,3=primary+secondary,4=primary+secondary+tertiary,5=primary+secondary(+tertiary if not black)
 constexpr size_t FIXED_PALETTE_COUNT = DYNAMIC_PALETTE_COUNT + FASTLED_PALETTE_COUNT + GRADIENT_PALETTE_COUNT; // total number of fixed palettes
-
 // Palette ID space layout (palette IDs are uint8_t, 0-255):
 //   0  .. FIXED_PALETTE_COUNT-1            : fixed built-in palettes
 //   72 .. WLED_CUSTOM_PALETTE_ID_BASE(200) : user custom palettes (index 0 = ID 200, growing downward)
@@ -73,8 +72,14 @@ constexpr size_t  WLED_MAX_USERMOD_PALETTES     = WLED_USERMOD_PALETTE_ID_BASE -
   #if !defined(LEDC_CHANNEL_MAX) || !defined(LEDC_SPEED_MODE_MAX)
     #include "driver/ledc.h" // needed for analog/LEDC channel counts
   #endif
-  #define WLED_MAX_ANALOG_CHANNELS (LEDC_CHANNEL_MAX*LEDC_SPEED_MODE_MAX)
-  #if defined(CONFIG_IDF_TARGET_ESP32C3)    // 2 RMT, 6 LEDC, only has 1 I2S but NPB does not support it ATM
+
+  // define -> constexpr to avoid preprocessor errors and enum arithmetic warnings from newer compilers
+  #ifdef WLED_MAX_ANALOG_CHANNELS
+    #undef WLED_MAX_ANALOG_CHANNELS   // avoid clash between macro name and constexpr constant
+  #endif
+  constexpr size_t WLED_MAX_ANALOG_CHANNELS = static_cast<size_t>(LEDC_CHANNEL_MAX) * static_cast<size_t>(LEDC_SPEED_MODE_MAX);
+
+  #if defined(CONFIG_IDF_TARGET_ESP32C3)
     #define WLED_MAX_RMT_CHANNELS 2         // ESP32-C3 has 2 RMT output channels
     #define WLED_MAX_I2S_CHANNELS 0         // I2S not supported by NPB
     //#define WLED_MAX_ANALOG_CHANNELS 6
@@ -89,21 +94,30 @@ constexpr size_t  WLED_MAX_USERMOD_PALETTES     = WLED_USERMOD_PALETTE_ID_BASE -
     #define WLED_MAX_I2S_CHANNELS 8         // uses LCD parallel output not I2S
     //#define WLED_MAX_ANALOG_CHANNELS 8
     #define WLED_PLATFORM_ID 3       // used in UI to distinguish ESP type in UI, needs a proper fix!
+  #elif defined(CONFIG_IDF_TARGET_ESP32P4)
+    #define WLED_MAX_RMT_CHANNELS 2         // ESP32-P4 uses the shared RMT driver
+    #define WLED_MAX_I2S_CHANNELS 0         // I2S LED output is not supported by NeoPixelBus on P4
+    #define WLED_PLATFORM_ID 42             // used in UI to distinguish ESP type in UI
   #else
     #define WLED_MAX_RMT_CHANNELS 8         // ESP32 has 8 RMT output channels
     #define WLED_MAX_I2S_CHANNELS 8         // I2S parallel output supported by NPB
     //#define WLED_MAX_ANALOG_CHANNELS 16
     #define WLED_PLATFORM_ID 4       // used in UI to distinguish ESP type in UI, needs a proper fix!
   #endif
   #define WLED_MAX_TIMERS 64                // maximum number of timers
-  #define WLED_MAX_DIGITAL_CHANNELS (WLED_MAX_RMT_CHANNELS + WLED_MAX_I2S_CHANNELS)
+  #ifndef WLED_MAX_DIGITAL_CHANNELS
+    #define WLED_MAX_DIGITAL_CHANNELS (WLED_MAX_RMT_CHANNELS + WLED_MAX_I2S_CHANNELS)
+  #else
+    #warning "buildenv overrides WLED_MAX_DIGITAL_CHANNELS - please check that the value is correct"
+  #endif
 #endif
 // WLED_MAX_BUSSES was used to define the size of busses[] array which is no longer needed
 // instead it will help determine max number of buses that can be defined at compile time
 #ifdef WLED_MAX_BUSSES
   #undef WLED_MAX_BUSSES
 #endif
-#define WLED_MAX_BUSSES (WLED_MAX_DIGITAL_CHANNELS+WLED_MAX_ANALOG_CHANNELS)
+// define -> constexpr to align with definition of WLED_MAX_ANALOG_CHANNELS
+constexpr size_t WLED_MAX_BUSSES = WLED_MAX_DIGITAL_CHANNELS + WLED_MAX_ANALOG_CHANNELS;
 static_assert(WLED_MAX_BUSSES <= 32, "WLED_MAX_BUSSES exceeds hard limit");
 
 // Maximum number of pins per output. 5 for RGBCCT analog LEDs.
@@ -395,7 +409,7 @@ static_assert(WLED_MAX_BUSSES <= 32, "WLED_MAX_BUSSES exceeds hard limit");
 #define BTN_TYPE_TOUCH_SWITCH     9
 
 //Ethernet board types
-#define WLED_NUM_ETH_TYPES        16
+#define WLED_NUM_ETH_TYPES        17
 
 
 #define WLED_ETH_NONE              0
@@ -414,7 +428,7 @@ static_assert(WLED_MAX_BUSSES <= 32, "WLED_MAX_BUSSES exceeds hard limit");
 #define WLED_ETH_GLEDOPTO         13
 #define WLED_ETH_QUINLED_V4_UNOQUAD  14
 #define WLED_ETH_QUINLED_V4_OCTA     15
-
+#define WLED_ETH_ESP32P4_ETH      16
 
 //Hue error codes
 #define HUE_ERROR_INACTIVE        0
@@ -537,7 +551,7 @@ static_assert(WLED_MAX_BUSSES <= 32, "WLED_MAX_BUSSES exceeds hard limit");
   #elif defined(CONFIG_IDF_TARGET_ESP32S2)
     #define MAX_LEDS 2048 //due to memory constraints S2
   #else
-    #define MAX_LEDS 16384
+    #define MAX_LEDS 16384 // classic esp32, S3 and P4 can take more
   #endif
 #endif
 
@@ -552,7 +566,7 @@ static_assert(WLED_MAX_BUSSES <= 32, "WLED_MAX_BUSSES exceeds hard limit");
       #else
         #define MAX_LED_MEMORY (48*1024)  // with PSRAM there is more wiggle room as buffers get moved to PSRAM when needed (prioritize functionality over speed)
       #endif
-    #elif defined(CONFIG_IDF_TARGET_ESP32S3)
+    #elif defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32P4)
       #define MAX_LED_MEMORY (192*1024) // S3 has ~330k of free heap after boot
     #elif defined(CONFIG_IDF_TARGET_ESP32C3)
       #define MAX_LED_MEMORY (100*1024) // C3 has ~240k of free heap after boot, even with 8000 LEDs configured (2D) there is 30k of contiguous heap left
@@ -670,7 +684,7 @@ static_assert(WLED_MAX_BUSSES <= 32, "WLED_MAX_BUSSES exceeds hard limit");
 #endif
 
 // Defaults pins, type and counts to configure LED output
-#if defined(ESP8266) || defined(CONFIG_IDF_TARGET_ESP32C3)
+#if defined(ESP8266) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32P4)
   #ifdef WLED_ENABLE_DMX
     #define DEFAULT_LED_PIN 1
     #warning "Compiling with DMX. The default LED pin has been changed to pin 1."

wled00/data/settings_wifi.htm

@@ -240,6 +240,7 @@ <h3>Ethernet Type</h3>
 			<option value="8">QuinLED Octa & T-ETH-POE</option>
 			<option value="14">QuinLED v4 Uno/Quad</option>
 			<option value="15">QuinLED v4 Octa</option>
+			<option value="16">Waveshare ESP32-P4-ETH/POE</option>
 			<option value="10">Serg74-ETH32</option>
 			<option value="5">TwilightLord-ESP32</option>
 			<option value="3">WESP32</option>