zigbee-herdsman-converters 15.0.110 → 15.0.112

package/devices/shenzhen_homa.js

@@ -3,6 +3,60 @@ const extend = require('../lib/extend');
 const e = exposes.presets;
 
 module.exports = [
+    {
+        fingerprint: [
+            {modelID: 'HOMA1001', endpoints: [
+                {ID: 10, profileID: 49246, deviceID: 256, inputClusters: [0, 3, 4, 5, 6, 8], outputClusters: []},
+                {ID: 11, profileID: 49246, deviceID: 528, inputClusters: [0, 3, 4, 5, 6, 8, 768], outputClusters: []},
+                {ID: 13, profileID: 49246, deviceID: 57694, inputClusters: [4096], outputClusters: [4096]},
+            ]},
+        ],
+        model: 'HOMA1001_RGBW',
+        vendor: 'Shenzhen Homa',
+        description: 'Smart LED driver RGBW',
+        extend: extend.light_onoff_brightness_color(),
+        exposes: [e.light_brightness().withEndpoint('white'), e.light_brightness_colorxy().withEndpoint('rgb')],
+        meta: {multiEndpoint: true},
+        endpoint: (device) => {
+            return {white: 10, rgb: 11};
+        },
+    },
+    {
+        fingerprint: [
+            {modelID: 'HOMA1001', endpoints: [
+                {ID: 11, profileID: 49246, deviceID: 528, inputClusters: [0, 3, 4, 5, 6, 8, 768], outputClusters: []},
+                {ID: 13, profileID: 49246, deviceID: 57694, inputClusters: [4096], outputClusters: [4096]},
+            ]},
+        ],
+        model: 'HOMA1001_RGB',
+        vendor: 'Shenzhen Homa',
+        description: 'Smart LED driver RGB',
+        extend: extend.light_onoff_brightness_color(),
+    },
+    {
+        fingerprint: [
+            {modelID: 'HOMA1001', endpoints: [
+                {ID: 11, profileID: 49246, deviceID: 544, inputClusters: [0, 3, 4, 5, 6, 8, 768], outputClusters: []},
+                {ID: 13, profileID: 49246, deviceID: 57694, inputClusters: [4096], outputClusters: [4096]},
+            ]},
+        ],
+        model: 'HOMA1001_CT',
+        vendor: 'Shenzhen Homa',
+        description: 'Smart LED driver CT',
+        extend: extend.light_onoff_brightness(),
+    },
+    {
+        fingerprint: [
+            {modelID: 'HOMA1001', endpoints: [
+                {ID: 11, profileID: 49246, deviceID: 256, inputClusters: [0, 3, 4, 5, 6, 8], outputClusters: []},
+                {ID: 13, profileID: 49246, deviceID: 57694, inputClusters: [4096], outputClusters: [4096]},
+            ]},
+        ],
+        model: 'HOMA1001_SC',
+        vendor: 'Shenzhen Homa',
+        description: 'Smart LED driver SC',
+        extend: extend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['HOMA1008', '00A'],
         model: 'HLD812-Z-SC',
@@ -18,7 +72,7 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['HOMA1002', 'HOMA0019', 'HOMA0006', 'HOMA000F', '019', 'HOMA1004'],
+        zigbeeModel: ['HOMA1002', 'HOMA1004', 'HOMA0019', 'HOMA0006', 'HOMA000F', '019'],
         model: 'HLC610-Z',
         vendor: 'Shenzhen Homa',
         description: 'Wireless dimmable controller',

package/devices/third_reality.js

@@ -192,4 +192,19 @@ module.exports = [
             device.save();
         },
     },
+    {
+        zigbeeModel: ['3RVS01031Z'],
+        model: '3RVS01031Z',
+        vendor: 'Third Reality',
+        description: 'Zigbee vibration sensor',
+        fromZigbee: [fz.ias_vibration_alarm_1, fz.battery],
+        toZigbee: [],
+        exposes: [e.vibration(), e.battery_low(), e.battery(), e.battery_voltage()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genPowerCfg', ['batteryPercentageRemaining']);
+            device.powerSource = 'Battery';
+            device.save();
+        },
+    },
 ];

package/devices/tuya.js

@@ -1379,7 +1379,6 @@ module.exports = [
             await reporting.batteryPercentageRemaining(endpoint);
             await reporting.batteryVoltage(endpoint);
         },
-        whiteLabel: [{vendor: 'Linkoze', model: 'LKMSZ001'}],
         exposes: [e.battery(), e.battery_voltage(), e.occupancy(), e.action(['single', 'double', 'hold']),
             exposes.enum('light', ea.STATE, ['dark', 'bright'])],
         meta: {
@@ -1388,6 +1387,9 @@ module.exports = [
                 [101, 'action', tuya.valueConverterBasic.lookup({'single': 0, 'double': 1, 'hold': 2})],
             ],
         },
+        whiteLabel: [
+            {vendor: 'Linkoze', model: 'LKMSZ001'},
+        ],
     },
     {
         fingerprint: [{modelID: 'TS0202', manufacturerName: '_TYZB01_jytabjkb'},
@@ -1407,6 +1409,9 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
             await reporting.batteryPercentageRemaining(endpoint);
         },
+        whiteLabel: [
+            tuya.whitelabel('TuYa', '809WZT', 'Motion sensor', ['_TZ3040_bb6xaihh']),
+        ],
     },
     {
         fingerprint: [{modelID: 'TS0202', manufacturerName: '_TYZB01_dr6sduka'},
@@ -1772,6 +1777,7 @@ module.exports = [
         whiteLabel: [
             {vendor: 'LoraTap', model: 'SC400'},
             tuya.whitelabel('Zemismart', 'ZN-LC1E', 'Smart curtain/shutter switch', ['_TZ3000_74hsp7qy']),
+            tuya.whitelabel('Nous', 'L12Z', 'Smart ZigBee Curtain Module L12Z', ['_TZ3000_jwv3cwak']),
         ],
         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'),
@@ -2275,7 +2281,7 @@ module.exports = [
     },
     {
         fingerprint: tuya.fingerprint('TS0001', ['_TZ3000_xkap8wtb', '_TZ3000_qnejhcsu', '_TZ3000_x3ewpzyr',
-            '_TZ3000_mkhkxx1p', '_TZ3000_tgddllx4']),
+            '_TZ3000_mkhkxx1p', '_TZ3000_tgddllx4', '_TZ3000_kqvb5akv']),
         model: 'TS0001_power',
         description: 'Switch with power monitoring',
         vendor: 'TuYa',
@@ -2320,6 +2326,9 @@ module.exports = [
             device.save();
             await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
         },
+        whiteLabel: [
+            tuya.whitelabel('TuYa', 'XSH01B', '2 gang switch module with power monitoring', ['_TZ3000_irrmjcgi']),
+        ],
     },
     {
         fingerprint: tuya.fingerprint('TS000F', ['_TZ3000_xkap8wtb']),
@@ -2509,6 +2518,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_cf1sl3tj'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_b2u1drdv'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_ol5jlkkr'},
+            {modelID: 'TS0601', manufacturerName: '_TZE204_guvc7pdy'},
             // Roller blinds:
             {modelID: 'TS0601', manufacturerName: '_TZE200_fctwhugx'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_hsgrhjpf'},
@@ -2545,6 +2555,7 @@ module.exports = [
             {vendor: 'Zemismart', model: 'BCM500DS-TYZ', description: 'Curtain motor'},
             {vendor: 'A-OK', model: 'AM25', description: 'Tubular motor'},
             {vendor: 'Alutech', model: 'AM/R-Sm', description: 'Tubular motor'},
+            tuya.whitelabel('Shenzhen Golden Security Technology', 'GM46', 'Curtain motor', ['_TZE204_guvc7pdy']),
             tuya.whitelabel('Zemismart', 'ZM85EL-2Z', 'Roman Rod I type U curtains track', ['_TZE200_cf1sl3tj']),
         ],
         fromZigbee: [fz.tuya_cover, fz.ignore_basic_report],
@@ -2572,6 +2583,41 @@ module.exports = [
         toZigbee: [tz.tuya_cover_control],
         exposes: [e.cover_position().setAccess('position', ea.STATE_SET)],
     },
+    {
+        fingerprint: [
+            {modelID: 'TS0601', manufacturerName: '_TZE200_cpbo62rn'},
+        ],
+        model: 'TS0601_cover_6',
+        vendor: 'TuYa',
+        description: 'Cover motor',
+        fromZigbee: [tuya.fz.datapoints],
+        toZigbee: [tuya.tz.datapoints],
+        exposes: [
+            exposes.text('work_state', ea.STATE),
+            e.cover_position().setAccess('position', ea.STATE_SET),
+            e.battery(),
+            exposes.enum('opening_mode', ea.STATE_SET, ['tilt', 'lift']).withDescription('Opening mode'),
+            exposes.enum('motor_direction', ea.STATE_SET, ['left', 'right']).withDescription('Motor side'),
+            exposes.enum('set_upper_limit', ea.STATE_SET, ['start', 'stop']).withDescription('Learning'),
+            exposes.enum('factory_reset', ea.STATE_SET, ['SET']).withDescription('Remove limits'),
+        ],
+        whiteLabel: [
+            tuya.whitelabel('TuYa', 'LY-108', 'Cover', ['_TZE200_cpbo62rn']),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [1, 'state', tuya.valueConverterBasic.lookup({'OPEN': tuya.enum(0), 'STOP': tuya.enum(1), 'CLOSE': tuya.enum(2)})],
+                [2, 'position', tuya.valueConverter.coverPosition],
+                [3, 'position', tuya.valueConverter.raw],
+                [4, 'opening_mode', tuya.valueConverterBasic.lookup({'tilt': tuya.enum(0), 'lift': tuya.enum(1)})],
+                [7, 'work_state', tuya.valueConverterBasic.lookup({'standby': tuya.enum(0), 'success': tuya.enum(1), 'learning': tuya.enum(2)})],
+                [13, 'battery', tuya.valueConverter.raw],
+                [101, 'motor_direction', tuya.valueConverterBasic.lookup({'left': tuya.enum(0), 'right': tuya.enum(1)})],
+                [102, 'set_upper_limit', tuya.valueConverterBasic.lookup({'start': tuya.enum(1), 'stop': tuya.enum(0)})],
+                [107, 'factory_reset', tuya.valueConverter.setLimit],
+            ],
+        },
+    },
     {
         zigbeeModel: ['kud7u2l'],
         fingerprint: [

package/devices/xiaomi.js

@@ -10,7 +10,7 @@ const ea = exposes.access;
 const globalStore = require('../lib/store');
 const xiaomi = require('../lib/xiaomi');
 const utils = require('../lib/utils');
-const {printNumberAsHex, printNumbersAsHexSequence} = utils;
+const {printNumbersAsHexSequence} = utils;
 const {fp1, manufacturerCode, trv} = xiaomi;
 
 const xiaomiExtend = {
@@ -35,12 +35,11 @@ const preventReset = async (type, data, device) => {
     ) {
         return;
     }
-    const options = {manufacturerCode: 0x115f};
     const payload = {[0xfff0]: {
         value: [0xaa, 0x10, 0x05, 0x41, 0x47, 0x01, 0x01, 0x10, 0x01],
         type: 0x41,
     }};
-    await device.getEndpoint(1).write('genBasic', payload, options);
+    await device.getEndpoint(1).write('genBasic', payload, {manufacturerCode});
 };
 
 const daysLookup = {
@@ -253,7 +252,6 @@ const fzLocal = {
 
             Object.entries(msg.data).forEach(([key, value]) => {
                 const eventKey = parseInt(key);
-                const eventKeyHex = printNumberAsHex(eventKey, 4);
 
                 switch (eventKey) {
                 case fp1.constants.region_event_key: {
@@ -287,21 +285,6 @@ const fzLocal = {
                     payload.action = `region_${regionId}_${eventTypeName}`;
                     break;
                 }
-                case 0xf7: {
-                    const valueHexSequence = printNumbersAsHexSequence(value, 2);
-                    log('debug', `Unhandled key ${eventKeyHex} = ${valueHexSequence}`);
-                    break;
-                }
-                case 0x0142:
-                case 0x0143:
-                case 0x0144:
-                case 0x0146: {
-                    log('debug', `Unhandled key ${eventKeyHex} = ${value}`);
-                    break;
-                }
-                default: {
-                    log('warn', `Unknown key ${eventKeyHex} = ${value}`);
-                }
                 }
             });
 
@@ -354,6 +337,18 @@ const fzLocal = {
 };
 
 const tzLocal = {
+    aqara_detection_distance: {
+        key: ['detection_distance'],
+        convertSet: async (entity, key, value, meta) => {
+            value = value.toLowerCase();
+            const lookup = {'10mm': 1, '20mm': 2, '30mm': 3};
+            await entity.write('aqaraOpple', {0x010C: {value: lookup[value], type: 0x20}}, {manufacturerCode});
+            return {state: {detection_distance: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('aqaraOpple', [0x010C], {manufacturerCode});
+        },
+    },
     aqara_trv: {
         key: ['system_mode', 'preset', 'window_detection', 'valve_detection', 'child_lock', 'away_preset_temperature',
             'calibrate', 'sensor', 'sensor_temp', 'identify', 'schedule', 'schedule_settings'],
@@ -743,10 +738,12 @@ module.exports = [
         vendor: 'Xiaomi',
         description: 'Aqara P1 door & window contact sensor',
         fromZigbee: [fz.xiaomi_contact, fz.ias_contact_alarm_1, fz.aqara_opple],
-        toZigbee: [],
+        toZigbee: [tzLocal.aqara_detection_distance],
         meta: {battery: {voltageToPercentage: '3V_2850_3000'}},
         exposes: [e.contact(), e.battery(), e.battery_voltage(),
             exposes.binary('battery_cover', ea.STATE, 'OPEN', 'CLOSE'),
+            exposes.enum('detection_distance', ea.ALL, ['10mm', '20mm', '30mm'])
+                .withDescription('The sensor will be considered "off" within the set distance. Please press the device button before setting'),
         ],
     },
     {

package/lib/xiaomi.js

@@ -374,6 +374,8 @@ const numericAttributes2Payload = async (msg, meta, model, options, dataObject)
         case '159':
             if (['JT-BZ-01AQ/A'].includes(model.model)) {
                 payload.gas_sensitivity = {1: '15%LEL', 2: '10%LEL'}[value];
+            } else if (['MCCGQ13LM'].includes(model.model)) {
+                payload.detection_distance = {1: '10mm', 2: '20mm', 3: '30mm'}[value];
             }
             break;
         case '160':

package/package.json

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