zigbee-herdsman-converters 15.0.50 → 15.0.52

package/converters/fromZigbee.js

@@ -1980,7 +1980,7 @@ const converters = {
                 return {temperature: calibrateAndPrecisionRoundOptions(value / 10, options, 'temperature')};
             case tuya.dataPoints.tthHumidity:
                 return {humidity: calibrateAndPrecisionRoundOptions(
-                    (value / (meta.device.manufacturerName === '_TZE200_bjawzodf' ? 10 : 1)),
+                    (value / (['_TZE200_bjawzodf', '_TZE200_zl1kmjqx'].includes(meta.device.manufacturerName) ? 10 : 1)),
                     options, 'humidity')};
             case tuya.dataPoints.tthBatteryLevel:
                 return {
@@ -8224,6 +8224,35 @@ const converters = {
             return result;
         },
     },
+    SNZB02_temperature: {
+        cluster: 'msTemperatureMeasurement',
+        type: ['attributeReport', 'readResponse'],
+        options: [exposes.options.precision('temperature'), exposes.options.calibration('temperature')],
+        convert: (model, msg, publish, options, meta) => {
+            const temperature = parseFloat(msg.data['measuredValue']) / 100.0;
+
+            // https://github.com/Koenkk/zigbee2mqtt/issues/13640
+            // SNZB-02 reports stranges values sometimes
+            if (temperature > -33 && temperature < 100) {
+                const property = postfixWithEndpointName('temperature', msg, model, meta);
+                return {[property]: calibrateAndPrecisionRoundOptions(temperature, options, 'temperature')};
+            }
+        },
+    },
+    SNZB02_humidity: {
+        cluster: 'msRelativeHumidity',
+        type: ['attributeReport', 'readResponse'],
+        options: [exposes.options.precision('humidity'), exposes.options.calibration('humidity')],
+        convert: (model, msg, publish, options, meta) => {
+            const humidity = parseFloat(msg.data['measuredValue']) / 100.0;
+
+            // https://github.com/Koenkk/zigbee2mqtt/issues/13640
+            // SNZB-02 reports stranges values sometimes
+            if (humidity >= 0 && humidity <= 99.75) {
+                return {humidity: calibrateAndPrecisionRoundOptions(humidity, options, 'humidity')};
+            }
+        },
+    },
     // #endregion
 
     // #region Ignore converters (these message dont need parsing).

package/devices/custom_devices_diy.js

@@ -812,7 +812,8 @@ module.exports = [
         model: 'SNZB-02_EFEKTA',
         vendor: 'Custom devices (DiY)',
         description: 'Alternative firmware for the SONOFF SNZB-02 sensor from EfektaLab, DIY',
-        fromZigbee: [fz.temperature, fz.humidity, fz.battery, fzLocal.termostat_config, fzLocal.hydrostat_config, fzLocal.node_config],
+        fromZigbee: [fz.SNZB02_temperature, fz.SNZB02_humidity, fz.battery, fzLocal.termostat_config,
+            fzLocal.hydrostat_config, fzLocal.node_config],
         toZigbee: [tzLocal.termostat_config, tzLocal.hydrostat_config, tzLocal.node_config],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);

package/devices/owon.js

@@ -94,14 +94,16 @@ module.exports = [
         description: 'Smart plug',
         fromZigbee: [fz.on_off, fz.metering],
         toZigbee: [tz.on_off],
+        exposes: [e.switch(), e.power(), e.energy()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
             await reporting.onOff(endpoint);
             await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.instantaneousDemand(endpoint, {min: 5, max: constants.repInterval.MINUTES_5, change: 2});
+            await reporting.instantaneousDemand(endpoint, {min: 5, max: constants.repInterval.MINUTES_5, change: 2}); // divider 1000: 2W
+            await reporting.currentSummDelivered(endpoint, {min: 5, max: constants.repInterval.MINUTES_5,
+                change: [10, 10]}); // divider 1000: 0,01kWh
         },
-        exposes: [e.switch(), e.power(), e.energy()],
     },
     {
         zigbeeModel: ['WSP404'],
@@ -110,14 +112,16 @@ module.exports = [
         description: 'Smart plug',
         fromZigbee: [fz.on_off, fz.metering],
         toZigbee: [tz.on_off],
+        exposes: [e.switch(), e.power(), e.energy()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
             await reporting.onOff(endpoint);
             await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.instantaneousDemand(endpoint, {min: 5, max: constants.repInterval.MINUTES_5, change: 2});
+            await reporting.instantaneousDemand(endpoint, {min: 5, max: constants.repInterval.MINUTES_5, change: 2}); // divider 1000: 2W
+            await reporting.currentSummDelivered(endpoint, {min: 5, max: constants.repInterval.MINUTES_5,
+                change: [10, 10]}); // divider 1000: 0,01kWh
         },
-        exposes: [e.switch(), e.power(), e.energy()],
     },
     {
         zigbeeModel: ['CB432'],

package/devices/philips.js

@@ -617,7 +617,7 @@ module.exports = [
         model: '8718699688820',
         vendor: 'Philips',
         description: 'Hue Filament Standard A60/E27 bluetooth',
-        extend: philips.extend.light_onoff_brightness(),
+        extend: philips.extend.light_onoff_brightness({disableHueEffects: false}),
     },
     {
         zigbeeModel: ['LWA021'],

package/devices/sonoff.js

@@ -9,16 +9,6 @@ const ea = exposes.access;
 const ota = require('../lib/ota');
 
 const fzLocal = {
-    // SNZB-02 reports stranges values sometimes
-    // https://github.com/Koenkk/zigbee2mqtt/issues/13640
-    SNZB02_temperature: {
-        ...fz.temperature,
-        convert: (model, msg, publish, options, meta) => {
-            if (msg.data.measuredValue > -10000 && msg.data.measuredValue < 10000) {
-                return fz.temperature.convert(model, msg, publish, options, meta);
-            }
-        },
-    },
     router_config: {
         cluster: 'genLevelCtrl',
         type: ['attributeReport', 'readResponse'],
@@ -157,7 +147,7 @@ module.exports = [
         whiteLabel: [{vendor: 'eWeLink', model: 'RHK08'}],
         description: 'Temperature and humidity sensor',
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
-        fromZigbee: [fzLocal.SNZB02_temperature, fz.humidity, fz.battery],
+        fromZigbee: [fz.SNZB02_temperature, fz.humidity, fz.battery],
         toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             try {

package/devices/tuya.js

@@ -797,7 +797,8 @@ module.exports = [
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_bq5c8xfe'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_bjawzodf'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_qyflbnbj'}],
+            {modelID: 'TS0601', manufacturerName: '_TZE200_qyflbnbj'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_zl1kmjqx'}],
         model: 'TS0601_temperature_humidity_sensor',
         vendor: 'TuYa',
         description: 'Temperature & humidity sensor',
@@ -1111,7 +1112,9 @@ module.exports = [
             {modelID: 'TS0202', manufacturerName: '_TZ3000_kmh5qpmb'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_hgu1dlak'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_h4wnrtck'},
-            {modelID: 'WHD02', manufacturerName: '_TZ3000_hktqahrq'}],
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_sr0vaafi'},
+            {modelID: 'WHD02', manufacturerName: '_TZ3000_hktqahrq'},
+        ],
         model: 'TS0202',
         vendor: 'TuYa',
         description: 'Motion sensor',
@@ -1126,6 +1129,7 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
             try {
                 await reporting.batteryPercentageRemaining(endpoint);
+                await reporting.batteryVoltage(endpoint);
             } catch (error) {/* Fails for some https://github.com/Koenkk/zigbee2mqtt/issues/13708*/}
         },
     },
@@ -2994,7 +2998,8 @@ module.exports = [
         vendor: 'TuYa',
         description: '1 gang switch module - (without neutral)',
         extend: tuya.extend.switch({switchType: true}),
-        whiteLabel: [{vendor: 'AVATTO', model: '1gang N-ZLWSM01'}, {vendor: 'SMATRUL', model: 'TMZ02L-16A-W'}],
+        whiteLabel: [{vendor: 'AVATTO', model: '1gang N-ZLWSM01'}, {vendor: 'SMATRUL', model: 'TMZ02L-16A-W'},
+            {vendor: 'Aubess', model: 'TMZ02L-16A-B'}],
         configure: async (device, coordinatorEndpoint, logger) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);

package/devices/yale.js

@@ -150,6 +150,34 @@ module.exports = [
         description: 'Assure lock SL',
         extend: lockExtend(),
     },
+    {
+        zigbeeModel: ['YRD410 TS'],
+        model: 'YRD410-BLE',
+        vendor: 'Yale',
+        description: 'Assure lock 2',
+        extend: lockExtend(),
+    },
+    {
+        zigbeeModel: ['YRD420 TS'],
+        model: 'YRD420-BLE',
+        vendor: 'Yale',
+        description: 'Assure lock 2',
+        extend: lockExtend(),
+    },
+    {
+        zigbeeModel: ['YRD430 TS'],
+        model: 'YRD430-BLE',
+        vendor: 'Yale',
+        description: 'Assure lock 2',
+        extend: lockExtend(),
+    },
+    {
+        zigbeeModel: ['YRD450 TS'],
+        model: 'YRD450-BLE',
+        vendor: 'Yale',
+        description: 'Assure lock 2',
+        extend: lockExtend(),
+    },
     {
         // Appears to be a slightly rebranded Assure lock SL
         // Just with Lockwood | Assa Abloy branding instead of Yale

package/package.json

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