Revert "Fix device incorrectly identified when still interviewing (attempt 2) #3947"

This reverts commit 2e0b23f97c.
This commit is contained in:
Koen Kanters
2020-07-22 13:44:47 +02:00
parent db748a1333
commit e06e54321c
2 changed files with 2 additions and 4 deletions
+1 -3
View File
@@ -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);
}
}
+1 -1
View File
@@ -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;
}