GitHub-Mirror/WLED
2
0
Fork 0
mirror of https://github.com/Fishwaldo/WLED.git synced 2025-07-23 05:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WebSockets

Browse source 
Better TwinkleFox speed regulation
This commit is contained in:
cschwinne 2020-06-26 17:28:35 +02:00
parent 2d4d7bf937
commit 3b3f8e6f43
9 changed files with 175 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
wled00/json.cpp
View file

@ -333,6 +333,12 @@ void serializeInfo(JsonObject root)
root["lip"] = realtimeIP.toString();
}
#ifdef WLED_ENABLE_WEBSOCKETS
root["ws"] = ws.count();
#else
root["ws"] = -1;
#endif
root["fxcount"] = strip.getModeCount();
root["palcount"] = strip.getPaletteCount();
@ -454,21 +460,37 @@ void serveJson(AsyncWebServerRequest* request)
#define MAX_LIVE_LEDS 180
void serveLiveLeds(AsyncWebServerRequest* request)
bool serveLiveLeds(AsyncWebServerRequest* request, uint32_t wsClient)
{
AsyncWebSocketClient * wsc;
if (!request) { //not HTTP, use Websockets
#ifdef WLED_ENABLE_WEBSOCKETS
wsc = ws.client(wsClient);
if (!wsc || wsc->queueLength() > 0) return false; //only send if queue free
#endif
}
uint16_t used = ledCount;
uint16_t n = (used -1) /MAX_LIVE_LEDS +1; //only serve every n'th LED if count over MAX_LIVE_LEDS
char buffer[2000] = "{\"leds\":[";
olen = 9;
obuf = buffer;
olen = 9;
for (uint16_t i= 0; i < used; i += n)
{
olen += sprintf(buffer + olen, "\"%06X\",", strip.getPixelColor(i));
olen += sprintf(obuf + olen, "\"%06X\",", strip.getPixelColor(i));
}
olen -= 1;
oappend("],\"n\":");
oappendi(n);
oappend("}");
request->send(200, "application/json", buffer);
if (request) {
request->send(200, "application/json", buffer);
}
#ifdef WLED_ENABLE_WEBSOCKETS
else {
wsc->text(obuf, olen);
}
#endif
return true;
}