Skip to content
Merged
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
22 changes: 11 additions & 11 deletions src/mqttmanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,6 @@ void ParseCallback(JsonDocument &messageobject){
}
}

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

auto deserializeError = deserializeJson(messageobject, payload, length, DeserializationOption::Filter(getMqttPayloadFilter()));
if (!deserializeError){
ParseCallback(messageobject);
}else{
Serial.println(F("Deserialize error while parsing mqtt"));
}
}

StaticJsonDocument<64> getMqttPayloadFilter()
{
StaticJsonDocument<64> filter;
Expand All @@ -161,6 +150,17 @@ StaticJsonDocument<64> getMqttPayloadFilter()
return filter;
}

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

auto deserializeError = deserializeJson(messageobject, payload, length, DeserializationOption::Filter(getMqttPayloadFilter()));
if (!deserializeError){
ParseCallback(messageobject);
}else{
Serial.println(F("Deserialize error while parsing mqtt"));
}
}

void setupMqtt(){
clientId += String(random(0xffff), HEX);
Serial.println(F("Setting up MQTT with ip: "));
Expand Down