zigbee-herdsman-converters 14.0.676 → 14.0.677

package/converters/fromZigbee.js

@@ -677,6 +677,7 @@ const converters = {
         cluster: 'seMetering',
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
+            if (utils.hasAlreadyProcessedMessage(msg, model)) return;
             const payload = {};
             const multiplier = msg.endpoint.getClusterAttributeValue('seMetering', 'multiplier');
             const divisor = msg.endpoint.getClusterAttributeValue('seMetering', 'divisor');
@@ -733,6 +734,7 @@ const converters = {
         options: [exposes.options.calibration('power', 'percentual'), exposes.options.calibration('current', 'percentual'),
             exposes.options.calibration('voltage', 'percentual')],
         convert: (model, msg, publish, options, meta) => {
+            if (utils.hasAlreadyProcessedMessage(msg, model)) return;
             const getFactor = (key) => {
                 const multiplier = msg.endpoint.getClusterAttributeValue('haElectricalMeasurement', `${key}Multiplier`);
                 const divisor = msg.endpoint.getClusterAttributeValue('haElectricalMeasurement', `${key}Divisor`);
@@ -2545,17 +2547,6 @@ const converters = {
             };
         },
     },
-    moes_power_on_behavior: {
-        cluster: 'genOnOff',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            const lookup = {0: 'off', 1: 'on', 2: 'previous'};
-            if (msg.data.hasOwnProperty('moesStartUpOnOff')) {
-                const property = postfixWithEndpointName('power_on_behavior', msg, model, meta);
-                return {[property]: lookup[msg.data['moesStartUpOnOff']]};
-            }
-        },
-    },
     moes_switch: {
         cluster: 'manuSpecificTuya',
         type: ['commandDataResponse', 'commandDataReport'],
@@ -2793,42 +2784,6 @@ const converters = {
             return result;
         },
     },
-    tuya_backlight_mode: {
-        cluster: 'genOnOff',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            if (msg.data.hasOwnProperty('tuyaBacklightMode')) {
-                const value = msg.data['tuyaBacklightMode'];
-                const backlightLookup = {0: 'LOW', 1: 'MEDIUM', 2: 'HIGH'};
-                return {backlight_mode: backlightLookup[value]};
-            }
-        },
-    },
-    ts011f_plug_indicator_mode: {
-        cluster: 'genOnOff',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            const property = 'tuyaBacklightMode'; // 0x8001 or 32769
-            if (msg.data.hasOwnProperty(property)) {
-                const value = msg.data[property];
-                const lookup = {0: 'off', 1: 'off/on', 2: 'on/off', 3: 'on'};
-                if (lookup.hasOwnProperty(value)) {
-                    return {indicator_mode: lookup[value]};
-                }
-            }
-        },
-    },
-    ts011f_plug_child_mode: {
-        cluster: 'genOnOff',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            const property = (0x8000).toString(); // 32768
-            if (msg.data.hasOwnProperty(property)) {
-                const value = msg.data[property];
-                return {child_lock: value ? 'LOCK' : 'UNLOCK'};
-            }
-        },
-    },
     WSZ01_on_off_action: {
         cluster: 65029,
         type: 'raw',
@@ -4779,16 +4734,6 @@ const converters = {
             });
         },
     },
-    tuya_switch_type: {
-        cluster: 'manuSpecificTuya_3',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            const lookup = {0: 'toggle', 1: 'state', 2: 'momentary'};
-            if (msg.data.hasOwnProperty('switchType')) {
-                return {switch_type: lookup[msg.data['switchType']]};
-            }
-        },
-    },
     tuya_min_brightness: {
         cluster: 'genLevelCtrl',
         type: ['attributeReport', 'readResponse'],
@@ -7192,22 +7137,6 @@ const converters = {
             }
         },
     },
-    tuya_switch_power_outage_memory: {
-        cluster: 'genOnOff',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            const property = 'moesStartUpOnOff';
-
-            if (msg.data.hasOwnProperty(property)) {
-                const dict = {0x00: 'off', 0x01: 'on', 0x02: 'restore'};
-                const value = msg.data[property];
-
-                if (dict.hasOwnProperty(value)) {
-                    return {[postfixWithEndpointName('power_outage_memory', msg, model, meta)]: dict[value]};
-                }
-            }
-        },
-    },
     tuya_relay_din_led_indicator: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],

package/converters/toZigbee.js

@@ -3612,34 +3612,6 @@ const converters = {
             await tuya.sendDataPointBool(entity, tuya.dataPoints.state, value === 'cool');
         },
     },
-    tuya_switch_power_outage_memory: {
-        key: ['power_outage_memory'],
-        convertSet: async (entity, key, value, meta) => {
-            value = value.toLowerCase();
-            const lookup = {'off': 0x00, 'on': 0x01, 'restore': 0x02};
-            utils.validateValue(value, Object.keys(lookup));
-            const payload = lookup[value];
-            await entity.write('genOnOff', {moesStartUpOnOff: payload});
-            return {state: {power_outage_memory: value}};
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('genOnOff', ['moesStartUpOnOff']);
-        },
-    },
-    moes_power_on_behavior: {
-        key: ['power_on_behavior'],
-        convertSet: async (entity, key, value, meta) => {
-            value = value.toLowerCase();
-            const lookup = {'off': 0, 'on': 1, 'previous': 2};
-            utils.validateValue(value, Object.keys(lookup));
-            const pState = lookup[value];
-            await entity.write('genOnOff', {moesStartUpOnOff: pState});
-            return {state: {power_on_behavior: value}};
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('genOnOff', ['moesStartUpOnOff']);
-        },
-    },
     moes_switch: {
         key: ['power_on_behavior', 'indicate_light'],
         convertSet: async (entity, key, value, meta) => {
@@ -3915,19 +3887,6 @@ const converters = {
             return {state: {state: value.toUpperCase()}};
         },
     },
-    tuya_switch_type: {
-        key: ['switch_type'],
-        convertSet: async (entity, key, value, meta) => {
-            value = value.toLowerCase();
-            const lookup = {'toggle': 0, 'state': 1, 'momentary': 2};
-            utils.validateValue(value, Object.keys(lookup));
-            await entity.write('manuSpecificTuya_3', {'switchType': lookup[value]}, {disableDefaultResponse: true});
-            return {state: {switch_type: value}};
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('manuSpecificTuya_3', ['switchType']);
-        },
-    },
     tuya_min_brightness: {
         key: ['min_brightness'],
         convertSet: async (entity, key, value, meta) => {
@@ -6231,46 +6190,6 @@ const converters = {
             await entity.read('closuresWindowCovering', ['moesCalibrationTime']);
         },
     },
-    tuya_backlight_mode: {
-        key: ['backlight_mode'],
-        convertSet: async (entity, key, value, meta) => {
-            const lookup = {'LOW': 0, 'MEDIUM': 1, 'HIGH': 2};
-            value = value.toUpperCase();
-            utils.validateValue(value, Object.keys(lookup));
-            const backlight = lookup[value];
-            await entity.write('genOnOff', {tuyaBacklightMode: backlight});
-            return {state: {backlight_mode: value}};
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('genOnOff', ['tuyaBacklightMode']);
-        },
-    },
-    ts011f_plug_indicator_mode: {
-        key: ['indicator_mode'],
-        convertSet: async (entity, key, value, meta) => {
-            if (typeof value === 'string') {
-                value = value.toLowerCase();
-                const lookup = {'off': 0, 'off/on': 1, 'on/off': 2, 'on': 3};
-                utils.validateValue(value, Object.keys(lookup));
-                value = lookup[value];
-            }
-
-            if (typeof value === 'number' && value >= 0 && value <= 3) {
-                await entity.write('genOnOff', {tuyaBacklightMode: value});
-            } else {
-                meta.logger.warn(`toZigbee.ts011f_plug_indicator_mode: Unsupported value ${value}`);
-            }
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('genOnOff', ['tuyaBacklightMode']);
-        },
-    },
-    ts011f_plug_child_mode: {
-        key: ['child_lock'],
-        convertSet: async (entity, key, value, meta) => {
-            await entity.write('genOnOff', {0x8000: {value: value === 'LOCK', type: 0x10}});
-        },
-    },
     hy_thermostat: {
         key: [
             'child_lock', 'current_heating_setpoint', 'local_temperature_calibration',

package/devices/alecto.js

@@ -62,6 +62,7 @@ module.exports = [
     {
         fingerprint: [
             {modelID: 'daqwrsj\u0000', manufacturerName: '_TYST11_8daqwrsj'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_qtbrwrfv'},
         ],
         model: 'SMART-HEAT10',
         vendor: 'Alecto',

package/devices/girier.js

@@ -1,8 +1,5 @@
-const fz = require('../converters/fromZigbee');
-const tz = require('../converters/toZigbee');
-const exposes = require('../lib/exposes');
+const tuya = require('../lib/tuya');
 const reporting = require('../lib/reporting');
-const extend = require('../lib/extend');
 
 module.exports = [
     {
@@ -13,9 +10,7 @@ module.exports = [
         model: 'JR-ZDS01',
         vendor: 'Girier',
         description: '1 gang mini switch',
-        toZigbee: extend.switch().toZigbee.concat([tz.moes_power_on_behavior, tz.tuya_switch_type]),
-        fromZigbee: extend.switch().fromZigbee.concat([fz.moes_power_on_behavior, fz.tuya_switch_type]),
-        exposes: extend.switch().exposes.concat([exposes.presets.power_on_behavior(), exposes.presets.switch_type_2()]),
+        extend: tuya.extend.switch({switchType: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
         },

package/devices/lellki.js

@@ -34,14 +34,11 @@ module.exports = [
         model: 'JZ-ZB-001',
         description: 'Smart plug (without power monitoring)',
         vendor: 'LELLKI',
-        fromZigbee: [fz.on_off, fz.tuya_switch_power_outage_memory],
-        toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory],
+        extend: tuya.extend.switch({powerOutageMemory: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
         },
-        exposes: [e.switch(), exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
-            .withDescription('Recover state after power outage')],
     },
     {
         zigbeeModel: ['JZ-ZB-003'],
@@ -88,9 +85,7 @@ module.exports = [
         model: 'XF-EU-S100-1-M',
         description: 'Touch switch 1 gang (with power monitoring)',
         vendor: 'LELLKI',
-        extend: extend.switch(),
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, fz.tuya_switch_power_outage_memory],
-        toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory],
+        extend: tuya.extend.switch({powerOutageMemory: true, electricalMeasurements: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
@@ -99,9 +94,6 @@ module.exports = [
             device.save();
         },
         options: [exposes.options.measurement_poll_interval()],
-        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE),
-            e.energy(), exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
-                .withDescription('Recover state after power outage')],
         onEvent: tuya.onEventMeasurementPoll,
     },
     {
@@ -109,8 +101,7 @@ module.exports = [
         model: 'WK34-EU',
         description: 'Power socket EU (with power monitoring)',
         vendor: 'LELLKI',
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, fz.tuya_switch_power_outage_memory],
-        toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory],
+        extend: tuya.extend.switch({powerOutageMemory: true, electricalMeasurements: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
@@ -120,9 +111,6 @@ module.exports = [
             device.save();
         },
         options: [exposes.options.measurement_poll_interval()],
-        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE),
-            e.energy(), exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
-                .withDescription('Recover state after power outage')],
         onEvent: tuya.onEventMeasurementPoll,
     },
     {
@@ -132,8 +120,8 @@ module.exports = [
         vendor: 'LELLKI',
         extend: extend.switch(),
         fromZigbee: [fz.on_off_force_multiendpoint, fz.electrical_measurement, fz.metering, fz.ignore_basic_report,
-            fz.tuya_switch_power_outage_memory],
-        toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory],
+            tuya.fz.power_outage_memory],
+        toZigbee: [tz.on_off, tuya.tz.power_on_behavior],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);

package/devices/lidl.js

@@ -8,7 +8,6 @@ const ea = exposes.access;
 const tuya = require('../lib/tuya');
 const globalStore = require('../lib/store');
 const ota = require('../lib/ota');
-const utils = require('../lib/utils');
 
 const tuyaLocal = {
     dataPoints: {
@@ -142,20 +141,6 @@ const fzLocal = {
             }
         },
     },
-    metering_skip_duplicate: {
-        ...fz.metering,
-        convert: (model, msg, publish, options, meta) => {
-            if (utils.hasAlreadyProcessedMessage(msg, model)) return;
-            return fz.metering.convert(model, msg, publish, options, meta);
-        },
-    },
-    electrical_measurement_skip_duplicate: {
-        ...fz.electrical_measurement,
-        convert: (model, msg, publish, options, meta) => {
-            if (utils.hasAlreadyProcessedMessage(msg, model)) return;
-            return fz.electrical_measurement.convert(model, msg, publish, options, meta);
-        },
-    },
 };
 const tzLocal = {
     zs_thermostat_child_lock: {
@@ -403,9 +388,7 @@ module.exports = [
         vendor: 'Lidl',
         description: 'Silvercrest smart plug with power monitoring (EU, FR)',
         ota: ota.zigbeeOTA,
-        fromZigbee: [fz.on_off, fzLocal.electrical_measurement_skip_duplicate, fzLocal.metering_skip_duplicate, fz.ignore_basic_report,
-            fz.tuya_switch_power_outage_memory, fz.ts011f_plug_indicator_mode, fz.ts011f_plug_child_mode],
-        toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory, tz.ts011f_plug_indicator_mode, tz.ts011f_plug_child_mode],
+        extend: tuya.extend.switch({electricalMeasurements: true, powerOutageMemory: true, indicatorMode: true, childLock: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
@@ -419,11 +402,6 @@ module.exports = [
             device.save();
         },
         options: [exposes.options.measurement_poll_interval().withDescription('Only the energy value is polled for this device.')],
-        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE),
-            e.energy(), exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
-                .withDescription('Recover state after power outage'),
-            exposes.enum('indicator_mode', ea.ALL, ['off', 'off/on', 'on/off', 'on'])
-                .withDescription('Plug LED indicator mode'), e.child_lock()],
         onEvent: (type, data, device, options) => tuya.onEventMeasurementPoll(type, data, device, options, false, true),
     },
     {

package/devices/lonsonho.js

@@ -3,6 +3,7 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+const tuya = require('../lib/tuya');
 const utils = require('../lib/utils');
 const e = exposes.presets;
 const ea = exposes.access;
@@ -62,8 +63,9 @@ module.exports = [
         model: '11830304',
         vendor: 'Lonsonho',
         description: 'Curtain switch',
-        fromZigbee: [fz.cover_position_tilt, fz.tuya_backlight_mode, fz.tuya_cover_options],
-        toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.tuya_cover_calibration, tz.tuya_cover_reversal, tz.tuya_backlight_mode],
+        fromZigbee: [fz.cover_position_tilt, tuya.fz.backlight_mode, fz.tuya_cover_options],
+        toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.tuya_cover_calibration, tz.tuya_cover_reversal,
+            tuya.tz.backlight_indicator_mode],
         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'),
@@ -271,9 +273,9 @@ module.exports = [
         vendor: 'Lonsonho',
         description: 'Zigbee smart dimmer module 2 gang with neutral',
         fromZigbee: extend.light_onoff_brightness({disablePowerOnBehavior: true, disableMoveStep: true, disableTransition: true})
-            .fromZigbee.concat([fz.tuya_switch_power_outage_memory, fzLocal.TS110E_switch_type]),
+            .fromZigbee.concat([tuya.fz.power_outage_memory, fzLocal.TS110E_switch_type]),
         toZigbee: extend.light_onoff_brightness({disablePowerOnBehavior: true, disableMoveStep: true, disableTransition: true})
-            .toZigbee.concat([tz.tuya_switch_power_outage_memory, tzLocal.TS110E_switch_type]),
+            .toZigbee.concat([tuya.tz.power_on_behavior, tzLocal.TS110E_switch_type]),
         meta: {multiEndpoint: true},
         exposes: [
             e.light_brightness().withEndpoint('l1'),

package/devices/mecrator.js

@@ -12,13 +12,11 @@ module.exports = [
         model: 'SPP04G',
         vendor: 'Mercator',
         description: 'Ikuü Quad Power Point',
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, fz.tuya_switch_power_outage_memory],
-        toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory],
+        extend: tuya.extend.switch({powerOutageMemory: true, electricalMeasurements: true, endpoints: ['left', 'right']}),
         exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right'),
             e.power().withEndpoint('left'), e.current().withEndpoint('left'),
             e.voltage().withEndpoint('left').withAccess(ea.STATE), e.energy(),
-            exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
-                .withDescription('Recover state after power outage')],
+            tuya.exposes.powerOutageMemory()],
         endpoint: (device) => {
             return {left: 1, right: 2};
         },
@@ -36,8 +34,7 @@ module.exports = [
         model: 'SPP02GIP',
         vendor: 'Mercator',
         description: 'Ikuü double outdoors power point',
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, fz.tuya_switch_power_outage_memory],
-        toZigbee: [tz.on_off],
+        extend: tuya.extend.switch({powerOutageMemory: true, electricalMeasurements: true, endpoints: ['left', 'right']}),
         exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right'),
             e.power().withEndpoint('left'), e.current().withEndpoint('left'),
             e.voltage().withEndpoint('left').withAccess(ea.STATE), e.energy()],
@@ -85,15 +82,11 @@ module.exports = [
         model: 'SPPUSB02',
         vendor: 'Mercator',
         description: 'Ikuü double power point with USB',
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, fz.tuya_switch_power_outage_memory],
-        toZigbee: [tz.on_off],
+        extend: tuya.extend.switch({powerOutageMemory: true, electricalMeasurements: true, endpoints: ['left', 'right']}),
         exposes: [
-            e.switch().withEndpoint('left'),
-            e.switch().withEndpoint('right'),
-            e.power().withEndpoint('left'),
-            e.current().withEndpoint('left'),
-            e.voltage().withEndpoint('left').withAccess(ea.STATE),
-            e.energy(),
+            e.switch().withEndpoint('left'), e.switch().withEndpoint('right'),
+            e.power().withEndpoint('left'), e.current().withEndpoint('left'), e.voltage().withEndpoint('left').withAccess(ea.STATE),
+            e.energy(), tuya.exposes.powerOutageMemory(),
         ],
         endpoint: (device) => {
             return {left: 1, right: 2};

package/devices/moes.js

@@ -26,13 +26,7 @@ module.exports = [
         model: 'ZP-LZ-FR2U',
         vendor: 'Moes',
         description: 'Zigbee 3.0 dual USB wireless socket plug',
-        fromZigbee: [fz.on_off, fz.tuya_switch_power_outage_memory, fz.ts011f_plug_indicator_mode, fz.ts011f_plug_child_mode],
-        toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory, tz.ts011f_plug_indicator_mode, tz.ts011f_plug_child_mode],
-        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'),
-            exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
-                .withDescription('Recover state after power outage'),
-            exposes.enum('indicator_mode', ea.ALL, ['off', 'off/on', 'on/off', 'on'])
-                .withDescription('Plug LED indicator mode'), e.child_lock()],
+        extend: tuya.extend.switch({powerOutageMemory: true, indicatorMode: true, childLock: true, endpoints: ['l1', 'l2']}),
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2};
         },
@@ -51,12 +45,7 @@ module.exports = [
         model: 'MS-104Z',
         description: 'Smart light switch module (1 gang)',
         vendor: 'Moes',
-        toZigbee: extend.switch().toZigbee.concat([tz.moes_power_on_behavior]),
-        fromZigbee: extend.switch().fromZigbee.concat([fz.moes_power_on_behavior]),
-        extend: extend.switch(),
-        exposes: [e.switch(),
-            exposes.enum('power_on_behavior', ea.ALL, ['on', 'off', 'previous'])
-                .withDescription('Controls the behaviour when the device is powered on')],
+        extend: tuya.extend.switch({powerOnBehavior: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
@@ -74,13 +63,8 @@ module.exports = [
         model: 'MS-104BZ',
         description: 'Smart light switch module (2 gang)',
         vendor: 'Moes',
-        toZigbee: extend.switch().toZigbee.concat([tz.moes_power_on_behavior]),
-        fromZigbee: extend.switch().fromZigbee.concat([fz.moes_power_on_behavior]),
-        extend: extend.switch(),
+        extend: tuya.extend.switch({endpoints: ['l1', 'l2']}),
         meta: {multiEndpoint: true},
-        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'),
-            exposes.enum('power_on_behavior', ea.ALL, ['on', 'off', 'previous'])
-                .withDescription('Controls the behaviour when the device is powered on')],
         endpoint: (device) => {
             return {l1: 1, l2: 2};
         },
@@ -414,15 +398,7 @@ module.exports = [
         model: 'ZS-EUB_1gang',
         vendor: 'Moes',
         description: 'Wall light switch (1 gang)',
-        toZigbee: extend.switch().toZigbee.concat([tz.moes_power_on_behavior, tz.tuya_switch_type, tz.tuya_backlight_mode]),
-        fromZigbee: extend.switch().fromZigbee.concat([fz.moes_power_on_behavior, fz.tuya_switch_type, fz.tuya_backlight_mode]),
-        exposes: [
-            e.switch(),
-            exposes.presets.power_on_behavior(),
-            exposes.presets.switch_type_2(),
-            exposes.enum('backlight_mode', ea.ALL, ['LOW', 'MEDIUM', 'HIGH'])
-                .withDescription('Indicator light status: LOW: Off | MEDIUM: On| HIGH: Inverted'),
-        ],
+        extend: tuya.extend.switch({backlightMode: true, switchType: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
             device.powerSource = 'Mains (single phase)';

package/devices/philips.js

@@ -1345,7 +1345,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
     {
-        zigbeeModel: ['3261331P6'],
+        zigbeeModel: ['3261331P6', '929003055301'],
         model: '3261331P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Still',
@@ -2935,4 +2935,14 @@ module.exports = [
         description: 'Hue Festavia gradient light string 250',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['915005987101'],
+        model: '915005987101',
+        vendor: 'Philips',
+        description: 'Hue Gradient Signe floor lamp (white)',
+        toZigbee: [tzLocal.gradient_scene, ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).toZigbee],
+        exposes: [exposes.enum('gradient_scene', ea.SET, Object.keys(gradientScenes)),
+            ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).exposes],
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
 ];

package/devices/third_reality.js

@@ -12,6 +12,7 @@ module.exports = [
         model: '3RSS009Z',
         vendor: 'Third Reality',
         description: 'Smart switch Gen3',
+        ota: ota.zigbeeOTA,
         fromZigbee: [fz.on_off, fz.battery],
         toZigbee: [tz.on_off, tz.ignore_transition],
         exposes: [e.switch(), e.battery_voltage()],
@@ -103,6 +104,7 @@ module.exports = [
         vendor: 'Third Reality',
         description: 'Zigbee / BLE smart plug',
         extend: extend.switch(),
+        ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);