diff --git a/wled00/FX.h b/wled00/FX.h index d33d950fc..81d5ff152 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 && defined(WLED_USE_PSRAM) + #if defined(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 0333ef5f6..ebb333fae 100644 --- a/wled00/json.cpp +++ b/wled00/json.cpp @@ -456,7 +456,7 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme // use rev:2 API if more than 12 segments on ESP8266 uint8_t tooMany = 0; for(uint8_t i=0; i < strip.getMaxSegments(); i++) if ((strip.getSegment(i)).isActive()) tooMany++; - if (tooMany>12) + if (tooMany<13) #endif root.remove("rev"); // remove API revision if ESP32 or ESP8266 with less than 13 segments uint8_t versionAPI = root["rev"] | 1; @@ -594,7 +594,7 @@ void serializeInfo(JsonObject root) #endif root[F("freeheap")] = ESP.getFreeHeap(); - #ifdef ARDUINO_ARCH_ESP32 && defined(WLED_USE_PSRAM) + #if defined(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/wled.h b/wled00/wled.h index 2c95ac8b1..3faa3c825 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2106161 +#define VERSION 2106181 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG diff --git a/wled00/xml.cpp b/wled00/xml.cpp index ad1ea5fbc..92eba9340 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 && defined(WLED_USE_PSRAM) + #if defined(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