From bd3fcb1f7c8633419d95e64e0b83e6da4d83e004 Mon Sep 17 00:00:00 2001 From: Timm Bogner <64260873+timmbogner@users.noreply.github.com> Date: Sat, 27 Jan 2024 18:30:15 -0600 Subject: [PATCH] ArduinoJson v7 support --- src/fdrs_gateway_filesystem.h | 2 +- src/fdrs_gateway_mqtt.h | 4 ++-- src/fdrs_gateway_serial.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/fdrs_gateway_filesystem.h b/src/fdrs_gateway_filesystem.h index a4ade63..03b564b 100644 --- a/src/fdrs_gateway_filesystem.h +++ b/src/fdrs_gateway_filesystem.h @@ -100,7 +100,7 @@ void sendLog() DBG("Logging to buffer"); for (int i = 0; i < ln; i++) { - StaticJsonDocument<96> doc; + JsonDocument doc; JsonObject doc_0 = doc.createNestedObject(); doc_0["id"] = theData[i].id; doc_0["type"] = theData[i].t; diff --git a/src/fdrs_gateway_mqtt.h b/src/fdrs_gateway_mqtt.h index c559411..6edc3de 100644 --- a/src/fdrs_gateway_mqtt.h +++ b/src/fdrs_gateway_mqtt.h @@ -119,7 +119,7 @@ void mqtt_callback(char *topic, byte *message, unsigned int length) { incomingString += (char)message[i]; } - StaticJsonDocument<2048> doc; + JsonDocument doc; DeserializationError error = deserializeJson(doc, incomingString); if (error) { // Test if parsing succeeds. @@ -180,7 +180,7 @@ void mqtt_publish(const char *payload) void sendMQTT() { DBG("Sending MQTT."); - DynamicJsonDocument doc(24576); + JsonDocument doc; for (int i = 0; i < ln; i++) { doc[i]["id"] = theData[i].id; diff --git a/src/fdrs_gateway_serial.h b/src/fdrs_gateway_serial.h index 869f2e2..ef2c825 100644 --- a/src/fdrs_gateway_serial.h +++ b/src/fdrs_gateway_serial.h @@ -32,7 +32,7 @@ void getSerial() { else if (Serial.available()){ incomingString = Serial.readStringUntil('\n'); } - DynamicJsonDocument doc(24576); + JsonDocument doc; DeserializationError error = deserializeJson(doc, incomingString); if (error) { // Test if parsing succeeds. // DBG("json parse err"); @@ -55,7 +55,7 @@ void getSerial() { void sendSerial() { DBG("Sending Serial."); - DynamicJsonDocument doc(24576); + JsonDocument doc; for (int i = 0; i < ln; i++) { doc[i]["id"] = theData[i].id; doc[i]["type"] = theData[i].t;