Revert "Fix device incorrectly identified when still interviewing. #3947"

This reverts commit 1d3a577fc4.
This commit is contained in:
Koen Kanters
2020-07-22 13:44:56 +02:00
parent e06e54321c
commit 6d9affaa49
3 changed files with 7 additions and 2 deletions
+4
View File
@@ -28,6 +28,10 @@ class Configure extends Extension {
return false;
}
if (resolvedEntity.device.interviewing === true) {
return false;
}
return true;
}
+1
View File
@@ -173,6 +173,7 @@ class Report extends Extension {
// https://github.com/Koenkk/zigbee2mqtt/issues/966
if (messageType === 'deviceAnnounce' && utils.isIkeaTradfriDevice(device)) return true;
if (resolvedEntity.device.interviewing === true) return false;
if (device.meta.hasOwnProperty('reporting') && device.meta.reporting === reportKey) return false;
if (!utils.isRouter(device) || utils.isBatteryPowered(device)) return false;
// Gledopto devices don't support reporting.
+2 -2
View File
@@ -191,7 +191,7 @@ class Zigbee extends events.EventEmitter {
return null;
}
const definition = !device.interviewing ? zigbeeHerdsmanConverters.findByDevice(device) : null;
const definition = zigbeeHerdsmanConverters.findByDevice(device);
const endpoints = definition && definition.endpoint ? definition.endpoint(device) : null;
let endpoint;
if (endpointKey) {
@@ -226,7 +226,7 @@ class Zigbee extends events.EventEmitter {
endpoint: key.endpoints[0],
settings: setting,
name: setting ? setting.friendlyName : (key.type === 'Coordinator' ? 'Coordinator' : key.ieeeAddr),
definition: !key.interviewing ? zigbeeHerdsmanConverters.findByDevice(key) : null,
definition: zigbeeHerdsmanConverters.findByDevice(key),
};
} else { // Group
const setting = settings.getEntity(key.groupID);