From b7fb9e182bfd89685e30c3f0cb4323331bf56fd1 Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Wed, 16 Jun 2021 12:19:16 +0200 Subject: [PATCH] WLED_USE_PSRAM fix --- wled00/FX.h | 2 +- wled00/json.cpp | 2 +- wled00/xml.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wled00/FX.h b/wled00/FX.h index b30231983..d33d950fc 100644 --- a/wled00/FX.h +++ b/wled00/FX.h @@ -331,7 +331,7 @@ class WS2812FX { deallocateData(); if (WS2812FX::instance->_usedSegmentData + len > MAX_SEGMENT_DATA) return false; //not enough memory // if possible use SPI RAM on ESP32 - #ifdef ARDUINO_ARCH_ESP32 + #ifdef ARDUINO_ARCH_ESP32 && defined(WLED_USE_PSRAM) if (psramFound()) data = (byte*) ps_malloc(len); else diff --git a/wled00/json.cpp b/wled00/json.cpp index 42084db76..0333ef5f6 100644 --- a/wled00/json.cpp +++ b/wled00/json.cpp @@ -594,7 +594,7 @@ void serializeInfo(JsonObject root) #endif root[F("freeheap")] = ESP.getFreeHeap(); - #ifdef ARDUINO_ARCH_ESP32 + #ifdef ARDUINO_ARCH_ESP32 && defined(WLED_USE_PSRAM) if (psramFound()) root[F("psram")] = ESP.getFreePsram(); #endif root[F("uptime")] = millis()/1000 + rolloverMillis*4294967; diff --git a/wled00/xml.cpp b/wled00/xml.cpp index 15d5abd5d..ad1ea5fbc 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -311,7 +311,7 @@ void getSettingsJS(byte subPage, char* dest) #ifdef WLED_DEBUG oappend(SET_F(",1")); // debug output (TX) pin #endif - #ifdef ARDUINO_ARCH_ESP32 + #ifdef ARDUINO_ARCH_ESP32 && defined(WLED_USE_PSRAM) if (psramFound()) oappend(SET_F(",16,17")); // GPIO16 & GPIO17 reserved for SPI RAM #endif //TODO: add reservations for Ethernet shield pins