From e06e54321c277cbfdb1168052892f69c29f7f409 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Wed, 22 Jul 2020 13:44:47 +0200 Subject: [PATCH] Revert "Fix device incorrectly identified when still interviewing (attempt 2) #3947" This reverts commit 2e0b23f97c611d9cee64406726a1cb765d5af122. --- lib/extension/homeassistant.js | 4 +--- lib/extension/receive.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js index 40352248a..6b58688e0 100644 --- a/lib/extension/homeassistant.js +++ b/lib/extension/homeassistant.js @@ -2156,9 +2156,7 @@ class HomeAssistant extends Extension { } onZigbeeEvent(type, data, resolvedEntity) { - // Don't discover on deviceJoined as definition might not be stable yet. - // https://github.com/Koenkk/zigbee2mqtt/issues/3947 - if (resolvedEntity && type !== 'deviceLeave' && type !== 'deviceJoined' && this.mqtt.isConnected()) { + if (resolvedEntity && type !== 'deviceLeave' && this.mqtt.isConnected()) { this.discover(resolvedEntity); } } diff --git a/lib/extension/receive.js b/lib/extension/receive.js index dfeae6f94..89dd6afc4 100755 --- a/lib/extension/receive.js +++ b/lib/extension/receive.js @@ -97,7 +97,7 @@ class Receive extends Extension { return false; } - if (data.device.interviewing) { + if (!data.device.modelID && data.device.interviewing) { logger.debug(`Skipping message, modelID is undefined and still interviewing`); return false; }