Sternenlabor/WLED
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Single JSON buffer.

Browse Source
This commit is contained in:
Blaž Kristan
2021-11-03 14:52:22 +01:00
parent f66fcfbe6d
commit bd521f858e
14 changed files with 158 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wled00/wled_serial.cpp
View File

@@ -43,18 +43,25 @@ void handleSerial()
}
else if (next == '{') { //JSON API
bool verboseResponse = false;
while (jsonBufferLock) delay(1);
jsonBufferLock = true;
doc.clear();
{
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
//DynamicJsonDocument doc(JSON_BUFFER_SIZE);
Serial.setTimeout(100);
DeserializationError error = deserializeJson(doc, Serial);
if (error) return;
if (error) {
jsonBufferLock = false;
return;
}
fileDoc = &doc;
verboseResponse = deserializeState(doc.as<JsonObject>());
fileDoc = nullptr;
}
//only send response if TX pin is unused for other purposes
if (verboseResponse && !pinManager.isPinAllocated(1)) {
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
//DynamicJsonDocument doc(JSON_BUFFER_SIZE);
doc.clear();
JsonObject state = doc.createNestedObject("state");
serializeState(state);
JsonObject info = doc.createNestedObject("info");
@@ -62,6 +69,7 @@ void handleSerial()
serializeJson(doc, Serial);
}
jsonBufferLock = false;
}
break;
case AdaState::Header_d: