zigbee-herdsman-converters 14.0.583 → 14.0.586

package/converters/fromZigbee.js

@@ -1544,6 +1544,8 @@ const converters = {
             if (msg.data.hasOwnProperty('currentPositionLiftPercentage') && msg.data['currentPositionLiftPercentage'] <= 100) {
                 const value = msg.data['currentPositionLiftPercentage'];
                 result[postfixWithEndpointName('position', msg, model, meta)] = invert ? value : 100 - value;
+                result[postfixWithEndpointName('state', msg, model, meta)] =
+                    invert ? (value === 100 ? 'CLOSE' : 'OPEN') : (value === 0 ? 'CLOSE' : 'OPEN');
             }
             if (msg.data.hasOwnProperty('currentPositionTiltPercentage') && msg.data['currentPositionTiltPercentage'] <= 100) {
                 const value = msg.data['currentPositionTiltPercentage'];

package/devices/awox.js

@@ -72,25 +72,9 @@ module.exports = [
     {
         fingerprint: [
             {
-                type: 'EndDevice',
-                manufacturerName: 'AwoX',
-                modelID: 'TLSR82xx',
-                powerSource: 'Battery',
-                endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 2048,
-                        inputClusters: [0, 3, 4, 4096],
-                        outputClusters: [0, 3, 4, 5, 6, 8, 768, 4096],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 2048,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                type: 'EndDevice', manufacturerName: 'AwoX', modelID: 'TLSR82xx', powerSource: 'Battery', endpoints: [
+                    {ID: 1, profileID: 260, deviceID: 2048, inputClusters: [0, 3, 4, 4096], outputClusters: [0, 3, 4, 5, 6, 8, 768, 4096]},
+                    {ID: 3, profileID: 4751, deviceID: 2048, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
         ],
@@ -108,76 +92,35 @@ module.exports = [
         fingerprint: [
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 269,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10],
-                        outputClusters: [6],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 269,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 269, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10], outputClusters: [6]},
+                    {ID: 3, profileID: 4751, deviceID: 269, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                     {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
                 ],
             },
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 258,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096],
-                        outputClusters: [6, 25],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 49152,
-                        deviceID: 258,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 269, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10], outputClusters: [6]},
+                    {ID: 3, profileID: 4751, deviceID: 269, inputClusters: [65360, 65361, 4], outputClusters: [65360, 65361]},
+                    {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
+                ],
+            },
+            {
+                type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
+                    {ID: 1, profileID: 260, deviceID: 258, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096], outputClusters: [6, 25]},
+                    {ID: 3, profileID: 49152, deviceID: 258, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 269,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599],
-                        outputClusters: [6],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 269,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 269, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599], outputClusters: [6]},
+                    {ID: 3, profileID: 4751, deviceID: 269, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                     {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
                 ],
             },
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 269,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599],
-                        outputClusters: [6],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 269,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 269, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599], outputClusters: [6]},
+                    {ID: 3, profileID: 4751, deviceID: 269, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
         ],
@@ -190,58 +133,22 @@ module.exports = [
         fingerprint: [
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 268,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599],
-                        outputClusters: [6],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 268,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 268, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599], outputClusters: [6]},
+                    {ID: 3, profileID: 4751, deviceID: 268, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 268,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599],
-                        outputClusters: [6],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 268, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599], outputClusters: [6]},
                     {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 268,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 3, profileID: 4751, deviceID: 268, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 268,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10],
-                        outputClusters: [6],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 268, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10], outputClusters: [6]},
                     {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
-                    {
-                        ID: 3,
-                        profileID: 4751,
-                        deviceID: 268,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 3, profileID: 4751, deviceID: 268, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
         ],
@@ -255,20 +162,8 @@ module.exports = [
         fingerprint: [
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
-                    {
-                        ID: 1,
-                        profileID: 260,
-                        deviceID: 268,
-                        inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096],
-                        outputClusters: [6, 25],
-                    },
-                    {
-                        ID: 3,
-                        profileID: 49152,
-                        deviceID: 268,
-                        inputClusters: [65360, 65361],
-                        outputClusters: [65360, 65361],
-                    },
+                    {ID: 1, profileID: 260, deviceID: 268, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096], outputClusters: [6, 25]},
+                    {ID: 3, profileID: 49152, deviceID: 268, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
         ],

package/devices/enocean.js

@@ -16,6 +16,8 @@ module.exports = [
             {vendor: 'Niko', description: 'Dimmer switch for Hue system', model: '91004'},
             {vendor: 'NodOn', description: 'Smart switch for Philips Hue', model: 'CWS-4-1-01_HUE'},
             {vendor: 'Vimar', description: 'Zigbee Friends of Hue RF switch', model: '03906'},
+            {vendor: 'Sunricher', model: 'SR-ZGP2801K4-FOH-E'},
+            {vendor: 'LED Trading', model: '9125'},
         ],
     },
     {

package/devices/iluminize.js

@@ -115,7 +115,7 @@ module.exports = [
         model: '5128.10',
         vendor: 'Iluminize',
         description: 'Zigbee 3.0 switch shutter SW with level control',
-        fromZigbee: [fz.cover_position_via_brightness, fz.cover_state_via_onoff],
+        fromZigbee: [fz.cover_position_via_brightness, fz.cover_state_via_onoff, fz.cover_position_tilt],
         toZigbee: [tz.cover_state, tz.cover_via_brightness],
         exposes: [e.cover_position()],
         ota: ota.zigbeeOTA,

package/devices/led_trading.js

@@ -21,31 +21,6 @@ const fzLocal = {
             }
         },
     },
-    led_trading_9125: {
-        cluster: 'greenPower',
-        type: ['commandNotification', 'commandCommisioningNotification'],
-        convert: (model, msg, publish, options, meta) => {
-            const commandID = msg.data.commandID;
-            if (utils.hasAlreadyProcessedMessage(msg, msg.data.frameCounter, `${msg.device.ieeeAddr}_${commandID}`)) return;
-            if (commandID === 104) return; // Skip commisioning command.
-
-            // Button 1: A0 (top left)
-            // Button 2: A1 (bottom left)
-            // Button 3: B0 (top right)
-            // Button 4: B1 (bottom right)
-            const lookup = {
-                0x10: 'press_1', 0x14: 'release_1', 0x11: 'press_2', 0x15: 'release_2', 0x13: 'press_3', 0x17: 'release_3',
-                0x12: 'press_4', 0x16: 'release_4', 0x64: 'press_1_and_3', 0x65: 'release_1_and_3', 0x62: 'press_2_and_4',
-                0x63: 'release_2_and_4',
-            };
-
-            if (!lookup.hasOwnProperty(commandID)) {
-                meta.logger.error(`LED Trading 9125: missing command '${commandID}'`);
-            } else {
-                return {action: lookup[commandID]};
-            }
-        },
-    },
 };
 
 module.exports = [
@@ -91,15 +66,4 @@ module.exports = [
             await reporting.bind(device.getEndpoint(5), coordinatorEndpoint, ['genOnOff']);
         },
     },
-    {
-        fingerprint: [{modelID: 'GreenPower_2', ieeeAddr: /^0x00000000017.....$/, manufId: null}],
-        model: '9125',
-        vendor: 'LED Trading',
-        description: 'FOH smart switch',
-        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZGP2801K4-FOH-E'}],
-        fromZigbee: [fzLocal.led_trading_9125],
-        toZigbee: [],
-        exposes: [e.action(['press_1', 'release_1', 'press_2', 'release_2', 'press_3', 'release_3', 'press_4', 'release_4',
-            'press_1_and_3', 'release_1_and_3', 'press_2_and_4', 'release_2_and_4'])],
-    },
 ];

package/devices/philips.js

@@ -3,6 +3,8 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const ota = require('../lib/ota');
 const reporting = require('../lib/reporting');
+const globalStore = require('../lib/store');
+const utils = require('../lib/utils');
 const e = exposes.presets;
 const ea = exposes.access;
 
@@ -40,6 +42,48 @@ const hueExtend = {
     }),
 };
 
+const fzLocal = {
+    hue_tap_dial: {
+        cluster: 'manuSpecificPhilips',
+        type: 'commandHueNotification',
+        options: [exposes.options.simulated_brightness()],
+        convert: (model, msg, publish, options, meta) => {
+            const buttonLookup = {1: 'button_1', 2: 'button_2', 3: 'button_3', 4: 'button_4', 20: 'dial'};
+            const button = buttonLookup[msg.data['button']];
+            const typeLookup = {0: 'press', 1: 'hold', 2: 'press_release', 3: 'hold_release'};
+            const type = typeLookup[msg.data['type']];
+            const direction = msg.data['unknown2'] <127 ? 'right' : 'left';
+            const time = msg.data['time'];
+            const payload = {};
+
+            if (button === 'dial') {
+                const adjustedTime = direction === 'right' ? time : 256 - time;
+                const dialType = 'rotate';
+                const speed = adjustedTime <= 25 ? 'step' : adjustedTime <= 75 ? 'slow' : 'fast';
+                payload.action = `${button}_${dialType}_${direction}_${speed}`;
+
+                // simulated brightness
+                if (options.simulated_brightness) {
+                    const opts = options.simulated_brightness;
+                    const deltaOpts = typeof opts === 'object' && opts.hasOwnProperty('delta') ? opts.delta : 35;
+                    const delta = direction === 'right' ? deltaOpts : deltaOpts * -1;
+                    const brightness = globalStore.getValue(msg.endpoint, 'brightness', 255) + delta;
+                    payload.brightness = utils.numberWithinRange(brightness, 0, 255);
+                    globalStore.putValue(msg.endpoint, 'brightness', payload.brightness);
+                }
+            } else {
+                payload.action = `${button}_${type}`;
+                // duration
+                if (type === 'press') globalStore.putValue(msg.endpoint, 'press_start', Date.now());
+                else if (type === 'hold' || type === 'hold_release') {
+                    payload.action_duration = (Date.now() - globalStore.getValue(msg.endpoint, 'press_start')) / 1000;
+                }
+            }
+            return payload;
+        },
+    },
+};
+
 module.exports = [
     {
         zigbeeModel: ['929003055801'],
@@ -2313,6 +2357,29 @@ module.exports = [
         description: 'Hue White and Color Ambiance A19 1100 lumen',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['RDM002'],
+        model: '8719514440937/8719514440999',
+        vendor: 'Philips',
+        description: 'Hue Tap dial switch',
+        fromZigbee: [fz.ignore_command_step, fzLocal.hue_tap_dial, fz.battery],
+        toZigbee: [],
+        exposes: [e.battery(), e.action(['button_1_press', 'button_1_press_release', 'button_1_hold', 'button_1_hold_release',
+            'button_2_press', 'button_2_press_release', 'button_2_hold', 'button_2_hold_release',
+            'button_3_press', 'button_3_press_release', 'button_3_hold', 'button_3_hold_release',
+            'button_4_press', 'button_4_press_release', 'button_4_hold', 'button_4_hold_release',
+            'dial_rotate_left_step', 'dial_rotate_left_slow', 'dial_rotate_left_fast',
+            'dial_rotate_right_step', 'dial_rotate_right_slow', 'dial_rotate_right_fast']),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'manuSpecificPhilips', 'genPowerCfg']);
+            const options = {manufacturerCode: 0x100B, disableDefaultResponse: true};
+            await endpoint.write('genBasic', {0x0031: {value: 0x000B, type: 0x19}}, options);
+            await reporting.batteryPercentageRemaining(endpoint);
+        },
+        ota: ota.zigbeeOTA,
+    },
     {
         fingerprint: [{modelID: 'GreenPower_2', ieeeAddr: /^0x00000000004.....$/}],
         model: '8718696743133',

package/devices/sengled.js

@@ -3,18 +3,27 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const ota = require('../lib/ota');
 const reporting = require('../lib/reporting');
-const extend = require('../lib/extend');
 const e = exposes.presets;
 
+// Make sure extend.ldight_* is not used (sengledExtend should be used instead)
+const extendDontUse = require('../lib/extend');
+const extend = {switch: extendDontUse.switch};
+const sengledExtend = {
+    light_onoff_brightness: (options={}) => extendDontUse.light_onoff_brightness({disableEffect: true, ...options}),
+    light_onoff_brightness_colortemp: (options={}) => extendDontUse.light_onoff_brightness_colortemp({disableEffect: true, ...options}),
+    light_onoff_brightness_colortemp_color: (options={}) =>
+        extendDontUse.light_onoff_brightness_colortemp_color({disableEffect: true, ...options}),
+};
+
 module.exports = [
     {
         zigbeeModel: ['E13-N11'],
         model: 'E13-N11',
         vendor: 'Sengled',
         description: 'Flood light with motion sensor light outdoor',
-        fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.ias_occupancy_alarm_1]),
-        toZigbee: extend.light_onoff_brightness().toZigbee,
-        exposes: extend.light_onoff_brightness().exposes.concat([e.occupancy()]),
+        fromZigbee: sengledExtend.light_onoff_brightness().fromZigbee.concat([fz.ias_occupancy_alarm_1]),
+        toZigbee: sengledExtend.light_onoff_brightness().toZigbee,
+        exposes: sengledExtend.light_onoff_brightness().exposes.concat([e.occupancy()]),
         ota: ota.zigbeeOTA,
     },
     {
@@ -22,7 +31,7 @@ module.exports = [
         model: 'E21-N13A',
         vendor: 'Sengled',
         description: 'Smart LED (A19)',
-        extend: extend.light_onoff_brightness(),
+        extend: sengledExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -30,12 +39,12 @@ module.exports = [
         model: 'E21-N1EA',
         vendor: 'Sengled',
         description: 'Smart LED multicolor A19 bulb',
-        fromZigbee: extend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).fromZigbee.concat([fz.metering]),
-        toZigbee: extend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).toZigbee,
-        exposes: extend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).exposes.concat([e.power(), e.energy()]),
+        fromZigbee: sengledExtend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).fromZigbee.concat([fz.metering]),
+        toZigbee: sengledExtend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).toZigbee,
+        exposes: sengledExtend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).exposes.concat([e.power(), e.energy()]),
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
-            await extend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]})
+            await sengledExtend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]})
                 .configure(device, coordinatorEndpoint, logger);
             device.powerSource = 'Mains (single phase)';
             device.save();
@@ -52,7 +61,7 @@ module.exports = [
         model: 'E12-N1E',
         vendor: 'Sengled',
         description: 'Smart LED multicolor (BR30)',
-        extend: extend.light_onoff_brightness_colortemp_color(),
+        extend: sengledExtend.light_onoff_brightness_colortemp_color(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -60,7 +69,7 @@ module.exports = [
         model: 'E1G-G8E',
         vendor: 'Sengled',
         description: 'Multicolor light strip (2M)',
-        extend: extend.light_onoff_brightness_colortemp_color(),
+        extend: sengledExtend.light_onoff_brightness_colortemp_color(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -68,7 +77,7 @@ module.exports = [
         model: 'E11-U21U31',
         vendor: 'Sengled',
         description: 'Element touch (A19)',
-        extend: extend.light_onoff_brightness(),
+        extend: sengledExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -76,11 +85,11 @@ module.exports = [
         model: 'E11-G13',
         vendor: 'Sengled',
         description: 'Element classic (A19)',
-        fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.metering]),
-        toZigbee: extend.light_onoff_brightness().toZigbee,
+        fromZigbee: sengledExtend.light_onoff_brightness().fromZigbee.concat([fz.metering]),
+        toZigbee: sengledExtend.light_onoff_brightness().toZigbee,
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
-            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            await sengledExtend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
             device.powerSource = 'Mains (single phase)';
             device.save();
 
@@ -90,14 +99,14 @@ module.exports = [
             await reporting.currentSummDelivered(endpoint);
             await reporting.instantaneousDemand(endpoint);
         },
-        exposes: extend.light_onoff_brightness().exposes.concat([e.power(), e.energy()]),
+        exposes: sengledExtend.light_onoff_brightness().exposes.concat([e.power(), e.energy()]),
     },
     {
         zigbeeModel: ['E11-G23', 'E11-G33'],
         model: 'E11-G23/E11-G33',
         vendor: 'Sengled',
         description: 'Element classic (A60)',
-        extend: extend.light_onoff_brightness(),
+        extend: sengledExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -105,7 +114,7 @@ module.exports = [
         model: 'E11-N13/E11-N13A/E11-N14/E11-N14A',
         vendor: 'Sengled',
         description: 'Element extra bright (A19)',
-        extend: extend.light_onoff_brightness(),
+        extend: sengledExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -113,7 +122,7 @@ module.exports = [
         model: 'Z01-CIA19NAE26',
         vendor: 'Sengled',
         description: 'Element touch (A19)',
-        extend: extend.light_onoff_brightness(),
+        extend: sengledExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -121,7 +130,7 @@ module.exports = [
         model: 'Z01-A19NAE26',
         vendor: 'Sengled',
         description: 'Element plus (A19)',
-        extend: extend.light_onoff_brightness_colortemp(),
+        extend: sengledExtend.light_onoff_brightness_colortemp(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -129,7 +138,7 @@ module.exports = [
         model: 'Z01-A60EAE27',
         vendor: 'Sengled',
         description: 'Element Plus (A60)',
-        extend: extend.light_onoff_brightness_colortemp(),
+        extend: sengledExtend.light_onoff_brightness_colortemp(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -137,11 +146,11 @@ module.exports = [
         model: 'E11-N1EA',
         vendor: 'Sengled',
         description: 'Element plus color (A19)',
-        fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.metering]),
-        toZigbee: extend.light_onoff_brightness().toZigbee,
+        fromZigbee: sengledExtend.light_onoff_brightness_colortemp_color().fromZigbee.concat([fz.metering]),
+        toZigbee: sengledExtend.light_onoff_brightness_colortemp_color().toZigbee,
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
-            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            await sengledExtend.light_onoff_brightness_colortemp_color().configure(device, coordinatorEndpoint, logger);
             device.powerSource = 'Mains (single phase)';
             device.save();
 
@@ -151,14 +160,14 @@ module.exports = [
             await reporting.currentSummDelivered(endpoint);
             await reporting.instantaneousDemand(endpoint);
         },
-        exposes: extend.light_onoff_brightness().exposes.concat([e.power(), e.energy()]),
+        exposes: sengledExtend.light_onoff_brightness_colortemp_color().exposes.concat([e.power(), e.energy()]),
     },
     {
         zigbeeModel: ['E11-U2E'],
         model: 'E11-U2E',
         vendor: 'Sengled',
         description: 'Element color plus E27',
-        extend: extend.light_onoff_brightness_colortemp_color(),
+        extend: sengledExtend.light_onoff_brightness_colortemp_color(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -166,7 +175,7 @@ module.exports = [
         model: 'E11-U3E',
         vendor: 'Sengled',
         description: 'Element color plus B22',
-        extend: extend.light_onoff_brightness_colortemp_color(),
+        extend: sengledExtend.light_onoff_brightness_colortemp_color(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -174,12 +183,12 @@ module.exports = [
         model: 'E1F-N5E',
         vendor: 'Sengled',
         description: 'Element color plus E12',
-        fromZigbee: extend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).fromZigbee.concat([fz.metering]),
-        toZigbee: extend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).toZigbee,
-        exposes: extend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).exposes.concat([e.power(), e.energy()]),
+        fromZigbee: sengledExtend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).fromZigbee.concat([fz.metering]),
+        toZigbee: sengledExtend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).toZigbee,
+        exposes: sengledExtend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]}).exposes.concat([e.power(), e.energy()]),
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
-            await extend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]})
+            await sengledExtend.light_onoff_brightness_colortemp_color({colorTempRange: [154, 500]})
                 .configure(device, coordinatorEndpoint, logger);
             device.powerSource = 'Mains (single phase)';
             device.save();
@@ -196,7 +205,7 @@ module.exports = [
         model: 'E12-N14',
         vendor: 'Sengled',
         description: 'Element Classic (BR30)',
-        extend: extend.light_onoff_brightness(),
+        extend: sengledExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -204,7 +213,7 @@ module.exports = [
         model: 'E1ACA4ABE38A',
         vendor: 'Sengled',
         description: 'Element downlight smart LED bulb',
-        extend: extend.light_onoff_brightness(),
+        extend: sengledExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -261,7 +270,7 @@ module.exports = [
         model: 'E11-N1G',
         vendor: 'Sengled',
         description: 'Vintage LED edison bulb (ST19)',
-        extend: extend.light_onoff_brightness(),
+        extend: sengledExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -269,7 +278,7 @@ module.exports = [
         model: 'E1F-N9G',
         vendor: 'Sengled',
         description: 'Smart LED filament candle (E12)',
-        extend: extend.light_onoff_brightness(),
+        extend: sengledExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
 ];

package/devices/tuya.js

@@ -794,6 +794,7 @@ module.exports = [
             {modelID: 'TS0503B', manufacturerName: '_TZ3210_778drfdt'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3000_g5xawfcq'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3210_trm3l2aw'},
+            {modelID: 'TS0503B', manufacturerName: '_TZ3210_95txyzbx'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3210_odlghna1'}],
         model: 'TS0503B',
         vendor: 'TuYa',
@@ -2202,13 +2203,20 @@ module.exports = [
         vendor: 'TuYa',
         description: 'Smart light switch - 3 gang without neutral wire',
         extend: extend.switch(),
-        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('center'), e.switch().withEndpoint('right')],
+        toZigbee: extend.switch().toZigbee.concat([tz.moes_power_on_behavior, tz.tuya_backlight_mode]),
+        fromZigbee: extend.switch().fromZigbee.concat([fz.moes_power_on_behavior, fz.tuya_backlight_mode]),
+        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('center'), e.switch().withEndpoint('right'),
+            exposes.enum('power_on_behavior', ea.ALL, Object.values(tuya.moesSwitch.powerOnBehavior)),
+            exposes.enum('backlight_mode', ea.ALL, ['LOW', 'MEDIUM', 'HIGH'])
+                .withDescription('Indicator light status: LOW: Off | MEDIUM: On| HIGH: Inverted')],
         endpoint: (device) => {
             return {'left': 1, 'center': 2, 'right': 3};
         },
         whiteLabel: [{vendor: 'TUYATEC', model: 'GDKES-03TZXD'}],
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
+            await device.getEndpoint(1).read('genBasic',
+                ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
             try {
                 for (const ID of [1, 2, 3]) {
                     const endpoint = device.getEndpoint(ID);

package/package.json

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