zigbee-herdsman-converters 15.0.89 → 15.0.90

package/devices/automaton.js

@@ -1,9 +1,5 @@
-const fz = require('../converters/fromZigbee');
-const tz = require('../converters/toZigbee');
-const exposes = require('../lib/exposes');
 const reporting = require('../lib/reporting');
 const tuya = require('../lib/tuya');
-const e = exposes.presets;
 
 module.exports = [
     {
@@ -11,21 +7,7 @@ module.exports = [
         model: 'AUT000069',
         vendor: 'AutomatOn',
         description: 'Underfloor heating controller - 5 zones',
-        fromZigbee: [fz.on_off, fz.ignore_basic_report, tuya.fz.power_on_behavior_2, tuya.fz.child_lock],
-        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2, tuya.tz.child_lock],
-        exposes: [
-            e.child_lock(),
-            e.switch().withEndpoint('l1'),
-            e.switch().withEndpoint('l2'),
-            e.switch().withEndpoint('l3'),
-            e.switch().withEndpoint('l4'),
-            e.switch().withEndpoint('l5'),
-            e.power_on_behavior().withEndpoint('l1'),
-            e.power_on_behavior().withEndpoint('l2'),
-            e.power_on_behavior().withEndpoint('l3'),
-            e.power_on_behavior().withEndpoint('l4'),
-            e.power_on_behavior().withEndpoint('l5'),
-        ],
+        extend: tuya.extend.switch({powerOnBehavior2: true, childLock: true, endpoints: ['l1', 'l2', 'l3', 'l4', 'l5']}),
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4, 'l5': 5};
         },

package/devices/iluminize.js

@@ -74,6 +74,19 @@ module.exports = [
             await reporting.onOff(endpoint);
         },
     },
+    {
+        zigbeeModel: ['5123.1110'],
+        model: '5123.1110',
+        vendor: 'Iluminize',
+        description: 'Zigbee 3.0 controller with adjustable current 250-1500mA, max. 50W / 48V SELV',
+        extend: extend.light_onoff_brightness({noConfigure: true}),
+        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']);
+            await reporting.onOff(endpoint);
+        },
+    },
     {
         zigbeeModel: ['511.010'],
         model: '511.010',

package/devices/lonsonho.js

@@ -101,7 +101,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TZ3000_ktuoyvt5'}, {modelID: 'TS110E', manufacturerName: '_TZ3210_weaqkhab'}],
+        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TZ3000_ktuoyvt5'}],
         model: 'QS-Zigbee-D02-TRIAC-L',
         vendor: 'Lonsonho',
         description: '1 gang smart dimmer switch module without neutral',

package/devices/tuya.js

@@ -3270,11 +3270,7 @@ module.exports = [
         model: 'TS0004',
         vendor: 'TuYa',
         description: 'Smart light switch - 4 gang with neutral wire',
-        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report],
-        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2],
-        exposes: [e.switch().withEndpoint('l1'), e.power_on_behavior().withEndpoint('l1'), e.switch().withEndpoint('l2'),
-            e.power_on_behavior().withEndpoint('l2'), e.switch().withEndpoint('l3'), e.power_on_behavior().withEndpoint('l3'),
-            e.switch().withEndpoint('l4'), e.power_on_behavior().withEndpoint('l4')],
+        extend: tuya.extend.switch({powerOnBehavior2: true, endpoints: ['l1', 'l2', 'l3', 'l4']}),
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4};
         },
@@ -3292,11 +3288,7 @@ module.exports = [
         model: 'TS0726',
         vendor: 'TuYa',
         description: '4 gang switch with neutral wire',
-        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report],
-        toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2],
-        exposes: [e.switch().withEndpoint('l1'), e.power_on_behavior().withEndpoint('l1'), e.switch().withEndpoint('l2'),
-            e.power_on_behavior().withEndpoint('l2'), e.switch().withEndpoint('l3'), e.power_on_behavior().withEndpoint('l3'),
-            e.switch().withEndpoint('l4'), e.power_on_behavior().withEndpoint('l4')],
+        extend: tuya.extend.switch({powerOnBehavior2: true, endpoints: ['l1', 'l2', 'l3', 'l4']}),
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4};
         },
@@ -4077,7 +4069,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: tuya.fingerprint('TS110E', ['_TZ3210_zxbtub8r', '_TZ3210_k1msuvg6']),
+        fingerprint: tuya.fingerprint('TS110E', ['_TZ3210_zxbtub8r', '_TZ3210_k1msuvg6', '_TZ3210_weaqkhab']),
         model: 'TS110E_1gang_1',
         vendor: 'TuYa',
         description: '1 channel dimmer',
@@ -4089,7 +4081,14 @@ module.exports = [
             [tz.light_onoff_brightness],
             [tzLocal.TS110E_light_onoff_brightness],
         ),
-        exposes: [e.light_brightness().withMinBrightness().withMaxBrightness(), e.power_on_behavior(), tuya.exposes.switchType()],
+        exposes: (device, options) => {
+            const exps = [e.light_brightness().withMinBrightness().withMaxBrightness(), e.linkquality()];
+            if (!device || !device.manufacturerName === '_TZ3210_weaqkhab') {
+                // _TZ3210_weaqkhab doesn't support power_on_behavior and switch_type
+                exps.push(e.power_on_behavior(), tuya.exposes.switchType());
+            }
+            return exps;
+        },
         configure: async (device, coordinatorEndpoint, logger) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);

package/lib/tuya.js

@@ -1867,6 +1867,14 @@ const tuyaExtend = {
             fromZigbee.push(tuyaFz.power_outage_memory);
             toZigbee.push(tuyaTz.power_on_behavior_1);
             exposes.push(tuyaExposes.powerOutageMemory());
+        } else if (options.powerOnBehavior2) {
+            fromZigbee.push(tuyaFz.power_on_behavior_2);
+            toZigbee.push(tuyaTz.power_on_behavior_2);
+            if (options.endpoints) {
+                exposes.push(...options.endpoints.map((ee) => e.power_on_behavior().withEndpoint(ee)));
+            } else {
+                exposes.push(e.power_on_behavior());
+            }
         } else {
             fromZigbee.push(tuyaFz.power_on_behavior_1);
             toZigbee.push(tuyaTz.power_on_behavior_1);

package/package.json

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