zigbee-herdsman-converters 14.0.625 → 14.0.627

package/converters/toZigbee.js

@@ -3484,8 +3484,6 @@ const converters = {
                 if (value == 'ON') {
                     await tuya.sendDataPointBool(entity, tuya.dataPoints.tvHeatingStop, 1);
                 } else {
-                    await tuya.sendDataPointBool(entity, tuya.dataPoints.tvHeatingStop, 0);
-                    await utils.sleep(500);
                     await tuya.sendDataPointEnum(entity, tuya.dataPoints.tvMode, 1 /* manual */);
                 }
                 break;
@@ -3493,8 +3491,6 @@ const converters = {
                 if (value == 'ON') {
                     await tuya.sendDataPointBool(entity, tuya.dataPoints.tvFrostDetection, 1);
                 } else {
-                    await tuya.sendDataPointBool(entity, tuya.dataPoints.tvFrostDetection, 0);
-                    await utils.sleep(500);
                     await tuya.sendDataPointEnum(entity, tuya.dataPoints.tvMode, 1 /* manual */);
                 }
                 break;

package/devices/acova.js

@@ -5,7 +5,7 @@ const reporting = require('../lib/reporting');
 
 module.exports = [
     {
-        zigbeeModel: ['PERCALE2 D1.00P1.01Z1.00'],
+        zigbeeModel: ['PERCALE2 D1.00P1.01Z1.00', 'PERCALE2 D1.00P1.02Z1.00'],
         model: 'PERCALE2',
         vendor: 'Acova',
         description: 'Percale 2 heater',

package/devices/databyte.ch.js

@@ -3,13 +3,29 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const extend = require('../lib/extend');
 const ea = exposes.access;
+const e = exposes.presets;
+
+const fzLocal = {
+    DTB2011014: {
+        cluster: 'genOnOff',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            return {
+                key_1: msg.data['41361'] === 1 ? 'ON' : 'OFF',
+                key_2: msg.data['41362'] === 1 ? 'ON' : 'OFF',
+                key_3: msg.data['41363'] === 1 ? 'ON' : 'OFF',
+                key_4: msg.data['41364'] === 1 ? 'ON' : 'OFF',
+            };
+        },
+    },
+};
 
 module.exports = [
     {
         zigbeeModel: ['DTB190502A1'],
         model: 'DTB190502A1',
         vendor: 'databyte.ch',
-        description: '[CC2530 based IO Board](https://databyte.ch/zigbee-dev-board-dtb190502a)',
+        description: 'CC2530 based IO Board',
         fromZigbee: [fz.DTB190502A1],
         toZigbee: [tz.DTB190502A1_LED],
         exposes: [exposes.binary('led_state', ea.STATE, 'ON', 'OFF'),
@@ -19,7 +35,21 @@ module.exports = [
         zigbeeModel: ['DTB-ED2004-012'],
         model: 'ED2004-012',
         vendor: 'databyte.ch',
-        description: 'Panda 1 - wall switch (https://databyte.ch/panda1-wallswitch-zigbee)',
+        description: 'Panda 1 - wall switch',
         extend: extend.switch(),
     },
+    {
+        zigbeeModel: ['DTB-ED2011-014'],
+        model: 'Touch4',
+        vendor: 'databyte.ch',
+        description: 'Wall touchsensor with 4 keys',
+        fromZigbee: [fzLocal.DTB2011014, fz.battery],
+        toZigbee: [],
+        exposes: [e.battery(), e.linkquality(),
+            exposes.binary('key_1', ea.STATE, 'ON', 'OFF'),
+            exposes.binary('key_2', ea.STATE, 'ON', 'OFF'),
+            exposes.binary('key_3', ea.STATE, 'ON', 'OFF'),
+            exposes.binary('key_4', ea.STATE, 'ON', 'OFF'),
+        ],
+    },
 ];

package/devices/develco.js

@@ -9,9 +9,9 @@ const e = exposes.presets;
 const ea = exposes.access;
 
 const fzLocal = {
-    // SPLZB-134 reports strange values sometimes
+    // SPLZB-134 and SPLZB-131 reports strange values sometimes
     // https://github.com/Koenkk/zigbee2mqtt/issues/13329
-    SPLZB134_electrical_measurement: {
+    develco_electrical_measurement: {
         ...fz.electrical_measurement,
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.rmsVoltage !== 0xFFFF && msg.data.rmsCurrent !== 0xFFFF && msg.data.activePower !== -0x8000) {
@@ -19,7 +19,7 @@ const fzLocal = {
             }
         },
     },
-    SPLZB134_device_temperature: {
+    develco_device_temperature: {
         ...fz.device_temperature,
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.currentTemperature !== -0x8000) {
@@ -27,7 +27,7 @@ const fzLocal = {
             }
         },
     },
-    SPLZB134_metering: {
+    develco_metering: {
         ...fz.metering,
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.instantaneousDemand !== -0x800000) {
@@ -43,7 +43,7 @@ module.exports = [
         model: 'SPLZB-131',
         vendor: 'Develco',
         description: 'Power plug',
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
+        fromZigbee: [fz.on_off, fzLocal.develco_electrical_measurement, fzLocal.develco_metering],
         toZigbee: [tz.on_off],
         exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy()],
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -94,7 +94,7 @@ module.exports = [
         model: 'SPLZB-134',
         vendor: 'Develco',
         description: 'Power plug (type G)',
-        fromZigbee: [fz.on_off, fzLocal.SPLZB134_electrical_measurement, fzLocal.SPLZB134_metering, fzLocal.SPLZB134_device_temperature],
+        fromZigbee: [fz.on_off, fzLocal.develco_electrical_measurement, fzLocal.develco_metering, fzLocal.develco_device_temperature],
         toZigbee: [tz.on_off],
         exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.device_temperature()],
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -144,7 +144,7 @@ module.exports = [
         model: 'EMIZB-132',
         vendor: 'Develco',
         description: 'Wattle AMS HAN power-meter sensor',
-        fromZigbee: [fzLocal.SPLZB134_metering, fzLocal.SPLZB134_electrical_measurement, fz.develco_fw],
+        fromZigbee: [fzLocal.develco_metering, fzLocal.develco_electrical_measurement, fz.develco_fw],
         toZigbee: [tz.EMIZB_132_mode],
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {

package/devices/ikea.js

@@ -6,6 +6,7 @@ const constants = require('../lib/constants');
 const reporting = require('../lib/reporting');
 const {repInterval} = require('../lib/constants');
 const utils = require('../lib/utils');
+const libColor = require('../lib/color');
 const extend = require('../lib/extend');
 const globalStore = require('../lib/store');
 const e = exposes.presets;
@@ -60,6 +61,30 @@ const configureRemote = async (device, coordinatorEndpoint, logger) => {
     await reporting.batteryPercentageRemaining(endpoint);
 };
 
+const tzLocal = {
+    LED1624G9_color_colortemp: {
+        ...tz.light_color_colortemp,
+        convertSet: async (entity, key, value, meta) => {
+            if (key == 'color') {
+                const result = await tz.light_color.convertSet(entity, key, value, meta);
+                return result;
+            } else if (key == 'color_temp' || key == 'color_temp_percent') {
+                const xy = libColor.ColorXY.fromMireds(value);
+                const payload = {
+                    transtime: utils.getTransition(entity, key, meta).time,
+                    colorx: utils.mapNumberRange(xy.x, 0, 1, 0, 65535),
+                    colory: utils.mapNumberRange(xy.y, 0, 1, 0, 65535),
+                };
+                await entity.command('lightingColorCtrl', 'moveToColor', payload, utils.getOptions(meta.mapped, entity));
+                return {
+                    state: libColor.syncColorState({'color_mode': constants.colorMode[2], 'color_temp': value}, meta.state,
+                        entity, meta.options, meta.logger), readAfterWriteTime: payload.transtime * 100,
+                };
+            }
+        },
+    },
+};
+
 const fzLocal = {
     // The STYRBAR sends an on +- 500ms after the arrow release. We don't want to send the ON action in this case.
     // https://github.com/Koenkk/zigbee2mqtt/issues/13335
@@ -453,7 +478,12 @@ module.exports = [
         model: 'LED1624G9',
         vendor: 'IKEA',
         description: 'TRADFRI LED bulb E14/E26/E27 600 lumen, dimmable, color, opal white',
-        extend: tradfriExtend.light_onoff_brightness_color(),
+        extend: tradfriExtend.light_onoff_brightness_colortemp_color(),
+        toZigbee: utils.replaceInArray(
+            tradfriExtend.light_onoff_brightness_colortemp_color().toZigbee,
+            [tz.light_color_colortemp],
+            [tzLocal.LED1624G9_color_colortemp],
+        ),
         meta: {supportsHueAndSaturation: false},
     },
     {

package/devices/ledvance.js

@@ -223,5 +223,30 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness(),
         ota: ota.ledvance,
     },
-
+    {
+        zigbeeModel: ['PLUG COMPACT EU T'],
+        model: '4058075729322',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ Compact Outdoor Plug EU',
+        extend: extend.switch(),
+        ota: ota.ledvance,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
+    {
+        zigbeeModel: ['PLUG OUTDOOR EU T'],
+        model: '4058075729308',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ Outdoor Plug EU',
+        extend: extend.switch(),
+        ota: ota.ledvance,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
 ];

package/devices/lifecontrol.js

@@ -38,13 +38,15 @@ module.exports = [
         model: 'MCLH-03',
         vendor: 'LifeControl',
         description: 'Power plug',
-        fromZigbee: [fz.on_off, fz.electrical_measurement],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
         toZigbee: [tz.on_off],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
             await reporting.onOff(endpoint);
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint);
         },
         onEvent: async (type, data, device) => {
             // This device doesn't support reporting correctly.
@@ -57,6 +59,7 @@ module.exports = [
                 const interval = setInterval(async () => {
                     try {
                         await endpoint.read('haElectricalMeasurement', ['rmsVoltage', 'rmsCurrent', 'activePower']);
+                        await endpoint.read('seMetering', ['currentSummDelivered', 'multiplier', 'divisor']);
                     } catch (error) {
                         // Do nothing
                     }
@@ -64,7 +67,7 @@ module.exports = [
                 globalStore.putValue(device, 'interval', interval);
             }
         },
-        exposes: [e.switch(), e.power(), e.current(), e.voltage()],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy()],
     },
     {
         zigbeeModel: ['Motion_Sensor'],

package/devices/lonsonho.js

@@ -145,15 +145,22 @@ module.exports = [
         model: 'QS-Zigbee-D02-TRIAC-LN',
         vendor: 'Lonsonho',
         description: '1 gang smart dimmer switch module with neutral',
-        extend: extend.light_onoff_brightness(),
+        fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.tuya_min_brightness]),
+        toZigbee: extend.light_onoff_brightness().toZigbee.concat([tz.tuya_min_brightness]),
+        exposes: [e.light_brightness().withMinBrightness()],
     },
     {
         fingerprint: [{modelID: 'TS110F', manufacturerName: '_TYZB01_v8gtiaed'}, {modelID: 'TS110E', manufacturerName: '_TZ3210_pagajpog'}],
         model: 'QS-Zigbee-D02-TRIAC-2C-LN',
         vendor: 'Lonsonho',
         description: '2 gang smart dimmer switch module with neutral',
-        extend: extend.light_onoff_brightness({noConfigure: true}),
-        exposes: [e.light_brightness().withEndpoint('l1'), e.light_brightness().withEndpoint('l2')],
+        fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.tuya_min_brightness]),
+        toZigbee: extend.light_onoff_brightness().toZigbee.concat([tz.tuya_min_brightness]),
+        exposes: [e.light_brightness().withMinBrightness().withEndpoint('l1'),
+            e.light_brightness().withMinBrightness().withEndpoint('l2')],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2};
+        },
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
@@ -161,9 +168,6 @@ module.exports = [
             await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
             // Don't do: await reporting.onOff(endpoint); https://github.com/Koenkk/zigbee2mqtt/issues/6041
         },
-        endpoint: (device) => {
-            return {l1: 1, l2: 2};
-        },
     },
     {
         fingerprint: [{modelID: 'TS110F', manufacturerName: '_TZ3000_92chsky7'}, {modelID: 'TS110E', manufacturerName: '_TZ3210_4ubylghk'}],

package/devices/philips.js

@@ -2580,6 +2580,13 @@ module.exports = [
         description: 'Hue White & Color Ambiance Xamento M',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['915005997901'],
+        model: '915005997901',
+        vendor: 'Philips',
+        description: 'Hue White & Color Ambiance Xamento L',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['929002966401'],
         model: '929002966401',
@@ -2756,10 +2763,17 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness(),
     },
     {
-        zigbeeModel: ['3402931P7'],
-        model: '3402931P7',
+        zigbeeModel: ['3402931P7', '3418231P6'],
+        model: '8718696175798',
         vendor: 'Philips',
         description: 'Philips Hue Adore Bathroom Mirror Light',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['929003045901'],
+        model: '929003045901',
+        vendor: 'Philips',
+        description: 'Hue White ambiance Runner spot white (1 spot)',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
 ];

package/devices/robb.js

@@ -105,12 +105,22 @@ module.exports = [
         model: 'ROB_200-014-0',
         vendor: 'ROBB',
         description: 'ZigBee AC phase-cut rotary dimmer',
-        extend: extend.light_onoff_brightness({noConfigure: true}),
+        fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.electrical_measurement, fz.metering, fz.ignore_genOta]),
+        toZigbee: extend.light_onoff_brightness().toZigbee,
+        exposes: [e.light_brightness(), e.power(), e.voltage(), e.current(), e.energy()],
+        whiteLabel: [{vendor: 'YPHIX', model: '50208695'}, {vendor: 'Samotech', model: 'SM311'}],
         configure: async (device, coordinatorEndpoint, logger) => {
-            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            const binds = ['genOnOff', 'genLevelCtrl', 'haElectricalMeasurement', 'seMetering'];
+            await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await reporting.onOff(endpoint);
+            await reporting.brightness(endpoint);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.activePower(endpoint);
+            await reporting.rmsCurrent(endpoint, {min: 10, change: 10});
+            await reporting.rmsVoltage(endpoint, {min: 10});
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint);
         },
     },
     {

package/devices/shinasystem.js

@@ -1,4 +1,5 @@
 const exposes = require('../lib/exposes');
+const utils = require('../lib/utils');
 const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
@@ -16,10 +17,12 @@ const fzLocal = {
         convert: (model, msg, publish, options, meta) => {
             const occupancyIn = msg.data.occupancy;
             globalStore.putValue(msg.endpoint, 'occupancy_in', occupancyIn);
-            const occupancy = occupancyIn | globalStore.getValue(msg.endpoint, 'occupancy_out', 0);
+            const occupancyOr = occupancyIn | globalStore.getValue(msg.endpoint, 'occupancy_out', 0);
+            const occupancyAnd = occupancyIn & globalStore.getValue(msg.endpoint, 'occupancy_out', 0);
             return {
                 occupancy_in: (occupancyIn & 1) > 0,
-                occupancy: (occupancy & 1) > 0,
+                occupancy_or: (occupancyOr & 1) > 0,
+                occupancy_and: (occupancyAnd & 1) > 0,
             };
         },
     },
@@ -29,15 +32,137 @@ const fzLocal = {
         convert: (model, msg, publish, options, meta) => {
             const occupancyOut = msg.data.zonestatus;
             globalStore.putValue(msg.endpoint, 'occupancy_out', occupancyOut);
-            const occupancy = occupancyOut | globalStore.getValue(msg.endpoint, 'occupancy_in', 0);
+            const occupancyOr = occupancyOut | globalStore.getValue(msg.endpoint, 'occupancy_in', 0);
+            const occupancyAnd = occupancyOut & globalStore.getValue(msg.endpoint, 'occupancy_in', 0);
             return {
                 occupancy_out: (occupancyOut & 1) > 0,
-                occupancy: (occupancy & 1) > 0,
+                occupancy_or: (occupancyOr & 1) > 0,
+                occupancy_and: (occupancyAnd & 1) > 0,
             };
         },
     },
+    ISM300Z3_on_off: {
+        cluster: 'genOnOff',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data.hasOwnProperty('onOff')) {
+                const property = utils.postfixWithEndpointName('state', msg, model, meta);
+                return {[property]: msg.data['onOff'] === 1 ? 'ON' : 'OFF'};
+            } else if (msg.data.hasOwnProperty(0x9000)) {
+                const value = msg.data[0x9000];
+                const lookup = {0: 'auto', 1: 'push', 2: 'latch'};
+                return {operation_mode: lookup[value]};
+            }
+        },
+    },
 };
 
+const tzLocal = {
+    CSM300_SETUP: {
+        key: ['rf_pairing_on', 'counting_freeze', 'tof_init', 'led_state', 'rf_state', 'transation', 'fast_in', 'fast_out'],
+        convertSet: async (entity, key, value, meta) => {
+            let payload = null;
+            const endpoint = meta.device.endpoints.find((e) => e.supportsInputCluster('genAnalogInput'));
+            switch (key) {
+            case 'rf_pairing_on':
+                payload = {'presentValue': 81};
+                break;
+            case 'counting_freeze':
+                if (value.toLowerCase() === 'on') {
+                    payload = {'presentValue': 82};
+                } else if (value.toLowerCase() === 'off') {
+                    payload = {'presentValue': 84};
+                }
+                break;
+            case 'tof_init':
+                payload = {'presentValue': 83};
+                break;
+            case 'led_state':
+                if (value === 'enable') {
+                    payload = {'presentValue': 86};
+                } else if (value === 'disable') {
+                    payload = {'presentValue': 87};
+                }
+                break;
+            case 'rf_state':
+                if (value === 'enable') {
+                    payload = {'presentValue': 88};
+                } else if (value === 'disable') {
+                    payload = {'presentValue': 89};
+                }
+                break;
+            case 'transation':
+                if (value === '0ms') {
+                    payload = {'presentValue': 90};
+                } else if (value === '200ms') {
+                    payload = {'presentValue': 91};
+                } else if (value === '400ms') {
+                    payload = {'presentValue': 92};
+                } else if (value === '600ms') {
+                    payload = {'presentValue': 93};
+                } else if (value === '800ms') {
+                    payload = {'presentValue': 94};
+                } else if (value === '1,000ms') {
+                    payload = {'presentValue': 95};
+                }
+                break;
+            case 'fast_in':
+                if (value === 'enable') {
+                    payload = {'presentValue': 96};
+                } else if (value === 'disable') {
+                    payload = {'presentValue': 97};
+                }
+                break;
+            case 'fast_out':
+                if (value === 'enable') {
+                    payload = {'presentValue': 98};
+                } else if (value === 'disable') {
+                    payload = {'presentValue': 99};
+                }
+                break;
+            }
+            await endpoint.write('genAnalogInput', payload);
+        },
+    },
+    ISM300Z3_on_off: {
+        key: ['state', 'operation_mode'],
+        convertSet: async (entity, key, value, meta) => {
+            const endpoint = meta.device.getEndpoint(1);
+            if (key === 'state') {
+                const state = meta.message.hasOwnProperty('state') ? meta.message.state.toLowerCase() : null;
+                utils.validateValue(state, ['toggle', 'off', 'on']);
+                await entity.command('genOnOff', state, {}, utils.getOptions(meta.mapped, entity));
+                if (state === 'toggle') {
+                    const currentState = meta.state[`state${meta.endpoint_name ? `_${meta.endpoint_name}` : ''}`];
+                    return currentState ? {state: {state: currentState === 'OFF' ? 'ON' : 'OFF'}} : {};
+                } else {
+                    return {state: {state: state.toUpperCase()}};
+                }
+            } else if (key === 'operation_mode') {
+                const lookup = {'auto': 0, 'push': 1, 'latch': 2};
+                const payload = {0x9000: {value: lookup[value], type: 0x20}}; // INT8U
+                await entity.write('genOnOff', payload);
+                await endpoint.read('genOnOff', [0x9000]);
+            }
+        },
+        convertGet: async (entity, key, meta) => {
+            if (key === 'operation_mode') {
+                const endpoint = meta.device.getEndpoint(1);
+                await endpoint.read('genOnOff', [0x9000]);
+            } else {
+                await entity.read('genOnOff', ['onOff']);
+            }
+        },
+    },
+    ISM300Z3_rf_pairing: {
+        key: ['rf_pairing'],
+        convertSet: async (entity, key, value, meta) => {
+            const lookup = {'l1': 1, 'l2': 2, 'l3': 3};
+            const payload = {0x9001: {value: lookup[value], type: 0x20}}; // INT8U
+            await entity.write('genOnOff', payload);
+        },
+    },
+};
 
 module.exports = [
     {
@@ -73,7 +198,7 @@ module.exports = [
         description: 'SiHAS multipurpose ToF sensor',
         meta: {battery: {voltageToPercentage: 'Add_1V_42V_CSM300z2v2'}},
         fromZigbee: [fz.battery, fz.sihas_people_cnt],
-        toZigbee: [tz.sihas_set_people],
+        toZigbee: [tz.sihas_set_people, tzLocal.CSM300_SETUP],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = ['genPowerCfg', 'genAnalogInput'];
@@ -84,7 +209,19 @@ module.exports = [
         },
         exposes: [e.battery(), e.battery_voltage(),
             exposes.enum('status', ea.STATE, ['idle', 'in', 'out']).withDescription('Currently status'),
-            exposes.numeric('people', ea.ALL).withValueMin(0).withValueMax(100).withDescription('People count')],
+            exposes.numeric('people', ea.ALL).withValueMin(0).withValueMax(100).withDescription('People count'),
+            exposes.enum('rf_pairing_on', ea.SET, ['run']).withDescription('Run RF pairing mode'),
+            exposes.binary('counting_freeze', ea.SET, 'ON', 'OFF')
+                .withDescription('Counting Freeze ON/OFF, not reporting people value when is ON'),
+            exposes.enum('tof_init', ea.SET, ['initial']).withDescription('ToF sensor initial'),
+            exposes.binary('led_state', ea.SET, 'enable', 'disable').withDescription('Indicate LED enable/disable, default : enable'),
+            exposes.binary('rf_state', ea.SET, 'enable', 'disable').withDescription('RF function enable/disable, default : disable'),
+            exposes.enum('transation', ea.SET, ['0ms', '200ms', '400ms', '600ms', '800ms', '1,000ms'])
+                .withDescription('Transation interval, default : 400ms'),
+            exposes.binary('fast_in', ea.SET, 'enable', 'disable')
+                .withDescription('Fast process enable/disable when people 0 to 1. default : enable'),
+            exposes.binary('fast_out', ea.SET, 'enable', 'disable')
+                .withDescription('Fast process enable/disable when people 1 to 0. default : enable')],
     },
     {
         zigbeeModel: ['USM-300Z'],
@@ -447,8 +584,10 @@ module.exports = [
                 .withDescription('Indicates whether "IN" Sensor of the device detected occupancy'),
             exposes.binary('occupancy_out', ea.STATE, true, false)
                 .withDescription('Indicates whether "OUT" Sensor of the device detected occupancy'),
-            exposes.binary('occupancy', ea.STATE, true, false)
+            exposes.binary('occupancy_or', ea.STATE, true, false)
                 .withDescription('Indicates whether "IN or OUT" Sensor of the device detected occupancy'),
+            exposes.binary('occupancy_and', ea.STATE, true, false)
+                .withDescription('Indicates whether "IN and OUT" Sensor of the device detected occupancy'),
             exposes.numeric('occupancy_timeout', ea.ALL).withUnit('second').withValueMin(0).withValueMax(3600)],
     },
     {
@@ -457,13 +596,19 @@ module.exports = [
         vendor: 'ShinaSystem',
         ota: ota.zigbeeOTA,
         description: 'SiHAS IOT smart inner switch 3 gang',
-        extend: extend.switch(),
-        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'), e.switch().withEndpoint('l3')],
+        fromZigbee: [fzLocal.ISM300Z3_on_off],
+        toZigbee: [tzLocal.ISM300Z3_on_off, tzLocal.ISM300Z3_rf_pairing],
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'), e.switch().withEndpoint('l3'),
+            exposes.enum('operation_mode', ea.ALL, ['auto', 'push', 'latch'])
+                .withDescription('Operation mode: "auto" - toggle by S/W, "push" - for momentary S/W, "latch" - sync S/W'),
+            exposes.enum('rf_pairing', ea.SET, ['l1', 'l2', 'l3'])
+                .withDescription('Enable RF pairing mode each button l1, l2, l3')],
         endpoint: (device) => {
             return {l1: 1, l2: 2, l3: 3};
         },
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
+            await device.getEndpoint(1).read('genOnOff', [0x9000]);
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
             await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
             await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);

package/devices/tuya.js

@@ -21,7 +21,7 @@ const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak',
     '_TZ3000_1h2x4akh', '_TZ3000_9vo5icau', '_TZ3000_cehuw1lw', '_TZ3000_ko6v90pg', '_TZ3000_f1bapcit', '_TZ3000_cjrngdr3',
     '_TZ3000_zloso4jk', '_TZ3000_r6buo8ba', '_TZ3000_iksasdbv', '_TZ3000_idrffznf', '_TZ3000_okaz9tjs', '_TZ3210_q7oryllx',
     '_TZ3000_ss98ec5d', '_TZ3000_gznh2xla', '_TZ3000_hdopuwv6', '_TZ3000_gvn91tmx', '_TZ3000_dksbtrzs', '_TZ3000_b28wrpvx',
-    '_TZ3000_aim0ztek'];
+    '_TZ3000_aim0ztek', '_TZ3000_mlswgkc3'];
 
 const tzLocal = {
     SA12IZL_silence_siren: {
@@ -796,6 +796,7 @@ module.exports = [
             {modelID: 'TS0001', manufacturerName: '_TZ3000_5ng23zjs'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_rmjr4ufz'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_v7gnj3ad'},
+            {modelID: 'TS0001', manufacturerName: '_TZ3000_ark8nv4y'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_mx3vgyea'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_qsp2pwtf'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_46t1rvdu'}],
@@ -1939,9 +1940,9 @@ module.exports = [
             exposes.binary('heating_stop', ea.STATE_SET, 'ON', 'OFF').withDescription('Battery life can be prolonged'+
                     ' by switching the heating off. To achieve this, the valve is closed fully. To activate the '+
                     'heating stop, the device display "HS", press the pair button to cancel.'),
-            e.holiday_temperature(), exposes.composite('holiday_mode_date').withDescription('The holiday mode( ⛱ ) will '+
-                    'automatically start at the set time starting point and run the holiday temperature.')
-                .withFeature(exposes.text('holiday_start_stop', ea.STATE_SET)),
+            e.holiday_temperature(),
+            exposes.text('holiday_start_stop', ea.STATE_SET).withDescription('The holiday mode( ⛱ ) will '+
+                    'automatically start at the set time starting point and run the holiday temperature.'),
             // exposes.enum('working_day', ea.STATE_SET, ['0', '1', '2', '3']),
             exposes.composite('schedule')/* .withFeature(exposes.text('week_schedule_programming', ea.STATE_SET)) */
                 .withDescription('week_schedule').withDescription('Auto Mode ⏱ - In this mode, '+
@@ -3270,6 +3271,8 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'msTemperatureMeasurement', 'msRelativeHumidity']);
+            await endpoint.read('genPowerCfg', ['batteryVoltage', 'batteryPercentageRemaining']);
+            await reporting.batteryPercentageRemaining(endpoint);
         },
     },
     {

package/devices/xiaomi.js

@@ -8,6 +8,7 @@ const extend = require('../lib/extend');
 const e = exposes.presets;
 const ea = exposes.access;
 const globalStore = require('../lib/store');
+const xiaomi = require('../lib/xiaomi');
 
 const xiaomiExtend = {
     light_onoff_brightness_colortemp: (options={disableColorTempStartup: true}) => ({
@@ -125,6 +126,17 @@ const tzLocal = {
             }
         },
     },
+    VOCKQJK11LM_display_unit: {
+        key: ['display_unit'],
+        convertSet: async (entity, key, value, meta) => {
+            await entity.write('aqaraOpple',
+                {0x0114: {value: xiaomi.VOCKQJK11LMDisplayUnit[value], type: 0x20}}, {manufacturerCode: 0x115F});
+            return {state: {display_unit: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('aqaraOpple', [0x0114], {manufacturerCode: 0x115F, disableDefaultResponse: true});
+        },
+    },
 };
 
 module.exports = [
@@ -550,6 +562,7 @@ module.exports = [
             // set "event" mode
             await endpoint1.write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.switch.n2aeu1'],
@@ -1594,7 +1607,7 @@ module.exports = [
             e.battery_voltage().withAccess(ea.STATE_GET),
             e.device_temperature(),
             e.action(['manual_open', 'manual_close']),
-            exposes.enum('motor_state', ea.STATE, ['stopped', 'opening', 'closing'])
+            exposes.enum('motor_state', ea.STATE, ['stopped', 'opening', 'closing', 'pause'])
                 .withDescription('Motor state'),
             exposes.binary('running', ea.STATE, true, false)
                 .withDescription('Whether the motor is moving or not'),
@@ -2020,9 +2033,11 @@ module.exports = [
         whiteLabel: [{vendor: 'Xiaomi', model: 'AAQS-S01'}],
         description: 'Aqara TVOC air quality monitor',
         fromZigbee: [fz.xiaomi_tvoc, fz.battery, fz.temperature, fz.humidity, fz.aqara_opple],
-        toZigbee: [],
+        toZigbee: [tzLocal.VOCKQJK11LM_display_unit],
         meta: {battery: {voltageToPercentage: '3V_2850_3000'}},
-        exposes: [e.temperature(), e.humidity(), e.voc(), e.device_temperature(), e.battery(), e.battery_voltage()],
+        exposes: [e.temperature(), e.humidity(), e.voc(), e.device_temperature(), e.battery(), e.battery_voltage(),
+            exposes.enum('display_unit', ea.ALL, ['mgm3_celsius', 'ppb_celsius', 'mgm3_fahrenheit', 'ppb_fahrenheit'])
+                .withDescription('Units to show on the display')],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = ['msTemperatureMeasurement', 'msRelativeHumidity', 'genAnalogInput'];
@@ -2258,13 +2273,18 @@ module.exports = [
         model: 'SRTS-A01',
         vendor: 'Xiaomi',
         description: 'Aqara Smart Radiator Thermostat E1',
-        fromZigbee: [fzLocal.aqara_trv, fz.thermostat],
+        fromZigbee: [fzLocal.aqara_trv, fz.thermostat, fz.battery],
         toZigbee: [tzLocal.aqara_trv, tz.thermostat_occupied_heating_setpoint],
         exposes: [e.switch().setAccess('state', ea.STATE_SET),
             exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 30, 0.5)
                 .withLocalTemperature(ea.STATE).withPreset(['manual', 'away', 'auto'], ea.STATE_SET),
             e.child_lock(), e.window_detection(), e.valve_detection(),
-            e.away_preset_temperature(),
+            e.away_preset_temperature(), e.battery_voltage(), e.battery(),
         ],
+        meta: {battery: {voltageToPercentage: '3V_2850_3000'}},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genPowerCfg', ['batteryVoltage']);
+        },
     },
 ];

package/lib/xiaomi.js

@@ -5,6 +5,7 @@ const {
     calibrateAndPrecisionRoundOptions,
     postfixWithEndpointName,
     precisionRound,
+    getKey,
 } = require('./utils');
 
 const buffer2DataObject = (meta, model, buffer) => {
@@ -432,6 +433,11 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
                 payload.gas_sensitivity = {1: '15%LEL', 2: '10%LEL'}[value];
             }
             break;
+        case '276':
+            if (['VOCKQJK11LM'].includes(model.model)) {
+                payload.display_unit = getKey(VOCKQJK11LMDisplayUnit, value);
+            }
+            break;
         case '293':
             payload.click_mode = {1: 'fast', 2: 'multi'}[value];
             break;
@@ -637,7 +643,15 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
     return payload;
 };
 
+const VOCKQJK11LMDisplayUnit = {
+    'mgm3_celsius': 0x00, // mg/m³, °C (default)
+    'ppb_celsius': 0x01, // ppb, °C
+    'mgm3_fahrenheit': 0x10, // mg/m³, °F
+    'ppb_fahrenheit': 0x11, // ppb, °F
+};
+
 module.exports = {
     buffer2DataObject,
     numericAttributes2Payload,
+    VOCKQJK11LMDisplayUnit,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.625",
+  "version": "14.0.627",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -38,7 +38,7 @@
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^2.2.0",
-    "zigbee-herdsman": "^0.14.54"
+    "zigbee-herdsman": "^0.14.55"
   },
   "devDependencies": {
     "eslint": "*",