zigbee-herdsman-converters 15.0.4 → 15.0.6

package/converters/toZigbee.js

@@ -760,6 +760,31 @@ const converters = {
             }
         },
     },
+    light_color_and_colortemp_via_color: {
+        key: ['color', 'color_temp', 'color_temp_percent'],
+        options: [exposes.options.color_sync(), exposes.options.transition()],
+        convertSet: async (entity, key, value, meta) => {
+            if (key == 'color') {
+                const result = await converters.light_color.convertSet(entity, key, value, meta);
+                return result;
+            } else if (key == 'color_temp' || key == 'color_temp_percent') {
+                const xy = libColor.ColorXY.fromMireds(value);
+                const payload = {
+                    transtime: utils.getTransition(entity, key, meta).time,
+                    colorx: utils.mapNumberRange(xy.x, 0, 1, 0, 65535),
+                    colory: utils.mapNumberRange(xy.y, 0, 1, 0, 65535),
+                };
+                await entity.command('lightingColorCtrl', 'moveToColor', payload, utils.getOptions(meta.mapped, entity));
+                return {
+                    state: libColor.syncColorState({'color_mode': constants.colorMode[2], 'color_temp': value}, meta.state,
+                        entity, meta.options, meta.logger), readAfterWriteTime: payload.transtime * 100,
+                };
+            }
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('lightingColorCtrl', light.readColorAttributes(entity, meta));
+        },
+    },
     light_hue_saturation_step: {
         key: ['hue_step', 'saturation_step'],
         options: [exposes.options.transition()],
@@ -5516,7 +5541,9 @@ const converters = {
                     extensionfieldsets.push({'clstId': 8, 'len': 1, 'extField': [val]});
                     state['brightness'] = val;
                 } else if (attribute === 'position') {
-                    extensionfieldsets.push({'clstId': 258, 'len': 1, 'extField': [100 - val]});
+                    const invert = utils.getMetaValue(entity, meta.mapped, 'coverInverted', 'allEqual', false) ?
+                        !meta.options.invert_cover : meta.options.invert_cover;
+                    extensionfieldsets.push({'clstId': 258, 'len': 1, 'extField': [invert ? 100 - val : val]});
                     state['position'] = val;
                 } else if (attribute === 'color_temp') {
                     /*

package/devices/ikea.js

@@ -6,7 +6,6 @@ const constants = require('../lib/constants');
 const reporting = require('../lib/reporting');
 const {repInterval} = require('../lib/constants');
 const utils = require('../lib/utils');
-const libColor = require('../lib/color');
 const extend = require('../lib/extend');
 const globalStore = require('../lib/store');
 const e = exposes.presets;
@@ -73,30 +72,6 @@ const configureRemote = async (device, coordinatorEndpoint, logger) => {
     await reporting.batteryPercentageRemaining(endpoint);
 };
 
-const tzLocal = {
-    LED1624G9_color_colortemp: {
-        ...tz.light_color_colortemp,
-        convertSet: async (entity, key, value, meta) => {
-            if (key == 'color') {
-                const result = await tz.light_color.convertSet(entity, key, value, meta);
-                return result;
-            } else if (key == 'color_temp' || key == 'color_temp_percent') {
-                const xy = libColor.ColorXY.fromMireds(value);
-                const payload = {
-                    transtime: utils.getTransition(entity, key, meta).time,
-                    colorx: utils.mapNumberRange(xy.x, 0, 1, 0, 65535),
-                    colory: utils.mapNumberRange(xy.y, 0, 1, 0, 65535),
-                };
-                await entity.command('lightingColorCtrl', 'moveToColor', payload, utils.getOptions(meta.mapped, entity));
-                return {
-                    state: libColor.syncColorState({'color_mode': constants.colorMode[2], 'color_temp': value}, meta.state,
-                        entity, meta.options, meta.logger), readAfterWriteTime: payload.transtime * 100,
-                };
-            }
-        },
-    },
-};
-
 const fzLocal = {
     // The STYRBAR sends an on +- 500ms after the arrow release. We don't want to send the ON action in this case.
     // https://github.com/Koenkk/zigbee2mqtt/issues/13335
@@ -490,7 +465,7 @@ module.exports = [
         toZigbee: utils.replaceInArray(
             tradfriExtend.light_onoff_brightness_colortemp_color().toZigbee,
             [tz.light_color_colortemp],
-            [tzLocal.LED1624G9_color_colortemp],
+            [tz.light_color_and_colortemp_via_color],
         ),
         meta: {supportsHueAndSaturation: false},
     },

package/devices/iris.js

@@ -58,7 +58,7 @@ module.exports = [
             await reporting.temperature(endpoint);
             await reporting.batteryVoltage(endpoint);
         },
-        exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.temperature(), e.battery()],
+        exposes: [e.occupancy(), e.battery_low(), e.temperature(), e.battery()],
     },
     {
         zigbeeModel: ['3320-L'],
@@ -74,7 +74,7 @@ module.exports = [
             await reporting.temperature(endpoint);
             await reporting.batteryVoltage(endpoint);
         },
-        exposes: [e.contact(), e.battery_low(), e.tamper(), e.temperature(), e.battery()],
+        exposes: [e.contact(), e.battery_low(), e.temperature(), e.battery()],
     },
     {
         zigbeeModel: ['3450-L', '3450-L2'],

package/devices/ledvance.js

@@ -251,6 +251,22 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness(),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['FLEX RGBW T'],
+        model: '4058075729384',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ Indoor Flex multicolor RGBW',
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 526]}),
+        ota: ota.ledvance,
+    },
+    {
+        zigbeeModel: ['OUTDOOR FLEX RGBW T'],
+        model: '4058075729360',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ Outdoor Flex multicolor RGBW',
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 526]}),
+        ota: ota.ledvance,
+    },
     {
         zigbeeModel: ['GLOBE60 FIL DIM T'],
         model: '4058075729247',

package/devices/lidl.js

@@ -8,6 +8,7 @@ const ea = exposes.access;
 const tuya = require('../lib/tuya');
 const globalStore = require('../lib/store');
 const ota = require('../lib/ota');
+const utils = require('../lib/utils');
 
 const tuyaLocal = {
     dataPoints: {
@@ -542,6 +543,11 @@ module.exports = [
         vendor: 'Lidl',
         description: 'Livarno smart LED ceiling light',
         ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, colorTempRange: [153, 500]}),
+        toZigbee: utils.replaceInArray(
+            extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, colorTempRange: [153, 500]}).toZigbee,
+            [tz.light_color_colortemp],
+            [tz.light_color_and_colortemp_via_color],
+        ),
         meta: {applyRedFix: true, enhancedHue: false},
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});

package/devices/lonsonho.js

@@ -25,7 +25,7 @@ module.exports = [
         model: '11830304',
         vendor: 'Lonsonho',
         description: 'Curtain switch',
-        fromZigbee: [fz.cover_position_tilt, tuya.fz.backlight_mode, fz.tuya_cover_options],
+        fromZigbee: [fz.cover_position_tilt, tuya.fz.backlight_mode_low_medium_high, fz.tuya_cover_options],
         toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.tuya_cover_calibration, tz.tuya_cover_reversal,
             tuya.tz.backlight_indicator_mode],
         meta: {coverInverted: true},

package/devices/moes.js

@@ -399,7 +399,7 @@ module.exports = [
         model: 'ZS-EUB_1gang',
         vendor: 'Moes',
         description: 'Wall light switch (1 gang)',
-        extend: tuya.extend.switch({backlightMode: true, switchType: true}),
+        extend: tuya.extend.switch({backlightModeLowMediumHigh: true, switchType: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
             device.powerSource = 'Mains (single phase)';

package/devices/philips.js

@@ -810,6 +810,13 @@ module.exports = [
         description: 'Hue Filament Standard A60/E27 bluetooth',
         extend: hueExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['LWA021'],
+        model: '9290030514',
+        vendor: 'Philips',
+        description: 'Hue Filament Standard A60/E27 bluetooth',
+        extend: hueExtend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['LCB001'],
         model: '548727',

package/devices/sinope.js

@@ -8,6 +8,7 @@ const extend = require('../lib/extend');
 const e = exposes.presets;
 const ea = exposes.access;
 
+const manuSinope = {manufacturerCode: 0x119C};
 const fzLocal = {
     sinope_thermostat: {
         cluster: 'hvacThermostat',
@@ -123,11 +124,11 @@ const tzLocal = {
         convertSet: async (entity, key, value, meta) => {
             const sinopeOccupancy = {0: 'unoccupied', 1: 'occupied'};
             const SinopeOccupancy = utils.getKey(sinopeOccupancy, value, value, Number);
-            await entity.write('hvacThermostat', {SinopeOccupancy}, {manufacturerCode: 0x119C});
+            await entity.write('hvacThermostat', {SinopeOccupancy}, manuSinope);
             return {state: {'thermostat_occupancy': value}};
         },
         convertGet: async (entity, key, meta) => {
-            await entity.read('hvacThermostat', ['SinopeOccupancy'], {manufacturerCode: 0x119C});
+            await entity.read('hvacThermostat', ['SinopeOccupancy'], manuSinope);
         },
     },
     sinope_thermostat_backlight_autodim_param: {
@@ -135,11 +136,11 @@ const tzLocal = {
         convertSet: async (entity, key, value, meta) => {
             const sinopeBacklightParam = {0: 'on_demand', 1: 'sensing'};
             const SinopeBacklight = utils.getKey(sinopeBacklightParam, value, value, Number);
-            await entity.write('hvacThermostat', {SinopeBacklight}, {manufacturerCode: 0x119C});
+            await entity.write('hvacThermostat', {SinopeBacklight}, manuSinope);
             return {state: {'backlight_auto_dim': value}};
         },
         convertGet: async (entity, key, meta) => {
-            await entity.read('hvacThermostat', ['SinopeBacklight'], {manufacturerCode: 0x119C});
+            await entity.read('hvacThermostat', ['SinopeBacklight'], manuSinope);
         },
     },
     sinope_thermostat_main_cycle_output: {
@@ -147,11 +148,11 @@ const tzLocal = {
         key: ['main_cycle_output'],
         convertSet: async (entity, key, value, meta) => {
             const lookup = {'15_sec': 15, '5_min': 300, '10_min': 600, '15_min': 900, '20_min': 1200, '30_min': 1800};
-            await entity.write('hvacThermostat', {SinopeMainCycleOutput: lookup[value]}, {manufacturerCode: 0x119C});
+            await entity.write('hvacThermostat', {SinopeMainCycleOutput: lookup[value]}, manuSinope);
             return {state: {'main_cycle_output': value}};
         },
         convertGet: async (entity, key, meta) => {
-            await entity.read('hvacThermostat', ['SinopeMainCycleOutput'], {manufacturerCode: 0x119C});
+            await entity.read('hvacThermostat', ['SinopeMainCycleOutput'], manuSinope);
         },
     },
     sinope_thermostat_aux_cycle_output: {
@@ -170,22 +171,22 @@ const tzLocal = {
         key: ['enable_outdoor_temperature'],
         convertSet: async (entity, key, value, meta) => {
             if (value.toLowerCase() == 'on') {
-                await entity.write('manuSpecificSinope', {outdoorTempToDisplayTimeout: 10800});
+                await entity.write('manuSpecificSinope', {outdoorTempToDisplayTimeout: 10800}, manuSinope);
             } else if (value.toLowerCase() == 'off') {
                 // set timer to 12 sec in order to disable outdoor temperature
-                await entity.write('manuSpecificSinope', {outdoorTempToDisplayTimeout: 12});
+                await entity.write('manuSpecificSinope', {outdoorTempToDisplayTimeout: 12}, manuSinope);
             }
             return {readAfterWriteTime: 250, state: {enable_outdoor_temperature: value}};
         },
         convertGet: async (entity, key, meta) => {
-            await entity.read('manuSpecificSinope', ['outdoorTempToDisplayTimeout']);
+            await entity.read('manuSpecificSinope', ['outdoorTempToDisplayTimeout'], manuSinope);
         },
     },
     sinope_thermostat_outdoor_temperature: {
         key: ['thermostat_outdoor_temperature'],
         convertSet: async (entity, key, value, meta) => {
             if (value > -100 && value < 100) {
-                await entity.write('manuSpecificSinope', {outdoorTempToDisplay: value * 100});
+                await entity.write('manuSpecificSinope', {outdoorTempToDisplay: value * 100}, manuSinope);
             }
         },
     },
@@ -197,9 +198,9 @@ const tzLocal = {
                 const thermostatTimeSec = thermostatDate.getTime() / 1000;
                 const thermostatTimezoneOffsetSec = thermostatDate.getTimezoneOffset() * 60;
                 const currentTimeToDisplay = Math.round(thermostatTimeSec - thermostatTimezoneOffsetSec - 946684800);
-                await entity.write('manuSpecificSinope', {currentTimeToDisplay});
+                await entity.write('manuSpecificSinope', {currentTimeToDisplay}, manuSinope);
             } else if (value !== '') {
-                await entity.write('manuSpecificSinope', {currentTimeToDisplay: value});
+                await entity.write('manuSpecificSinope', {currentTimeToDisplay: value}, manuSinope);
             }
         },
     },
@@ -287,12 +288,12 @@ const tzLocal = {
             const lookup = {'24h': 0, '12h': 1};
             value = value.toLowerCase();
             if (lookup.hasOwnProperty(value)) {
-                await entity.write('manuSpecificSinope', {timeFormatToDisplay: lookup[value]});
+                await entity.write('manuSpecificSinope', {timeFormatToDisplay: lookup[value]}, manuSinope);
                 return {readAfterWriteTime: 250, state: {time_format: value}};
             }
         },
         convertGet: async (entity, key, meta) => {
-            await entity.read('manuSpecificSinope', ['timeFormatToDisplay']);
+            await entity.read('manuSpecificSinope', ['timeFormatToDisplay'], manuSinope);
         },
     },
     sinope_connected_load: {
@@ -428,6 +429,10 @@ module.exports = [
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
+
+            await reporting.temperature(endpoint, {min: 1, max: 0xFFFF}); // Disable default reporting
+            await endpoint.configureReporting('msTemperatureMeasurement', [{
+                attribute: 'tolerance', minimumReportInterval: 1, maximumReportInterval: 0xFFFF, reportableChange: 1}]);
             try {
                 await reporting.thermostatSystemMode(endpoint);
             } catch (error) {/* Not all support this */}
@@ -446,8 +451,6 @@ module.exports = [
             }
             await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 100}); // divider 1000: 0.1Arms
             await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 5}); // divider 10: 0.5Vrms
-
-            await reporting.temperature(endpoint, {min: 1, max: 0xFFFF}); // Disable default reporting
         },
     },
     {
@@ -492,6 +495,10 @@ module.exports = [
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
+
+            await reporting.temperature(endpoint, {min: 1, max: 0xFFFF}); // Disable default reporting
+            await endpoint.configureReporting('msTemperatureMeasurement', [{
+                attribute: 'tolerance', minimumReportInterval: 1, maximumReportInterval: 0xFFFF, reportableChange: 1}]);
             try {
                 await reporting.thermostatSystemMode(endpoint);
             } catch (error) {/* Not all support this */}
@@ -510,8 +517,6 @@ module.exports = [
             }
             await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 100}); // divider 1000: 0.1Arms
             await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 5}); // divider 10: 0.5Vrms
-
-            await reporting.temperature(endpoint, {min: 1, max: 0xFFFF}); // Disable default reporting
         },
     },
     {
@@ -557,22 +562,24 @@ module.exports = [
             const thermostatTimeSec = thermostatDate.getTime() / 1000;
             const thermostatTimezoneOffsetSec = thermostatDate.getTimezoneOffset() * 60;
             const currentTimeToDisplay = Math.round(thermostatTimeSec - thermostatTimezoneOffsetSec - 946684800);
-            await endpoint.write('manuSpecificSinope', {currentTimeToDisplay}, {manufacturerCode: 0x119C});
-            await endpoint.write('manuSpecificSinope', {'secondScreenBehavior': 0}, {manufacturerCode: 0x119C}); // Mode auto
+            await endpoint.write('manuSpecificSinope', {currentTimeToDisplay}, manuSinope);
+            await endpoint.write('manuSpecificSinope', {'secondScreenBehavior': 0}, manuSinope); // Mode auto
 
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
             await reporting.thermostatSystemMode(endpoint);
 
+            await reporting.temperature(endpoint, {min: 1, max: 0xFFFF}); // Disable default reporting
+            await endpoint.configureReporting('msTemperatureMeasurement', [{
+                attribute: 'tolerance', minimumReportInterval: 1, maximumReportInterval: 0xFFFF, reportableChange: 1}]);
+
             await reporting.readMeteringMultiplierDivisor(endpoint);
             await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [1, 1]});
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
             await reporting.activePower(endpoint, {min: 10, max: 305, change: 1}); // divider 1: 1W
             await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 100}); // divider 1000: 0.1Arms
             await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 5}); // divider 10: 0.5Vrms
-
-            await reporting.temperature(endpoint, {min: 1, max: 0xFFFF}); // Disable default reporting
             try {
                 await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
             } catch (error) {/* Do nothing */} // Not enought space but shall pass

package/devices/tuya.js

@@ -931,7 +931,7 @@ module.exports = [
         model: 'TS011F_2_gang_wall',
         vendor: 'TuYa',
         description: '2 gang wall outlet',
-        extend: tuya.extend.switch({backlightMode: true, childLock: true, endpoints: ['l1', 'l2']}),
+        extend: tuya.extend.switch({backlightModeLowMediumHigh: true, childLock: true, endpoints: ['l1', 'l2']}),
         whiteLabel: [{vendor: 'ClickSmart+', model: 'CMA30036'}],
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2};
@@ -1389,7 +1389,7 @@ module.exports = [
         model: 'TS130F',
         vendor: 'TuYa',
         description: 'Curtain/blind switch',
-        fromZigbee: [fz.cover_position_tilt, tuya.fz.backlight_mode, fz.tuya_cover_options],
+        fromZigbee: [fz.cover_position_tilt, tuya.fz.backlight_mode_low_medium_high, fz.tuya_cover_options],
         toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.tuya_cover_calibration, tz.tuya_cover_reversal,
             tuya.tz.backlight_indicator_mode],
         meta: {coverInverted: true},
@@ -1676,7 +1676,7 @@ module.exports = [
         model: 'TS011F_2_gang_2_usb_wall',
         vendor: 'TuYa',
         description: '2 gang 2 usb wall outlet',
-        extend: tuya.extend.switch({backlightMode: true, endpoints: ['l1', 'l2', 'l3', 'l4']}),
+        extend: tuya.extend.switch({backlightModeLowMediumHigh: true, endpoints: ['l1', 'l2', 'l3', 'l4']}),
         endpoint: () => {
             return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4};
         },
@@ -2766,8 +2766,7 @@ module.exports = [
         description: 'Smart light switch - 2 gang',
         whiteLabel: [{vendor: 'Vrey', model: 'VR-X712U-0013'}, {vendor: 'TUYATEC', model: 'GDKES-02TZXD'},
             {vendor: 'Earda', model: 'ESW-2ZAA-EU'}],
-        extend: tuya.extend.switch(),
-        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right')],
+        extend: tuya.extend.switch({backlightModeOffNormalInverted: true, endpoints: ['left', 'right']}),
         endpoint: (device) => {
             return {'left': 1, 'right': 2};
         },
@@ -2806,7 +2805,7 @@ module.exports = [
         model: 'TS0013',
         vendor: 'TuYa',
         description: 'Smart light switch - 3 gang without neutral wire',
-        extend: tuya.extend.switch({backlightMode: true, endpoints: ['left', 'center', 'right']}),
+        extend: tuya.extend.switch({backlightModeLowMediumHigh: true, endpoints: ['left', 'center', 'right']}),
         endpoint: (device) => {
             return {'left': 1, 'center': 2, 'right': 3};
         },
@@ -2857,7 +2856,7 @@ module.exports = [
         model: 'TS0014',
         vendor: 'TuYa',
         description: 'Smart light switch - 4 gang without neutral wire',
-        extend: tuya.extend.switch({backlightMode: true, endpoints: ['l1', 'l2', 'l3', 'l4']}),
+        extend: tuya.extend.switch({backlightModeLowMediumHigh: true, endpoints: ['l1', 'l2', 'l3', 'l4']}),
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4};
         },

package/devices/visonic.js

@@ -36,9 +36,14 @@ module.exports = [
         model: 'MCT-350 SMA',
         vendor: 'Visonic',
         description: 'Magnetic door & window contact sensor',
-        fromZigbee: [fz.ias_contact_alarm_1],
+        fromZigbee: [fz.ias_contact_alarm_1, fz.temperature],
         toZigbee: [],
-        exposes: [e.contact(), e.battery_low(), e.tamper()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement']);
+            await reporting.temperature(endpoint);
+        },
+        exposes: [e.contact(), e.battery_low(), e.tamper(), e.temperature()],
     },
     {
         zigbeeModel: ['MCT-340 E'],

package/lib/tuya.js

@@ -1158,7 +1158,10 @@ const tuyaExposes = {
     powerFactorWithPhase: (phase) => exposes.numeric(`power_factor_${phase}`, ea.STATE).withUnit('%')
         .withDescription(`Instantaneous measured power factor (phase ${phase.toUpperCase()})`),
     switchType: () => exposes.enum('switch_type', ea.ALL, ['toggle', 'state', 'momentary']).withDescription('Type of the switch'),
-    backlightMode: () => exposes.enum('backlight_mode', ea.ALL, ['low', 'medium', 'high']).withDescription('Intensity of the backlight'),
+    backlightModeLowMediumHigh: () => exposes.enum('backlight_mode', ea.ALL, ['low', 'medium', 'high'])
+        .withDescription('Intensity of the backlight'),
+    backlightModeOffNormalInverted: () => exposes.enum('backlight_mode', ea.ALL, ['off', 'normal', 'inverted'])
+        .withDescription('Mode of the backlight'),
     indicatorMode: () => exposes.enum('indicator_mode', ea.ALL, ['off', 'off/on', 'on/off', 'on']).withDescription('LED indicator mode'),
     powerOutageMemory: () => exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
         .withDescription('Recover state after power outage'),
@@ -1546,7 +1549,8 @@ const tuyaTz = {
     backlight_indicator_mode: {
         key: ['backlight_mode', 'indicator_mode'],
         convertSet: async (entity, key, value, meta) => {
-            const lookup = key === 'backlight_mode' ? {'low': 0, 'medium': 1, 'high': 2} : {'off': 0, 'off/on': 1, 'on/off': 2, 'on': 3};
+            const lookup = key === 'backlight_mode' ? {'low': 0, 'medium': 1, 'high': 2, 'off': 0, 'normal': 1, 'inverted': 2} :
+                {'off': 0, 'off/on': 1, 'on/off': 2, 'on': 3};
             value = value.toLowerCase();
             utils.validateValue(value, Object.keys(lookup));
             await entity.write('genOnOff', {tuyaBacklightMode: lookup[value]});
@@ -1644,7 +1648,7 @@ const tuyaFz = {
             }
         },
     },
-    backlight_mode: {
+    backlight_mode_low_medium_high: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
@@ -1655,6 +1659,17 @@ const tuyaFz = {
             }
         },
     },
+    backlight_mode_off_normal_inverted: {
+        cluster: 'genOnOff',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data.hasOwnProperty('tuyaBacklightMode')) {
+                const value = msg.data['tuyaBacklightMode'];
+                const backlightLookup = {0: 'off', 1: 'normal', 2: 'inverted'};
+                return {backlight_mode: backlightLookup[value]};
+            }
+        },
+    },
     indicator_mode: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],
@@ -1747,10 +1762,20 @@ const tuyaExtend = {
             toZigbee.push(tuyaTz.switch_type);
             exposes.push(tuyaExposes.switchType());
         }
-        if (options.backlightMode || options.indicatorMode) {
-            fromZigbee.push(options.backlightMode ? tuyaFz.backlight_mode : tuyaFz.indicator_mode);
+        if (options.backlightModeLowMediumHigh || options.backlightModeOffNormalInverted || options.indicatorMode) {
+            if (options.backlightModeLowMediumHigh) {
+                fromZigbee.push(tuyaFz.backlight_mode_low_medium_high);
+                exposes.push(tuyaExposes.backlightModeLowMediumHigh());
+            }
+            if (options.backlightModeOffNormalInverted) {
+                fromZigbee.push(tuyaFz.backlight_mode_off_normal_inverted);
+                exposes.push(tuyaExposes.backlightModeOffNormalInverted());
+            }
+            if (options.indicatorMode) {
+                fromZigbee.push(tuyaFz.indicator_mode);
+                exposes.push(tuyaExposes.indicatorMode());
+            }
             toZigbee.push(tuyaTz.backlight_indicator_mode);
-            exposes.push(options.backlightMode ? tuyaExposes.backlightMode() : tuyaExposes.indicatorMode());
         }
         if (options.electricalMeasurements) {
             fromZigbee.push(fz.electrical_measurement, fz.metering);

package/package.json

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