Skip to content

compiler error fixes #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DutchDevelop merged 1 commit into from
Jan 26, 2024
Merged

compiler error fixes #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/filesystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -81,7 +81,7 @@ void loadFileSystem(){
std::unique_ptr<char[]> buf(new char[size]);
configFile.readBytes(buf.get(), size);

StaticJsonDocument<1024> json; //512
JsonDocument json; //512

auto deserializeError = deserializeJson(json, buf.get());

Expand Down
8 changes: 4 additions & 4 deletions src/mqttmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <Arduino.h>
#include <WiFi.h>
static int mqttbuffer = 32768;
static int mqttdocument = 16384;
//static int mqttdocument = 16384;

#include <WiFiClientSecure.h>
#include <PubSubClient.h>
Expand Down Expand Up @@ -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;
Expand All @@ -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){
Expand Down
2 changes: 1 addition & 1 deletion src/serialmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ");
Expand Down
4 changes: 2 additions & 2 deletions src/web-server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void handleGetConfig(){
return;
}

DynamicJsonDocument doc(300);
JsonDocument doc;
doc["brightness"] = printerConfig.brightness;
doc["turbo"] = printerConfig.turbo;
doc["ip"] = printerConfig.printerIP;
Expand All @@ -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);
Expand Down