zigbee-herdsman-converters 14.0.409 → 14.0.410

package/converters/fromZigbee.js

@@ -5168,8 +5168,16 @@ const converters = {
     aqara_opple: {
         cluster: 'aqaraOpple',
         type: ['attributeReport', 'readResponse'],
-        options: [exposes.options.precision('temperature'), exposes.options.calibration('temperature'),
-            exposes.options.precision('illuminance'), exposes.options.calibration('illuminance', 'percentual')],
+        options: (definition) => {
+            const result = [];
+            if (definition.exposes.find((e) => e.name === 'temperature')) {
+                result.push(exposes.options.precision('temperature'), exposes.options.calibration('temperature'));
+            }
+            if (definition.exposes.find((e) => e.name === 'illuminance')) {
+                result.push(exposes.options.precision('illuminance'), exposes.options.calibration('illuminance', 'percentual'));
+            }
+            return result;
+        },
         convert: (model, msg, publish, options, meta) => {
             const payload = {};
             if (msg.data.hasOwnProperty('247')) {

package/devices/gledopto.js

@@ -62,7 +62,7 @@ const gledoptoExtend = {
     }),
 };
 
-const configureReadModelID = async (device, coordinatorEndpoint, logger) => {
+const configureReadModelID = async (device) => {
     // https://github.com/Koenkk/zigbee-herdsman-converters/issues/3016#issuecomment-1027726604
     const endpoint = device.endpoints[0];
     await endpoint.read('genBasic', ['modelId']);
@@ -122,8 +122,11 @@ module.exports = [
         vendor: 'Gledopto',
         ota: ota.zigbeeOTA,
         description: 'Zigbee LED Controller WW/CW (pro)',
-        extend: gledoptoExtend.light_onoff_brightness_colortemp(),
-        configure: configureReadModelID,
+        extend: gledoptoExtend.light_onoff_brightness_colortemp({noConfigure: true}),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness_colortemp().configure(device, coordinatorEndpoint, logger);
+            await configureReadModelID(device);
+        },
     },
     {
         fingerprint: [
@@ -186,8 +189,11 @@ module.exports = [
         vendor: 'Gledopto',
         ota: ota.zigbeeOTA,
         description: 'Zigbee LED Controller RGBW (pro)',
-        extend: gledoptoExtend.light_onoff_brightness_colortemp_color(),
-        configure: configureReadModelID,
+        extend: gledoptoExtend.light_onoff_brightness_colortemp_color({noConfigure: true}),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness_colortemp_color().configure(device, coordinatorEndpoint, logger);
+            await configureReadModelID(device);
+        },
     },
     {
         fingerprint: [
@@ -245,8 +251,11 @@ module.exports = [
         vendor: 'Gledopto',
         ota: ota.zigbeeOTA,
         description: 'Zigbee LED Controller RGB (pro)',
-        extend: gledoptoExtend.light_onoff_brightness_color(),
-        configure: configureReadModelID,
+        extend: gledoptoExtend.light_onoff_brightness_color({noConfigure: true}),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness_color().configure(device, coordinatorEndpoint, logger);
+            await configureReadModelID(device);
+        },
     },
     {
         zigbeeModel: ['GL-C-008P'],
@@ -254,9 +263,12 @@ module.exports = [
         vendor: 'Gledopto',
         ota: ota.zigbeeOTA,
         description: 'Zigbee LED Controller RGB+CCT (pro)',
-        extend: gledoptoExtend.light_onoff_brightness_colortemp_color({colorTempRange: [158, 495]}),
+        extend: gledoptoExtend.light_onoff_brightness_colortemp_color({colorTempRange: [158, 495], noConfigure: true}),
         meta: {disableDefaultResponse: true},
-        configure: configureReadModelID,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness_colortemp_color().configure(device, coordinatorEndpoint, logger);
+            await configureReadModelID(device);
+        },
     },
     {
         zigbeeModel: ['GL-C-009'],
@@ -277,8 +289,11 @@ module.exports = [
         vendor: 'Gledopto',
         ota: ota.zigbeeOTA,
         description: 'Zigbee LED Controller W (pro)',
-        extend: gledoptoExtend.light_onoff_brightness(),
-        configure: configureReadModelID,
+        extend: gledoptoExtend.light_onoff_brightness({noConfigure: true}),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            await configureReadModelID(device);
+        },
     },
     {
         zigbeeModel: ['GL-C-009S'],

package/devices/m/303/274ller_licht.js

@@ -29,7 +29,7 @@ module.exports = [
         description: 'Smart power strip',
         extend: extend.switch(),
         configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(11);
+            const endpoint = device.getEndpoint(11) || device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(endpoint);
         },
@@ -96,7 +96,8 @@ module.exports = [
         toZigbee: extend.light_onoff_brightness_colortemp_color().toZigbee.concat([tz.tint_scene]),
     },
     {
-        zigbeeModel: ['ZBT-Remote-ALL-RGBW'],
+        fingerprint: [{manufacturerName: '_TZ3000_bdbb0fon'}],
+        zigbeeModel: ['ZBT-Remote-ALL-RGBW', 'TS1001'],
         model: 'MLI-404011',
         description: 'Tint remote control',
         vendor: 'Müller Licht',

package/devices/schwaiger.js

@@ -45,4 +45,11 @@ module.exports = [
         description: 'LED bulb GU10 350 lumen, dimmable, color, white 2700-6500K',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
     },
+    {
+        zigbeeModel: ['ZBT-DIMLight-GU100800'],
+        model: 'HAL400',
+        vendor: 'Schwaiger',
+        description: 'LED Schwaiger HAL400 GU10 dimmable, warm white',
+        extend: extend.light_onoff_brightness(),
+    },
 ];

package/devices/sengled.js

@@ -60,13 +60,20 @@ module.exports = [
         model: 'E11-G13',
         vendor: 'Sengled',
         description: 'Element classic (A19)',
-        extend: extend.light_onoff_brightness({noConfigure: true}),
-        ota: ota.zigbeeOTA,
+        fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.metering]),
+        toZigbee: extend.light_onoff_brightness().toZigbee,
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
             device.powerSource = 'Mains (single phase)';
             device.save();
+
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint);
+            await reporting.instantaneousDemand(endpoint);
         },
+        exposes: [e.power(), e.energy(), e.light_brightness()],
     },
     {
         zigbeeModel: ['E11-G23', 'E11-G33'],

package/devices/sunricher.js

@@ -103,7 +103,7 @@ module.exports = [
         },
     },
     {
-        zigbeeModel: ['ON/OFF', 'ZIGBEE-SWITCH'],
+        zigbeeModel: ['ON/OFF -M', 'ON/OFF', 'ZIGBEE-SWITCH'],
         model: 'ZG9101SAC-HP-Switch',
         vendor: 'Sunricher',
         description: 'Zigbee AC in wall switch',

package/devices/tuya.js

@@ -12,7 +12,7 @@ const utils = require('../lib/utils');
 
 const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak', '_TZ3000_ew3ldmgx', '_TZ3000_gjnozsaz',
     '_TZ3000_jvzvulen', '_TZ3000_mraovvmm', '_TZ3000_nfnmi125', '_TZ3000_ps3dmato', '_TZ3000_w0qqde0g', '_TZ3000_u5u4cakc',
-    '_TZ3000_rdtixbnu', '_TZ3000_typdpbpg'];
+    '_TZ3000_rdtixbnu', '_TZ3000_typdpbpg', '_TZ3000_2xlvlnez'];
 
 const tzLocal = {
     TS0504B_color: {

package/devices/xiaomi.js

@@ -1174,8 +1174,8 @@ module.exports = [
             exposes.enum('mute_buzzer', ea.SET, ['Mute']).withDescription('Mute the buzzer for 10 minutes (buzzer cannot be ' +
                 'pre-muted, because this function only works when the alarm is triggered)'),
             exposes.binary('mute', ea.STATE_GET, true, false).withDescription('Buzzer muted'),
-            exposes.switch().withState('linkage_alarm', true, 'After being turned on, one of the devices triggers the ' +
-                'natural gas leakage alarm, and other devices with linkage turned on', ea.ALL, true, false),
+            exposes.binary('linkage_alarm', ea.ALL, true, false).withDescription('When this option is enabled and a gas leak ' +
+                'is detected, other detectors with this option enabled will also sound the alarm buzzer'),
             exposes.binary('state', ea.STATE_GET, 'preparation', 'work').withDescription('"Preparation" or "work" ' +
                 '(measurement of the gas concentration value and triggering of an alarm are only performed in the "work" state)'),
             exposes.numeric('power_outage_count', ea.STATE_GET).withDescription('Number of power outages (since last pairing)')],
@@ -1289,7 +1289,7 @@ module.exports = [
         model: 'LLKZMK11LM',
         vendor: 'Xiaomi',
         description: 'Aqara wireless relay controller',
-        fromZigbee: [fz.xiaomi_switch_basic, fz.xiaomi_power, fz.ignore_multistate_report, fz.on_off],
+        fromZigbee: [fz.xiaomi_switch_basic, fz.xiaomi_power, fz.ignore_multistate_report, fz.on_off, fz.aqara_opple],
         meta: {multiEndpoint: true},
         toZigbee: [tz.on_off, tz.LLKZMK11LM_interlock, tz.xiaomi_power],
         endpoint: (device) => {
@@ -1597,7 +1597,8 @@ module.exports = [
             e.battery(), e.battery_voltage(), e.action([
                 'single_left', 'single_right', 'single_both',
                 'double_left', 'double_right', 'double_both',
-                'triple_left', 'triple_right', 'triple_both']),
+                'triple_left', 'triple_right', 'triple_both',
+                'hold_left', 'hold_right', 'hold_both']),
             exposes.enum('click_mode', ea.ALL, ['fast', 'multi'])
                 .withDescription('Click mode, fast: only supports single click which will be send immediately after clicking.' +
                     'multi: supports more events like double and hold'),

package/index.js

@@ -62,7 +62,7 @@ function addDefinition(definition) {
     const {extend, ...definitionWithoutExtend} = definition;
     if (extend) {
         if (extend.hasOwnProperty('configure') && definition.hasOwnProperty('configure')) {
-            console.log(`'${definition.model}' has configure in extend and device, this is not allowed`);
+            assert.fail(`'${definition.model}' has configure in extend and device, this is not allowed`);
         }
 
         definition = {
@@ -89,7 +89,8 @@ function addDefinition(definition) {
     const optionKeys = definition.options.map((o) => o.name);
     for (const converter of [...definition.toZigbee, ...definition.fromZigbee]) {
         if (converter.options) {
-            for (const option of converter.options) {
+            const options = typeof converter.options === 'function' ? converter.options(definition) : converter.options;
+            for (const option of options) {
                 if (!optionKeys.includes(option.name)) {
                     definition.options.push(option);
                     optionKeys.push(option.name);

package/lib/extend.js

@@ -58,12 +58,14 @@ const extend = {
             tz.light_brightness_step, tz.level_config, tz.power_on_behavior, tz.light_hue_saturation_move,
             tz.light_hue_saturation_step, tz.light_color_options, tz.light_color_mode, ...(!options.disableEffect ? [tz.effect] : [])];
 
-        return {
-            exposes, fromZigbee, toZigbee,
-            configure: async (device, coordinatorEndpoint, logger) => {
+        const result = {exposes, fromZigbee, toZigbee};
+        if (!options.noConfigure) {
+            result.configure = async (device, coordinatorEndpoint, logger) => {
                 await light.configure(device, coordinatorEndpoint, logger, false);
-            },
-        };
+            };
+        }
+
+        return result;
     },
     light_onoff_brightness_colortemp_color: (options={}) => {
         options = {disableEffect: false, supportsHS: false, disableColorTempStartup: false, preferHS: false, ...options};

package/npm-shrinkwrap.json

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

package/package.json

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