dandri/zigbee2mqtt
1
0 Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-10-22 14:01:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Also respect device_options for Home Assistant device specific configuration. #3541

Browse Source
This commit is contained in:
Koen Kanters committed 2020-05-14 19:03:54 +02:00
1 parent 855e9e0eb1
commit 528539214c
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
lib/extension/homeassistant.js
+1 -1
View File
@@ -1817,7 +1817,7 @@ class HomeAssistant extends Extension {
discover(resolvedEntity, force=false) {
// Check if already discoverd and check if there are configs.
const {device, definition} = resolvedEntity;
const deviceSettings = resolvedEntity.settings;
const deviceSettings = {...settings.get().device_options, ...resolvedEntity.settings};
const discover = force || !this.discovered[device.ieeeAddr];
if (!discover || !device || !definition || !mapping[definition.model] || !deviceSettings ||
(deviceSettings.hasOwnProperty('homeassistant') && !deviceSettings.homeassistant)) {