fix: adjust to firmware updates

HASwitchPlate · Feb 25, 2024 · fea4ebf · fea4ebf
1 parent 7af0c7a
commit fea4ebf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/custom_components/openhasp/config_flow.py b/custom_components/openhasp/config_flow.py
@@ -30,6 +30,7 @@
     DISCOVERED_MANUFACTURER,
     DISCOVERED_MODEL,
     DISCOVERED_NODE,
+    DISCOVERED_NODE_T,
     DISCOVERED_PAGES,
     DISCOVERED_POWER,
     DISCOVERED_URL,
@@ -85,10 +86,10 @@ async def async_step_user(self, user_input=None):
         return self.async_abort(reason="discovery_only")
 
     async def async_step_zeroconf(self, discovery_info=None):
-        _discovered = json.loads(discovery_info.properties.get("discovery"))
-        _LOGGER.error("Discovered ZeroConf: %s", _discovered)
+        _discovered = discovery_info.properties
+        _LOGGER.debug("Discovered ZeroConf: %s", _discovered)
 
-        _discovered[CONF_TOPIC] = f"{DEFAULT_TOPIC}/{_discovered[DISCOVERED_NODE]}"
+        _discovered[CONF_TOPIC] = _discovered[DISCOVERED_NODE_T][:-1]
 
         return await self._process_discovery(_discovered)
 

diff --git a/custom_components/openhasp/const.py b/custom_components/openhasp/const.py
@@ -37,6 +37,7 @@
 DEFAULT_IDLE_BRIGHNESS = 25
 
 DISCOVERED_NODE = "node"
+DISCOVERED_NODE_T = "node_t"
 DISCOVERED_MODEL = "mdl"
 DISCOVERED_MANUFACTURER = "mf"
 DISCOVERED_HWID = "hwid"