Merge remote-tracking branch 'upstream/main' into mdev

2023-06-07 20:54:04 +02:00
parent 74f75b1124 999bec19f1
commit b95ff2d74f
37 changed files with 6133 additions and 5775 deletions
--- a/wled00/presets.cpp
+++ b/wled00/presets.cpp
@@ -52,7 +52,7 @@ static void doSaveState() {
    size_t len = measureJson(*fileDoc) + 1;
    DEBUG_PRINTLN(len);
    // if possible use SPI RAM on ESP32
-    #if defined(BOARD_HAS_PSRAM) && (defined(WLED_USE_PSRAM) || defined(WLED_USE_PSRAM_JSON))
+    #if defined(BOARD_HAS_PSRAM) && defined(WLED_USE_PSRAM)
    if (psramFound())
      tmpRAMbuffer = (char*) ps_malloc(len);
    else