Only setup reporting for non battery powered routers. Koenkk#1064

wilmardo · Apr 16, 2019 · 8dd8155 · 8dd8155
1 parent 5e48ee6
commit 8dd8155
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/lib/extension/deviceReport.js b/lib/extension/deviceReport.js
@@ -1,6 +1,7 @@
 const zigbeeShepherdConverters = require('zigbee-shepherd-converters');
 const logger = require('../util/logger');
 const CC2530Router = zigbeeShepherdConverters.devices.find((d) => d.model === 'CC2530.ROUTER');
+const utils = require('../util/utils');
 
 const candidates = {
     'genOnOff': {
@@ -82,14 +83,20 @@ class DeviceReport {
         });
     }
 
+    shouldSetupReporting(device) {
+        return utils.isRouter(device) && !utils.isBatteryPowered(device);
+    }
+
     onZigbeeStarted() {
-        this.zigbee.getAllClients().forEach((device) => {
-            const mappedDevice = zigbeeShepherdConverters.findByZigbeeModel(device.modelId);
+        this.zigbee.getAllClients()
+            .filter((d) => this.shouldSetupReporting(d))
+            .forEach((device) => {
+                const mappedDevice = zigbeeShepherdConverters.findByZigbeeModel(device.modelId);
 
-            if (mappedDevice) {
-                this.setupReporting(mappedDevice, device);
-            }
-        });
+                if (mappedDevice) {
+                    this.setupReporting(mappedDevice, device);
+                }
+            });
     }
 
     onZigbeeMessage(message, device, mappedDevice) {
@@ -98,7 +105,8 @@ class DeviceReport {
         // Ikea TRADFRI tend to forget their reporting after powered off.
         // Re-setup reporting.
         // https://github.com/Koenkk/zigbee2mqtt/issues/966
-        if (device && mappedDevice && ['endDeviceAnnce', 'devIncoming'].includes(message.type)) {
+        if (device && mappedDevice && ['endDeviceAnnce', 'devIncoming'].includes(message.type) &&
+            this.shouldSetupReporting(device)) {
             this.setupReporting(mappedDevice, device);
         }
     }