zigbee-herdsman-converters 15.0.94 → 15.0.96

package/devices/aldi.js

@@ -1,45 +1,8 @@
 const exposes = require('../lib/exposes');
-const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
-const tuya = require('../lib/tuya');
+const fz = require('../converters/fromZigbee');
 const e = exposes.presets;
 
 module.exports = [
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_j0gtlepx'}],
-        model: 'L122FF63H11A5.0W',
-        vendor: 'Aldi',
-        description: 'LIGHTWAY smart home LED-lamp - spot',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color(),
-        meta: {applyRedFix: true},
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_iivsrikg'}],
-        model: 'L122AA63H11A6.5W',
-        vendor: 'Aldi',
-        description: 'LIGHTWAY smart home LED-lamp - candle',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color(),
-    },
-    {
-        fingerprint: [{modelID: 'TS0502B', manufacturerName: '_TZ3000_g1glzzfk'}],
-        model: 'F122SB62H22A4.5W',
-        vendor: 'Aldi',
-        description: 'LIGHTWAY smart home LED-lamp - filament',
-        extend: tuya.extend.light_onoff_brightness_colortemp(),
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_v1srfw9x'}],
-        model: 'C422AC11D41H140.0W',
-        vendor: 'Aldi',
-        description: 'MEGOS LED panel RGB+CCT 40W 3600lm 62 x 62 cm',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color(),
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_gb5gaeca'}],
-        model: 'C422AC14D41H140.0W',
-        vendor: 'Aldi',
-        description: 'MEGOS LED panel RGB+CCT 40W 3600lm 30 x 120 cm',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color(),
-    },
     {
         fingerprint: [{modelID: 'TS1001', manufacturerName: '_TZ3000_ztrfrcsu'}],
         model: '141L100RC',

package/devices/climax.js

@@ -112,7 +112,7 @@ module.exports = [
         exposes: [e.carbon_monoxide(), e.battery_low(), e.tamper(), e.battery()],
     },
     {
-        zigbeeModel: ['KP-ACE_00.00.03.12TC'],
+        zigbeeModel: ['KP-ACE_00.00.03.12TC', 'KP-ACE_00.00.03.11TC'],
         model: 'KP-23EL-ZBS-ACE',
         vendor: 'Climax',
         description: 'Remote Keypad',

package/devices/iluminize.js

@@ -8,6 +8,18 @@ const e = exposes.presets;
 const ea = exposes.access;
 
 module.exports = [
+    {
+        zigbeeModel: ['5120.2210'],
+        model: '5120.2210',
+        vendor: 'iluminize',
+        description: 'Zigbee 3.0 actuator mini 1x 230V',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
     {
         zigbeeModel: ['511.050'],
         model: '511.050',

package/devices/lidl.js

@@ -1,5 +1,5 @@
 const exposes = require('../lib/exposes');
-const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
+const fz = require('../converters/fromZigbee');
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const e = exposes.presets;
@@ -607,16 +607,6 @@ module.exports = [
             return {'l1': 1, 'l2': 2, 'l3': 3};
         },
     },
-    {
-        fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_riwp3k79'}, {manufacturerName: '_TZ3000_riwp3k79'}],
-        model: 'HG06104A',
-        vendor: 'Lidl',
-        description: 'Livarno Lux smart LED light strip 2.5m',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_s8gkrkxk'}],
         model: 'HG06467',
@@ -626,16 +616,6 @@ module.exports = [
         fromZigbee: [fz.on_off, fz.silvercrest_smart_led_string],
         exposes: [e.light_brightness_colorhs().setAccess('brightness', ea.STATE_SET).setAccess('color_hs', ea.STATE_SET)],
     },
-    {
-        fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_odygigth'}],
-        model: 'HG06106B',
-        vendor: 'Lidl',
-        description: 'Livarno Lux E14 candle RGB',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
     {
         fingerprint: [{modelID: 'TS0504B', manufacturerName: '_TZ3210_sroezl0s'}],
         model: '14153806L',
@@ -646,205 +626,6 @@ module.exports = [
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
         },
     },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_r0xgkft5'}],
-        model: '14156506L',
-        vendor: 'Lidl',
-        description: 'Livarno Lux smart LED mood light',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0502B', manufacturerName: '_TZ3210_c2iwpxf1'}],
-        model: '14156408L',
-        vendor: 'Lidl',
-        description: 'Livarno Lux smart LED ceiling light',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_umi6vbsz'}],
-        model: 'HG08010',
-        vendor: 'Lidl',
-        description: 'Livarno Home outdoor spotlight',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_p9ao60da'}],
-        model: 'HG08008',
-        vendor: 'Lidl',
-        description: 'Livarno Home LED ceiling light',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_zbabx9wh'}],
-        model: 'HG08007',
-        vendor: 'TuYa',
-        description: 'Livarno Home outdoor LED band',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_z1vlyufu'}],
-        model: '14158704L',
-        vendor: 'Lidl',
-        description: 'Livarno Home LED floor lamp, RGBW',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_hxtfthp5'}],
-        model: '14158804L',
-        vendor: 'Lidl',
-        description: 'Livarno Home LED desk lamp RGBW',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_quqaeew6'}],
-        model: 'HG07834A',
-        vendor: 'Lidl',
-        description: 'Livarno Lux GU10 spot RGB',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_th6zqqy6'},
-            {modelID: 'TS0505B', manufacturerName: '_TZ3000_wr6g6olr'}],
-        model: 'HG07834B',
-        vendor: 'Lidl',
-        description: 'Livarno Lux E14 candle RGB',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_q50zhdsc'}],
-        model: 'HG08131C',
-        vendor: 'Lidl',
-        description: 'Livarno Home outdoor E27 bulb in set with flare',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_kdpxju99'}],
-        model: 'HG06106A',
-        vendor: 'Lidl',
-        description: 'Livarno Lux GU10 spot RGB',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_dbou1ap4'}],
-        model: 'HG06106C',
-        vendor: 'Lidl',
-        description: 'Livarno Lux E27 bulb RGB',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_qd7hej8u'}],
-        model: 'HG07834C',
-        vendor: 'Lidl',
-        description: 'Livarno Lux E27 bulb RGB',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0502A', manufacturerName: '_TZ3000_el5kt5im'}],
-        model: 'HG06492A',
-        vendor: 'Lidl',
-        description: 'Livarno Lux GU10 spot CCT',
-        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0502A', manufacturerName: '_TZ3000_oborybow'}],
-        model: 'HG06492B',
-        vendor: 'Lidl',
-        description: 'Livarno Lux E14 candle CCT',
-        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0502A', manufacturerName: '_TZ3000_49qchf10'}],
-        model: 'HG06492C',
-        vendor: 'Lidl',
-        description: 'Livarno Lux E27 bulb CCT',
-        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0502A', manufacturerName: '_TZ3000_rylaozuc'},
-            {modelID: 'TS0502A', manufacturerName: '_TZ3000_5fkufhn1'}],
-        model: '14147206L',
-        vendor: 'Lidl',
-        description: 'Livarno Lux ceiling light',
-        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0502A', manufacturerName: '_TZ3000_8uaoilu9'}],
-        model: '14153905L',
-        vendor: 'Lidl',
-        description: 'Livarno Home LED floor lamp',
-        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_9cpuaca6'}],
-        model: '14148906L',
-        vendor: 'Lidl',
-        description: 'Livarno Lux mood light RGB+CCT',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_gek6snaj'}],
-        model: '14149505L/14149506L_1',
-        vendor: 'Lidl',
-        description: 'Livarno Lux light bar RGB+CCT (black/white)',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
-        configure: async (device, coordinatorEndpoint, logger) => {
-            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
-        },
-    },
     {
         fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_iystcadi'}],
         model: '14149505L/14149506L_2',
@@ -869,22 +650,6 @@ module.exports = [
         exposes: [e.switch(), exposes.numeric('timer', ea.SET).withValueMin(1).withValueMax(10000)
             .withUnit('min').withDescription('Auto off after specific time.')],
     },
-    {
-        fingerprint: [{modelID: 'TS0501A', manufacturerName: '_TZ3000_j2w1dw29'}],
-        model: 'HG06463A',
-        vendor: 'Lidl',
-        description: 'Livarno Lux E27 ST64 filament bulb',
-        extend: tuya.extend.light_onoff_brightness(),
-        meta: {turnsOffAtBrightness1: false},
-    },
-    {
-        fingerprint: [{modelID: 'TS0501A', manufacturerName: '_TZ3000_nosnx7im'}],
-        model: 'HG06463B',
-        vendor: 'Lidl',
-        description: 'Livarno Lux E27 G95 filament bulb',
-        extend: tuya.extend.light_onoff_brightness(),
-        meta: {turnsOffAtBrightness1: false},
-    },
     {
         fingerprint: [{modelID: 'TS0101', manufacturerName: '_TZ3000_br3laukf'}],
         model: 'HG06620',
@@ -897,17 +662,6 @@ module.exports = [
             await reporting.onOff(endpoint);
         },
     },
-    {
-        fingerprint: [
-            {modelID: 'TS0501A', manufacturerName: '_TZ3000_7dcddnye'},
-            {modelID: 'TS0501A', manufacturerName: '_TZ3000_nbnmw9nc'}, // UK
-        ],
-        model: 'HG06462A',
-        vendor: 'Lidl',
-        description: 'Livarno Lux E27 A60 filament bulb',
-        extend: tuya.extend.light_onoff_brightness(),
-        meta: {turnsOffAtBrightness1: false},
-    },
     {
         fingerprint: [{modelID: 'TS0101', manufacturerName: '_TZ3000_pnzfdr9y'}],
         model: 'HG06619',
@@ -927,13 +681,6 @@ module.exports = [
         description: 'Livarno gardenspot RGB',
         extend: tuya.extend.light_onoff_brightness_colortemp_color({supportsHS: true, preferHS: true, colorTempRange: [153, 500]}),
     },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_bwlvyjwk'}],
-        model: 'HG08383B',
-        vendor: 'Lidl',
-        description: 'Livarno outdoor LED light chain',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
-    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_chyvmhay'}],
         model: '368308_2010',
@@ -990,11 +737,4 @@ module.exports = [
             }),
         ],
     },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_taspddvq'}],
-        model: 'HG08383A',
-        vendor: 'Lidl',
-        description: 'Livarno outdoor LED light chain',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
-    },
 ];

package/devices/lixee.js

@@ -319,12 +319,51 @@ const tarifsDef = {
             'EJPHPM',
             'PEJP',
         ]},
+    stand_SEM_WE_LUNDI: {
+        fname: 'Standard - Sem WE Lundi',
+        currentTarf: 'SEM WE LUNDI', excluded: [
+            'EASF07',
+            'EASF08',
+            'EASF09',
+            'EASF10',
+            'EASD02',
+            'EASD03',
+            'EASD04',
+            'DPM1',
+            'DPM2',
+            'DPM3',
+            'FPM1',
+            'FPM2',
+            'FPM3',
+            'NJOURF',
+            'NJOURF+1',
+            'PJOURF+1',
+            'PPOINTE1',
+        ]},
     stand_SEM_WE_MERCR: {
         fname: 'Standard - Sem WE Mercredi',
         currentTarf: 'SEM WE MERCREDI', excluded: [
-            'EASF04',
-            'EASF05',
-            'EASF06',
+            'EASF07',
+            'EASF08',
+            'EASF09',
+            'EASF10',
+            'EASD02',
+            'EASD03',
+            'EASD04',
+            'DPM1',
+            'DPM2',
+            'DPM3',
+            'FPM1',
+            'FPM2',
+            'FPM3',
+            'NJOURF',
+            'NJOURF+1',
+            'PJOURF+1',
+            'PPOINTE1',
+        ]},
+    stand_SEM_WE_VENDR: {
+        fname: 'Standard - Sem WE Vendredi',
+        currentTarf: 'SEM WE VENDREDI', excluded: [
             'EASF07',
             'EASF08',
             'EASF09',
@@ -598,9 +637,15 @@ function getCurrentConfig(device, options, logger=console) {
     case linkyMode == linkyModeDef.legacy && currentTarf && currentTarf.startsWith(tarifsDef.histo_BBR.currentTarf):
         myExpose = myExpose.filter((a) => !tarifsDef.histo_BBR.excluded.includes(a.exposes.name));
         break;
+    case linkyMode == linkyModeDef.standard && tarifsDef.stand_SEM_WE_LUNDI.currentTarf:
+        myExpose = myExpose.filter((a) => !tarifsDef.stand_SEM_WE_LUNDI.excluded.includes(a.exposes.name));
+        break;
     case linkyMode == linkyModeDef.standard && tarifsDef.stand_SEM_WE_MERCR.currentTarf:
         myExpose = myExpose.filter((a) => !tarifsDef.stand_SEM_WE_MERCR.excluded.includes(a.exposes.name));
         break;
+    case linkyMode == linkyModeDef.standard && tarifsDef.stand_SEM_WE_VENDR.currentTarf:
+        myExpose = myExpose.filter((a) => !tarifsDef.stand_SEM_WE_VENDR.excluded.includes(a.exposes.name));
+        break;
     case linkyMode == linkyModeDef.standard && tarifsDef.stand_HPHC.currentTarf:
         myExpose = myExpose.filter((a) => !tarifsDef.stand_HPHC.excluded.includes(a.exposes.name));
         break;

package/devices/miboxer.js

@@ -4,40 +4,6 @@ const e = exposes.presets;
 const tuya = require('../lib/tuya');
 
 module.exports = [
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_zrvxvydd'}],
-        model: 'FUT066Z',
-        vendor: 'MiBoxer',
-        description: 'RGB+CCT LED Downlight',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
-    },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_jicmoite'}],
-        model: 'FUT039Z',
-        vendor: 'Miboxer',
-        description: 'RGB+CCT LED controller',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
-    },
-    {
-        fingerprint: [{modelID: 'TS0501B', manufacturerName: '_TZ3210_dxroobu3'},
-            {modelID: 'TS0501B', manufacturerName: '_TZ3210_dbilpfqk'}],
-        model: 'FUT036Z',
-        description: 'Single color LED controller',
-        vendor: 'Miboxer',
-        extend: tuya.extend.light_onoff_brightness(),
-        onEvent: tuya.onEventSetTime,
-    },
-    {
-        fingerprint: [
-            {modelID: 'TS0502B', manufacturerName: '_TZ3210_frm6149r'},
-            {modelID: 'TS0502B', manufacturerName: '_TZ3210_jtifm80b'},
-            {modelID: 'TS0502B', manufacturerName: '_TZ3210_xwqng7ol'},
-        ],
-        model: 'FUT035Z',
-        description: 'Dual white LED controller',
-        vendor: 'Miboxer',
-        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], disablePowerOnBehavior: true}),
-    },
     {
         fingerprint: [{modelID: 'TS0504B', manufacturerName: '_TZ3210_ttkgurpb'}],
         model: 'FUT038Z',

package/devices/philips.js

@@ -2595,6 +2595,13 @@ module.exports = [
         description: 'Hue White and color ambiance A19 800 lumen',
         extend: philips.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['929003553001'],
+        model: '929003553001',
+        vendor: 'Philips',
+        description: 'Hue outdoor Resonate downward wall lamp',
+        extend: philips.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['LWE003'],
         model: '9290020400',

package/devices/sinope.js

@@ -179,6 +179,15 @@ const fzLocal = {
             if (msg.data.hasOwnProperty('minimumBrightness')) {
                 result.minimum_brightness = msg.data['minimumBrightness'];
             }
+            if (msg.data.hasOwnProperty('actionReport')) {
+                const lookup = {2: 'up_single', 3: 'up_hold', 4: 'up_double',
+                    18: 'down_single', 19: 'down_hold', 20: 'down_double'};
+                result.action = lookup[msg.data['actionReport']];
+            }
+            if (msg.data.hasOwnProperty('keypadLockout')) {
+                const lookup = {0: 'unlock', 1: 'lock'};
+                result.keypad_lockout = lookup[msg.data['keypadLockout']];
+            }
             return result;
         },
     },
@@ -473,6 +482,18 @@ const tzLocal = {
             await entity.read('manuSpecificSinope', ['dimmerTimmer']);
         },
     },
+    keypad_lock: {
+        // SW2500ZB
+        key: ['keypad_lockout'],
+        convertSet: async (entity, key, value, meta) => {
+            const lookup = {'unlock': 0, 'lock': 1};
+            await entity.write('manuSpecificSinope', {keypadLockout: lookup[value]});
+            return {state: {keypad_lockout: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('manuSpecificSinope', ['keypadLockout']);
+        },
+    },
 };
 module.exports = [
     {
@@ -972,8 +993,9 @@ module.exports = [
         description: 'Zigbee smart light switch',
         fromZigbee: [fz.on_off, fz.electrical_measurement, fzLocal.sinope],
         toZigbee: [tz.on_off, tzLocal.timer_seconds, tzLocal.led_intensity_on, tzLocal.led_intensity_off,
-            tzLocal.led_color_on, tzLocal.led_color_off],
+            tzLocal.led_color_on, tzLocal.led_color_off, tzLocal.keypad_lock],
         exposes: [e.switch(),
+            e.action(['up_single', 'up_double', 'up_hold', 'down_single', 'down_double', 'down_hold']),
             exposes.numeric('timer_seconds', ea.ALL).withValueMin(0).withValueMax(10800)
                 .withDescription('Automatically turn off load after x seconds'),
             exposes.numeric('led_intensity_on', ea.ALL).withValueMin(0).withValueMax(100)
@@ -989,12 +1011,21 @@ module.exports = [
                 .withFeature(exposes.numeric('r', ea.SET))
                 .withFeature(exposes.numeric('g', ea.SET))
                 .withFeature(exposes.numeric('b', ea.SET))
-                .withDescription('Control status LED color when load OFF')],
+                .withDescription('Control status LED color when load OFF'),
+            exposes.enum('keypad_lockout', ea.ALL, ['unlock', 'lock'])
+                .withDescription('Enables or disables the device’s buttons')],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = ['genOnOff'];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await reporting.onOff(endpoint);
+            const payload = [{
+                attribute: 'actionReport',
+                minimumReportInterval: 0,
+                maximumReportInterval: 0,
+                reportableChange: 0,
+            }];
+            await endpoint.configureReporting('manuSpecificSinope', payload);
         },
     },
     {

package/devices/tuya.js

@@ -1012,8 +1012,34 @@ module.exports = [
             {vendor: 'Zemismart', model: 'LXZB-ZB-09A', description: 'Zemismart LED Surface Mounted Downlight 9W RGBW'},
             {vendor: 'Feconn', model: 'FE-GU10-5W', description: 'Zigbee GU10 5W smart bulb'},
             {vendor: 'Nedis', model: 'ZBLC1E14'},
+            tuya.whitelabel('Aldi', 'L122FF63H11A5.0W', 'LIGHTWAY smart home LED-lamp - spot', ['_TZ3000_j0gtlepx']),
+            tuya.whitelabel('Aldi', 'L122AA63H11A6.5W', 'LIGHTWAY smart home LED-lamp - candle', ['_TZ3000_iivsrikg']),
+            tuya.whitelabel('Aldi', 'C422AC11D41H140.0W', 'MEGOS LED panel RGB+CCT 40W 3600lm 62 x 62 cm', ['_TZ3000_v1srfw9x']),
+            tuya.whitelabel('Aldi', 'C422AC14D41H140.0W', 'MEGOS LED panel RGB+CCT 40W 3600lm 30 x 120 cm', ['_TZ3000_gb5gaeca']),
+            tuya.whitelabel('MiBoxer', 'FUT066Z', 'RGB+CCT LED Downlight', ['_TZ3210_zrvxvydd']),
+            tuya.whitelabel('Miboxer', 'FUT039Z', 'RGB+CCT LED controller', ['_TZ3210_jicmoite']),
+            tuya.whitelabel('Lidl', '14156506L', 'Livarno Lux smart LED mood light', ['_TZ3210_r0xgkft5']),
+            tuya.whitelabel('Lidl', 'HG08010', 'Livarno Home outdoor spotlight', ['_TZ3210_umi6vbsz']),
+            tuya.whitelabel('Lidl', 'HG08008', 'Livarno Home LED ceiling light', ['_TZ3210_p9ao60da']),
+            tuya.whitelabel('TuYa', 'HG08007', 'Livarno Home outdoor LED band', ['_TZ3210_zbabx9wh']),
+            tuya.whitelabel('Lidl', '14158704L', 'Livarno Home LED floor lamp, RGBW', ['_TZ3210_z1vlyufu']),
+            tuya.whitelabel('Lidl', '14158804L', 'Livarno Home LED desk lamp RGBW', ['_TZ3210_hxtfthp5']),
+            tuya.whitelabel('Lidl', 'HG07834A', 'Livarno Lux GU10 spot RGB', ['_TZ3000_quqaeew6']),
+            tuya.whitelabel('Lidl', 'HG07834B', 'Livarno Lux E14 candle RGB', ['_TZ3000_th6zqqy6', '_TZ3000_wr6g6olr']),
+            tuya.whitelabel('Lidl', 'HG08131C', 'Livarno Home outdoor E27 bulb in set with flare', ['_TZ3000_q50zhdsc']),
+            tuya.whitelabel('Lidl', 'HG07834C', 'Livarno Lux E27 bulb RGB', ['_TZ3000_qd7hej8u']),
+            tuya.whitelabel('Lidl', 'HG08383B', 'Livarno outdoor LED light chain', ['_TZ3000_bwlvyjwk']),
+            tuya.whitelabel('Lidl', 'HG08383A', 'Livarno outdoor LED light chain', ['_TZ3000_taspddvq']),
+            tuya.whitelabel('Garza Smart', 'Garza-Standard-A60', 'Standard A60 bulb', ['_TZ3210_sln7ah6r']),
+            tuya.whitelabel('UR Lighting', 'TH008L10RGBCCT', '10W RGB+CCT downlight', ['_TZ3210_dn5higyl']),
+            tuya.whitelabel('Lidl', 'HG08010', 'Livarno Home outdoor spotlight', ['_TZ3210_umi6vbsz']),
+            tuya.whitelabel('Lidl', 'HG08008', 'Livarno Home LED ceiling light', ['_TZ3210_p9ao60da']),
+            tuya.whitelabel('Lidl', 'HG08007', 'Livarno Home outdoor LED band', ['_TZ3210_zbabx9wh']),
         ],
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
+        },
     },
     {
         zigbeeModel: ['TS0503B'],
@@ -1040,6 +1066,12 @@ module.exports = [
         description: 'Zigbee light',
         vendor: 'TuYa',
         extend: tuya.extend.light_onoff_brightness(),
+        meta: {turnsOffAtBrightness1: false},
+        whiteLabel: [
+            tuya.whitelabel('Lidl', 'HG06463A', 'Livarno Lux E27 ST64 filament bulb', ['_TZ3000_j2w1dw29']),
+            tuya.whitelabel('Lidl', 'HG06463B', 'Livarno Lux E27 G95 filament bulb', ['_TZ3000_nosnx7im']),
+            tuya.whitelabel('Lidl', 'HG06462A', 'Livarno Lux E27 A60 filament bulb', ['_TZ3000_7dcddnye', '_TZ3000_nbnmw9nc']),
+        ],
     },
     {
         zigbeeModel: ['TS0501B'],
@@ -1047,6 +1079,9 @@ module.exports = [
         description: 'Zigbee light',
         vendor: 'TuYa',
         extend: tuya.extend.light_onoff_brightness(),
+        whiteLabel: [
+            tuya.whitelabel('Miboxer', 'FUT036Z', 'Single color LED controller', ['_TZ3210_dxroobu3', '_TZ3210_dbilpfqk']),
+        ],
     },
     {
         fingerprint: tuya.fingerprint('TS0202', ['_TYZB01_vwqnz1sn']),
@@ -1690,7 +1725,17 @@ module.exports = [
         model: 'TS0502A',
         vendor: 'TuYa',
         description: 'Light controller',
-        extend: tuya.extend.light_onoff_brightness_colortemp(),
+        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], noConfigure: true}),
+        whiteLabel: [
+            tuya.whitelabel('Lidl', 'HG06492B', 'Livarno Lux E14 candle CCT', ['_TZ3000_oborybow']),
+            tuya.whitelabel('Lidl', 'HG06492A', 'Livarno Lux GU10 spot CCT', ['_TZ3000_el5kt5im']),
+            tuya.whitelabel('Lidl', 'HG06492C', 'Livarno Lux E27 bulb CCT', ['_TZ3000_49qchf10']),
+            tuya.whitelabel('Lidl', '14147206L', 'Livarno Lux ceiling light', ['_TZ3000_rylaozuc', '_TZ3000_5fkufhn1']),
+            tuya.whitelabel('Lidl', '14153905L', 'Livarno Home LED floor lamp', ['_TZ3000_8uaoilu9']),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
+        },
     },
     {
         zigbeeModel: ['TS0502B'],
@@ -1700,8 +1745,14 @@ module.exports = [
         whiteLabel: [
             {vendor: 'Mercator Ikuü', model: 'SMI7040', description: 'Ford Batten Light'},
             {vendor: 'Mercator Ikuü', model: 'SMD9300', description: 'Donovan Panel Light'},
+            tuya.whitelabel('Aldi', 'F122SB62H22A4.5W', 'LIGHTWAY smart home LED-lamp - filament', ['_TZ3000_g1glzzfk']),
+            tuya.whitelabel('Miboxer', 'FUT035Z', 'Dual white LED controller', ['_TZ3210_frm6149r', '_TZ3210_jtifm80b', '_TZ3210_xwqng7ol']),
+            tuya.whitelabel('Lidl', '14156408L', 'Livarno Lux smart LED ceiling light', ['_TZ3210_c2iwpxf1']),
         ],
-        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
+        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], noConfigure: true}),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
+        },
     },
     {
         zigbeeModel: ['TS0504A'],
@@ -1724,7 +1775,19 @@ module.exports = [
         model: 'TS0505A',
         vendor: 'TuYa',
         description: 'RGB+CCT light controller',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color(),
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
+        whiteLabel: [
+            tuya.whitelabel('Lidl', 'HG06106B', 'Livarno Lux E14 candle RGB', ['_TZ3000_odygigth']),
+            tuya.whitelabel('Lidl', 'HG06106A', 'Livarno Lux GU10 spot RGB', ['_TZ3000_kdpxju99']),
+            tuya.whitelabel('Lidl', 'HG06106C', 'Livarno Lux E27 bulb RGB', ['_TZ3000_dbou1ap4']),
+            tuya.whitelabel('Lidl', '14148906L', 'Livarno Lux mood light RGB+CCT', ['_TZ3000_9cpuaca6']),
+            tuya.whitelabel('Lidl', '14149505L/14149506L_1', 'Livarno Lux light bar RGB+CCT (black/white)', ['_TZ3000_gek6snaj']),
+            tuya.whitelabel('Mycket', 'MS-SP-LE27WRGB', 'E27 RGBW bulb', ['_TZ3000_evag0pvn']),
+            tuya.whitelabel('Lidl', 'HG06104A', 'Livarno Lux smart LED light strip 2.5m', ['_TZ3000_riwp3k79', '_TZ3000_riwp3k79']),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
+        },
     },
     {
         fingerprint: [{manufacturerName: '_TZ2000_a476raq2'}],
@@ -2775,6 +2838,23 @@ module.exports = [
             await reporting.bind(device.getEndpoint(5), coordinatorEndpoint, ['genOnOff']);
         },
     },
+    {
+        fingerprint: tuya.fingerprint('TS011F', ['_TZ3000_dlug3kbc']),
+        model: 'TS011F_3_gang',
+        description: '3 gang wall ac outlet',
+        vendor: 'TuYa',
+        extend: tuya.extend.switch({powerOutageMemory: true, childLock: true, endpoints: ['l1', 'l2', 'l3']}),
+        endpoint: (device) => {
+            return {l1: 1, l2: 2, l3: 3, l4: 4, l5: 5};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
+            for (const ep of [1, 2, 3]) {
+                await reporting.bind(device.getEndpoint(ep), coordinatorEndpoint, ['genOnOff']);
+            }
+        },
+    },
     {
         fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ntcy3xu1']),
         model: 'TS0601_smoke_1',
@@ -4276,6 +4356,33 @@ module.exports = [
             ],
         },
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_x8fp01wi']),
+        model: 'TS0601_3_phase_clamp_meter_relay',
+        vendor: 'TuYa',
+        description: '3-phase clamp power meter with relay',
+        fromZigbee: [tuya.fz.datapoints],
+        toZigbee: [tuya.tz.datapoints],
+        configure: tuya.configureMagicPacket,
+        whiteLabel: [{vendor: 'Wenzhou Taiye Electric', model: 'TAC7361C BI'}],
+        exposes: [
+            e.switch().setAccess('state', ea.STATE_SET), e.power(), e.energy(), e.produced_energy(),
+            tuya.exposes.voltageWithPhase('a'), tuya.exposes.voltageWithPhase('b'), tuya.exposes.voltageWithPhase('c'),
+            tuya.exposes.powerWithPhase('a'), tuya.exposes.powerWithPhase('b'), tuya.exposes.powerWithPhase('c'),
+            tuya.exposes.currentWithPhase('a'), tuya.exposes.currentWithPhase('b'), tuya.exposes.currentWithPhase('c'),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [16, 'state', tuya.valueConverter.onOff],
+                [1, 'energy', tuya.valueConverter.divideBy100],
+                [2, 'produced_energy', tuya.valueConverter.divideBy100],
+                [9, 'power', tuya.valueConverter.raw],
+                [6, null, tuya.valueConverter.phaseVariant2WithPhase('a')],
+                [7, null, tuya.valueConverter.phaseVariant2WithPhase('b')],
+                [8, null, tuya.valueConverter.phaseVariant2WithPhase('c')],
+            ],
+        },
+    },
     {
         zigbeeModel: ['TS0049'],
         model: 'TS0049',

package/devices/zemismart.js

@@ -124,7 +124,7 @@ module.exports = [
             'button_6_hold', 'button_6_single', 'button_6_double'])],
     },
     {
-        fingerprint: tuya.fingerprint('TS011F', ['_TZ3000_zigisuyh', '_TZ3000_v4mevirn', '_TZ3000_mlswgkc3', '_TZ3000_dlug3kbc']),
+        fingerprint: tuya.fingerprint('TS011F', ['_TZ3000_zigisuyh', '_TZ3000_v4mevirn', '_TZ3000_mlswgkc3']),
         model: 'ZIGBEE-B09-UK',
         vendor: 'Zemismart',
         description: 'Zigbee smart outlet universal socket with USB port',

package/index.js

@@ -131,6 +131,22 @@ function findByZigbeeModel(zigbeeModel) {
 }
 
 function findByDevice(device) {
+    let definition = findDefintion(device);
+    if (definition && definition.whiteLabel) {
+        const match = definition.whiteLabel.find((w) => w.fingerprint && w.fingerprint.find((f) => isFingerprintMatch(f, device)));
+        if (match) {
+            definition = {
+                ...definition,
+                model: match.model,
+                vendor: match.vendor,
+                description: match.description || definition.description,
+            };
+        }
+    }
+    return definition;
+}
+
+function findDefintion(device) {
     if (!device) {
         return null;
     }

package/lib/exposes.js

@@ -344,13 +344,13 @@ class Cover extends Base {
 
     withPosition() {
         assert(!this.endpoint, 'Cannot add feature after adding endpoint');
-        this.features.push(new Numeric('position', access.ALL).withValueMin(0).withValueMax(100).withDescription('Position of this cover'));
+        this.features.push(new Numeric('position', access.ALL).withValueMin(0).withValueMax(100).withDescription('Position of this cover').withUnit('%'));
         return this;
     }
 
     withTilt() {
         assert(!this.endpoint, 'Cannot add feature after adding endpoint');
-        this.features.push(new Numeric('tilt', access.ALL).withValueMin(0).withValueMax(100).withDescription('Tilt of this cover'));
+        this.features.push(new Numeric('tilt', access.ALL).withValueMin(0).withValueMax(100).withDescription('Tilt of this cover').withUnit('%'));
         return this;
     }
 }

package/lib/tuya.js

@@ -1179,6 +1179,13 @@ const fingerprint = (modelID, manufacturerNames) => {
     });
 };
 
+const whitelabel = (vendor, model, description, manufacturerNames) => {
+    const fingerprint = manufacturerNames.map((manufacturerName) => {
+        return {manufacturerName};
+    });
+    return {vendor, model, description, fingerprint};
+};
+
 class Base {
     constructor(value) {
         this.value = value;
@@ -1770,7 +1777,7 @@ const tuyaFz = {
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.hasOwnProperty('tuyaBacklightSwitch')) {
                 const value = msg.data['tuyaBacklightSwitch'];
-                const backlightLookup = {0: 'off', 1: 'on'};
+                const backlightLookup = {0: 'OFF', 1: 'ON'};
                 return {backlight_mode: backlightLookup[value]};
             }
         },
@@ -1973,6 +1980,7 @@ module.exports = {
     skip,
     configureMagicPacket,
     fingerprint,
+    whitelabel,
     enum: (value) => new Enum(value),
     bitmap: (value) => new Bitmap(value),
     valueConverter,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.94",
+  "version": "15.0.96",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -34,11 +34,11 @@
   },
   "homepage": "https://github.com/Koenkk/zigbee-herdsman-converters",
   "dependencies": {
-    "axios": "^1.3.5",
+    "axios": "^1.3.6",
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^3.0.0",
-    "zigbee-herdsman": "^0.14.107"
+    "zigbee-herdsman": "^0.14.108"
   },
   "devDependencies": {
     "eslint": "*",

package/devices/garza.js

@@ -1,11 +0,0 @@
-const tuya = require('../lib/tuya');
-
-module.exports = [
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_sln7ah6r'}],
-        model: 'Garza-Standard-A60',
-        vendor: 'Garza Smart',
-        description: 'Standard A60 bulb',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
-    },
-];

package/devices/mycket.js

@@ -1,11 +0,0 @@
-const tuya = require('../lib/tuya');
-
-module.exports = [
-    {
-        fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_evag0pvn'}],
-        model: 'MS-SP-LE27WRGB',
-        description: 'E27 RGBW bulb',
-        vendor: 'Mycket',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color(),
-    },
-];

package/devices/urlighting.js

@@ -1,12 +0,0 @@
-const tuya = require('../lib/tuya');
-
-module.exports = [
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_dn5higyl'}],
-        model: 'TH008L10RGBCCT',
-        vendor: 'UR Lighting',
-        description: '10W RGB+CCT downlight',
-        meta: {applyRedFix: true, enhancedHue: false},
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
-    },
-];