Add backported get_topic_lwt

fmtr · Sep 17, 2023 · fc01830 · fc01830
1 parent 053fa37
commit fc01830
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/module/hct_entity.be b/module/hct_entity.be
@@ -14,7 +14,7 @@ import hct_logger as logger
 var Config=hct_config.Config
 
 var TOPIC=tools_be.mqtt.get_topic()
-var TOPIC_LWT=tools_be.mqtt.get_topic_lwt()
+var TOPIC_LWT=tools.get_topic_lwt()
 var MAC=tools_be.network.get_mac()
 var MAC_SHORT=tools_be.network.get_mac_short()
 var MAC_LAST_SIX=tools_be.network.get_mac_last_six()

diff --git a/module/hct_tools.be b/module/hct_tools.be
@@ -41,19 +41,31 @@ def update_hct(url)
     return tools_be.update.update_tapp_github_asset(url, constants.ORG, constants.NAME, constants.ASSET_FILENAME, constants.PATH_MODULE)
 end
 
+def get_topic_lwt()
+
+    import string
+
+    var topic_mask=tasmota.cmd('FullTopic')['FullTopic']
+    var prefix=tasmota.cmd('prefix')['Prefix3']
+
+    var topic=topic_mask
+    topic=string.replace(topic,'%topic%',tools_be.mqtt.get_topic())
+    topic=string.replace(topic,'%prefix%',prefix)
+
+    return string.format('%sLWT',topic)
+
+end
+
 var mod = module("hct_tools")
 
 mod.tools_be=tools_be
 
 mod.to_bool=tools_be.converter.to_bool
 mod.from_bool=tools_be.converter.from_bool
-
 mod.sanitize_name=sanitize_name
-
 mod.add_rule_once=add_rule_once
-
-
 mod.update_hct=update_hct
+mod.get_topic_lwt=get_topic_lwt
 
 
 mod.get_random=tools_be.random.get_random