From 03c8284c40344d04f44c5fb0ce3e65a8f1c47bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Mart=C3=ADn?= Date: Tue, 30 Apr 2019 18:40:38 +0200 Subject: [PATCH] Add ArduinoJson 6.x.x compatibility --- README.md | 2 +- .../CayenneLPPdec_test/CayenneLPPdec_test.ino | 6 ++--- library.json | 12 ++++----- library.properties | 2 +- src/CayenneLPPDec.cpp | 26 +++++++++---------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 463165b..6fde5f1 100644 --- a/README.md +++ b/README.md @@ -33,5 +33,5 @@ Please check examples folder into repository source code. In order to use **CayenneLPPdec** You will need these two libraries: -- [ArduinoJSON](https://arduinojson.org). (Please use version < 6.0.0) +- [ArduinoJSON](https://arduinojson.org). (Please use version > 6.10.0) - [CayenneLPP encoder library](https://github.com/sabas1080/CayenneLPP) for data type definition. diff --git a/examples/CayenneLPPdec_test/CayenneLPPdec_test.ino b/examples/CayenneLPPdec_test/CayenneLPPdec_test.ino index efcccbc..65d712c 100644 --- a/examples/CayenneLPPdec_test/CayenneLPPdec_test.ino +++ b/examples/CayenneLPPdec_test/CayenneLPPdec_test.ino @@ -24,16 +24,16 @@ void setup () { Serial.printf ("LPP Buffer: %s\n\n", printHexBuffer (buffer, len)); // Create a Json buffer big enough. You can use https://arduinojson.org/v5/assistant/ to do a calculation - StaticJsonBuffer<512> jsonBuffer; + StaticJsonDocument<512> jsonBuffer; // Create an array to parse data to - JsonArray& root = jsonBuffer.createArray (); + JsonArray root = jsonBuffer.createNestedArray(); // Call parser CayenneLPPDec::ParseLPP (buffer, len, root); // Print JSON data to serial - root.prettyPrintTo (Serial); + serializeJsonPretty (root, Serial); } diff --git a/library.json b/library.json index 3b51896..b626c88 100644 --- a/library.json +++ b/library.json @@ -1,7 +1,7 @@ { "name": "CayenneLPPdec", "frameworks": "arduino", - "version": "0.1.2", + "version": "0.2.0", "keywords": "sensor, comm, communication, packing, lpp, cayenne, cayennelpp", "platforms": "*", "license": "MIT", @@ -9,7 +9,7 @@ [{ "name": "ArduinoJson", "authors": "Benoit Blanchon", - "version": "^5.13.4" + "version": "^6.10.1" }, { "name": "CayenneLPP", @@ -23,10 +23,10 @@ "name": "Germán Martín", "email": "gmag11@gmail.com" }, - { - "name": "gizmocuz", - "url": "https://github.com/gizmocuz" - }], + { + "name": "gizmocuz", + "url": "https://github.com/gizmocuz" + }], "repository": { "type": "git", diff --git a/library.properties b/library.properties index 3242914..7bcfda8 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=CayenneLPPdec -version=0.1.2 +version=0.2.0 author=German Martin maintainer=gizmocuz,German Martin sentence=CayenneLPP data decoder diff --git a/src/CayenneLPPDec.cpp b/src/CayenneLPPDec.cpp index 090dc93..e4737fa 100644 --- a/src/CayenneLPPDec.cpp +++ b/src/CayenneLPPDec.cpp @@ -59,7 +59,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_DIGITAL_INPUT_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "digital_input"; data["value"] = pBuffer[2]; @@ -70,7 +70,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_DIGITAL_OUTPUT_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "digital_output"; data["value"] = pBuffer[2]; @@ -81,7 +81,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_ANALOG_INPUT_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "analog_input"; @@ -94,7 +94,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_ANALOG_OUTPUT_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "analog_output"; @@ -107,7 +107,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_LUMINOSITY_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "luminosity"; @@ -120,7 +120,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_PRESENCE_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "presence"; @@ -132,7 +132,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_TEMPERATURE_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "temp"; @@ -145,7 +145,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_RELATIVE_HUMIDITY_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "humidity"; @@ -158,7 +158,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_ACCELEROMETER_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "accel"; @@ -178,7 +178,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_BAROMETRIC_PRESSURE_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "baro"; @@ -191,7 +191,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_UNIXTIME_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "unixtime"; @@ -204,7 +204,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_GYROMETER_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "gyro"; @@ -224,7 +224,7 @@ bool CayenneLPPDec::ParseLPP (const uint8_t *pBuffer, size_t Len, JsonArray& roo if (Len < LPP_GPS_SIZE) return false; - JsonObject& data = root.createNestedObject (); + JsonObject data = root.createNestedObject (); data["channel"] = channel; data["type"] = "gps";