zigbee-herdsman-converters 14.0.341 → 14.0.342

package/devices/ewelink.js

@@ -20,6 +20,21 @@ module.exports = [
             device.skipDefaultResponse = true;
         },
     },
+    {
+        zigbeeModel: ['SWITCH-ZR02'],
+        model: 'SWITCH-ZR02',
+        vendor: 'eWeLink',
+        description: 'Zigbee smart switch',
+        extend: extend.switch(),
+        fromZigbee: [fz.on_off_skip_duplicate_transaction],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+        },
+        onEvent: async (type, data, device) => {
+            device.skipDefaultResponse = true;
+        },
+    },
     {
         zigbeeModel: ['ZB-SW01'],
         model: 'ZB-SW01',

package/devices/ikea.js

@@ -32,6 +32,18 @@ const bulbOnEvent = async (type, data, device) => {
     }
 };
 
+const configureRemote = async (device, coordinatorEndpoint, logger) => {
+    // Firmware 2.3.75 >= only supports binding to endpoint, before only to group
+    // - https://github.com/Koenkk/zigbee2mqtt/issues/2772#issuecomment-577389281
+    // - https://github.com/Koenkk/zigbee2mqtt/issues/7716
+    const endpoint = device.getEndpoint(1);
+    const version = device.softwareBuildID.split('.').map((n) => Number(n));
+    const bindTarget = version[0] >= 2 && version[1] >= 3 && version[2] >= 75 ? coordinatorEndpoint : constants.defaultBindGroup;
+    await endpoint.bind('genOnOff', bindTarget);
+    await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+    await reporting.batteryPercentageRemaining(endpoint);
+};
+
 const tradfriExtend = {
     light_onoff_brightness: (options = {}) => ({
         ...extend.light_onoff_brightness(options),
@@ -518,14 +530,7 @@ module.exports = [
         toZigbee: [],
         ota: ota.tradfri,
         meta: {battery: {dontDividePercentage: true}},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(1);
-            // See explanation in E1743, only applies to E1810 (for E1524 it has no effect)
-            // https://github.com/Koenkk/zigbee2mqtt/issues/2772#issuecomment-577389281
-            await endpoint.bind('genOnOff', constants.defaultBindGroup);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
-            await reporting.batteryPercentageRemaining(endpoint);
-        },
+        configure: configureRemote,
     },
     {
         zigbeeModel: ['Remote Control N2'],
@@ -540,12 +545,7 @@ module.exports = [
         toZigbee: [],
         ota: ota.tradfri,
         meta: {battery: {dontDividePercentage: true}},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(1);
-            await endpoint.bind('genOnOff', constants.defaultBindGroup);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
-            await reporting.batteryPercentageRemaining(endpoint);
-        },
+        configure: configureRemote,
     },
     {
         zigbeeModel: ['TRADFRI on/off switch'],
@@ -558,16 +558,7 @@ module.exports = [
         toZigbee: [],
         ota: ota.tradfri,
         meta: {disableActionGroup: true, battery: {dontDividePercentage: true}},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(1);
-            // By default this device controls group 0, some devices are by default in
-            // group 0 causing the remote to control them.
-            // By binding it to a random group, e.g. 901, it will send the commands to group 901 instead of 0
-            // https://github.com/Koenkk/zigbee2mqtt/issues/2772#issuecomment-577389281
-            await endpoint.bind('genOnOff', constants.defaultBindGroup);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
-            await reporting.batteryPercentageRemaining(endpoint);
-        },
+        configure: configureRemote,
     },
     {
         zigbeeModel: ['KNYCKLAN Open/Close remote'],
@@ -579,16 +570,7 @@ module.exports = [
         toZigbee: [],
         ota: ota.tradfri,
         meta: {disableActionGroup: true, battery: {dontDividePercentage: true}},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(1);
-            // By default this device controls group 0, some devices are by default in
-            // group 0 causing the remote to control them.
-            // By binding it to a random group, e.g. 901, it will send the commands to group 901 instead of 0
-            // https://github.com/Koenkk/zigbee2mqtt/issues/2772#issuecomment-577389281
-            await endpoint.bind('genOnOff', constants.defaultBindGroup);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
-            await reporting.batteryPercentageRemaining(endpoint);
-        },
+        configure: configureRemote,
     },
     {
         zigbeeModel: ['KNYCKLAN receiver'],
@@ -613,14 +595,7 @@ module.exports = [
         toZigbee: [],
         ota: ota.tradfri,
         meta: {disableActionGroup: true, battery: {dontDividePercentage: true}},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(1);
-            // By default this device controls group 0, some devices are by default in
-            // group 0 causing the remote to control them.
-            // By binding it to a random group, e.g. 901, it will send the commands to group 901 instead of 0
-            await reporting.bind(endpoint, constants.defaultBindGroup, ['genPowerCfg']);
-            await reporting.batteryPercentageRemaining(endpoint);
-        },
+        configure: configureRemote,
     },
     {
         zigbeeModel: ['SYMFONISK Sound Controller'],
@@ -722,16 +697,7 @@ module.exports = [
         toZigbee: [],
         meta: {battery: {dontDividePercentage: true}},
         ota: ota.tradfri,
-        configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(1);
-            // By default this device controls group 0, some devices are by default in
-            // group 0 causing the remote to control them.
-            // By binding it to a random group, e.g. 901, it will send the commands to group 901 instead of 0
-            // https://github.com/Koenkk/zigbee2mqtt/issues/2772#issuecomment-577389281
-            await endpoint.bind('genOnOff', constants.defaultBindGroup);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
-            await reporting.batteryPercentageRemaining(endpoint);
-        },
+        configure: configureRemote,
     },
     {
         zigbeeModel: ['GUNNARP panel round'],

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.341",
+  "version": "14.0.342",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.341",
+  "version": "14.0.342",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [