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

Cleanup and small issues

Browse Source 
pio.ini: cleanup debug directives (build_flags_min move to _debug), remove blynks

index.htm/js: 
- visualization in div to turn of if 1D
- scale visualizations if height>width

json.cpp, util.cpp: USER/DEBUG_PRINT changes
This commit is contained in:
Ewoud
2023-02-23 15:23:35 +01:00
parent 1ce3d2fa08
commit 6fbce9b326
11 changed files with 2402 additions and 2391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wled00/json.cpp
View File

@@ -51,8 +51,7 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId)
//WLEDMM add USER_PRINT
String temp;
serializeJson(elem, temp);
USER_PRINT("deserializeSegment ");
USER_PRINTLN(temp);
USER_PRINTF("deserializeSegment %s\n", temp.c_str());
byte id = elem["id"] | it;
if (id >= strip.getMaxSegments()) return;
@@ -339,8 +338,7 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
//WLEDMM add USER_PRINT
String temp;
serializeJson(root, temp);
USER_PRINT("deserializeState ");
USER_PRINTLN(temp);
USER_PRINTF("deserializeState %s\n", temp.c_str());
bool stateResponse = root[F("v")] | false;
@@ -512,6 +510,11 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
void serializeSegment(JsonObject& root, Segment& seg, byte id, bool forPreset, bool segmentBounds)
{
//WLEDMM add USER_PRINT
String temp;
serializeJson(root, temp);
DEBUG_PRINTF("serializeSegment %s\n", temp.c_str());
root["id"] = id;
if (segmentBounds) {
root["start"] = seg.start;
@@ -577,6 +580,11 @@ void serializeSegment(JsonObject& root, Segment& seg, byte id, bool forPreset, b
void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segmentBounds, bool selectedSegmentsOnly)
{
//WLEDMM add USER_PRINT
String temp;
serializeJson(root, temp);
DEBUG_PRINTF("serializeState %s\n", temp.c_str());
if (includeBri) {
root["on"] = (bri > 0);
root["bri"] = briLast;
@@ -1254,7 +1262,7 @@ void serveJson(AsyncWebServerRequest* request)
//lDoc["m"] = lDoc.memoryUsage(); // JSON buffer usage, for remote debugging
}
DEBUG_PRINTF("JSON buffer size: %u for request: %d\n", lDoc.memoryUsage(), subJson);
DEBUG_PRINTF("JSON buffer size: %u for request: %d (%s)\n", lDoc.memoryUsage(), subJson, url.c_str());
response->setLength();
request->send(response);