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
17 changes: 12 additions & 5 deletions src/mqttmanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,19 +141,26 @@ void ParseCallback(JsonDocument &messageobject){

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

// 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));
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;
filter["print"]["stg_cur"] = true;
filter["print"]["gcode_state"] = true;
filter["print"]["lights_report"] = true;
filter["print"]["hms"] = true;
// Make sure to add more here when needed
return filter;
}

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