mqtt-auto-discovery: Use event system instead of open coding it

Tinkerforge · Nov 26, 2024 · 938633e · 938633e
1 parent 5c06250
commit 938633e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/software/src/modules/mqtt_auto_discovery/module.ini b/software/src/modules/mqtt_auto_discovery/module.ini
@@ -1,7 +1,8 @@
 [Dependencies]
 Requires = Task Scheduler
            Event Log
+           Event
            API
            Mqtt
 
-Optional = System
+Optional = System
diff --git a/software/src/modules/mqtt_auto_discovery/mqtt_auto_discovery.cpp b/software/src/modules/mqtt_auto_discovery/mqtt_auto_discovery.cpp
@@ -82,6 +82,16 @@ void MqttAutoDiscovery::register_urls()
     api.addPersistentConfig("mqtt/auto_discovery_config", &config);
 }
 
+void MqttAutoDiscovery::register_events()
+{
+#if MODULE_SYSTEM_AVAILABLE()
+    event.registerEvent("system/i18n_config", {"language"}, [this](const Config */*language*/) {
+        reschedule_announce_next_topic();
+        return EventResult::OK;
+    });
+#endif
+}
+
 void MqttAutoDiscovery::prepare_topics()
 {
     const String &auto_discovery_prefix = config_in_use.get("auto_discovery_prefix")->asString();

diff --git a/software/src/modules/mqtt_auto_discovery/mqtt_auto_discovery.h b/software/src/modules/mqtt_auto_discovery/mqtt_auto_discovery.h
@@ -31,6 +31,7 @@ class MqttAutoDiscovery final : public IModule
     void pre_setup() override;
     void setup() override;
     void register_urls() override;
+    void register_events() override;
 
     ConfigRoot config;
     ConfigRoot config_in_use;

diff --git a/software/src/modules/system/module.ini b/software/src/modules/system/module.ini
@@ -7,4 +7,3 @@ Requires = Task Scheduler
 Optional = Evse Common
            Users
            Charge Tracker
-           Mqtt Auto Discovery
diff --git a/software/src/modules/system/system.cpp b/software/src/modules/system/system.cpp
@@ -78,17 +78,7 @@ void System::pre_setup()
     i18n_config = ConfigRoot{Config::Object({
         {"language", Config::Enum(Language::German, Language::German, Language::English)},
         {"detect_browser_language", Config::Bool(true)}
-    })
-#if MODULE_MQTT_AUTO_DISCOVERY_AVAILABLE()
-    , [this](Config &update, ConfigSource source) -> String {
-        if (update.get("language")->asEnum<Language>() != i18n_config.get("language")->asEnum<Language>()) {
-            mqtt_auto_discovery.reschedule_announce_next_topic();
-        }
-
-        return "";
-    }
-#endif
-    };
+    })};
 }
 
 void System::setup()