zigbee-herdsman-converters 15.0.40 → 15.0.42

package/converters/fromZigbee.js

@@ -4773,17 +4773,6 @@ const converters = {
             });
         },
     },
-    tuya_min_brightness: {
-        cluster: 'genLevelCtrl',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            if (msg.data.hasOwnProperty(0xfc00)) {
-                const property = postfixWithEndpointName('min_brightness', msg, model, meta);
-                const value = parseInt(msg.data[0xfc00].toString(16).slice(0, 2), 16);
-                return {[property]: value};
-            }
-        },
-    },
     restorable_brightness: {
         cluster: 'genLevelCtrl',
         type: ['attributeReport', 'readResponse'],
@@ -5461,7 +5450,7 @@ const converters = {
             if (['QBKG39LM', 'QBKG41LM', 'WS-EUK02', 'WS-EUK04', 'QBKG20LM', 'QBKG31LM'].includes(model.model)) {
                 buttonLookup = {41: 'left', 42: 'right', 51: 'both'};
             }
-            if (['QBKG25LM', 'QBKG26LM', 'QBKG34LM'].includes(model.model)) {
+            if (['QBKG25LM', 'QBKG26LM', 'QBKG34LM', 'ZNQBKG31LM'].includes(model.model)) {
                 buttonLookup = {
                     41: 'left', 42: 'center', 43: 'right',
                     51: 'left_center', 52: 'left_right', 53: 'center_right',

package/converters/toZigbee.js

@@ -2145,7 +2145,7 @@ const converters = {
             if (['SP-EUC01', 'ZNCZ04LM', 'ZNCZ12LM', 'ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM', 'SSM-U01', 'SSM-U02', 'DLKZMK11LM', 'DLKZMK12LM',
                 'WS-EUK01', 'WS-EUK02', 'WS-EUK03', 'WS-EUK04', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM',
                 'QBKG31LM', 'QBKG34LM', 'QBKG38LM', 'QBKG39LM', 'QBKG40LM', 'QBKG41LM', 'ZNDDMK11LM', 'ZNLDP13LM',
-                'WS-USC02', 'WS-USC04',
+                'WS-USC02', 'WS-USC04', 'ZNQBKG31LM',
             ].includes(meta.mapped.model)) {
                 await entity.write('aqaraOpple', {0x0201: {value: value ? 1 : 0, type: 0x10}}, manufacturerOptions.xiaomi);
             } else if (['ZNCZ02LM', 'QBCZ11LM', 'LLKZMK11LM'].includes(meta.mapped.model)) {
@@ -2170,7 +2170,7 @@ const converters = {
             if (['SP-EUC01', 'ZNCZ04LM', 'ZNCZ12LM', 'ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM', 'SSM-U01', 'SSM-U02', 'DLKZMK11LM', 'DLKZMK12LM',
                 'WS-EUK01', 'WS-EUK02', 'WS-EUK03', 'WS-EUK04', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM',
                 'QBKG31LM', 'QBKG34LM', 'QBKG38LM', 'QBKG39LM', 'QBKG40LM', 'QBKG41LM', 'ZNDDMK11LM', 'ZNLDP13LM',
-                'WS-USC02', 'WS-USC04',
+                'WS-USC02', 'WS-USC04', 'ZNQBKG31LM',
             ].includes(meta.mapped.model)) {
                 await entity.read('aqaraOpple', [0x0201]);
             } else if (['ZNCZ02LM', 'QBCZ11LM', 'ZNCZ11LM'].includes(meta.mapped.model)) {
@@ -3828,20 +3828,6 @@ const converters = {
             return {state: {state: value.toUpperCase()}};
         },
     },
-    tuya_min_brightness: {
-        key: ['min_brightness'],
-        convertSet: async (entity, key, value, meta) => {
-            const minValueHex = value.toString(16);
-            const maxValueHex = 'ff';
-            const minMaxValue = parseInt(`${minValueHex}${maxValueHex}`, 16);
-            const payload = {0xfc00: {value: minMaxValue, type: 0x21}};
-            await entity.write('genLevelCtrl', payload, {disableDefaultResponse: true});
-            return {state: {min_brightness: value}};
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('genLevelCtrl', [0xfc00]);
-        },
-    },
     frankever_threshold: {
         key: ['threshold'],
         convertSet: async (entity, key, value, meta) => {
@@ -6622,23 +6608,6 @@ const converters = {
             }
         },
     },
-    tuya_do_not_disturb: {
-        key: ['do_not_disturb'],
-        convertSet: async (entity, key, value, meta) => {
-            await entity.command('lightingColorCtrl', 'tuyaDoNotDisturb', {enable: value ? 1 : 0});
-            return {state: {do_not_disturb: value}};
-        },
-    },
-    tuya_color_power_on_behavior: {
-        key: ['color_power_on_behavior'],
-        convertSet: async (entity, key, value, meta) => {
-            const lookup = {'initial': 0, 'previous': 1, 'cutomized': 2};
-            utils.validateValue(value, Object.keys(lookup));
-            await entity.command('lightingColorCtrl', 'tuyaOnStartUp', {
-                mode: lookup[value]*256, data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]});
-            return {state: {color_power_on_behavior: value}};
-        },
-    },
     tuya_motion_sensor: {
         key: ['o_sensitivity', 'v_sensitivity', 'led_status', 'vacancy_delay',
             'light_on_luminance_prefer', 'light_off_luminance_prefer', 'mode'],

package/devices/ajax_online.js

@@ -1,4 +1,5 @@
 const extend = require('../lib/extend');
+const tuya = require('../lib/tuya');
 
 module.exports = [
     {
@@ -35,11 +36,11 @@ module.exports = [
         model: 'AJ_RGBCCT_CTRL',
         vendor: 'Ajax Online',
         description: 'Smart Zigbee LED strip RGB+CCT',
-        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], disableColorTempStartup: true}),
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         meta: {applyRedFix: true, enhancedHue: false},
     },
     {
-        zigbeeModel: ['ZB-CCT_Filament'],
+        fingerprint: [{modelID: 'CCT Light', manufacturerName: 'ZB/Ajax Online', manufacturerID: 4137}],
         model: 'ZB-CCT_Filament',
         vendor: 'Ajax Online',
         description: 'Zigbee LED filament light dimmable E27, edison ST64, flame 2200K',

package/devices/aldi.js

@@ -1,6 +1,6 @@
 const exposes = require('../lib/exposes');
 const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
-const extend = require('../lib/extend');
+const tuya = require('../lib/tuya');
 const e = exposes.presets;
 
 module.exports = [
@@ -9,7 +9,7 @@ module.exports = [
         model: 'L122FF63H11A5.0W',
         vendor: 'Aldi',
         description: 'LIGHTWAY smart home LED-lamp - spot',
-        extend: extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true}),
+        extend: tuya.extend.light_onoff_brightness_colortemp_color(),
         meta: {applyRedFix: true},
     },
     {
@@ -17,31 +17,28 @@ module.exports = [
         model: 'L122AA63H11A6.5W',
         vendor: 'Aldi',
         description: 'LIGHTWAY smart home LED-lamp - candle',
-        extend: extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true}),
-        meta: {applyRedFix: true},
+        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: extend.light_onoff_brightness_colortemp({disableColorTempStartup: true}),
+        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: extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true}),
-        meta: {applyRedFix: true},
+        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: extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true}),
-        meta: {applyRedFix: true},
+        extend: tuya.extend.light_onoff_brightness_colortemp_color(),
     },
     {
         fingerprint: [{modelID: 'TS1001', manufacturerName: '_TZ3000_ztrfrcsu'}],

package/devices/ecodim.js

@@ -4,6 +4,7 @@ const e = exposes.presets;
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const ota = require('../lib/ota');
+const tuya = require('../lib/tuya');
 
 module.exports = [
     {
@@ -131,7 +132,7 @@ module.exports = [
         model: 'ED-10042',
         vendor: 'EcoDim',
         description: 'Zigbee LED filament light dimmable E27, globe G125, flame 2200K',
-        extend: extend.light_onoff_brightness(),
+        extend: tuya.extend.light_onoff_brightness(),
     },
     {
         fingerprint: [{modelID: 'CCT Light', manufacturerName: 'ZigBee/CCT', manufacturerID: 4137},
@@ -139,6 +140,6 @@ module.exports = [
         model: 'ED-10041',
         vendor: 'EcoDim',
         description: 'Zigbee LED filament light dimmable E27, edison ST64, flame 2200K',
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
 ];

package/devices/garza.js

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

package/devices/immax.js

@@ -58,7 +58,7 @@ module.exports = [
         model: '07743L',
         vendor: 'Immax',
         description: 'Neo Smart LED E27 11W RGB + CCT, color, dimmable, Zigbee 3.0',
-        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['Keyfob-ZB3.0'],
@@ -192,7 +192,7 @@ module.exports = [
         exposes: [e.action(['disarm', 'arm_home', 'arm_away', 'sos']), e.tamper()],
         meta: {
             tuyaDatapoints: [
-                [24, 'tamper', tuya.valueConverter.trueFalse],
+                [24, 'tamper', tuya.valueConverter.trueFalse1],
                 [26, 'action', tuya.valueConverter.static('disarm')],
                 [27, 'action', tuya.valueConverter.static('arm_away')],
                 [28, 'action', tuya.valueConverter.static('arm_home')],

package/devices/lidl.js

@@ -511,8 +511,7 @@ module.exports = [
         model: 'HG06104A',
         vendor: 'Lidl',
         description: 'Livarno Lux smart LED light strip 2.5m',
-        ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, disablePowerOnBehavior: true}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
         },
@@ -531,8 +530,7 @@ module.exports = [
         model: 'HG06106B',
         vendor: 'Lidl',
         description: 'Livarno Lux E14 candle RGB',
-        ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, disablePowerOnBehavior: true}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
         },
@@ -542,9 +540,7 @@ module.exports = [
         model: '14153806L',
         vendor: 'Lidl',
         description: 'Livarno smart LED ceiling light',
-        ...extend.light_onoff_brightness_colortemp_color(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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});
         },
@@ -554,9 +550,7 @@ module.exports = [
         model: '14156506L',
         vendor: 'Lidl',
         description: 'Livarno Lux smart LED mood light',
-        ...extend.light_onoff_brightness_colortemp_color(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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});
         },
@@ -566,9 +560,7 @@ module.exports = [
         model: '14156408L',
         vendor: 'Lidl',
         description: 'Livarno Lux smart LED ceiling light',
-        ...extend.light_onoff_brightness_colortemp(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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});
         },
@@ -578,9 +570,7 @@ module.exports = [
         model: 'HG08010',
         vendor: 'Lidl',
         description: 'Livarno Home outdoor spotlight',
-        ...extend.light_onoff_brightness_colortemp_color(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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});
         },
@@ -590,9 +580,7 @@ module.exports = [
         model: 'HG08008',
         vendor: 'Lidl',
         description: 'Livarno Home LED ceiling light',
-        ...extend.light_onoff_brightness_colortemp_color(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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});
         },
@@ -602,18 +590,14 @@ module.exports = [
         model: 'HG08007',
         vendor: 'TuYa',
         description: 'Livarno Home outdoor LED band',
-        extend: extend.light_onoff_brightness_colortemp_color(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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.light_onoff_brightness_colortemp_color(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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});
         },
@@ -623,9 +607,7 @@ module.exports = [
         model: '14158804L',
         vendor: 'Lidl',
         description: 'Livarno Home LED desk lamp RGBW',
-        ...extend.light_onoff_brightness_colortemp_color(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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});
         },
@@ -635,9 +617,7 @@ module.exports = [
         model: 'HG07834A',
         vendor: 'Lidl',
         description: 'Livarno Lux GU10 spot RGB',
-        ...extend.light_onoff_brightness_colortemp_color(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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});
         },
@@ -648,9 +628,7 @@ module.exports = [
         model: 'HG07834B',
         vendor: 'Lidl',
         description: 'Livarno Lux E14 candle RGB',
-        ...extend.light_onoff_brightness_colortemp_color(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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});
         },
@@ -660,9 +638,7 @@ module.exports = [
         model: 'HG08131C',
         vendor: 'Lidl',
         description: 'Livarno Home outdoor E27 bulb in set with flare',
-        ...extend.light_onoff_brightness_colortemp_color(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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});
         },
@@ -672,8 +648,7 @@ module.exports = [
         model: 'HG06106A',
         vendor: 'Lidl',
         description: 'Livarno Lux GU10 spot RGB',
-        ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, disablePowerOnBehavior: true}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
         },
@@ -683,8 +658,7 @@ module.exports = [
         model: 'HG06106C',
         vendor: 'Lidl',
         description: 'Livarno Lux E27 bulb RGB',
-        ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, disablePowerOnBehavior: true}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
         },
@@ -694,9 +668,7 @@ module.exports = [
         model: 'HG07834C',
         vendor: 'Lidl',
         description: 'Livarno Lux E27 bulb RGB',
-        ...extend.light_onoff_brightness_colortemp_color(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 500]}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        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});
         },
@@ -706,7 +678,7 @@ module.exports = [
         model: 'HG06492A',
         vendor: 'Lidl',
         description: 'Livarno Lux GU10 spot CCT',
-        ...extend.light_onoff_brightness_colortemp({disableColorTempStartup: true, disablePowerOnBehavior: true}),
+        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
         },
@@ -716,8 +688,7 @@ module.exports = [
         model: 'HG06492B',
         vendor: 'Lidl',
         description: 'Livarno Lux E14 candle CCT',
-        ...extend.light_onoff_brightness_colortemp(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, 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});
         },
@@ -727,7 +698,7 @@ module.exports = [
         model: 'HG06492C',
         vendor: 'Lidl',
         description: 'Livarno Lux E27 bulb CCT',
-        ...extend.light_onoff_brightness_colortemp({disableColorTempStartup: true, disablePowerOnBehavior: true}),
+        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
         },
@@ -738,7 +709,7 @@ module.exports = [
         model: '14147206L',
         vendor: 'Lidl',
         description: 'Livarno Lux ceiling light',
-        ...extend.light_onoff_brightness_colortemp({disableColorTempStartup: true, disablePowerOnBehavior: true}),
+        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
         },
@@ -748,8 +719,7 @@ module.exports = [
         model: '14153905L',
         vendor: 'Lidl',
         description: 'Livarno Home LED floor lamp',
-        ...extend.light_onoff_brightness_colortemp(
-            {disableColorTempStartup: true, disablePowerOnBehavior: true, colorTempRange: [153, 333]}),
+        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 333], noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 16});
         },
@@ -759,8 +729,7 @@ module.exports = [
         model: '14148906L',
         vendor: 'Lidl',
         description: 'Livarno Lux mood light RGB+CCT',
-        ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, disablePowerOnBehavior: true}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
         },
@@ -771,8 +740,7 @@ module.exports = [
         model: '14149505L/14149506L',
         vendor: 'Lidl',
         description: 'Livarno Lux light bar RGB+CCT (black/white)',
-        ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, disablePowerOnBehavior: true}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
         },
@@ -794,7 +762,7 @@ module.exports = [
         model: 'HG06463A',
         vendor: 'Lidl',
         description: 'Livarno Lux E27 ST64 filament bulb',
-        extend: extend.light_onoff_brightness({disableEffect: true, disablePowerOnBehavior: true}),
+        extend: tuya.extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: false},
     },
     {
@@ -802,7 +770,7 @@ module.exports = [
         model: 'HG06463B',
         vendor: 'Lidl',
         description: 'Livarno Lux E27 G95 filament bulb',
-        extend: extend.light_onoff_brightness({disableEffect: true, disablePowerOnBehavior: true}),
+        extend: tuya.extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: false},
     },
     {
@@ -825,7 +793,7 @@ module.exports = [
         model: 'HG06462A',
         vendor: 'Lidl',
         description: 'Livarno Lux E27 A60 filament bulb',
-        extend: extend.light_onoff_brightness({disableEffect: true, disablePowerOnBehavior: true}),
+        extend: tuya.extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: false},
     },
     {
@@ -845,18 +813,14 @@ module.exports = [
         model: 'HG08633',
         vendor: 'Lidl',
         description: 'Livarno gardenspot RGB',
-        extend: extend.light_onoff_brightness_colortemp_color({supportsHS: true, preferHS: true, colorTempRange: [153, 500],
-            disableColorTempStartup: true, disablePowerOnBehavior: true}),
-        meta: {enhancedHue: false},
+        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: extend.light_onoff_brightness_colortemp_color(
-            {colorTempRange: [153, 500], disableColorTempStartup: true, disablePowerOnBehavior: true}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_chyvmhay'}],
@@ -919,8 +883,6 @@ module.exports = [
         model: 'HG08383A',
         vendor: 'Lidl',
         description: 'Livarno outdoor LED light chain',
-        extend: extend.light_onoff_brightness_colortemp_color(
-            {colorTempRange: [153, 500], disableColorTempStartup: true, disablePowerOnBehavior: true}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
 ];

package/devices/linkind.js

@@ -81,6 +81,13 @@ module.exports = [
         description: 'Zigbee LED 4.8W GU10 bulb, dimmable & tunable',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
     },
+    {
+        zigbeeModel: ['ZBT-CCTLight-D115'],
+        model: 'ZL13100314',
+        vendor: 'Linkind',
+        description: 'Ceiling light 28W, 3000 lm, Ø40CM CCT',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+    },
     {
         zigbeeModel: ['ZBT-CCTLight-BR300107'],
         model: 'ZL100050004',

package/devices/lonsonho.js

@@ -112,27 +112,20 @@ module.exports = [
         model: 'QS-Zigbee-D02-TRIAC-LN',
         vendor: 'Lonsonho',
         description: '1 gang smart dimmer switch module with neutral',
-        fromZigbee: extend.light_onoff_brightness({disableMoveStep: true, disableTransition: true})
-            .fromZigbee.concat([fz.tuya_min_brightness]),
-        toZigbee: extend.light_onoff_brightness({disableMoveStep: true, disableTransition: true})
-            .toZigbee.concat([tz.tuya_min_brightness]),
-        exposes: [e.light_brightness().withMinBrightness()],
+        extend: tuya.extend.light_onoff_brightness({disableMoveStep: true, disableTransition: true, minBrightness: true}),
     },
     {
         fingerprint: [{modelID: 'TS110F', manufacturerName: '_TYZB01_v8gtiaed'}],
         model: 'QS-Zigbee-D02-TRIAC-2C-LN',
         vendor: 'Lonsonho',
         description: '2 gang smart dimmer switch module with neutral',
-        fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.tuya_min_brightness]),
-        toZigbee: extend.light_onoff_brightness().toZigbee.concat([tz.tuya_min_brightness]),
-        exposes: [e.light_brightness().withMinBrightness().withEndpoint('l1'),
-            e.light_brightness().withMinBrightness().withEndpoint('l2')],
+        extend: tuya.extend.light_onoff_brightness({minBrightness: true, endpoints: ['l1', 'l2'], noConfigure: true}),
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2};
         },
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
-            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            await tuya.extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
             await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
             // Don't do: await reporting.onOff(endpoint); https://github.com/Koenkk/zigbee2mqtt/issues/6041

package/devices/mercator.js

@@ -3,7 +3,6 @@ const fz = require('../converters/fromZigbee');
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const tuya = require('../lib/tuya');
-const extend = require('../lib/extend');
 const e = exposes.presets;
 const ea = exposes.access;
 
@@ -78,16 +77,14 @@ module.exports = [
         model: 'SMCL01-ZB',
         vendor: 'Mercator',
         description: 'Ikuü Ikon ceiling light CCT',
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], disablePowerOnBehavior: true}),
+        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
     },
     {
         fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_xr5m6kfg'}],
         model: 'SMD4109W-RGB-ZB',
         vendor: 'Mercator',
         description: 'Ikuü Walter downlight RGB + CCT',
-        extend: extend.light_onoff_brightness_colortemp_color(
-            {colorTempRange: [153, 500], disableColorTempStartup: true, disablePowerOnBehavior: true}),
-        meta: {applyRedFix: true, enhancedHue: false},
+        extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3210_raqjcxo5'}],