post-merge

* restore WLED_USE_PSRAM_JSON - not existing in upstream * fix compiler warning about ambiguous "&"
2023-06-07 21:45:52 +02:00
parent b95ff2d74f
commit 6fd647ab15
4 changed files with 5 additions and 4 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)
+    #if defined(BOARD_HAS_PSRAM) && (defined(WLED_USE_PSRAM) || defined(WLED_USE_PSRAM_JSON))        // WLEDMM
    if (psramFound())
      tmpRAMbuffer = (char*) ps_malloc(len);
    else