Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions src/mqttmanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,13 @@ void ParseCallback(JsonDocument &messageobject){

void mqttCallback(char *topic, byte *payload, unsigned int length){
DynamicJsonDocument messageobject(mqttdocument);
auto deserializeError = deserializeJson(messageobject, payload, length);

// Create filter to only grab "print" part from MQTT payload
StaticJsonDocument<64> filter;
filter["print"] = true;

auto deserializeError = deserializeJson(messageobject, payload, length, DeserializationOption::Filter(filter));
if (!deserializeError){
if (!messageobject.containsKey("print")) {
return;
}
ParseCallback(messageobject);
}else{
Serial.println(F("Deserialize error while parsing mqtt"));
Expand Down Expand Up @@ -175,4 +177,4 @@ void mqttloop(){
}
}

#endif
#endif
18 changes: 11 additions & 7 deletions src/wifi-manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,25 @@ bool setupWifi(){
}

while (connectionAttempts < maxConnectionAttempts) {
if (WiFi.status() == WL_CONNECTED)
break;

//WiFi.mode(WIFI_STA);
WiFi.begin(globalVariables.SSID, globalVariables.APPW);
delay(1000);
if (WiFi.status() != WL_CONNECTED){
Serial.print(F("Connecting to WIFI.. "));
Serial.println(globalVariables.SSID);
Serial.println(globalVariables.APPW);
delay(8000);
};

Serial.print(F("Connecting to WIFI.. "));
Serial.println(globalVariables.SSID);
Serial.println(globalVariables.APPW);
delay(8000); // can probably be lower?
connectionAttempts++;
}

if (WiFi.status() != WL_CONNECTED){
Serial.println(F("Failed to connect to wifi."));
return false;
}

int signalStrength = WiFi.RSSI();
Serial.println(F("Connected To Wifi:"));
Serial.println(signalStrength);
Expand All @@ -74,4 +78,4 @@ bool setupWifi(){
return true;
}

#endif
#endif