zigbee-herdsman-converters 15.0.100 → 15.0.102

package/devices/bosch.js

@@ -860,7 +860,7 @@ const definition = [
         zigbeeModel: ['RBSH-MMS-ZB-EU'],
         model: 'BMCT-SLZ',
         vendor: 'Bosch',
-        description: 'Bosch Light/shutter control unit II',
+        description: 'Light/shutter control unit II',
         fromZigbee: [fzLocal.bmct, fz.cover_position_tilt, fz.on_off, fz.power_on_behavior],
         toZigbee: [tzLocal.bmct, tz.cover_position_tilt, tz.on_off, tz.power_on_behavior],
         meta: {multiEndpoint: true},

package/devices/ledvance.js

@@ -31,7 +31,7 @@ module.exports = [
         zigbeeModel: ['Panel TW Z3'],
         model: '4058075181472',
         vendor: 'LEDVANCE',
-        description: 'SMART+ panel 60 x 60cm tunable white',
+        description: 'SMART+ panel 60x60cm/120x30cm tunable white',
         extend: extend.ledvance.light_onoff_brightness_colortemp(),
         ota: ota.ledvance,
     },

package/devices/philips.js

@@ -395,6 +395,13 @@ module.exports = [
         description: 'Hue Go portable light',
         extend: philips.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['929003128501'],
+        model: '929003128501',
+        vendor: 'Philips',
+        description: 'Hue Go portable table lamp',
+        extend: philips.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['7602031K6'],
         model: '7602031K6',

package/devices/samotech.js

@@ -27,6 +27,37 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic', 'genIdentify', 'genOnOff']);
         },
     },
+    {
+        zigbeeModel: ['SM308-2CH'],
+        model: 'SM308-2CH',
+        vendor: 'Samotech',
+        description: 'Zigbee 2 channel in wall switch',
+        extend: extend.switch({fromZigbee: [fz.electrical_measurement, fz.metering]}),
+        exposes: [
+            e.switch().withEndpoint('l1'),
+            e.switch().withEndpoint('l2'),
+            e.power_on_behavior().withEndpoint('l1'),
+            e.power_on_behavior().withEndpoint('l2'),
+            e.power(), e.current(), e.voltage(), e.energy()],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint1 = device.getEndpoint(1);
+            const endpoint2 = device.getEndpoint(2);
+            const endpoint11 = device.getEndpoint(11);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['genBasic', 'genIdentify', 'genOnOff']);
+            await reporting.bind(endpoint2, coordinatorEndpoint, ['genBasic', 'genIdentify', 'genOnOff']);
+            await reporting.bind(endpoint11, coordinatorEndpoint, ['genOta', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint11);
+            await reporting.readMeteringMultiplierDivisor(endpoint11);
+            await reporting.rmsVoltage(endpoint11, {min: 10, change: 20});
+            await reporting.rmsCurrent(endpoint11, {min: 10, change: 10});
+            await reporting.activePower(endpoint11, {min: 10, change: 15});
+            await reporting.currentSummDelivered(endpoint11, {min: 300});
+        },
+    },
     {
         zigbeeModel: ['SM309-S'],
         model: 'SM309-S',

package/devices/tuya.js

@@ -903,10 +903,11 @@ const fzLocal = {
             // https://github.com/Koenkk/zigbee2mqtt/issues/16709#issuecomment-1509599046
             if (['_TZ3000_gvn91tmx', '_TZ3000_amdymr7l'].includes(meta.device.manufacturerName)) {
                 for (const key of ['power', 'current', 'voltage']) {
-                    if (result[key] === 0 && globalStore.getValue(msg.endpoint, key) !== 0) {
+                    const value = result[key];
+                    if (value === 0 && globalStore.getValue(msg.endpoint, key) !== 0) {
                         delete result[key];
                     }
-                    globalStore.putValue(msg.endpoint, key, result[key]);
+                    globalStore.putValue(msg.endpoint, key, value);
                 }
             }
             return result;
@@ -1433,7 +1434,9 @@ module.exports = [
         whiteLabel: [{vendor: 'Mercator Ikuü', model: 'SMA02P'},
             {vendor: 'TuYa', model: 'TY-ZPR06'},
             {vendor: 'Tesla Smart', model: 'TS0202'},
-            tuya.whitelabel('MiBoxer', 'PIR1-ZB', 'PIR Sensor', ['_TZ3040_wqmtjsyk'])],
+            tuya.whitelabel('MiBoxer', 'PIR1-ZB', 'PIR sensor', ['_TZ3040_wqmtjsyk']),
+            tuya.whitelabel('TuYa', 'ZMS01', 'Motion sensor', ['_TZ3000_otvn3lne']),
+        ],
         fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_occupancy_alarm_1_report],
         toZigbee: [],
         exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.battery(), e.battery_voltage()],
@@ -1768,7 +1771,10 @@ module.exports = [
         toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.tuya_cover_calibration, tz.tuya_cover_reversal,
             tuya.tz.backlight_indicator_mode_1],
         meta: {coverInverted: true},
-        whiteLabel: [{vendor: 'LoraTap', model: 'SC400'}],
+        whiteLabel: [
+            {vendor: 'LoraTap', model: 'SC400'},
+            tuya.whitelabel('Zemismart', 'ZN-LC1E', 'Smart curtain/shutter switch', ['_TZ3000_74hsp7qy']),
+        ],
         exposes: [e.cover_position(), exposes.enum('moving', ea.STATE, ['UP', 'STOP', 'DOWN']),
             exposes.binary('calibration', ea.ALL, 'ON', 'OFF'), exposes.binary('motor_reversal', ea.ALL, 'ON', 'OFF'),
             exposes.enum('backlight_mode', ea.ALL, ['low', 'medium', 'high']),
@@ -2385,8 +2391,9 @@ module.exports = [
         vendor: 'TuYa',
         description: '2 gang switch module',
         whiteLabel: [
-            {vendor: 'OXT', model: 'SWTZ22'}, {vendor: 'Nous', model: 'L13Z'},
+            {vendor: 'OXT', model: 'SWTZ22'},
             tuya.whitelabel('pcblab.io', 'RR620ZB', '2 gang Zigbee switch module', ['_TZ3000_4xfqlgqo']),
+            tuya.whitelabel('Nous', 'L13Z', '2 gang switch', ['_TZ3000_ruxexjfz']),
         ],
         extend: tuya.extend.switch({switchType: true, endpoints: ['l1', 'l2']}),
         endpoint: (device) => {
@@ -2512,7 +2519,9 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_3ylew7b4'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_llm0epxg'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_n1aauwb4'},
+            {modelID: 'TS0601', manufacturerName: '_TZE204_sxm7l9xa'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_xu4a5rhj'},
+            {modelID: 'TS0601', manufacturerName: '_TZE204_r0jdjrvi'},
         ],
         model: 'TS0601_cover_1',
         vendor: 'TuYa',
@@ -2709,6 +2718,7 @@ module.exports = [
             {vendor: 'AVATTO', model: 'TRV06'},
             {vendor: 'Tesla Smart', model: 'TSL-TRV-TV01ZG'},
             {vendor: 'Unknown/id3.pl', model: 'GTZ08'},
+            tuya.whitelabel('Moes', 'ZTRV-ZX-TV01-MS', 'Thermostat radiator valve', ['_TZE200_7yoranx2']),
         ],
         ota: ota.zigbeeOTA,
         fromZigbee: [tuya.fz.datapoints],
@@ -3065,7 +3075,9 @@ module.exports = [
         whiteLabel: [{vendor: 'LELLKI', model: 'TS011F_plug'}, {vendor: 'NEO', model: 'NAS-WR01B'},
             {vendor: 'BlitzWolf', model: 'BW-SHP15'}, {vendor: 'Nous', model: 'A1Z'}, {vendor: 'BlitzWolf', model: 'BW-SHP13'},
             {vendor: 'MatSee Plus', model: 'PJ-ZSW01'}, {vendor: 'MODEMIX', model: 'MOD037'}, {vendor: 'MODEMIX', model: 'MOD048'},
-            {vendor: 'Coswall', model: 'CS-AJ-DE2U-ZG-11'}, {vendor: 'Aubess', model: 'TS011F_plug_1'}, {vendor: 'Immax', model: '07752L'}],
+            {vendor: 'Coswall', model: 'CS-AJ-DE2U-ZG-11'}, {vendor: 'Aubess', model: 'TS011F_plug_1'}, {vendor: 'Immax', model: '07752L'},
+            tuya.whitelabel('NOUS', 'A1Z', 'Smart plug (with power monitoring)', ['_TZ3000_2putqrmw']),
+        ],
         ota: ota.zigbeeOTA,
         extend: tuya.extend.switch({
             electricalMeasurements: true, electricalMeasurementsFzConverter: fzLocal.TS011F_electrical_measurement,
@@ -3103,7 +3115,9 @@ module.exports = [
         description: 'Smart plug (with power monitoring by polling)',
         vendor: 'TuYa',
         whiteLabel: [{vendor: 'VIKEFON', model: 'TS011F'}, {vendor: 'BlitzWolf', model: 'BW-SHP15'},
-            {vendor: 'Avatto', model: 'MIUCOT10Z'}, {vendor: 'Neo', model: 'NAS-WR01B'}, {vendor: 'Neo', model: 'PLUG-001SPB2'}],
+            {vendor: 'Avatto', model: 'MIUCOT10Z'}, {vendor: 'Neo', model: 'NAS-WR01B'}, {vendor: 'Neo', model: 'PLUG-001SPB2'},
+            tuya.whitelabel('TuYa', 'BSD29', 'Smart plug (with power monitoring by polling)', ['_TZ3000_okaz9tjs']),
+        ],
         ota: ota.zigbeeOTA,
         extend: tuya.extend.switch({electricalMeasurements: true, powerOutageMemory: true, indicatorMode: true, childLock: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -3197,6 +3211,9 @@ module.exports = [
                 [101, 'test', tuya.valueConverter.raw],
             ],
         },
+        whiteLabel: [
+            tuya.whitelabel('TuYa', 'PA-44Z', 'Smoke detector', ['_TZE200_m9skfctm']),
+        ],
     },
     {
         fingerprint: [
@@ -4205,7 +4222,8 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS004F', manufacturerName: '_TZ3000_4fjiwweb'}, {modelID: 'TS004F', manufacturerName: '_TZ3000_uri7ongn'},
-            {modelID: 'TS004F', manufacturerName: '_TZ3000_ixla93vd'}, {modelID: 'TS004F', manufacturerName: '_TZ3000_qja6nq5z'}],
+            {modelID: 'TS004F', manufacturerName: '_TZ3000_ixla93vd'}, {modelID: 'TS004F', manufacturerName: '_TZ3000_qja6nq5z'},
+            {modelID: 'TS004F', manufacturerName: '_TZ3000_abrsvsou'}],
         model: 'ERS-10TZBVK-AA',
         vendor: 'TuYa',
         description: 'Smart knob',
@@ -4316,6 +4334,9 @@ module.exports = [
             exposes.enum('self_test', ea.STATE, Object.values(tuya.tuyaHPSCheckingResult))
                 .withDescription('Self_test, possible resuts: checking, check_success, check_failure, others, comm_fault, radar_fault.'),
         ],
+        whiteLabel: [
+            tuya.whitelabel('TuYa', 'ZY-M100-S', 'Human presence sensor', ['_TZE204_ztc6ggyl']),
+        ],
     },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_whkgqxse'}],
@@ -4815,4 +4836,21 @@ module.exports = [
             tuya.whitelabel('TONGOU', 'TO-Q-SY2-163JZT', 'Smart circuit breaker', ['_TZ3000_cayepv1a']),
         ],
     },
+    {
+        fingerprint: tuya.fingerprint('TS000F', ['_TZ3000_m8f3z8ju']),
+        model: 'QS-Zigbee-SEC02-U',
+        vendor: 'TuYa',
+        description: 'Zigbee 3.0 smart light switch module 2 gang',
+        toZigbee: [tz.on_off],
+        extend: extend.switch(),
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2')],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+        },
+    },
 ];

package/devices/ynoa.js

@@ -6,6 +6,13 @@ const e = exposes.presets;
 const extend = require('..//lib/extend');
 
 module.exports = [
+    {
+        zigbeeModel: ['ZBT-CCTfilament-D0001'],
+        model: '8718801528204',
+        vendor: 'Ynoa',
+        description: 'Smart LED E27 CCT',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [250, 454], disableEffect: true}),
+    },
     {
         zigbeeModel: ['ZBT-CCTLight-GU100001'],
         model: '8718801528273',

package/index.js

@@ -131,7 +131,7 @@ function findByZigbeeModel(zigbeeModel) {
 }
 
 function findByDevice(device) {
-    let definition = findDefintion(device);
+    let definition = findDefinition(device);
     if (definition && definition.whiteLabel) {
         const match = definition.whiteLabel.find((w) => w.fingerprint && w.fingerprint.find((f) => isFingerprintMatch(f, device)));
         if (match) {
@@ -146,7 +146,7 @@ function findByDevice(device) {
     return definition;
 }
 
-function findDefintion(device) {
+function findDefinition(device) {
     if (!device) {
         return null;
     }

package/lib/xiaomi.js

@@ -224,11 +224,13 @@ const numericAttributes2Payload = async (msg, meta, model, options, dataObject)
                 payload[`state_${mapping}`] = value === 1 ? 'ON' : 'OFF';
             } else if (['WXKG14LM', 'WXKG16LM', 'WXKG17LM'].includes(model.model)) {
                 payload.click_mode = {1: 'fast', 2: 'multi'}[value];
-            } else if (['WXCJKG11LM', 'WXCJKG12LM', 'WXCJKG13LM', 'ZNMS12LM', 'ZNCLBL01LM', 'RTCGQ12LM', 'RTCGQ13LM', 'RTCGQ14LM',
-                'RTCGQ15LM'].includes(model.model)) {
+            } else if (['WXCJKG11LM', 'WXCJKG12LM', 'WXCJKG13LM', 'ZNMS12LM', 'ZNCLBL01LM', 'RTCGQ12LM', 'RTCGQ13LM',
+                'RTCGQ14LM'].includes(model.model)) {
                 // We don't know what the value means for these devices.
                 // https://github.com/Koenkk/zigbee2mqtt/issues/11126
                 // https://github.com/Koenkk/zigbee2mqtt/issues/12279
+            } else if (['RTCGQ15LM'].includes(model.model)) {
+                payload.occupancy = value;
             } else if (['WSDCGQ01LM', 'WSDCGQ11LM', 'WSDCGQ12LM', 'VOCKQJK11LM'].includes(model.model)) {
                 // https://github.com/Koenkk/zigbee2mqtt/issues/798
                 // Sometimes the sensor publishes non-realistic vales, filter these

package/package.json

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