Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

minor speedup for liveview and websockets

Browse Source 
it seems that getFreeHeap() needs some time, and blocks other tasks until completion.
sendDataWS() does not need ESP.getFreeHeap() results on esp32.
This commit is contained in:
Frank
2023-05-21 21:01:23 +02:00
parent fc193408d8
commit 63e63ad156
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wled00/ws.cpp
View File

@@ -114,9 +114,9 @@ void sendDataWs(AsyncWebSocketClient * client)
size_t len = measureJson(doc);
DEBUG_PRINTF("JSON buffer size: %u for WS request (%u).\n", doc.memoryUsage(), len);
size_t heap1 = ESP.getFreeHeap();
DEBUG_PRINT(F("heap ")); DEBUG_PRINTLN(ESP.getFreeHeap());
#ifdef ESP8266
size_t heap1 = ESP.getFreeHeap(); // WLEDMM moved into 8266 specific section
DEBUG_PRINT(F("heap ")); DEBUG_PRINTLN(ESP.getFreeHeap());
if (len>heap1) {
DEBUG_PRINTLN(F("Out of memory (WS)!"));
return;
@@ -140,6 +140,7 @@ void sendDataWs(AsyncWebSocketClient * client)
size_t heap2 = ESP.getFreeHeap();
DEBUG_PRINT(F("heap ")); DEBUG_PRINTLN(ESP.getFreeHeap());
#else
size_t heap1 = len+16; // WLEDMM
size_t heap2 = 0; // ESP32 variants do not have the same issue and will work without checking heap allocation
#endif
if (!buffer || heap1-heap2<len) {
@@ -188,7 +189,7 @@ static bool sendLiveLedsWs(uint32_t wsClient) // WLEDMM added "static"
size_t bufSize = pos + (used/n)*3;
//WLEDMM: no skipLines
if (bufSize < 1) return(false); // WLEDMM should not happen
if ((bufSize < 1) || (used < 1)) return(false); // WLEDMM should not happen
//AsyncWebSocketMessageBuffer * wsBuf = ws.makeBuffer(bufSize);
// WLEDMM protect against exceptions due to low memory
AsyncWebSocketMessageBuffer * wsBuf = nullptr;