noisymime
/
ESPAsyncWebServer
mirror of https://github.com/noisymime/ESPAsyncWebServer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PrettyAsyncJsonResponse for ArduinoJson 6.x (#539) 

* PrettyAsyncJsonResponse for ArduinoJson 6.x

add support for PrettyAsyncJsonResponse in ArduinoJson 6.x

* Update AsyncJson.h

Maintain order of args to AsyncJsonResponse between ArduinoJson 5.x and 6.x compatibility for ease of migration
This commit is contained in:
Mike Dunston 2019-09-24 11:24:18 -07:00 committed by Me No Dev
parent 69aaf767eb
commit 59066bd1e4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/AsyncJson.h
View File

@ -101,7 +101,7 @@ class AsyncJsonResponse: public AsyncAbstractResponse {
_root = _jsonBuffer.createObject();
}
#else
AsyncJsonResponse(size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE, bool isArray=false) : _jsonBuffer(maxJsonBufferSize), _isValid{false} {
AsyncJsonResponse(bool isArray=false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE) : _jsonBuffer(maxJsonBufferSize), _isValid{false} {
_code = 200;
_contentType = JSON_MIMETYPE;
if(isArray)
@ -140,18 +140,25 @@ class AsyncJsonResponse: public AsyncAbstractResponse {
}
};
#ifdef ARDUINOJSON_5_COMPATIBILITY
class PrettyAsyncJsonResponse: public AsyncJsonResponse {
public:
PrettyAsyncJsonResponse (bool isArray=false) : AsyncJsonResponse{isArray} {}
size_t setLength () {
#ifdef ARDUINOJSON_5_COMPATIBILITY
_contentLength = _root.measurePrettyLength ();
#else
_contentLength = measureJsonPretty(_root);
#endif
if (_contentLength) {_isValid = true;}
return _contentLength;
}
size_t _fillBuffer (uint8_t *data, size_t len) {
ChunkPrint dest (data, _sentLength, len);
#ifdef ARDUINOJSON_5_COMPATIBILITY
_root.prettyPrintTo (dest);
#else
serializeJsonPretty(_root, dest);
#endif
return len;
}
};