🚀 Add new MCU support (C6 and C5) to the ESP-IDF V5 builds

.gitignore

@@ -10,6 +10,10 @@
 compile_commands.json
 __pycache__/
 
+/.dummy
+/dependencies.lock
+/managed_components
+
 esp01-update.sh
 platformio_override.ini
 replace_fs.py

.vscode/extensions.json

@@ -1,7 +1,6 @@
 {
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
     "recommendations": [
+        "pioarduino.pioarduino-ide",
         "platformio.platformio-ide"
     ],
     "unwantedRecommendations": [

pio-scripts/set_metadata.py

@@ -100,15 +100,16 @@ def add_wled_metadata_flags(env, node):
     if not has_def(cdefs, "WLED_REPO"):
         repo = get_github_repo()
         if repo:
+            print(f"repo = {repo}")
             cdefs.append(("WLED_REPO", f"\\\"{repo}\\\""))
 
     cdefs.append(("WLED_VERSION", WLED_VERSION))
 
-    # This transforms the node in to a Builder; it cannot be modified again
-    return env.Object(
-        node,
-        CPPDEFINES=cdefs
-    )
+    # Return the node unmodified - middleware should not create new build targets
+    print(f"version = {WLED_VERSION}")
+    # Instead, modify the environment's CPPDEFINES before the file is compiled
+    env["CPPDEFINES"] = cdefs
+    return node
 
 env.AddBuildMiddleware(
     add_wled_metadata_flags,

platformio.ini

@@ -27,6 +27,8 @@ default_envs =
                esp32_wrover
                lolin_s2_mini ;; TODO: disabled NeoEsp32RmtMethodIsr
                esp32c3dev
+               esp32c6dev_4MB
+               esp32c5dev
                ; esp32s3dev_16MB_opi ;; TODO: disabled NeoEsp32RmtMethodIsr
                ; esp32s3dev_8MB_opi ;; TODO: disabled NeoEsp32RmtMethodIsr
                ; esp32s3_4M_qspi ;; TODO: disabled NeoEsp32RmtMethodIsr
@@ -169,6 +171,7 @@ upload_speed = 115200
 lib_compat_mode = strict
 lib_deps =
     fastled/FastLED @ 3.10.1
+    ;; https://github.com/softhack007/FastLED.git#ESP32-C6 ;; patched version for -C6
 ;   IRremoteESP8266 @ 2.8.2 ;; TODO: add back
     ;; neopixelbus dependancy moved into [8266] and [esp32_all_variants] sections
     https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.4.2
@@ -385,6 +388,160 @@ lib_ignore = ${esp32_idf_V5.lib_ignore}
 board_build.partitions = ${esp32.default_partitions}   ;; default partioning for 4MB Flash - can be overridden in build envs
 board_build.flash_mode = qio
 
+
+[esp32c5]
+;; generic definitions for all ESP32-C5 boards
+;; NOTE: ESP32-C5 requires pioarduino platform (Tasmota framework doesn't include C5 Arduino libs yet)
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.36/platform-espressif32.zip
+platform_packages =
+build_unflags = ${esp32_idf_V5.build_unflags}
+  -D WLED_ENABLE_DMX_INPUT  ;; esp_dmx library doesn't support C5 UART registers yet
+build_flags = -g
+  -Wshadow=compatible-local
+  -DARDUINO_ARCH_ESP32
+  -DARDUINO_ARCH_ESP32C5
+  -DCONFIG_IDF_TARGET_ESP32C5=1
+  -D CONFIG_ASYNC_TCP_USE_WDT=0
+  -DCO
+  ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:
+  ;; ARDUINO_USB_MODE
+  ;; ARDUINO_USB_CDC_ON_BOOT
+  ${esp32_idf_V5.build_flags}
+lib_deps =
+  ;; NB: we spell out deps explicitly (instead of ${esp32_idf_V5.lib_deps}) to replace
+  ;; the upstream NeoPixelBus with a C5-patched fork; using both causes duplicate compilation.
+  ;; TODO: remove the temporarily Override below once NeoPixelBus has official support for -C5 
+  ;; ${esp32_all_variants.lib_deps}
+  esp32async/AsyncTCP @ 3.4.6
+  bitbank2/AnimatedGIF@^1.4.7
+  https://github.com/Aircoookie/GifDecoder.git#bc3af189b6b1e06946569f6b4287f0b79a860f8e
+  https://github.com/jonny190/NeoPixelBus.git#wled-c5-stable ;; wled-c5-stable for C5 support: I2S exclusion, bit-bang CSR/GPIO, channel ctor overload
+  https://github.com/netmindz/esp_dmx/#esp-idf-v5-fixes
+  ${env.lib_deps}
+lib_ignore = ${esp32_idf_V5.lib_ignore}
+  esp_dmx  ;; esp_dmx library doesn't support C5 UART registers yet
+extra_scripts = ${scripts_defaults.extra_scripts}
+
+[esp32c6]
+;; generic definitions for all ESP32-C6 boards
+platform = ${esp32_idf_V5.platform}
+platform_packages =  ${esp32_idf_V5.platform_packages}
+;;platform_packages =
+;;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.1
+;;  framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.1/esp32-arduino-libs-3.0.1.zip
+
+;; board = esp32-c6-devkitm-1 ;; board must be defined in the lower-level [env:*] buildenvs for C6-based boards
+build_unflags = ${esp32_idf_V5.build_unflags}
+build_flags = -g
+  -DARDUINO_ARCH_ESP32
+  -DARDUINO_ARCH_ESP32C6
+  -DCONFIG_IDF_TARGET_ESP32C6=1
+  -D CONFIG_ASYNC_TCP_USE_WDT=0
+  -DCO
+  -DARDUINO_USB_MODE=1 ;; this flag is - most likely - mandatory for ESP32-C6
+  ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:
+  ;; ARDUINO_USB_CDC_ON_BOOT
+  ${esp32_idf_V5.build_flags}
+lib_deps =
+  ${esp32_idf_V5.lib_deps}
+lib_ignore = ${esp32_idf_V5.lib_ignore}
+
+
+[env:esp32c6dev_8MB]
+;; ESP32-C6 "devkit C" with 8MB flash
+extends = esp32c6
+platform = ${esp32c6.platform}
+platform_packages = ${esp32c6.platform_packages}
+framework = arduino
+board = esp32-c6-devkitc-1
+
+build_unflags = ${esp32c6.build_unflags}
+  ;;-D CORE_DEBUG_LEVEL=0
+  ;;-D NDEBUG
+build_flags = ${common.build_flags} ${esp32c6.build_flags} -D WLED_RELEASE_NAME=\"ESP32-C6_8MB\"
+  -Wno-volatile -Wno-deprecated-declarations ;; silence compiler warnings
+  ;; -Wno-cpp                                   ;; silence '#pragma warning' messages
+  ;;-D DEBUG -g3 -ggdb
+  ;;-D CORE_DEBUG_LEVEL=4
+  -D WLED_WATCHDOG_TIMEOUT=0
+  ;; -DLOLIN_WIFI_FIX ; might be needed on "-C6 mini"
+  ;;-DARDUINO_USB_CDC_ON_BOOT=1 ;; for virtual CDC USB
+  -DARDUINO_USB_CDC_ON_BOOT=0   ;; for serial-to-USB chip
+  -D WLED_DISABLE_INFRARED     ;; library not not compatible with -C6
+  -D WLED_DISABLE_ESPNOW       ;; ToDO: temporarily disabled, until we find a solution for esp-now build errors with -C6
+upload_speed = 460800
+lib_deps = ${esp32c6.lib_deps}
+lib_ignore = ${esp32c6.lib_ignore}
+  IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
+  QuickEspNow     ; ToDO: disabled until we find a compatible version
+
+board_build.partitions = ${esp32.large_partitions}
+board_build.f_flash = 80000000L
+board_build.flash_mode = qio
+board_build.arduino.memory_type = qio_qspi
+monitor_filters = esp32_exception_decoder
+
+[env:esp32c6dev_4MB]
+;; ESP32-C6 "devkit M" with 4MB flash
+extends = env:esp32c6dev_8MB
+board = esp32-c6-devkitm-1
+board_build.partitions = ${esp32.default_partitions}
+build_unflags = ${env:esp32c6dev_8MB.build_unflags} -D WLED_RELEASE_NAME=\"ESP32-C6_8MB\"
+build_flags = ${env:esp32c6dev_8MB.build_flags}     -D WLED_RELEASE_NAME=\"ESP32-C6_4MB\"
+
+
+[env:esp32c5dev]
+;; ESP32-C5 "devkit C" with 4MB flash, no PSRAM - EXPERIMENTAL
+extends = esp32c5
+board = esp32-c5-devkitc-1
+board_build.f_flash = 80000000L
+board_build.flash_mode = qio
+board_build.arduino.memory_type = qio_qspi  ;; flash config only, this board has no PSRAM
+
+build_flags = ${common.build_flags} ${esp32c5.build_flags} -D WLED_RELEASE_NAME=\"ESP32-C5\"
+  -Wno-volatile -Wno-deprecated-declarations
+  -D WLED_WATCHDOG_TIMEOUT=0
+  -DARDUINO_USB_MODE=1            ;; this flag is mandatory for ESP32-C5
+  -DARDUINO_USB_CDC_ON_BOOT=0     ;; for serial-to-USB chip
+  -D WLED_DISABLE_INFRARED       ;; library not compatible with -C5
+  -D WLED_DISABLE_ESPNOW         ;; not yet tested
+  -D WLED_DEBUG
+lib_ignore = ${esp32c5.lib_ignore}
+  IRremoteESP8266
+  QuickEspNow
+
+board_build.partitions = ${esp32.big_partitions}
+upload_speed = 460800
+monitor_filters = esp32_exception_decoder
+
+[env:esp32c5dev_8MB_qspi]
+;; ESP32-C5 with 8MB flash and PSRAM - EXPERIMENTAL
+extends = esp32c5
+board = esp32-c5-devkitc1-n8r4
+board_build.f_flash = 80000000L
+board_build.flash_mode = qio
+board_build.arduino.memory_type = qio_qspi  ;; this board has PSRAM
+
+build_flags = ${common.build_flags} ${esp32c5.build_flags} -D WLED_RELEASE_NAME=\"ESP32-C5_8MB_qspi\"
+  -Wno-volatile -Wno-deprecated-declarations
+  -D BOARD_HAS_PSRAM
+  -D WLED_WATCHDOG_TIMEOUT=0
+  -DARDUINO_USB_MODE=1            ;; this flag is mandatory for ESP32-C5
+  -DARDUINO_USB_CDC_ON_BOOT=0     ;; for serial-to-USB chip
+  -D WLED_DISABLE_INFRARED       ;; library not compatible with -C5
+  -D WLED_DISABLE_ESPNOW         ;; not yet tested
+  -D WLED_DEBUG
+lib_ignore = ${esp32c5.lib_ignore}
+  IRremoteESP8266
+  QuickEspNow
+
+board_build.partitions = ${esp32.large_partitions}
+board_upload.flash_size = 8MB
+board_upload.maximum_size = 8388608
+upload_speed = 460800
+monitor_filters = esp32_exception_decoder
+
+
 [esp32s3]
 ;; generic definitions for all ESP32-S3 boards
 platform = ${esp32_idf_V5.platform}

usermods/audioreactive/audio_reactive.cpp

@@ -668,7 +668,7 @@ class AudioReactive : public Usermod {
     static const char _dynamics[];
     static const char _frequency[];
     static const char _inputLvl[];
-#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
+#if defined(CONFIG_IDF_TARGET_ESP32) // analog mic is only supported on classic esp32
     static const char _analogmic[];
 #endif
     static const char _digitalmic[];
@@ -1160,23 +1160,23 @@ class AudioReactive : public Usermod {
 
       // Reset I2S peripheral for good measure
       i2s_driver_uninstall(I2S_NUM_0);   // E (696) I2S: i2s_driver_uninstall(2006): I2S port 0 has not installed
-      #if !defined(CONFIG_IDF_TARGET_ESP32C3)
+      #if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5)
         delay(100);
         periph_module_reset(PERIPH_I2S0_MODULE);   // not possible on -C3
       #endif
       delay(100);         // Give that poor microphone some time to setup.
 
       useBandPassFilter = false;
 
-      #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
+      #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5)
         if ((i2sckPin == I2S_PIN_NO_CHANGE) && (i2ssdPin >= 0) && (i2swsPin >= 0) && ((dmType == 1) || (dmType == 4)) ) dmType = 5;   // dummy user support: SCK == -1 --means--> PDM microphone
       #endif
 
       switch (dmType) {
-      #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)
+      #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C5) || defined(CONFIG_IDF_TARGET_ESP32S3)
         // stub cases for not-yet-supported I2S modes on other ESP32 chips
         case 0:  //ADC analog
-        #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3)
+        #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C5)
         case 5:  //PDM Microphone
         #endif
       #endif
@@ -1204,7 +1204,7 @@ class AudioReactive : public Usermod {
           delay(100);
           if (audioSource) audioSource->initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
           break;
-        #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
+        #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5)
         case 5:
           DEBUGSR_PRINT(F("AR: I2S PDM Microphone - ")); DEBUGSR_PRINTLN(F(I2S_PDM_MIC_CHANNEL_TEXT));
           audioSource = new I2SSource(SAMPLE_RATE, BLOCK_SIZE, 1.0f/4.0f);
@@ -1220,7 +1220,7 @@ class AudioReactive : public Usermod {
           if (audioSource) audioSource->initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
           break;
 
-        #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
+        #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32S3)
         // ADC over I2S is only possible on "classic" ESP32
         case 0:
           DEBUGSR_PRINTLN(F("AR: Analog Microphone (left channel only)."));
@@ -1797,7 +1797,7 @@ class AudioReactive : public Usermod {
       top[FPSTR(_addPalettes)] = addPalettes;
 
 #ifdef ARDUINO_ARCH_ESP32
-    #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
+    #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32S3)
       JsonObject amic = top.createNestedObject(FPSTR(_analogmic));
       amic["pin"] = audioPin;
     #endif
@@ -1856,16 +1856,16 @@ class AudioReactive : public Usermod {
       configComplete &= getJsonValue(top[FPSTR(_addPalettes)], addPalettes);
 
 #ifdef ARDUINO_ARCH_ESP32
-    #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
+    #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32S3)
       configComplete &= getJsonValue(top[FPSTR(_analogmic)]["pin"], audioPin);
     #else
       audioPin = -1; // MCU does not support analog mic
     #endif
 
       configComplete &= getJsonValue(top[FPSTR(_digitalmic)]["type"],   dmType);
-    #if  defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)
+    #if  defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C5) || defined(CONFIG_IDF_TARGET_ESP32S3)
       if (dmType == 0) dmType = SR_DMTYPE;   // MCU does not support analog
-      #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3)
+      #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C5)
       if (dmType == 5) dmType = SR_DMTYPE;   // MCU does not support PDM
       #endif
     #endif
@@ -1903,14 +1903,14 @@ class AudioReactive : public Usermod {
 #ifdef ARDUINO_ARCH_ESP32
       uiScript.print(F("uxp=ux+':digitalmic:pin[]';")); // uxp = shortcut for AudioReactive:digitalmic:pin[]
       uiScript.print(F("dd=addDropdown(ux,'digitalmic:type');"));
-    #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
+    #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32S3)
       uiScript.print(F("addOption(dd,'Generic Analog',0);"));
     #endif
       uiScript.print(F("addOption(dd,'Generic I2S',1);"));
       uiScript.print(F("addOption(dd,'ES7243',2);"));
       uiScript.print(F("addOption(dd,'SPH0654',3);"));
       uiScript.print(F("addOption(dd,'Generic I2S with Mclk',4);"));
-    #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
+    #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5)
       uiScript.print(F("addOption(dd,'Generic I2S PDM',5);"));
     #endif
     uiScript.print(F("addOption(dd,'ES8388',6);"));
@@ -1946,7 +1946,7 @@ class AudioReactive : public Usermod {
       uiScript.print(F("addInfo(uxp,0,'<i>sd/data/dout</i>','I2S SD');"));
       uiScript.print(F("addInfo(uxp,1,'<i>ws/clk/lrck</i>','I2S WS');"));
       uiScript.print(F("addInfo(uxp,2,'<i>sck/bclk</i>','I2S SCK');"));
-      #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
+      #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32S3)
         uiScript.print(F("addInfo(uxp,3,'<i>only use -1, 0, 1 or 3</i>','I2S MCLK');"));
       #else
         uiScript.print(F("addInfo(uxp,3,'<i>master clock</i>','I2S MCLK');"));
@@ -2069,7 +2069,7 @@ const char AudioReactive::_config[]     PROGMEM = "config";
 const char AudioReactive::_dynamics[]   PROGMEM = "dynamics";
 const char AudioReactive::_frequency[]  PROGMEM = "frequency";
 const char AudioReactive::_inputLvl[]   PROGMEM = "inputLevel";
-#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
+#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32S3)
 const char AudioReactive::_analogmic[]  PROGMEM = "analogmic";
 #endif
 const char AudioReactive::_digitalmic[] PROGMEM = "digitalmic";

usermods/audioreactive/audio_source.h

@@ -22,7 +22,7 @@
 
 // see https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/chip-series-comparison.html#related-documents
 // and https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-reference/peripherals/i2s.html#overview-of-all-modes
-#if defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C5) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(ESP8266) || defined(ESP8265)
+#if defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C5) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32C61) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(ESP8266) || defined(ESP8265)
   // there are two things in these MCUs that could lead to problems with audio processing:
   // * no floating point hardware (FPU) support - FFT uses float calculations. If done in software, a strong slow-down can be expected (between 8x and 20x)
   // * single core, so FFT task might slow down other things like LED updates

wled00/FX.h

@@ -70,10 +70,12 @@ extern byte realtimeMode;           // used in getMappedPixelIndex()
 #define WLED_FPS         42
 #define FRAMETIME_FIXED  (1000/WLED_FPS)
 #define FRAMETIME        strip.getFrameTime()
-#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
-  #define MIN_FRAME_DELAY  2                                              // minimum wait between repaints, to keep other functions like WiFi alive 
-#elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3)
-  #define MIN_FRAME_DELAY  3                                              // S2/C3 are slower than normal esp32, and only have one core
+#if defined(ARDUINO_ARCH_ESP32)
+  #if (SOC_CPU_CORES_NUM < 2)
+    #define MIN_FRAME_DELAY  3                                            // S2/C3/C6/C5 are slower than normal esp32, and only have one core
+  #else
+    #define MIN_FRAME_DELAY  2                                            // classic esp32/S3/P4: minimum wait between repaints, to keep other functions like WiFi alive
+  #endif
 #else
   #define MIN_FRAME_DELAY  8                                              // 8266 legacy MIN_SHOW_DELAY
 #endif