Merged MsgPackError and JsonError into DeserializationError.

Return NotSupported if the JSON input contains "\u".
This commit is contained in:
Benoit Blanchon
2018-05-15 18:23:09 +02:00
parent ccb54136a2
commit 4592f23260
38 changed files with 574 additions and 636 deletions

View File

@ -35,7 +35,7 @@ void loadConfiguration(const char *filename, Config &config) {
StaticJsonDocument<512> doc;
// Deserialize the JSON document
JsonError error = deserializeJson(doc, file);
DeserializationError error = deserializeJson(doc, file);
if (error)
Serial.println(F("Failed to read file, using default configuration"));

View File

@ -76,7 +76,7 @@ void setup() {
DynamicJsonDocument doc(capacity);
// Parse JSON object
JsonError error = deserializeJson(doc, client);
DeserializationError error = deserializeJson(doc, client);
if (error) {
Serial.print(F("deserializeJson() failed: "));
Serial.println(error.c_str());

View File

@ -32,7 +32,7 @@ void setup() {
"{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
// Deserialize the JSON document
JsonError error = deserializeJson(doc, json);
DeserializationError error = deserializeJson(doc, json);
// Test if parsing succeeds.
if (error) {

View File

@ -45,7 +45,7 @@ void setup() {
// It's a reference to the JsonObject, the actual bytes are inside the
// JsonBuffer with all the other nodes of the object tree.
// Memory is freed when jsonBuffer goes out of scope.
MsgPackError error = deserializeMsgPack(doc, input);
DeserializationError error = deserializeMsgPack(doc, input);
// Test if parsing succeeds.
if (error) {