This commit is contained in:
Koen Kanters
2018-12-07 23:09:15 +01:00
parent 0fb84294f0
commit 1fa13f3f96
+2 -5
View File
@@ -454,11 +454,8 @@ class HomeAssistant {
// Set unique names in cases this device produces multiple entities in homeassistant.
payload.name = mapping[model].length > 1 ? `${friendlyName}_${config.object_id}` : friendlyName;
// Only set unique_id when user did not set a friendly_name yet,
// see https://github.com/Koenkk/zigbee2mqtt/issues/138
if (ieeeAddr === friendlyName) {
payload.unique_id = `${ieeeAddr}_${config.object_id}_${settings.get().mqtt.base_topic}`;
}
// Set unique_id
payload.unique_id = `${ieeeAddr}_${config.object_id}_${settings.get().mqtt.base_topic}`;
if (payload.command_topic) {
payload.command_topic = `${settings.get().mqtt.base_topic}/${friendlyName}/`;