zigbee-herdsman-converters 14.0.584 → 14.0.587

package/converters/fromZigbee.js

@@ -1545,7 +1545,7 @@ const converters = {
                 const value = msg.data['currentPositionLiftPercentage'];
                 result[postfixWithEndpointName('position', msg, model, meta)] = invert ? value : 100 - value;
                 result[postfixWithEndpointName('state', msg, model, meta)] =
-                    invert ? (value > 0 ? 'CLOSE' : 'OPEN') : (value > 0 ? 'OPEN' : 'CLOSE');
+                    invert ? (value === 100 ? 'CLOSE' : 'OPEN') : (value === 0 ? 'CLOSE' : 'OPEN');
             }
             if (msg.data.hasOwnProperty('currentPositionTiltPercentage') && msg.data['currentPositionTiltPercentage'] <= 100) {
                 const value = msg.data['currentPositionTiltPercentage'];

package/converters/toZigbee.js

@@ -2562,15 +2562,15 @@ const converters = {
     },
     lidl_watering_timer: {
         key: ['timer'],
-        convertSet: (entity, key, value, meta) => {
-            tuya.sendDataPointRaw(entity, tuya.dataPoints.lidlTimer, tuya.convertDecimalValueTo4ByteHexArray(value));
+        convertSet: async (entity, key, value, meta) => {
+            await tuya.sendDataPointRaw(entity, tuya.dataPoints.lidlTimer, tuya.convertDecimalValueTo4ByteHexArray(value));
         },
     },
     matsee_garage_door_opener: {
         key: ['trigger'],
-        convertSet: (entity, key, value, meta) => {
+        convertSet: async (entity, key, value, meta) => {
             const state = meta.message.hasOwnProperty('trigger') ? meta.message.trigger : true;
-            tuya.sendDataPointBool(entity, tuya.dataPoints.garageDoorTrigger, state);
+            await tuya.sendDataPointBool(entity, tuya.dataPoints.garageDoorTrigger, state);
             return {state: {trigger: state}};
         },
     },
@@ -4927,7 +4927,7 @@ const converters = {
                         payload[i * 3 + 2] = value[prob][i].temperature;
                     }
                 }
-                tuya.sendDataPointRaw(entity, dpId, payload);
+                await tuya.sendDataPointRaw(entity, dpId, payload);
             }
         },
     },
@@ -4956,7 +4956,7 @@ const converters = {
                 payload[i*3+1] = minute;
                 payload[i*3+2] = temperature;
             }
-            tuya.sendDataPointRaw(entity, dpId, payload);
+            await tuya.sendDataPointRaw(entity, dpId, payload);
         },
     },
     tuya_thermostat_week: {
@@ -6613,7 +6613,7 @@ const converters = {
     },
     wiser_sed_thermostat_local_temperature_calibration: {
         key: ['local_temperature_calibration'],
-        convertSet: (entity, key, value, meta) => {
+        convertSet: async (entity, key, value, meta) => {
             entity.write('hvacThermostat', {localTemperatureCalibration: Math.round(value * 10)},
                 {srcEndpoint: 11, disableDefaultResponse: true, sendWhen: 'active'});
             return {state: {local_temperature_calibration: value}};
@@ -6762,7 +6762,7 @@ const converters = {
                     await tuya.sendDataPointRaw(entity, 102, [value]);
                     break;
                 } else {
-                    tuya.sendDataPointRaw(entity, 105, [value]);
+                    await tuya.sendDataPointRaw(entity, 105, [value]);
                     break;
                 }
             case 'led_enable':// OK (value true/false or 1/0)

package/devices/adeo.js

@@ -5,7 +5,37 @@ const extend = require('../lib/extend');
 const tz = require('../converters/toZigbee');
 const e = exposes.presets;
 
+const fzLocal = {
+    LDSENK08: {
+        cluster: 'ssIasZone',
+        type: 'commandStatusChangeNotification',
+        convert: (model, msg, publish, options, meta) => {
+            const zoneStatus = msg.data.zonestatus;
+            return {
+                contact: !((zoneStatus & 1) > 0),
+                vibration: (zoneStatus & 1<<1) > 0,
+                tamper: (zoneStatus & 1<<2) > 0,
+                battery_low: (zoneStatus & 1<<3) > 0,
+            };
+        },
+    },
+};
+
 module.exports = [
+    {
+        zigbeeModel: ['LDSENK08'],
+        model: 'LDSENK08',
+        vendor: 'ADEO',
+        description: 'ENKI LEXMAN wireless smart door window sensor with vibration',
+        fromZigbee: [fzLocal.LDSENK08, fz.battery],
+        toZigbee: [],
+        exposes: [e.battery_low(), e.contact(), e.vibration(), e.tamper(), e.battery()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
+        },
+    },
     {
         zigbeeModel: ['LDSENK09'],
         model: 'LDSENK09',

package/devices/awox.js

@@ -72,25 +72,9 @@ module.exports = [
     {
         fingerprint: [
             {
-                type: 'EndDevice',
-                manufacturerName: 'AwoX',
-                modelID: 'TLSR82xx',
-                powerSource: 'Battery',
-                endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 2048,
-                        inputClusters: [0, 3, 4, 4096],
-                        outputClusters: [0, 3, 4, 5, 6, 8, 768, 4096],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 2048,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                type: 'EndDevice', manufacturerName: 'AwoX', modelID: 'TLSR82xx', powerSource: 'Battery', endpoints: [
+                    {ID: 1, profileID: 260, deviceID: 2048, inputClusters: [0, 3, 4, 4096], outputClusters: [0, 3, 4, 5, 6, 8, 768, 4096]},
+                    {ID: 3, profileID: 4751, deviceID: 2048, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
         ],
@@ -108,76 +92,35 @@ module.exports = [
         fingerprint: [
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 269,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10],
-                        outputClusters: [6],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 269,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 269, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10], outputClusters: [6]},
+                    {ID: 3, profileID: 4751, deviceID: 269, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                     {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
                 ],
             },
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 258,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096],
-                        outputClusters: [6, 25],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 49152,
-                        deviceID: 258,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 269, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10], outputClusters: [6]},
+                    {ID: 3, profileID: 4751, deviceID: 269, inputClusters: [65360, 65361, 4], outputClusters: [65360, 65361]},
+                    {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
+                ],
+            },
+            {
+                type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
+                    {ID: 1, profileID: 260, deviceID: 258, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096], outputClusters: [6, 25]},
+                    {ID: 3, profileID: 49152, deviceID: 258, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 269,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599],
-                        outputClusters: [6],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 269,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 269, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599], outputClusters: [6]},
+                    {ID: 3, profileID: 4751, deviceID: 269, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                     {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
                 ],
             },
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 269,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599],
-                        outputClusters: [6],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 269,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 269, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599], outputClusters: [6]},
+                    {ID: 3, profileID: 4751, deviceID: 269, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
         ],
@@ -190,58 +133,22 @@ module.exports = [
         fingerprint: [
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 268,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599],
-                        outputClusters: [6],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 268,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 268, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599], outputClusters: [6]},
+                    {ID: 3, profileID: 4751, deviceID: 268, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 268,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599],
-                        outputClusters: [6],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 268, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599], outputClusters: [6]},
                     {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 268,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 3, profileID: 4751, deviceID: 268, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 268,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10],
-                        outputClusters: [6],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 268, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10], outputClusters: [6]},
                     {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 268,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 3, profileID: 4751, deviceID: 268, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
         ],
@@ -255,20 +162,8 @@ module.exports = [
         fingerprint: [
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 268,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096],
-                        outputClusters: [6, 25],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 49152,
-                        deviceID: 268,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 268, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096], outputClusters: [6, 25]},
+                    {ID: 3, profileID: 49152, deviceID: 268, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
         ],

package/devices/enocean.js

@@ -16,6 +16,8 @@ module.exports = [
             {vendor: 'Niko', description: 'Dimmer switch for Hue system', model: '91004'},
             {vendor: 'NodOn', description: 'Smart switch for Philips Hue', model: 'CWS-4-1-01_HUE'},
             {vendor: 'Vimar', description: 'Zigbee Friends of Hue RF switch', model: '03906'},
+            {vendor: 'Sunricher', model: 'SR-ZGP2801K4-FOH-E'},
+            {vendor: 'LED Trading', model: '9125'},
         ],
     },
     {

package/devices/led_trading.js

@@ -21,31 +21,6 @@ const fzLocal = {
             }
         },
     },
-    led_trading_9125: {
-        cluster: 'greenPower',
-        type: ['commandNotification', 'commandCommisioningNotification'],
-        convert: (model, msg, publish, options, meta) => {
-            const commandID = msg.data.commandID;
-            if (utils.hasAlreadyProcessedMessage(msg, msg.data.frameCounter, `${msg.device.ieeeAddr}_${commandID}`)) return;
-            if (commandID === 104) return; // Skip commisioning command.
-
-            // Button 1: A0 (top left)
-            // Button 2: A1 (bottom left)
-            // Button 3: B0 (top right)
-            // Button 4: B1 (bottom right)
-            const lookup = {
-                0x10: 'press_1', 0x14: 'release_1', 0x11: 'press_2', 0x15: 'release_2', 0x13: 'press_3', 0x17: 'release_3',
-                0x12: 'press_4', 0x16: 'release_4', 0x64: 'press_1_and_3', 0x65: 'release_1_and_3', 0x62: 'press_2_and_4',
-                0x63: 'release_2_and_4',
-            };
-
-            if (!lookup.hasOwnProperty(commandID)) {
-                meta.logger.error(`LED Trading 9125: missing command '${commandID}'`);
-            } else {
-                return {action: lookup[commandID]};
-            }
-        },
-    },
 };
 
 module.exports = [
@@ -91,15 +66,4 @@ module.exports = [
             await reporting.bind(device.getEndpoint(5), coordinatorEndpoint, ['genOnOff']);
         },
     },
-    {
-        fingerprint: [{modelID: 'GreenPower_2', ieeeAddr: /^0x00000000017.....$/, manufId: null}],
-        model: '9125',
-        vendor: 'LED Trading',
-        description: 'FOH smart switch',
-        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZGP2801K4-FOH-E'}],
-        fromZigbee: [fzLocal.led_trading_9125],
-        toZigbee: [],
-        exposes: [e.action(['press_1', 'release_1', 'press_2', 'release_2', 'press_3', 'release_3', 'press_4', 'release_4',
-            'press_1_and_3', 'release_1_and_3', 'press_2_and_4', 'release_2_and_4'])],
-    },
 ];

package/devices/m/303/274ller_licht.js

@@ -100,7 +100,8 @@ module.exports = [
         toZigbee: extend.light_onoff_brightness_colortemp_color().toZigbee.concat([tz.tint_scene]),
     },
     {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_mntza0sw'}],
+        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_mntza0sw'},
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_r0vzq1oj'}],
         model: '404062',
         vendor: 'Müller Licht',
         description: 'Kea RGB+CCT',

package/devices/sengled.js

@@ -146,11 +146,11 @@ module.exports = [
         model: 'E11-N1EA',
         vendor: 'Sengled',
         description: 'Element plus color (A19)',
-        fromZigbee: sengledExtend.light_onoff_brightness().fromZigbee.concat([fz.metering]),
-        toZigbee: sengledExtend.light_onoff_brightness().toZigbee,
+        fromZigbee: sengledExtend.light_onoff_brightness_colortemp_color().fromZigbee.concat([fz.metering]),
+        toZigbee: sengledExtend.light_onoff_brightness_colortemp_color().toZigbee,
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
-            await sengledExtend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            await sengledExtend.light_onoff_brightness_colortemp_color().configure(device, coordinatorEndpoint, logger);
             device.powerSource = 'Mains (single phase)';
             device.save();
 
@@ -160,7 +160,7 @@ module.exports = [
             await reporting.currentSummDelivered(endpoint);
             await reporting.instantaneousDemand(endpoint);
         },
-        exposes: sengledExtend.light_onoff_brightness().exposes.concat([e.power(), e.energy()]),
+        exposes: sengledExtend.light_onoff_brightness_colortemp_color().exposes.concat([e.power(), e.energy()]),
     },
     {
         zigbeeModel: ['E11-U2E'],

package/devices/tuya.js

@@ -794,7 +794,9 @@ module.exports = [
             {modelID: 'TS0503B', manufacturerName: '_TZ3210_778drfdt'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3000_g5xawfcq'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3210_trm3l2aw'},
-            {modelID: 'TS0503B', manufacturerName: '_TZ3210_odlghna1'}],
+            {modelID: 'TS0503B', manufacturerName: '_TZ3210_95txyzbx'},
+            {modelID: 'TS0503B', manufacturerName: '_TZ3210_odlghna1'},
+            {modelID: 'TS0503B', manufacturerName: '_TZ3220_wp1k8xws'}],
         model: 'TS0503B',
         vendor: 'TuYa',
         description: 'Zigbee RGB light',
@@ -1161,6 +1163,7 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS0215A', manufacturerName: '_TZ3000_p6ju8myv'},
+            {modelID: 'TS0215A', manufacturerName: '_TZ3000_0zrccfgx'},
             {modelID: 'TS0215A', manufacturerName: '_TZ3000_fsiepnrh'}],
         model: 'TS0215A_remote',
         vendor: 'TuYa',
@@ -1477,7 +1480,11 @@ module.exports = [
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
             const ep1 = device.getEndpoint(1);
-            await ep1.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+            try {
+                await ep1.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+            } catch (e) {
+                // Fails for some: https://github.com/Koenkk/zigbee2mqtt/discussions/13368
+            }
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
             await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
         },

package/lib/reporting.js

@@ -171,7 +171,7 @@ module.exports = {
         await endpoint.configureReporting('hvacThermostat', p);
     },
     thermostatRunningMode: async (endpoint, overrides) => {
-        const p = payload('runningMode', 0, repInterval.HOUR, 0, overrides);
+        const p = payload('runningMode', 10, repInterval.HOUR, null, overrides);
         await endpoint.configureReporting('hvacThermostat', p);
     },
     thermostatOcupancy: async (endpoint, overrides) => {

package/package.json

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