diff --git a/front/plugins/_publisher_mqtt/mqtt.py b/front/plugins/_publisher_mqtt/mqtt.py index 07e22d86..036ad7f2 100755 --- a/front/plugins/_publisher_mqtt/mqtt.py +++ b/front/plugins/_publisher_mqtt/mqtt.py @@ -473,7 +473,10 @@ def mqtt_start(db): "model": devDisplayName, "last_connection": prepTimeStamp(str(device["devLastConnection"])), "first_connection": prepTimeStamp(str(device["devFirstConnection"])), - "sync_node": device["devSyncHubNode"] + "sync_node": device["devSyncHubNode"], + "group": device["devGroup"], + "location": device["devLocation"], + "parent_mac": device["devParentMAC"] } # bulk update device sensors in home assistant diff --git a/front/plugins/newdev_template/config.json b/front/plugins/newdev_template/config.json index d35efc87..aef2ac7b 100755 --- a/front/plugins/newdev_template/config.json +++ b/front/plugins/newdev_template/config.json @@ -398,7 +398,8 @@ "XC5sYW4=", "XC5ob21l", "LVthLWZBLUYwLTldezMyfQ==", - "Iy4q" + "Iy4q", + "XC5cYg==" ], "options": [], "localized": [ diff --git a/server/helper.py b/server/helper.py index 8f71cd41..6b402b2b 100755 --- a/server/helper.py +++ b/server/helper.py @@ -624,7 +624,7 @@ def cleanDeviceName(str, match_IP): str = re.sub(rgx, "", str) mylog('trace', ["[cleanDeviceName] name after regex : " + str]) - str = re.sub(r'\.\b', '', str) # trailing dot after words + # str = re.sub(r'\.\b', '', str) # trailing dot after words str = re.sub(r'\.$', '', str) # trailing dot at the end of the string str = str.replace(". (IP match)", " (IP match)") # Remove dot if (IP match) is added