zigbee-herdsman-converters 15.0.111 → 15.0.112

package/devices/tuya.js

@@ -1389,7 +1389,6 @@ module.exports = [
         },
         whiteLabel: [
             {vendor: 'Linkoze', model: 'LKMSZ001'},
-            tuya.whitelabel('TuYa', '809WZT', 'Motion sensor', ['_TZ3040_bb6xaihh']),
         ],
     },
     {
@@ -1410,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'},
@@ -2279,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',
@@ -2516,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'},
@@ -2552,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],

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.111",
+  "version": "15.0.112",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [