diff --git a/src/filesystem.h b/src/filesystem.h index 17d4404..8792e42 100644 --- a/src/filesystem.h +++ b/src/filesystem.h @@ -27,7 +27,7 @@ char* generateRandomString(int length) { void saveFileSystem(){ Serial.println(F("Saving config")); - StaticJsonDocument<1024> json;//512 + JsonDocument json;//512 json["brightness"] = printerConfig.brightness; json["printerIp"] = printerConfig.printerIP; json["accessCode"] = printerConfig.accessCode; @@ -81,7 +81,7 @@ void loadFileSystem(){ std::unique_ptr buf(new char[size]); configFile.readBytes(buf.get(), size); - StaticJsonDocument<1024> json; //512 + JsonDocument json; //512 auto deserializeError = deserializeJson(json, buf.get()); diff --git a/src/mqttmanager.h b/src/mqttmanager.h index 1299520..d4d7759 100644 --- a/src/mqttmanager.h +++ b/src/mqttmanager.h @@ -4,7 +4,7 @@ #include #include static int mqttbuffer = 32768; -static int mqttdocument = 16384; +//static int mqttdocument = 16384; #include #include @@ -137,9 +137,9 @@ void ParseCallback(JsonDocument &messageobject){ } } -StaticJsonDocument<64> getMqttPayloadFilter() + JsonDocument getMqttPayloadFilter() { - StaticJsonDocument<64> filter; + JsonDocument filter; filter["print"]["stg_cur"] = true; filter["print"]["gcode_state"] = true; filter["print"]["lights_report"] = true; @@ -149,7 +149,7 @@ StaticJsonDocument<64> getMqttPayloadFilter() } void mqttCallback(char *topic, byte *payload, unsigned int length){ - DynamicJsonDocument messageobject(mqttdocument); + JsonDocument messageobject; auto deserializeError = deserializeJson(messageobject, payload, length, DeserializationOption::Filter(getMqttPayloadFilter())); if (!deserializeError){ diff --git a/src/serialmanager.h b/src/serialmanager.h index 1f4a6ef..6fa294b 100644 --- a/src/serialmanager.h +++ b/src/serialmanager.h @@ -14,7 +14,7 @@ void setupSerial(){ void serialLoop(){ if (Serial.available() > 0) { String input = Serial.readStringUntil('\n'); - DynamicJsonDocument doc(256); + JsonDocument doc; deserializeJson(doc, input); if (doc.containsKey("ssid") && doc.containsKey("pass")) { Serial.print("SSID "); diff --git a/src/web-server.h b/src/web-server.h index 7212ba0..2bc23a0 100644 --- a/src/web-server.h +++ b/src/web-server.h @@ -55,7 +55,7 @@ void handleGetConfig(){ return; } - DynamicJsonDocument doc(300); + JsonDocument doc; doc["brightness"] = printerConfig.brightness; doc["turbo"] = printerConfig.turbo; doc["ip"] = printerConfig.printerIP; @@ -77,7 +77,7 @@ void handleGetConfig(){ } void setupWebserver(){ - if (!MDNS.begin(globalVariables.Host)) { + if (!MDNS.begin(globalVariables.Host.c_str())) { Serial.println(F("Error setting up MDNS responder!")); while (1) { delay(1000);