zigbee-herdsman-converters 14.0.593 → 14.0.596

package/devices/climax.js

@@ -91,7 +91,7 @@ module.exports = [
         },
         exposes: [e.battery_low(), e.tamper(), e.warning(),
             exposes.numeric('max_duration', ea.ALL).withUnit('s').withValueMin(0).withValueMax(600).withDescription('Duration of Siren'),
-            exposes.binary('alarm', ea.SET, 'ON', 'OFF').withDescription('Manual start of siren')],
+            exposes.binary('alarm', ea.SET, 'START', 'OFF').withDescription('Manual start of siren')],
     },
     {
         zigbeeModel: ['WS15_00.00.00.14TC'],

package/devices/develco.js

@@ -8,6 +8,35 @@ const ota = require('../lib/ota');
 const e = exposes.presets;
 const ea = exposes.access;
 
+const fzLocal = {
+    // SPLZB-134 reports strange values sometimes
+    // https://github.com/Koenkk/zigbee2mqtt/issues/13329
+    SPLZB134_electrical_measurement: {
+        ...fz.electrical_measurement,
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data.rmsVoltage !== 0xFFFF && msg.data.rmsCurrent !== 0xFFFF && msg.data.activePower !== -0x8000) {
+                return fz.electrical_measurement.convert(model, msg, publish, options, meta);
+            }
+        },
+    },
+    SPLZB134_device_temperature: {
+        ...fz.device_temperature,
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data.currentTemperature !== -0x8000) {
+                return fz.device_temperature.convert(model, msg, publish, options, meta);
+            }
+        },
+    },
+    SPLZB134_metering: {
+        ...fz.metering,
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data.instantaneousDemand !== -0x800000) {
+                return fz.metering.convert(model, msg, publish, options, meta);
+            }
+        },
+    },
+};
+
 module.exports = [
     {
         zigbeeModel: ['SPLZB-131'],
@@ -65,7 +94,7 @@ module.exports = [
         model: 'SPLZB-134',
         vendor: 'Develco',
         description: 'Power plug (type G)',
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.device_temperature],
+        fromZigbee: [fz.on_off, fzLocal.SPLZB134_electrical_measurement, fzLocal.SPLZB134_metering, fzLocal.SPLZB134_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) => {

package/devices/ecodim.js

@@ -8,9 +8,9 @@ module.exports = [
     {
         fingerprint: [
             {type: 'Router', manufacturerName: 'EcoDim BV', modelID: 'EcoDim-Zigbee 3.0', endpoints: [
-                {ID: 1, profileID: 260, deviceID: 257, inputClusters: [0, 3, 4, 5, 6, 8, 2821, 4096], outputClusters: [25]},
-                {ID: 2, profileID: 260, deviceID: 257, inputClusters: [0, 3, 4, 5, 6, 8], outputClusters: []},
-                {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
+                {ID: 1, profileID: 260, inputClusters: [0, 3, 4, 5, 6, 8, 2821, 4096], outputClusters: [25]},
+                {ID: 2, profileID: 260, inputClusters: [0, 3, 4, 5, 6, 8], outputClusters: []},
+                {ID: 242, profileID: 41440, inputClusters: [], outputClusters: [33]},
             ]},
         ],
         model: 'Eco-Dim.05',

package/devices/giex.js

@@ -118,8 +118,8 @@ module.exports = [
             e.battery(),
             exposes.binary('state', ea.STATE_SET, 'ON', 'OFF').withDescription('State'),
             exposes.enum('mode', ea.STATE_SET, ['duration', 'capacity']).withDescription('Irrigation mode'),
-            exposes.numeric('irrigation_target', exposes.access.STATE_SET).withValueMin(0).withValueMax(1440).withUnit('mintues or Litres')
-                .withDescription('Irrigation Target, duration in minutes or capacity in Liters (depending on mode)'),
+            exposes.numeric('irrigation_target', exposes.access.STATE_SET).withValueMin(0).withValueMax(1440).withUnit('minutes or Litres')
+                .withDescription('Irrigation Target, duration in minutes or capacity in Litres (depending on mode)'),
             exposes.numeric('cycle_irrigation_num_times', exposes.access.STATE_SET).withValueMin(0).withValueMax(100).withUnit('#')
                 .withDescription('Number of cycle irrigation times, set to 0 for single cycle'),
             exposes.numeric('cycle_irrigation_interval', exposes.access.STATE_SET).withValueMin(0).withValueMax(1440).withUnit('min')

package/devices/iluminize.js

@@ -5,6 +5,7 @@ const extend = require('../lib/extend');
 const tz = require('../converters/toZigbee');
 const ota = require('../lib/ota');
 const e = exposes.presets;
+const ea = exposes.access;
 
 module.exports = [
     {
@@ -160,7 +161,14 @@ module.exports = [
             fz.command_step, fz.command_recall, fz.command_on, fz.command_off],
         exposes: [e.battery(), e.action([
             'color_move', 'color_temperature_move', 'hue_move', 'hue_stop', 'brightness_step_up', 'brightness_step_down',
-            'recall_*', 'on', 'off'])],
+            'recall_*', 'on', 'off']),
+        //    exposes.composite('action_color', 'action_color') * At the moment not shown in Frontend correctly
+        //       .withFeature(exposes.numeric('x', ea.STATE))     see: https://github.com/nurikk/zigbee2mqtt-frontend/issues/1535
+        //       .withFeature(exposes.numeric('y', ea.STATE)),
+        exposes.numeric('action_color_temperature', ea.STATE).withUnit('mired'),
+        exposes.numeric('action_group', ea.STATE),
+        exposes.numeric('action_transition_time', ea.STATE),
+        exposes.text('action_color', ea.STATE)],
         toZigbee: [],
         meta: {multiEndpoint: true},
         endpoint: (device) => {

package/devices/istar.js

@@ -9,4 +9,12 @@ module.exports = [
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
     },
+    {
+        zigbeeModel: ['iStar CCT Light'],
+        model: 'SCCV2403-2',
+        vendor: 'iStar',
+        description: 'Zigbee 3.0 LED controller, dimmable white spectrum',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+        meta: {turnsOffAtBrightness1: true},
+    },
 ];

package/devices/legrand.js

@@ -110,6 +110,7 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBinaryInput', 'closuresWindowCovering', 'genIdentify']);
+            await reporting.currentPositionLiftPercentage(endpoint);
         },
         exposes: [e.cover_position()],
     },

package/devices/philips.js

@@ -84,6 +84,96 @@ const fzLocal = {
     },
 };
 
+const gradientScenes = {
+    'blossom': '50010400135000000039d553d2955ba5287a9f697e25fb802800',
+    'crocus': '50010400135000000050389322f97f2b597343764cc664282800',
+    'precious': '5001040013500000007fa8838bb9789a786d7577499a773f2800',
+    'narcissa': '500104001350000000b0498a5c0a888fea89eb0b7ee15c742800',
+    'beginnings': '500104001350000000b3474def153e2ad42e98232c7483292800',
+    'first_light': '500104001350000000b28b7900e959d3f648a614389723362800',
+    'horizon': '500104001350000000488b7d6cbb750c6642f1133cc4033c2800',
+    'valley_dawn': '500104001350000000c1aa7de03a7a8ce861c7c4410d94412800',
+    'sunflare': '500104001350000000d0aa7d787a7daf197590154d6c14472800',
+    'emerald_flutter': '5001040013500000006a933977e34bb0d35e916468f246792800',
+    'memento': '500104001350000000f87318a3e31962331ec3532cceea892800',
+    'resplendent': '500104001350000000278b6d257a58efe84204273a35f5252800',
+    'scarlet_dream': '500104001350000000b02c654e4c5b45ab51fb0950d6c84d2800',
+    'lovebirds': '50010400135000000053ab84ea1a7e35fb7c098c73994c772800',
+    'smitten': '500104001350000000fe7b70a74b6aa42b65811b60550a592800',
+    'glitz_and_glam': '500104001350000000cc193cb9b845bad9521d1c77bf6c712800',
+    'promise': '500104001350000000258b606eca6b28d6382db445df26812800',
+    'ruby_romance': '5001040013500000000edb63cbcb6bac0c670b2d58204e572800',
+    'city_of_love': '50010400135000000055830e5cf31b6aa339d2ec70908b802800',
+    'honolulu': '500104001350000000dbfd59866c6378ec6c45cc765c0a822800',
+    'savanna_sunset': '50010400135000000005ae65c38c6c6b4b7573ca820fc9832800',
+    'golden_pond': '5001040013500000007e4a88cc4a8605db8728ec7b666c792800',
+    'runy_glow': '50010400135000000095bb53ac2a56eb99591e095c54985e2800',
+    'tropical_twilight': '500104001350000000408523a0b636e777524c0a71a76c6e2800',
+    'miami': '50010400135000000022ec61e6d94902d83766c3305a43182800',
+    'cancun': '500104001350000000a7eb54673d55944e6265fd6e26bb842800',
+    'rio': '500104001350000000a26526088c51a74b58ea6b7137ba892800',
+    'chinatown': '500104001350000000b33e5b408e59d90d5b4c6c6360ac792800',
+    'ibiza': '500104001350000000014d6d708c73827b7b6c7a8887f98a2800',
+    'osaka': '500104001350000000d649510b5c4deb7c5d8b6d6d2b9b802800',
+    'tokyo': '500104001350000000d1c311665331d3451fd59c4e394c7b2800',
+    'motown': '50010400135000000055730e5db3156623306c533d7a235c2800',
+    'fairfax': '50010400135000000072d34a3664477d7a61581d5fc08e5b2800',
+    'galaxy': '500104001350000000a6cb638b2a4f8cfa549bb9549ff73a2800',
+    'starlight': '5001040013500000008d897134a9653ec854d2963ed1d4282800',
+    'blood moon': '500104001350000000202a6987c8599ee647ec632779c3142800',
+    'artic_aurora': '50010400135000000082548922057511046571c32d5b93192800',
+    'moonlight': '50010400135000000055730e5e9320c1832e96243ebec7652800',
+    'nebula': '50010400135000000026c852e106460d653ee745342964142800',
+    'sundown': '500104001350000000f37c68157c6d8efa755ac5512e24332800',
+    'blue_lagoon': '50010400135000000088c3623975699ea672a0c8831ada6d2800',
+    'palm_beach': '5001040013500000005ec4679ba56077f85a80ea64639c6a2800',
+    'lake_placid': '5001040013500000002eab69239a692d996552c54c39743a2800',
+    'mountain_breeze': '500104001350000000df843d2355419195465a98674ca97b2800',
+    'lake_mist': '500104001350000000e3286f39b96859f86266e54ded943f2800',
+    'ocean_dawn': '5001040013500000005cf9779da97105b96b07485e32564a2800',
+    'frosty_dawn': '5001040013500000006d6883bca87e3029758ec9722d6a722800',
+    'sunday_morning': '5001040013500000002c586dc6f87345997c63f983f777892800',
+    'emerald_isle': '500104001350000000e535628dc57ed2667d8b687d1e2a812800',
+    'spring_blossom': '500104001350000000a8b75fd0c75826b851a7094d305b652800',
+    'midsummer_sun': '500104001350000000002984799984dd29848eba836c0b7f2800',
+    'autumn_gold': '500104001350000000435a7817aa7ba3f979a8a981f3c9852800',
+    'spring_lake': '5001040013500000004a976d3347736e677561b77a4b07812800',
+    'winter_mountain': '5001040013500000002c555c68c55d7c555ef165606136622800',
+    'midwinter': '500104001350000000bda5532c554dbd254cd5a4428d94392800',
+    'amber_bloom': '500104001350000000739d67f2bc7372ec78a0ab78be8a6f2800',
+    'lily': '5001040013500000009cfc76c5ab793d4a6a1a9b586b9c522800',
+    'painted_sky': '500104001350000000d1c424c3d63783384c3f7a6a83bd6d2800',
+    'winter_beauty': '500104001350000000e2335ea7b4942467952db986a7ab7b2800',
+    'orange_fields': '500104001350000000409c69694c79eafa88498a8fb867aa2800',
+    'forest_adventure': '50010400135000000023999bbd76b363d4b674d3415fb3222800',
+    'blue_planet': '50010400135000000037a7a3a403b489737b2b746e6873362800',
+    'soho': '500104001350000000c52c4e220b6eed8a53d404192b04782800',
+    'vapor_wave': '500104001350000000e1c32401251acb183ac31b8051ea842800',
+    'magneto': '50010400135000000077b3286d9340b9e3662d99943c9b852800',
+    'tyrell': '500104001350000000ef4419a898370ea84698353574434e2800',
+    'disturbia': '50010400135000000084f371a4845e6998388c3b4f57ce582800',
+    'hal': '50010400135000000075f351a6244cf6dc5d480c658cda862800',
+    'golden_star': '5001040013500000007a4a8702eb8372ac7892cd61d51e5c2800',
+    'under_the_tree': '5001040013500000001de498b9a3cc0c9b8563bb6cc1ae5d2800',
+    'silent_night': '5001040013500000009e296a245a6f660a75086b70953b6e2800',
+    'rosy_sparkle': '500104001350000000810967c63a6cb2aa5ea7094eddd73c2800',
+    'festive_fun': '5001040013500000005a9318de53123e9414fdcc67839d612800',
+    'colour_burst': '500104001350000000f2731ff0c6266a6c64246e57d4f98f2800',
+    'crystalline': '5001040013500000006ea96a92a85e58074e18543d9cf3332800',
+};
+
+const tzLocal = {
+    gradient_scene: {
+        key: ['gradient_scene'],
+        convertSet: async (entity, key, value, meta) => {
+            const scene = gradientScenes[value];
+            if (!scene) throw new Error(`Gradient scene '${value}' is unknown`);
+            const payload = {data: Buffer.from(scene, 'hex')};
+            await entity.command('manuSpecificPhilips2', 'multiColor', payload);
+        },
+    },
+};
+
 module.exports = [
     {
         zigbeeModel: ['929003055801'],
@@ -134,6 +224,13 @@ module.exports = [
         description: 'Hue gradient lightstrip',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['929003045401'],
+        model: '929003045401',
+        vendor: 'Philips',
+        description: 'Hue Centura recessed spotlight white and color ambiance GU10 (black)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['929003045501_01', '929003045501_02', '929003045501_03'],
         model: '929003045501',
@@ -968,7 +1065,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['3417831P6'],
+        zigbeeModel: ['3417831P6', '929003056101'],
         model: '3417831P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Adore spotlight with Bluetooth (1 spot)',
@@ -1483,6 +1580,9 @@ module.exports = [
         model: '4080248U9',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Signe floor light',
+        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]}),
     },
     {
@@ -2071,7 +2171,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color(),
     },
     {
-        zigbeeModel: ['LCS001'],
+        zigbeeModel: ['LCS001', '1741830P7'],
         model: '1741830P7',
         vendor: 'Philips',
         description: 'Hue Lily outdoor spot light',

package/devices/robb.js

@@ -274,4 +274,24 @@ module.exports = [
             await reporting.currentSummDelivered(endpoint1, {min: 60, change: 1});
         },
     },
+    {
+        zigbeeModel: ['ROB_200-035-0'],
+        model: 'ROB_200-035-0',
+        vendor: 'ROBB',
+        description: '1 channel switch with power monitoring',
+        fromZigbee: [fz.electrical_measurement, fz.on_off, fz.ignore_genLevelCtrl_report, fz.metering],
+        toZigbee: [tz.on_off],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.onOff(endpoint);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.rmsCurrent(endpoint);
+            await reporting.activePower(endpoint);
+            await reporting.rmsVoltage(endpoint);
+            await reporting.currentSummDelivered(endpoint);
+        },
+    },
 ];

package/devices/shinasystem.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 ota = require('../lib/ota');
 const e = exposes.presets;
 const ea = exposes.access;
 
@@ -23,6 +24,7 @@ module.exports = [
             const payload = reporting.payload('presentValue', 1, 600, 0);
             await endpoint.configureReporting('genAnalogInput', payload);
         },
+        ota: ota.zigbeeOTA,
         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(50).withDescription('People count')],

package/devices/skydance.js

@@ -2,6 +2,7 @@ const exposes = require('../lib/exposes');
 const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
 const tz = require('../converters/toZigbee');
 const extend = require('../lib/extend');
+const reporting = require('../lib/reporting');
 const ea = exposes.access;
 
 module.exports = [
@@ -95,4 +96,18 @@ module.exports = [
         ],
         meta: {separateWhite: true},
     },
+    {
+        fingerprint: [{modelID: 'TS0501B', manufacturerName: '_TZB210_rkgngb5o'}],
+        model: 'WZ1',
+        vendor: 'Skydance',
+        description: 'Zigbee & RF 2 channel LED controller',
+        extend: extend.light_onoff_brightness({noConfigure: true, disableEffect: 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);
+            await reporting.brightness(endpoint);
+        },
+    },
 ];

package/devices/third_reality.js

@@ -116,8 +116,10 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'closuresWindowCovering']);
-            await reporting.batteryPercentageRemaining(endpoint);
             await reporting.currentPositionLiftPercentage(endpoint);
+            try {
+                await reporting.batteryPercentageRemaining(endpoint);
+            } catch (error) {/* Fails for some*/}
         },
         exposes: [e.cover_position(), e.battery()],
     },

package/devices/tuya.js

@@ -744,6 +744,7 @@ module.exports = [
         fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_qqjaziws'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_jtmhndw2'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_ezlg0pht'},
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_3lbtuxgp'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_5snkkrxw'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_12sxjap4'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_x2fqbdun'},
@@ -842,14 +843,15 @@ module.exports = [
         extend: extend.light_onoff_brightness(),
     },
     {
-        fingerprint: [{modelID: 'TS0202', manufacturerName: '_TYZB01_jytabjkb'}],
+        fingerprint: [{modelID: 'TS0202', manufacturerName: '_TYZB01_jytabjkb'},
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_lltemgsf'}],
         model: 'TS0202_1',
         vendor: 'TuYa',
         description: 'Motion sensor',
         // Requires alarm_1_with_timeout https://github.com/Koenkk/zigbee2mqtt/issues/2818#issuecomment-776119586
         fromZigbee: [fz.ias_occupancy_alarm_1_with_timeout, fz.battery, fz.ignore_basic_report],
         toZigbee: [],
-        exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.battery()],
+        exposes: [e.occupancy(), e.battery_low(), e.linkquality()],
     },
     {
         fingerprint: [{modelID: 'TS0202', manufacturerName: '_TYZB01_dr6sduka'},
@@ -2479,7 +2481,12 @@ module.exports = [
                 .withLocalTemperature(ea.STATE).withLocalTemperatureCalibration(-9.9, 9.9, 0.1, ea.STATE_SET)
                 .withSystemMode(['off', 'heat'], ea.STATE_SET).withRunningState(['idle', 'heat'], ea.STATE)
                 .withPreset(['manual', 'program']).withSensor(['internal', 'external', 'both'], ea.STATE_SET),
-            exposes.text('schedule', ea.STATE_SET), e.child_lock(), e.week(),
+            exposes.text('schedule', ea.STATE_SET).withDescription('There are 8 periods in the schedule in total. ' +
+                '6 for workdays and 2 for holidays. It should be set in the following format for each of the periods: ' +
+                '`hours:minutes/temperature`. All periods should be set at once and delimited by the space symbol. ' +
+                'For example: `06:00/20.5 08:00/15 11:30/15 13:30/15 17:00/22 22:00/15 06:00/20 22:00/15`. ' +
+                'The thermostat doesn\'t report the schedule by itself even if you change it manually from device'),
+            e.child_lock(), e.week(),
             exposes.enum('brightness_state', ea.STATE_SET, ['off', 'low', 'medium', 'high'])
                 .withDescription('Screen brightness'),
             exposes.binary('sound', ea.STATE_SET, 'ON', 'OFF')
@@ -2516,7 +2523,8 @@ module.exports = [
     {
         fingerprint: [{modelID: 'TS0210', manufacturerName: '_TYZB01_3zv6oleo'},
             {modelID: 'TS0210', manufacturerName: '_TYZB01_j9xxahcl'},
-            {modelID: 'TS0210', manufacturerName: '_TYZB01_kulduhbj'}],
+            {modelID: 'TS0210', manufacturerName: '_TYZB01_kulduhbj'},
+            {modelID: 'TS0210', manufacturerName: '_TZ3000_bmfw9ykl'}],
         model: 'TS0210',
         vendor: 'TuYa',
         description: 'Vibration sensor',
@@ -2804,7 +2812,7 @@ module.exports = [
                 .withFeature(exposes.binary('over_leakage_current_trip', ea.STATE_SET, 'ON', 'OFF'))
                 .withFeature(exposes.binary('over_leakage_current_alarm', ea.STATE_SET, 'ON', 'OFF'))
                 .withFeature(exposes.binary('self_test', ea.STATE_SET, 'test', 'clear')),*/
-            exposes.enum('clear_device_data', ea.SET, ['clear']),
+            exposes.enum('clear_device_data', ea.SET, ['']),
         ],
     },
     {
@@ -3021,7 +3029,7 @@ module.exports = [
                 .withDescription('Favorite position of this cover'),
             exposes.binary(`reverse_direction`, ea.STATE_SET, true, false).withDescription(`Inverts the cover direction`),
             exposes.text('motor_type', ea.STATE),
-            exposes.enum('report', ea.SET, ['REPORT']),
+            exposes.enum('report', ea.SET, ['']),
         ],
     },
     {

package/devices/woolley.js

@@ -0,0 +1,17 @@
+const extend = require('../lib/extend');
+const reporting = require('../lib/reporting');
+
+module.exports = [
+    {
+        zigbeeModel: ['Z111PL0H-1JX'],
+        model: 'SA-029',
+        vendor: 'Woolley',
+        description: 'Smart Plug',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
+];

package/devices/xiaomi.js

@@ -312,6 +312,7 @@ module.exports = [
             // set "event" mode
             await endpoint1.write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.switch.b2laus01'],
@@ -332,6 +333,7 @@ module.exports = [
             await reporting.bind(endpoint2, coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(endpoint2);
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.switch.b1naus01'],
@@ -344,6 +346,7 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(endpoint);
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.switch.b2naus01'],
@@ -364,6 +367,7 @@ module.exports = [
             await reporting.bind(endpoint2, coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(endpoint2);
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.switch.n2acn1'],
@@ -737,6 +741,7 @@ module.exports = [
             await device.getEndpoint(1).write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
         },
         onEvent: preventReset,
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.switch.b1nacn02'],
@@ -761,6 +766,7 @@ module.exports = [
             device.powerSource = 'Mains (single phase)';
             device.save();
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.switch.b2nacn02'],
@@ -1045,7 +1051,7 @@ module.exports = [
                 'sensor detects approaching'),
             exposes.enum('motion_sensitivity', ea.ALL, ['low', 'medium', 'high']).withDescription('Different sensitivities ' +
                 'means different static human body recognition rate and response speed of occupied'),
-            exposes.enum('reset_nopresence_status', ea.SET, ['Reset']).withDescription('Reset the status of no presence'),
+            exposes.enum('reset_nopresence_status', ea.SET, ['']).withDescription('Reset the status of no presence'),
             e.device_temperature(), e.power_outage_count()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -1304,10 +1310,10 @@ module.exports = [
             exposes.numeric('gas_density', ea.STATE_GET).withUnit('%LEL').withDescription('Value of gas concentration'),
             exposes.enum('gas_sensitivity', ea.ALL, ['10%LEL', '15%LEL']).withDescription('Gas concentration value at which ' +
                 'an alarm is triggered ("10%LEL" is more sensitive than "15%LEL")'),
-            exposes.enum('selftest', ea.SET, ['Test']).withDescription('Starts the self-test process (checking the indicator ' +
+            exposes.enum('selftest', ea.SET, ['']).withDescription('Starts the self-test process (checking the indicator ' +
                 'light and buzzer work properly)'),
             exposes.binary('test', ea.STATE, true, false).withDescription('Self-test in progress'),
-            exposes.enum('mute_buzzer', ea.SET, ['Mute']).withDescription('Mute the buzzer for 10 minutes (buzzer cannot be ' +
+            exposes.enum('mute_buzzer', ea.SET, ['']).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.binary('linkage_alarm', ea.ALL, true, false).withDescription('When this option is enabled and a gas leak ' +
@@ -1338,10 +1344,10 @@ module.exports = [
         exposes: [e.smoke().withAccess(ea.STATE_GET),
             exposes.numeric('smoke_density', ea.STATE_GET).withDescription('Value of smoke concentration'),
             exposes.numeric('smoke_density_dbm', ea.STATE).withUnit('dB/m').withDescription('Value of smoke concentration in dB/m'),
-            exposes.enum('selftest', ea.SET, ['Test']).withDescription('Starts the self-test process (checking the indicator ' +
+            exposes.enum('selftest', ea.SET, ['']).withDescription('Starts the self-test process (checking the indicator ' +
                 'light and buzzer work properly)'),
             exposes.binary('test', ea.STATE, true, false).withDescription('Self-test in progress'),
-            exposes.enum('mute_buzzer', ea.SET, ['Mute']).withDescription('Mute the buzzer for 80 seconds (buzzer cannot be ' +
+            exposes.enum('mute_buzzer', ea.SET, ['']).withDescription('Mute the buzzer for 80 seconds (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.binary('heartbeat_indicator', ea.ALL, true, false).withDescription('When this option is enabled then in ' +
@@ -1392,6 +1398,7 @@ module.exports = [
         fromZigbee: [fz.DJT12LM_vibration],
         exposes: [e.action(['vibration'])],
         toZigbee: [],
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.curtain'],
@@ -1681,6 +1688,7 @@ module.exports = [
         vendor: 'Xiaomi',
         description: 'Aqara smart RGBW light controller',
         extend: extend.light_onoff_brightness_colortemp_color({supportsHS: true}),
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.light.cbacn1'],
@@ -1688,6 +1696,7 @@ module.exports = [
         vendor: 'Xiaomi',
         description: 'Aqara zigbee LED-controller ',
         extend: extend.light_onoff_brightness(),
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.switch.n0agl1'],
@@ -1771,37 +1780,37 @@ module.exports = [
         },
         exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('center'),
             e.switch().withEndpoint('right'),
-            exposes.binary('standby_enabled', ea.SET, true, false).withDescription('Enable standby'),
-            exposes.enum('theme', ea.SET, ['classic', 'concise']).withDescription('Display theme'),
-            exposes.enum('beep_volume', ea.SET, ['mute', 'low', 'medium', 'high']).withDescription('Beep volume'),
-            exposes.numeric('lcd_brightness', ea.SET).withValueMin(1).withValueMax(100).withUnit('%')
+            exposes.binary('standby_enabled', ea.STATE_SET, true, false).withDescription('Enable standby'),
+            exposes.enum('theme', ea.STATE_SET, ['classic', 'concise']).withDescription('Display theme'),
+            exposes.enum('beep_volume', ea.STATE_SET, ['mute', 'low', 'medium', 'high']).withDescription('Beep volume'),
+            exposes.numeric('lcd_brightness', ea.STATE_SET).withValueMin(1).withValueMax(100).withUnit('%')
                 .withDescription('LCD brightness (will not persist if auto-brightness is enabled)'),
-            exposes.enum('language', ea.SET, ['chinese', 'english']).withDescription('Interface language'),
-            exposes.enum('screen_saver_style', ea.SET, ['classic', 'analog clock']).withDescription('Screen saver style'),
-            exposes.numeric('standby_time', ea.SET).withValueMin(0).withValueMax(65534).withUnit('s')
+            exposes.enum('language', ea.STATE_SET, ['chinese', 'english']).withDescription('Interface language'),
+            exposes.enum('screen_saver_style', ea.STATE_SET, ['classic', 'analog clock']).withDescription('Screen saver style'),
+            exposes.numeric('standby_time', ea.STATE_SET).withValueMin(0).withValueMax(65534).withUnit('s')
                 .withDescription('Display standby time'),
-            exposes.enum('font_size', ea.SET, ['small', 'medium', 'large']).withDescription('Display font size'),
-            exposes.binary('lcd_auto_brightness_enabled', ea.SET, true, false).withDescription('Enable LCD auto brightness'),
-            exposes.enum('homepage', ea.SET, ['scene', 'feel', 'thermostat', 'switch']).withDescription('Default display homepage'),
-            exposes.binary('screen_saver_enabled', ea.SET, true, false).withDescription('Enable screen saver'),
-            exposes.numeric('standby_lcd_brightness', ea.SET).withValueMin(1).withValueMax(100).withUnit('%')
+            exposes.enum('font_size', ea.STATE_SET, ['small', 'medium', 'large']).withDescription('Display font size'),
+            exposes.binary('lcd_auto_brightness_enabled', ea.STATE_SET, true, false).withDescription('Enable LCD auto brightness'),
+            exposes.enum('homepage', ea.STATE_SET, ['scene', 'feel', 'thermostat', 'switch']).withDescription('Default display homepage'),
+            exposes.binary('screen_saver_enabled', ea.STATE_SET, true, false).withDescription('Enable screen saver'),
+            exposes.numeric('standby_lcd_brightness', ea.STATE_SET).withValueMin(1).withValueMax(100).withUnit('%')
                 .withDescription('Standby LCD brightness'),
-            exposes.enum('available_switches', ea.SET, ['none', '1', '2', '3', '1 and 2', '1 and 3', '2 and 3', 'all'])
+            exposes.enum('available_switches', ea.STATE_SET, ['none', '1', '2', '3', '1 and 2', '1 and 3', '2 and 3', 'all'])
                 .withDescription('Control which switches are available in the switches screen (none disables switches screen)'),
             exposes.composite('switch_1_text_icon', 'switch_1_text_icon').withDescription('Switch 1 text and icon')
-                .withFeature(exposes.enum('switch_1_icon', ea.SET, ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'])
+                .withFeature(exposes.enum('switch_1_icon', ea.STATE_SET, ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'])
                     .withDescription('Icon'))
-                .withFeature(exposes.text('switch_1_text', ea.SET)
+                .withFeature(exposes.text('switch_1_text', ea.STATE_SET)
                     .withDescription('Text')),
             exposes.composite('switch_2_text_icon', 'switch_2_text_icon').withDescription('Switch 2 text and icon')
-                .withFeature(exposes.enum('switch_2_icon', ea.SET, ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'])
+                .withFeature(exposes.enum('switch_2_icon', ea.STATE_SET, ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'])
                     .withDescription('Icon'))
-                .withFeature(exposes.text('switch_2_text', ea.SET)
+                .withFeature(exposes.text('switch_2_text', ea.STATE_SET)
                     .withDescription('Text')),
             exposes.composite('switch_3_text_icon', 'switch_3_text_icon').withDescription('Switch 3 text and icon')
-                .withFeature(exposes.enum('switch_3_icon', ea.SET, ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'])
+                .withFeature(exposes.enum('switch_3_icon', ea.STATE_SET, ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'])
                     .withDescription('Icon'))
-                .withFeature(exposes.text('switch_3_text', ea.SET)
+                .withFeature(exposes.text('switch_3_text', ea.STATE_SET)
                     .withDescription('Text'))],
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
@@ -1811,6 +1820,7 @@ module.exports = [
             // await reporting.onOff(device.getEndpoint(2)); ToDo: Currently fails
             // await reporting.onOff(device.getEndpoint(3)); ToDo: Currently fails
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.remote.b28ac1'],

package/package.json

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