diff --git a/src/Globals.cpp b/src/Globals.cpp index acf8651..aa530d0 100644 --- a/src/Globals.cpp +++ b/src/Globals.cpp @@ -104,7 +104,6 @@ void saveSettings() #ifdef ULANZI Settings.putBool("BAT", SHOW_BAT); #endif -======= Settings.putBool("SOUND", SOUND_ACTIVE); Settings.end(); } diff --git a/src/MQTTManager.cpp b/src/MQTTManager.cpp index b56aab5..301dce3 100644 --- a/src/MQTTManager.cpp +++ b/src/MQTTManager.cpp @@ -213,15 +213,16 @@ void onMqttConnected() "/previousapp", "/nextapp", "/nextapp", - "/apps" - }; - + "/apps"}; for (const char *topic : topics) + { String fullTopic = prefix + topic; mqtt.subscribe(fullTopic.c_str()); } Serial.println(F("MQTT Connected")); } + + void connect() { mqtt.onMessage(onMqttMessage); @@ -264,7 +265,6 @@ void MQTTManager_::setup() device.setAvailability(true); device.enableSharedAvailability(); device.enableLastWill(); - String uniqueIDWithSuffix;