Merge remote-tracking branch 'upstream/main' into mdev

2023-01-17 15:24:32 +01:00
parent e537c48796 39edb1ad37
commit 34e93c6361
37 changed files with 539 additions and 380 deletions
--- a/usermods/boblight/boblight.h
+++ b/usermods/boblight/boblight.h
@@ -219,6 +219,7 @@ class BobLightUsermod : public Usermod {

    void enable(bool en) { enabled = en; }
    
+#ifndef WLED_DISABLE_MQTT
    /**
     * handling of MQTT message
     * topic only contains stripped topic (part after /wled/MAC)
@@ -249,6 +250,7 @@ class BobLightUsermod : public Usermod {
      //  mqtt->subscribe(subuf, 0);
      //}
    }
+#endif

    void addToJsonInfo(JsonObject& root)
    {