Merge pull request #923 from rechrtb/mqtt_fixes

MQTT improvements and fixes
Duet3D · Oct 27, 2023 · e0dfb25 · e0dfb25
2 parents 1166535 + 2266f96
commit e0dfb25
Show file tree

Hide file tree

Showing 13 changed files with 277 additions and 446 deletions.
diff --git a/Scripts/MQTTDemo/README.md b/Scripts/MQTTDemo/README.md
diff --git a/Scripts/MQTTDemo/echo.py b/Scripts/MQTTDemo/echo.py
diff --git a/Scripts/MQTTDemo/mosquitto.conf b/Scripts/MQTTDemo/mosquitto.conf
diff --git a/Scripts/MQTTDemo/passwords.txt b/Scripts/MQTTDemo/passwords.txt
diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp
@@ -2079,14 +2079,32 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeEx
 					}
 #endif
 
+#if SUPPORT_MQTT
+					if ((type & MqttMessage) && (result != GCodeResult::error))
+					{
+						String<MaxGCodeLength> topic;
+						gb.MustSee('T');
+						gb.GetQuotedString(topic.GetRef());
+
+						bool seen = false;
+
+						uint32_t qos = 0;
+						gb.TryGetLimitedUIValue('Q', qos, seen, 3);
+
+						bool retain = 0;
+						gb.TryGetBValue('R', retain, seen);
+
+						bool dup = 0;
+						gb.TryGetBValue('D', dup, seen);
+
+						reprap.GetNetwork().MqttPublish(message.c_str(), topic.c_str(), qos, retain, dup);
+					}
+#endif
+
 					if (result != GCodeResult::error)
 					{
 						// Append newline and send the message to the destinations,
-						// except for MqttMessage
-						if (type != MqttMessage)
-						{
-							message.cat('\n');
-						}
+						message.cat('\n');
 						platform.Message(type, message.c_str());
 					}
 				}