zigbee-herdsman-converters 14.0.444 → 14.0.447

package/converters/fromZigbee.js

@@ -428,7 +428,7 @@ const converters = {
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.hasOwnProperty('occupancy')) {
                 const payload = {occupancy: (msg.data.occupancy % 2) > 0};
-                utils.noOccupancySince(msg.endpoint, payload, options, publish, payload.occupancy ? 'stop' : 'start');
+                utils.noOccupancySince(msg.endpoint, options, publish, payload.occupancy ? 'stop' : 'start');
                 return payload;
             }
         },
@@ -464,7 +464,7 @@ const converters = {
             }
 
             const payload = {occupancy: true};
-            utils.noOccupancySince(msg.endpoint, payload, options, publish, 'start');
+            utils.noOccupancySince(msg.endpoint, options, publish, 'start');
             return payload;
         },
     },
@@ -2790,6 +2790,33 @@ const converters = {
             }
         },
     },
+    livolo_new_switch_state_4gang: {
+        cluster: 'genPowerCfg',
+        type: ['raw'],
+        convert: (model, msg, publish, options, meta) => {
+            const stateHeader = Buffer.from([122, 209]);
+            if (msg.data.indexOf(stateHeader) === 0) {
+                if (msg.data[10] === 7) {
+                    const status = msg.data[14];
+                    return {
+                        state_left: status & 1 ? 'ON' : 'OFF',
+                        state_right: status & 2 ? 'ON' : 'OFF',
+                        state_bottom_left: status & 4 ? 'ON' : 'OFF',
+                        state_bottom_right: status & 8 ? 'ON' : 'OFF',
+                    };
+                }
+                if (msg.data[10] === 13) {
+                    const status = msg.data[13];
+                    return {
+                        state_left: status & 1 ? 'ON' : 'OFF',
+                        state_right: status & 2 ? 'ON' : 'OFF',
+                        state_bottom_left: status & 4 ? 'ON' : 'OFF',
+                        state_bottom_right: status & 8 ? 'ON' : 'OFF',
+                    };
+                }
+            }
+        },
+    },
     livolo_curtain_switch_state: {
         cluster: 'genPowerCfg',
         type: ['raw'],
@@ -2949,7 +2976,8 @@ const converters = {
                     meta.device.modelID = 'TI0001-socket';
                     meta.device.save();
                 }
-                if (msg.data.includes(Buffer.from([19, 1, 0]), 13)) {
+                // No need to detect this switches, will be done by universal procedure
+                /* if (msg.data.includes(Buffer.from([19, 1, 0]), 13)) {
                     // new switch, hack
                     meta.device.modelID = 'TI0001-switch';
                     meta.device.save();
@@ -2958,7 +2986,7 @@ const converters = {
                     // new switch, hack
                     meta.device.modelID = 'TI0001-switch-2gang';
                     meta.device.save();
-                }
+                }*/
                 if (msg.data.includes(Buffer.from([19, 5, 0]), 13)) {
                     if (meta.logger) meta.logger.debug('Detected Livolo Curtain Switch');
                     // curtain switch, hack
@@ -5231,40 +5259,8 @@ const converters = {
         type: ['attributeReport', 'readResponse'],
         options: [exposes.options.precision('temperature'), exposes.options.calibration('temperature')],
         convert: (model, msg, publish, options, meta) => {
-            if (msg.data['65281']) {
-                const data = msg.data['65281'];
-                const payload = {};
-
-                if (data.hasOwnProperty('100')) {
-                    if (['QBKG03LM', 'QBKG12LM', 'LLKZMK11LM'].includes(model.model)) {
-                        const mapping = model.model === 'LLKZMK11LM' ? ['l1', 'l2'] : ['left', 'right'];
-                        payload[`state_${mapping[0]}`] = data['100'] === 1 ? 'ON' : 'OFF';
-                        payload[`state_${mapping[1]}`] = data['101'] === 1 ? 'ON' : 'OFF';
-                    } else {
-                        payload.state = data['100'] === 1 ? 'ON' : 'OFF';
-                    }
-                }
-
-                if (data.hasOwnProperty('152')) {
-                    payload.power = precisionRound(data['152'], 2);
-                }
-
-                if (data.hasOwnProperty('149')) {
-                    // Consumption is deprecated
-                    payload.consumption = precisionRound(data['149'], 2);
-                    payload.energy = precisionRound(data['149'], 2);
-                }
-
-                if (data.hasOwnProperty('3')) {
-                    payload.temperature = calibrateAndPrecisionRoundOptions(data['3'], options, 'temperature');
-                }
-
-                if (data.hasOwnProperty('150')) {
-                    payload.voltage = precisionRound(data['150'] * 0.1, 1);
-                }
-
-                return payload;
-            }
+            const payload = xiaomi.numericAttributes2Payload(msg, meta, model, options, msg.data);
+            return payload;
         },
     },
     xiaomi_basic_raw: {
@@ -7730,6 +7726,8 @@ const converters = {
             case tuya.dataPoints.trsIlluminanceLux:
                 result = {illuminance_lux: value};
                 break;
+            case tuya.dataPoints.trsDetectionData: // Ignore this, function of this DP is unknown at the moment!
+                break;
             default:
                 meta.logger.warn(`fromZigbee.tuya_radar_sensor: NOT RECOGNIZED DP ${dp} with data ${JSON.stringify(dpValue)}`);
             }

package/converters/toZigbee.js

@@ -1599,13 +1599,23 @@ const converters = {
             }
 
             const state = value.toLowerCase();
+            let oldstate = 1;
+            if (state === 'on') {
+                oldstate = 108;
+            }
+            let channel = 1.0;
             const postfix = meta.endpoint_name || 'left';
             await entity.command('genOnOff', 'toggle', {}, {transactionSequenceNumber: 0});
             const payloadOn = {0x0001: {value: Buffer.from([1, 0, 0, 0, 0, 0, 0, 0]), type: 1}};
             const payloadOff = {0x0001: {value: Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]), type: 1}};
             const payloadOnRight = {0x0001: {value: Buffer.from([2, 0, 0, 0, 0, 0, 0, 0]), type: 2}};
             const payloadOffRight = {0x0001: {value: Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]), type: 2}};
+            const payloadOnBottomLeft = {0x0001: {value: Buffer.from([4, 0, 0, 0, 0, 0, 0, 0]), type: 4}};
+            const payloadOffBottomLeft = {0x0001: {value: Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]), type: 4}};
+            const payloadOnBottomRight = {0x0001: {value: Buffer.from([8, 0, 0, 0, 0, 0, 0, 0]), type: 136}};
+            const payloadOffBottomRight = {0x0001: {value: Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]), type: 136}};
             if (postfix === 'left') {
+                await entity.command('genLevelCtrl', 'moveToLevelWithOnOff', {level: oldstate, transtime: channel});
                 await entity.write('genPowerCfg', (state === 'on') ? payloadOn : payloadOff,
                     {
                         manufacturerCode: 0x1ad2, disableDefaultResponse: true, disableResponse: true,
@@ -1613,12 +1623,28 @@ const converters = {
                     });
                 return {state: {state_left: value.toUpperCase()}, readAfterWriteTime: 250};
             } else if (postfix === 'right') {
+                channel = 2.0;
+                await entity.command('genLevelCtrl', 'moveToLevelWithOnOff', {level: oldstate, transtime: channel});
                 await entity.write('genPowerCfg', (state === 'on') ? payloadOnRight : payloadOffRight,
                     {
                         manufacturerCode: 0x1ad2, disableDefaultResponse: true, disableResponse: true,
                         reservedBits: 3, direction: 1, transactionSequenceNumber: 0xe9,
                     });
                 return {state: {state_right: value.toUpperCase()}, readAfterWriteTime: 250};
+            } else if (postfix === 'bottom_right') {
+                await entity.write('genPowerCfg', (state === 'on') ? payloadOnBottomRight : payloadOffBottomRight,
+                    {
+                        manufacturerCode: 0x1ad2, disableDefaultResponse: true, disableResponse: true,
+                        reservedBits: 3, direction: 1, transactionSequenceNumber: 0xe9,
+                    });
+                return {state: {state_bottom_right: value.toUpperCase()}, readAfterWriteTime: 250};
+            } else if (postfix === 'bottom_left') {
+                await entity.write('genPowerCfg', (state === 'on') ? payloadOnBottomLeft : payloadOffBottomLeft,
+                    {
+                        manufacturerCode: 0x1ad2, disableDefaultResponse: true, disableResponse: true,
+                        reservedBits: 3, direction: 1, transactionSequenceNumber: 0xe9,
+                    });
+                return {state: {state_bottom_left: value.toUpperCase()}, readAfterWriteTime: 250};
             }
             return {state: {state: value.toUpperCase()}, readAfterWriteTime: 250};
         },
@@ -2005,7 +2031,7 @@ const converters = {
             await entity.read('genBasic', [0x0033], manufacturerOptions.hue);
         },
     },
-    RTCGQ13LM_motion_sensitivity: {
+    aqara_motion_sensitivity: {
         key: ['motion_sensitivity'],
         convertSet: async (entity, key, value, meta) => {
             const lookup = {'low': 1, 'medium': 2, 'high': 3};
@@ -2048,6 +2074,12 @@ const converters = {
             await entity.read('aqaraOpple', [0x0146], manufacturerOptions.xiaomi);
         },
     },
+    RTCZCGQ11LM_reset_nopresence_status: {
+        key: ['reset_nopresence_status'],
+        convertSet: async (entity, key, value, meta) => {
+            await entity.write('aqaraOpple', {0x0157: {value: 1, type: 0x20}}, manufacturerOptions.xiaomi);
+        },
+    },
     ZigUP_lock: {
         key: ['led'],
         convertSet: async (entity, key, value, meta) => {

package/devices/aurora_lighting.js

@@ -13,7 +13,7 @@ const tzLocal = {
         convertSet: async (entity, key, value, meta) => {
             const state = value.toLowerCase();
             utils.validateValue(state, ['toggle', 'off', 'on']);
-            const endpoint = meta.mapped.model === 'AU-A1ZBDSS' ? meta.device.getEndpoint(3) : meta.device.getEndpoint(2);
+            const endpoint = meta.device.getEndpoint(3);
             await endpoint.command('genOnOff', state, {});
             return {state: {backlight_led: state.toUpperCase()}};
         },
@@ -184,8 +184,9 @@ module.exports = [
         fromZigbee: [fz.identify, fz.on_off, fz.electrical_measurement],
         exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right'),
             e.power().withEndpoint('left'), e.power().withEndpoint('right'),
-            exposes.binary('backlight_led', ea.STATE_SET, 'ON', 'OFF').withDescription('Enable or disable the blue backlight LED')],
-        toZigbee: [tz.on_off, tzLocal.aOneBacklight],
+            exposes.numeric('brightness', ea.ALL).withValueMin(0).withValueMax(254)
+                .withDescription('Brightness of this backlight LED')],
+        toZigbee: [tz.light_onoff_brightness],
         meta: {multiEndpoint: true},
         endpoint: (device) => {
             return {'left': 1, 'right': 2};

package/devices/lidl.js

@@ -446,6 +446,8 @@ module.exports = [
         extend: extend.switch(),
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
             for (const ID of [1, 2, 3]) {
                 await reporting.bind(device.getEndpoint(ID), coordinatorEndpoint, ['genOnOff']);
             }

package/devices/livolo.js

@@ -20,13 +20,18 @@ module.exports = [
     {
         zigbeeModel: ['TI0001          '],
         model: 'TI0001',
-        description: 'Zigbee switch (1 and 2 gang)',
+        description: 'Zigbee switch (1, 2, 3, 4 gang)',
         vendor: 'Livolo',
-        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right')],
-        fromZigbee: [fz.livolo_switch_state, fz.livolo_switch_state_raw],
-        toZigbee: [tz.livolo_switch_on_off],
+        exposes: [
+            e.switch().withEndpoint('left'),
+            e.switch().withEndpoint('right'),
+            e.switch().withEndpoint('bottom_left'),
+            e.switch().withEndpoint('bottom_right'),
+        ],
+        fromZigbee: [fz.livolo_switch_state, fz.livolo_switch_state_raw, fz.livolo_new_switch_state_4gang],
+        toZigbee: [tz.livolo_socket_switch_on_off],
         endpoint: (device) => {
-            return {'left': 6, 'right': 6};
+            return {'left': 6, 'right': 6, 'bottom_left': 6, 'bottom_right': 6};
         },
         configure: poll,
         onEvent: async (type, data, device) => {
@@ -41,6 +46,18 @@ module.exports = [
                     globalStore.putValue(device, 'interval', interval);
                 }
             }
+            if (data.cluster === 'genPowerCfg' && data.type === 'raw') {
+                const dp = data.data[10];
+                if (data.data[0] === 0x7a && data.data[1] === 0xd1) {
+                    const endpoint = device.getEndpoint(6);
+                    if (dp === 0x01) {
+                        const options = {manufacturerCode: 0x1ad2, disableDefaultResponse: true, disableResponse: true,
+                            reservedBits: 3, direction: 1, writeUndiv: true};
+                        const payload = {0x2002: {value: [0, 0, 0, 0, 0, 0, 0], type: 0x0e}};
+                        await endpoint.readResponse('genPowerCfg', 0xe9, payload, options);
+                    }
+                }
+            }
         },
     },
     {

package/devices/lonsonho.js

@@ -197,6 +197,18 @@ module.exports = [
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
         },
     },
+    {
+        fingerprint: [{modelID: 'TS130F', manufacturerName: '_TZ3000_zirycpws'}],
+        model: 'QS-Zigbee-C03',
+        vendor: 'Lonsonho',
+        description: 'Curtain/blind motor controller',
+        fromZigbee: [fz.cover_position_tilt, fz.tuya_cover_options],
+        toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.tuya_cover_calibration, tz.tuya_cover_reversal],
+        meta: {coverInverted: true},
+        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.numeric('calibration_time', ea.STATE).withUnit('S').withDescription('Calibration time')],
+    },
     {
         fingerprint: [{modelID: 'TS110E', manufacturerName: '_TZ3210_zxbtub8r'}],
         model: 'TS110E_1gang',

package/devices/philips.js

@@ -2239,6 +2239,13 @@ module.exports = [
         meta: {turnsOffAtBrightness1: true},
         extend: hueExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['929003055201'],
+        model: '929003055201',
+        vendor: 'Philips',
+        description: 'Hue Being',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
     {
         zigbeeModel: ['1743630P7', '1743630V7'],
         model: '17436/30/P7',
@@ -2785,4 +2792,13 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['LWS002'],
+        model: '046677562229',
+        vendor: 'Philips',
+        description: 'Hue White PAR20 with Bluetooth',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness(),
+        ota: ota.zigbeeOTA,
+    },
 ];

package/devices/qmotion.js

@@ -3,6 +3,7 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const e = exposes.presets;
 const ea = exposes.access;
+const reporting = require('../lib/reporting');
 
 module.exports = [
     {
@@ -19,8 +20,14 @@ module.exports = [
         model: 'HDM40PV620',
         vendor: 'Qmotion',
         description: 'Motorized roller blind',
-        fromZigbee: [fz.identify],
+        fromZigbee: [fz.identify, fz.cover_position_tilt, fz.battery],
         toZigbee: [tz.cover_state, tz.cover_position_tilt],
-        exposes: [e.cover_position()],
+        exposes: [e.cover_position(), e.battery()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'closuresWindowCovering']);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.currentPositionLiftPercentage(endpoint);
+        },
     },
 ];

package/devices/slv.js

@@ -17,4 +17,11 @@ module.exports = [
         toZigbee: [],
         exposes: [],
     },
+    {
+        zigbeeModel: ['ZBT-RGBWLight-AR0844'],
+        model: '1001923',
+        vendor: 'SLV',
+        description: 'VALETO LED GU10 RGBW',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 556]}),
+    },
 ];

package/devices/tuya.js

@@ -234,6 +234,7 @@ module.exports = [
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_tza2vjxx'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_k1pe6ibm'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_bfwvfyx1'},
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_leyz4rju'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_jd3z4yig'}],
         model: 'TS0505B',
         vendor: 'TuYa',

package/devices/woox.js

@@ -13,10 +13,10 @@ module.exports = [
         model: 'R7060',
         vendor: 'Woox',
         description: 'Smart garden irrigation control',
-        fromZigbee: [fz.on_off, fz.ignore_tuya_set_time, fz.ignore_basic_report, fz.woox_R7060],
+        fromZigbee: [fz.on_off, fz.ignore_tuya_set_time, fz.ignore_basic_report, fz.woox_R7060, fz.battery],
         toZigbee: [tz.on_off],
         onEvent: tuya.onEventSetTime,
-        exposes: [e.switch()],
+        exposes: [e.switch(), e.battery(), e.battery_voltage()],
         meta: {disableDefaultResponse: true},
     },
     {

package/devices/xiaomi.js

@@ -893,7 +893,7 @@ module.exports = [
         vendor: 'Xiaomi',
         description: 'Aqara high precision motion sensor',
         fromZigbee: [fz.RTCGQ13LM_occupancy, fz.aqara_opple, fz.battery],
-        toZigbee: [tz.aqara_detection_interval, tz.RTCGQ13LM_motion_sensitivity],
+        toZigbee: [tz.aqara_detection_interval, tz.aqara_motion_sensitivity],
         exposes: [e.occupancy(), exposes.enum('motion_sensitivity', ea.ALL, ['low', 'medium', 'high']),
             exposes.numeric('detection_interval', ea.ALL).withValueMin(2).withValueMax(65535).withUnit('s')
                 .withDescription('Time interval for detecting actions'), e.battery()],
@@ -910,9 +910,10 @@ module.exports = [
         zigbeeModel: ['lumi.motion.ac01'],
         model: 'RTCZCGQ11LM',
         vendor: 'Xiaomi',
-        description: 'Aqara Presence Detector FP1 (regions not supported for now)',
+        description: 'Aqara presence detector FP1 (regions not supported for now)',
         fromZigbee: [fz.aqara_opple],
-        toZigbee: [tz.RTCZCGQ11LM_presence, tz.RTCZCGQ11LM_monitoring_mode, tz.RTCZCGQ11LM_approach_distance],
+        toZigbee: [tz.RTCZCGQ11LM_presence, tz.RTCZCGQ11LM_monitoring_mode, tz.RTCZCGQ11LM_approach_distance,
+            tz.aqara_motion_sensitivity, tz.RTCZCGQ11LM_reset_nopresence_status],
         exposes: [e.presence().withAccess(ea.STATE_GET),
             exposes.enum('presence_event', ea.STATE, ['enter', 'leave', 'left_enter', 'right_leave', 'right_enter', 'left_leave',
                 'approach', 'away']).withDescription('Presence events: "enter", "leave", "left_enter", "right_leave", ' +
@@ -921,9 +922,14 @@ module.exports = [
                 'without considering right and left sides'),
             exposes.enum('approach_distance', ea.ALL, ['far', 'medium', 'near']).withDescription('The distance at which the ' +
                 'sensor detects approaching'),
-            exposes.numeric('power_outage_count', ea.STATE).withDescription('Number of power outages (since last pairing)')],
+            exposes.enum('motion_sensitivity', ea.ALL, ['low', 'medium', 'high']).withDescription('Different sensitivities ' +
+                'means different static human body recognition rate and response speed of occupied'),
+            exposes.enum('reset_nopresence_status', ea.SET, ['Reset']).withDescription('Reset the status of no presence'),
+            exposes.numeric('power_outage_count', ea.STATE).withDescription('Number of power outages (since last pairing)'),
+            e.temperature()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
+            await endpoint.read('aqaraOpple', [0x010c], {manufacturerCode: 0x115f});
             await endpoint.read('aqaraOpple', [0x0142], {manufacturerCode: 0x115f});
             await endpoint.read('aqaraOpple', [0x0144], {manufacturerCode: 0x115f});
             await endpoint.read('aqaraOpple', [0x0146], {manufacturerCode: 0x115f});
@@ -1298,7 +1304,7 @@ module.exports = [
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2};
         },
-        exposes: [e.power().withAccess(ea.STATE_GET), e.energy(), e.temperature(), e.voltage().withAccess(ea.STATE),
+        exposes: [e.power().withAccess(ea.STATE_GET), e.energy(), e.temperature(), e.voltage().withAccess(ea.STATE), e.current(),
             e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'),
             exposes.binary('interlock', ea.STATE_SET, true, false)
                 .withDescription('Enabling prevents both relais being on at the same time')],

package/devices/zemismart.js

@@ -125,7 +125,10 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_iossyxra'}],
+        fingerprint: [
+            {modelID: 'TS0601', manufacturerName: '_TZE200_iossyxra'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_gubdgai2'},
+        ],
         model: 'ZM-AM02_cover',
         vendor: 'Zemismart',
         description: 'Zigbee/RF curtain converter',

package/lib/ota/zigbeeOTA.js

@@ -1,5 +1,4 @@
 const url = 'https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/index.json';
-const assert = require('assert');
 const common = require('./common');
 const axios = common.getAxios();
 const fs = require('fs');
@@ -110,7 +109,10 @@ async function getImageMeta(current, logger, device) {
         (!i.minFileVersion || current.fileVersion >= i.minFileVersion) && (!i.maxFileVersion || current.fileVersion <= i.maxFileVersion) &&
         (!i.modelId || i.modelId === modelId) && (!i.manufacturerName || i.manufacturerName.includes(manufacturerName)));
 
-    assert(image !== undefined, `No image available for imageType '${imageType}'`);
+    if (!image) {
+        throw new Error(`No image available for imageType '${imageType}'`);
+    }
+
     return {
         fileVersion: image.fileVersion,
         fileSize: image.fileSize,

package/lib/tuya.js

@@ -435,6 +435,7 @@ const dataPoints = {
     trsSensitivity: 2,
     trsMotionState: 102,
     trsIlluminanceLux: 103,
+    trsDetectionData: 104,
     trsScene: 112,
     trsMotionDirection: 114,
     trsMotionSpeed: 115,

package/lib/utils.js

@@ -397,13 +397,12 @@ function extendDevice(deviceConfigs, modelName, adjustments) {
     return {...baseDevice, ...adjustments};
 }
 
-function noOccupancySince(endpoint, newPayload, options, publish, action) {
+function noOccupancySince(endpoint, options, publish, action) {
     if (options && options.no_occupancy_since) {
         if (action == 'start') {
             globalStore.getValue(endpoint, 'no_occupancy_since_timers', []).forEach((t) => clearTimeout(t));
             globalStore.putValue(endpoint, 'no_occupancy_since_timers', []);
 
-            newPayload.no_occupancy_since = 0;
             options.no_occupancy_since.forEach((since) => {
                 const timer = setTimeout(() => {
                     publish({no_occupancy_since: since});

package/lib/xiaomi.js

@@ -168,7 +168,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             payload.switch_type = {1: 'toggle', 2: 'momentary'}[value];
             break;
         case '100':
-            if (['QBKG20LM', 'QBKG31LM', 'QBKG39LM', 'QBKG41LM', 'QBCZ15LM', 'LLKZMK11LM'].includes(model.model)) {
+            if (['QBKG20LM', 'QBKG31LM', 'QBKG39LM', 'QBKG41LM', 'QBCZ15LM', 'LLKZMK11LM', 'QBKG12LM', 'QBKG03LM'].includes(model.model)) {
                 let mapping;
                 switch (model.model) {
                 case 'QBCZ15LM':
@@ -191,7 +191,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             }
             break;
         case '101':
-            if (['QBKG20LM', 'QBKG31LM', 'QBKG39LM', 'QBKG41LM', 'QBCZ15LM', 'QBKG25LM', 'QBKG34LM', 'LLKZMK11LM']
+            if (['QBKG20LM', 'QBKG31LM', 'QBKG39LM', 'QBKG41LM', 'QBCZ15LM', 'QBKG25LM', 'QBKG34LM', 'LLKZMK11LM', 'QBKG12LM', 'QBKG03LM']
                 .includes(model.model)) {
                 let mapping;
                 switch (model.model) {
@@ -213,19 +213,25 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
                 payload.illuminance = calibrateAndPrecisionRoundOptions(value, options, 'illuminance');
             } else if (['ZNJLBL01LM'].includes(model.model)) {
                 payload.battery = value;
+            } else if (['RTCZCGQ11LM'].includes(model.model)) {
+                payload.presence = {0: false, 1: true, 255: null}[value];
             }
             break;
         case '102':
             if (['QBKG25LM', 'QBKG34LM'].includes(model.model)) {
                 payload.state_right = value === 1 ? 'ON' : 'OFF';
             } else if (['RTCZCGQ11LM'].includes(model.model)) {
-                payload.presence_event = {0: 'enter', 1: 'leave', 2: 'left_enter', 3: 'right_leave', 4: 'right_enter',
-                    5: 'left_leave', 6: 'approach', 7: 'away', 255: null}[value];
+                if (meta.device.applicationVersion < 50) {
+                    payload.presence_event = {0: 'enter', 1: 'leave', 2: 'left_enter', 3: 'right_leave', 4: 'right_enter',
+                        5: 'left_leave', 6: 'approach', 7: 'away', 255: null}[value];
+                } else {
+                    payload.motion_sensitivity = {1: 'low', 2: 'medium', 3: 'high'}[value];
+                }
             }
             break;
         case '103':
             if (['RTCZCGQ11LM'].includes(model.model)) {
-                payload.monitoring_mode = value === 1 ? 'left_right' : 'undirected';
+                payload.monitoring_mode = {0: 'undirected', 1: 'left_right'}[value];
             }
             break;
         case '105':
@@ -244,7 +250,11 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             payload.voltage = precisionRound(value * 0.1, 1); // 0x96
             break;
         case '151':
-            payload.current = precisionRound(value * 0.001, 4); // 0x97
+            if (['LLKZMK11LM'].includes(model.model)) {
+                payload.current = precisionRound(value, 4);
+            } else {
+                payload.current = precisionRound(value * 0.001, 4);
+            }
             break;
         case '152':
             payload.power = precisionRound(value, 2); // 0x98
@@ -284,7 +294,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             payload.detection_interval = value;
             break;
         case '268':
-            if (['RTCGQ13LM'].includes(model.model)) {
+            if (['RTCGQ13LM', 'RTCZCGQ11LM'].includes(model.model)) {
                 payload.motion_sensitivity = {1: 'low', 2: 'medium', 3: 'high'}[value];
             } else if (['JT-BZ-01AQ/A'].includes(model.model)) {
                 payload.gas_sensitivity = {1: '15%LEL', 2: '10%LEL'}[value];
@@ -309,19 +319,25 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             payload.gas_density = value; // JT-BZ-01AQ/A
             break;
         case '322':
-            payload.presence = value === 1; // RTCZCGQ11LM
+            if (['RTCZCGQ11LM'].includes(model.model)) {
+                payload.presence = {0: false, 1: true, 255: null}[value];
+            }
             break;
         case '323':
-            payload.presence_event = {0: 'enter', 1: 'leave', 2: 'left_enter', 3: 'right_leave', 4: 'right_enter',
-                5: 'left_leave', 6: 'approach', 7: 'away'}[value]; // RTCZCGQ11LM
+            if (['RTCZCGQ11LM'].includes(model.model)) {
+                payload.presence_event = {0: 'enter', 1: 'leave', 2: 'left_enter', 3: 'right_leave', 4: 'right_enter',
+                    5: 'left_leave', 6: 'approach', 7: 'away'}[value];
+            }
             break;
         case '324':
-            // RTCZCGQ11LM
-            payload.monitoring_mode = value === 1 ? 'left_right' : 'undirected';
+            if (['RTCZCGQ11LM'].includes(model.model)) {
+                payload.monitoring_mode = {0: 'undirected', 1: 'left_right'}[value];
+            }
             break;
         case '326':
-            // RTCZCGQ11LM
-            payload.approach_distance = {0: 'far', 1: 'medium', 2: 'near'}[value];
+            if (['RTCZCGQ11LM'].includes(model.model)) {
+                payload.approach_distance = {0: 'far', 1: 'medium', 2: 'near'}[value];
+            }
             break;
         case '331':
             payload.linkage_alarm = value === 1; // JT-BZ-01AQ/A
@@ -355,6 +371,12 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
         case '1289':
             payload.dimmer_mode = {3: 'rgbw', 1: 'dual_ct'}[value];
             break;
+        case '65281':
+            {
+                const payload65281 = numericAttributes2Payload(msg, meta, model, options, value);
+                payload = {...payload, ...payload65281};
+            }
+            break;
         case 'mode':
             payload.operation_mode = ['command', 'event'][value];
             break;

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.444",
+  "version": "14.0.447",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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