jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-26 20:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix for ESP8266 saving segments.

Browse Source
This commit is contained in:
Blaz Kristan 2021-06-18 12:16:04 +02:00
parent b7fb9e182b
commit 3acc521741
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wled00/FX.h
View File

@ -331,7 +331,7 @@ class WS2812FX {
deallocateData(); deallocateData();
if (WS2812FX::instance->_usedSegmentData + len > MAX_SEGMENT_DATA) return false; //not enough memory if (WS2812FX::instance->_usedSegmentData + len > MAX_SEGMENT_DATA) return false; //not enough memory
// if possible use SPI RAM on ESP32 // 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()) if (psramFound())
data = (byte*) ps_malloc(len); data = (byte*) ps_malloc(len);
else else

4
wled00/json.cpp
View File

@ -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 // use rev:2 API if more than 12 segments on ESP8266
uint8_t tooMany = 0; uint8_t tooMany = 0;
for(uint8_t i=0; i < strip.getMaxSegments(); i++) if ((strip.getSegment(i)).isActive()) tooMany++; for(uint8_t i=0; i < strip.getMaxSegments(); i++) if ((strip.getSegment(i)).isActive()) tooMany++;
if (tooMany>12) if (tooMany<13)
#endif #endif
root.remove("rev"); // remove API revision if ESP32 or ESP8266 with less than 13 segments root.remove("rev"); // remove API revision if ESP32 or ESP8266 with less than 13 segments
uint8_t versionAPI = root["rev"] | 1; uint8_t versionAPI = root["rev"] | 1;
@ -594,7 +594,7 @@ void serializeInfo(JsonObject root)
#endif #endif
root[F("freeheap")] = ESP.getFreeHeap(); 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(); if (psramFound()) root[F("psram")] = ESP.getFreePsram();
#endif #endif
root[F("uptime")] = millis()/1000 + rolloverMillis*4294967; root[F("uptime")] = millis()/1000 + rolloverMillis*4294967;

2
wled00/wled.h
View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // 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 //uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG //#define WLED_USE_MY_CONFIG

2
wled00/xml.cpp
View File

@ -311,7 +311,7 @@ void getSettingsJS(byte subPage, char* dest)
#ifdef WLED_DEBUG #ifdef WLED_DEBUG
oappend(SET_F(",1")); // debug output (TX) pin oappend(SET_F(",1")); // debug output (TX) pin
#endif #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 if (psramFound()) oappend(SET_F(",16,17")); // GPIO16 & GPIO17 reserved for SPI RAM
#endif #endif
//TODO: add reservations for Ethernet shield pins //TODO: add reservations for Ethernet shield pins