zigbee-herdsman-converters 15.0.53 → 15.0.55

package/converters/fromZigbee.js

@@ -327,7 +327,7 @@ const converters = {
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
             const payload = {};
-            if (msg.data.hasOwnProperty('batteryPercentageRemaining')) {
+            if (msg.data.hasOwnProperty('batteryPercentageRemaining') && (msg.data['batteryPercentageRemaining'] < 255)) {
                 // Some devices do not comply to the ZCL and report a
                 // batteryPercentageRemaining of 100 when the battery is full (should be 200).
                 const dontDividePercentage = model.meta && model.meta.battery && model.meta.battery.dontDividePercentage;
@@ -336,7 +336,7 @@ const converters = {
                 payload.battery = precisionRound(percentage, 2);
             }
 
-            if (msg.data.hasOwnProperty('batteryVoltage')) {
+            if (msg.data.hasOwnProperty('batteryVoltage') && (msg.data['batteryVoltage'] < 255)) {
                 // Deprecated: voltage is = mV now but should be V
                 payload.voltage = msg.data['batteryVoltage'] * 100;
 
@@ -408,6 +408,15 @@ const converters = {
             }
         },
     },
+    pm25: {
+        cluster: 'pm25Measurement',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data['measuredValue']) {
+                return {pm25: msg.data['measuredValue']};
+            }
+        },
+    },
     soil_moisture: {
         cluster: 'msSoilMoisture',
         type: ['attributeReport', 'readResponse'],
@@ -601,8 +610,8 @@ const converters = {
             }
 
             if (msg.data.hasOwnProperty('colorMode')) {
-                result.color_mode = constants.colorMode.hasOwnProperty(msg.data['colorMode']) ?
-                    constants.colorMode[msg.data['colorMode']] : msg.data['colorMode'];
+                result.color_mode = constants.colorModeLookup.hasOwnProperty(msg.data['colorMode']) ?
+                    constants.colorModeLookup[msg.data['colorMode']] : msg.data['colorMode'];
             }
 
             if (
@@ -2299,9 +2308,9 @@ const converters = {
 
             if (msg.data.hasOwnProperty('tuyaRgbMode')) {
                 if (msg.data['tuyaRgbMode'] === 1) {
-                    result.color_mode = constants.colorMode[0];
+                    result.color_mode = constants.colorModeLookup[0];
                 } else {
-                    result.color_mode = constants.colorMode[2];
+                    result.color_mode = constants.colorModeLookup[2];
                 }
             }
 
@@ -5926,15 +5935,6 @@ const converters = {
             };
         },
     },
-    heiman_pm25: {
-        cluster: 'heimanSpecificPM25Measurement',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            if (msg.data['measuredValue']) {
-                return {pm25: msg.data['measuredValue']};
-            }
-        },
-    },
     heiman_hcho: {
         cluster: 'heimanSpecificFormaldehydeMeasurement',
         type: ['attributeReport', 'readResponse'],

package/converters/toZigbee.js

@@ -796,7 +796,7 @@ const converters = {
                 };
                 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,
+                    state: libColor.syncColorState({'color_mode': constants.colorModeLookup[2], 'color_temp': value}, meta.state,
                         entity, meta.options, meta.logger), readAfterWriteTime: payload.transtime * 100,
                 };
             }
@@ -1031,7 +1031,7 @@ const converters = {
             const payload = {colortemp: value, transtime: utils.getTransition(entity, key, meta).time};
             await entity.command('lightingColorCtrl', 'moveToColorTemp', payload, utils.getOptions(meta.mapped, entity));
             return {
-                state: libColor.syncColorState({'color_mode': constants.colorMode[2], 'color_temp': value}, meta.state,
+                state: libColor.syncColorState({'color_mode': constants.colorModeLookup[2], 'color_temp': value}, meta.state,
                     entity, meta.options, meta.logger), readAfterWriteTime: payload.transtime * 100,
             };
         },
@@ -1091,7 +1091,7 @@ const converters = {
                     xy.y = 0.2993;
                 }
 
-                newState.color_mode = constants.colorMode[1];
+                newState.color_mode = constants.colorModeLookup[1];
                 newState.color = xy.toObject();
                 zclData.colorx = utils.mapNumberRange(xy.x, 0, 1, 0, 65535);
                 zclData.colory = utils.mapNumberRange(xy.y, 0, 1, 0, 65535);
@@ -1100,7 +1100,7 @@ const converters = {
                 const enhancedHue = utils.getMetaValue(entity, meta.mapped, 'enhancedHue', 'allEqual', true);
                 const hsv = newColor.hsv;
                 const hsvCorrected = hsv.colorCorrected(meta);
-                newState.color_mode = constants.colorMode[0];
+                newState.color_mode = constants.colorModeLookup[0];
                 newState.color = hsv.toObject(false);
 
                 if (hsv.hue !== null) {
@@ -3542,7 +3542,7 @@ const converters = {
         key: ['brightness', 'color', 'color_temp'],
         options: [exposes.options.color_sync()],
         convertSet: async (entity, key, value, meta) => {
-            if (key === 'brightness' && meta.state.color_mode == constants.colorMode[2] &&
+            if (key === 'brightness' && meta.state.color_mode == constants.colorModeLookup[2] &&
                 !meta.message.hasOwnProperty('color') && !meta.message.hasOwnProperty('color_temp')) {
                 const zclData = {level: Number(value), transtime: 0};
 
@@ -3565,7 +3565,7 @@ const converters = {
 
                 const newState = {
                     brightness: zclDataBrightness.level,
-                    color_mode: constants.colorMode[2],
+                    color_mode: constants.colorModeLookup[2],
                     color_temp: meta.message.color_temp,
                 };
 
@@ -3583,7 +3583,7 @@ const converters = {
 
                 const newState = {
                     brightness: zclDataBrightness.level,
-                    color_mode: constants.colorMode[2],
+                    color_mode: constants.colorModeLookup[2],
                     color_temp: value,
                 };
 
@@ -3649,7 +3649,7 @@ const converters = {
                     s: utils.mapNumberRange(zclData.saturation, 0, 254, 0, 100),
                     saturation: utils.mapNumberRange(zclData.saturation, 0, 254, 0, 100),
                 },
-                color_mode: constants.colorMode[0],
+                color_mode: constants.colorModeLookup[0],
             };
 
             return {state: libColor.syncColorState(newState, meta.state, entity, meta.options, meta.logger),
@@ -5285,12 +5285,12 @@ const converters = {
 
             const addColorMode = (newState) => {
                 if (newState.hasOwnProperty('color_temp')) {
-                    newState.color_mode = constants.colorMode[2];
+                    newState.color_mode = constants.colorModeLookup[2];
                 } else if (newState.hasOwnProperty('color')) {
                     if (newState.color.hasOwnProperty('x')) {
-                        newState.color_mode = constants.colorMode[1];
+                        newState.color_mode = constants.colorModeLookup[1];
                     } else {
-                        newState.color_mode = constants.colorMode[0];
+                        newState.color_mode = constants.colorModeLookup[0];
                     }
                 }
 
@@ -5391,7 +5391,7 @@ const converters = {
                     const xScaled = utils.mapNumberRange(xy.x, 0, 1, 0, 65535);
                     const yScaled = utils.mapNumberRange(xy.y, 0, 1, 0, 65535);
                     extensionfieldsets.push({'clstId': 768, 'len': 4, 'extField': [xScaled, yScaled]});
-                    state['color_mode'] = constants.colorMode[2];
+                    state['color_mode'] = constants.colorModeLookup[2];
                     state['color_temp'] = val;
                 } else if (attribute === 'color') {
                     try {
@@ -5411,7 +5411,7 @@ const converters = {
                                 'extField': [xScaled, yScaled],
                             },
                         );
-                        state['color_mode'] = constants.colorMode[1];
+                        state['color_mode'] = constants.colorModeLookup[1];
                         state['color'] = newColor.xy.toObject();
                     } else if (newColor.isHSV()) {
                         const hsvCorrected = newColor.hsv.colorCorrected(meta);
@@ -5439,7 +5439,7 @@ const converters = {
                                 },
                             );
                         }
-                        state['color_mode'] = constants.colorMode[0];
+                        state['color_mode'] = constants.colorModeLookup[0];
                         state['color'] = newColor.hsv.toObject(false, false);
                     }
                 }

package/devices/heiman.js

@@ -557,14 +557,14 @@ module.exports = [
         model: 'HS2AQ-EM',
         vendor: 'HEIMAN',
         description: 'Air quality monitor',
-        fromZigbee: [fz.battery, fz.temperature, fz.humidity, fz.heiman_pm25, fz.heiman_hcho, fz.heiman_air_quality],
+        fromZigbee: [fz.battery, fz.temperature, fz.humidity, fz.pm25, fz.heiman_hcho, fz.heiman_air_quality],
         toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const heiman = {
                 configureReporting: {
                     pm25MeasuredValue: async (endpoint, overrides) => {
                         const payload = reporting.payload('measuredValue', 0, constants.repInterval.HOUR, 1, overrides);
-                        await endpoint.configureReporting('heimanSpecificPM25Measurement', payload);
+                        await endpoint.configureReporting('pm25Measurement', payload);
                     },
                     formAldehydeMeasuredValue: async (endpoint, overrides) => {
                         const payload = reporting.payload('measuredValue', 0, constants.repInterval.HOUR, 1, overrides);
@@ -591,7 +591,7 @@ module.exports = [
 
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, [
-                'genPowerCfg', 'genTime', 'msTemperatureMeasurement', 'msRelativeHumidity', 'heimanSpecificPM25Measurement',
+                'genPowerCfg', 'genTime', 'msTemperatureMeasurement', 'msRelativeHumidity', 'pm25Measurement',
                 'heimanSpecificFormaldehydeMeasurement', 'heimanSpecificAirQuality']);
 
             await reporting.batteryPercentageRemaining(endpoint);

package/devices/ikea.js

@@ -186,7 +186,7 @@ const ikea = {
             type: ['attributeReport', 'readResponse'],
             convert: (model, msg, publish, options, meta) => {
                 const payload = {};
-                if (msg.data.hasOwnProperty('batteryPercentageRemaining')) {
+                if (msg.data.hasOwnProperty('batteryPercentageRemaining') && (msg.data['batteryPercentageRemaining'] < 255)) {
                     // Some devices do not comply to the ZCL and report a
                     // batteryPercentageRemaining of 100 when the battery is full (should be 200).
                     //
@@ -1025,4 +1025,30 @@ module.exports = [
         description: 'PILSKOTT LED floor lamp',
         extend: tradfriExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['VINDSTYRKA'],
+        model: 'E2112',
+        vendor: 'IKEA',
+        description: 'Vindstyrka air quality and humidity sensor',
+        fromZigbee: [fz.temperature, fz.humidity, fz.pm25],
+        toZigbee: [],
+        exposes: [e.temperature(), e.humidity(), e.pm25()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const ep = device.getEndpoint(1);
+            await reporting.bind(ep, coordinatorEndpoint,
+                ['msTemperatureMeasurement', 'msRelativeHumidity', 'pm25Measurement']);
+            await ep.configureReporting('msTemperatureMeasurement', [{
+                attribute: 'measuredValue',
+                minimumReportInterval: 60, maximumReportInterval: 120,
+            }]);
+            await ep.configureReporting('msRelativeHumidity', [{
+                attribute: 'measuredValue',
+                minimumReportInterval: 60, maximumReportInterval: 120,
+            }]);
+            await ep.configureReporting('pm25Measurement', [{
+                attribute: 'measuredValueIkea',
+                minimumReportInterval: 60, maximumReportInterval: 120, reportableChange: 2,
+            }]);
+        },
+    },
 ];

package/devices/innr.js

@@ -4,7 +4,6 @@ const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
-const ea = exposes.access;
 const ota = require('../lib/ota');
 
 module.exports = [
@@ -543,7 +542,7 @@ module.exports = [
             endpoint.saveClusterAttributeKeyValue('seMetering', {multiplier: 1, divisor: 100});
             await reporting.currentSummDelivered(endpoint);
         },
-        exposes: [e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.switch(), e.energy()],
+        exposes: [e.power(), e.current(), e.voltage(), e.switch(), e.energy()],
     },
     {
         zigbeeModel: ['SP 110'],
@@ -618,7 +617,7 @@ module.exports = [
             await reporting.currentSummDelivered(endpoint);
         },
         ota: ota.zigbeeOTA,
-        exposes: [e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.switch(), e.energy()],
+        exposes: [e.power(), e.current(), e.voltage(), e.switch(), e.energy()],
     },
     {
         zigbeeModel: ['OFL 120 C'],

package/devices/ledvance.js

@@ -35,6 +35,13 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness_colortemp(),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['Panel Light 2x2 TW'],
+        model: '74746',
+        vendor: 'LEDVANCE',
+        description: 'LEDVANCE 74746 Sylvania smart+ Zigbee dimmable edge-lit panel',
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [200, 370]}),
+    },
     {
         zigbeeModel: ['Panel TW 620 UGR19'],
         model: 'GPDRPLOP401100CE',

package/devices/lellki.js

@@ -135,7 +135,7 @@ module.exports = [
         },
         options: [exposes.options.measurement_poll_interval()],
         exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'),
-            e.switch().withEndpoint('l3'), e.power(), e.current(), e.voltage().withAccess(ea.STATE),
+            e.switch().withEndpoint('l3'), e.power(), e.current(), e.voltage(),
             e.energy(), exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
                 .withDescription('Recover state after power outage')],
         endpoint: (device) => {

package/devices/lidl.js

@@ -7,6 +7,9 @@ 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 {ColorMode} = require('../lib/constants');
+const libColor = require('../lib/color');
 
 const tuyaLocal = {
     dataPoints: {
@@ -142,6 +145,101 @@ const fzLocal = {
     },
 };
 const tzLocal = {
+    led_control: {
+        key: ['brightness', 'color', 'color_temp', 'transition'],
+        options: [exposes.options.color_sync()],
+        convertSet: async (entity, _key, _value, meta) => {
+            const newState = {};
+
+            // The color mode encodes whether the light is using its white LEDs or its color LEDs
+            let colorMode = meta.state.color_mode ?? ColorMode.ColorTemp;
+
+            // Color mode switching is done by setting color temperature (switch to white LEDs) or setting color (switch
+            // to color LEDs)
+            if ('color_temp' in meta.message) colorMode = ColorMode.ColorTemp;
+            if ('color' in meta.message) colorMode = ColorMode.HS;
+
+            if (colorMode != meta.state.color_mode) {
+                newState.color_mode = colorMode;
+
+                // To switch between white mode and color mode, we have to send a special command:
+                const rgbMode = (colorMode == ColorMode.HS);
+                await entity.command('lightingColorCtrl', 'tuyaRgbMode', {enable: rgbMode}, {}, {disableDefaultResponse: true});
+            }
+
+            // A transition time of 0 would be treated as about 1 second, probably some kind of fallback/default
+            // transition time, so for "no transition" we use 1 (tenth of a second).
+            const transtime = 'transition' in meta.message ? meta.message.transition * 10 : 1;
+
+            if (colorMode == ColorMode.ColorTemp) {
+                if ('brightness' in meta.message) {
+                    const zclData = {level: Number(meta.message.brightness), transtime};
+                    await entity.command('genLevelCtrl', 'moveToLevel', zclData, utils.getOptions(meta.mapped, entity));
+                    newState.brightness = meta.message.brightness;
+                }
+
+                if ('color_temp' in meta.message) {
+                    const zclData = {colortemp: meta.message.color_temp, transtime: transtime};
+                    await entity.command('lightingColorCtrl', 'moveToColorTemp', zclData, utils.getOptions(meta.mapped, entity));
+                    newState.color_temp = meta.message.color_temp;
+                }
+            } else if (colorMode == ColorMode.HS) {
+                if ('brightness' in meta.message || 'color' in meta.message) {
+                    // We ignore the brightness of the color and instead use the overall brightness setting of the lamp
+                    // for the brightness because I think that's the expected behavior and also because the color
+                    // conversion below always returns 100 as brightness ("value") even for very dark colors, except
+                    // when the color is completely black/zero.
+
+                    // Load current state or defaults
+                    const newSettings = {
+                        brightness: meta.state.brightness ?? 254, //      full brightness
+                        hue: (meta.state.color ?? {}).h ?? 0, //          red
+                        saturation: (meta.state.color ?? {}).s ?? 100, // full saturation
+                    };
+
+                    // Apply changes
+                    if ('brightness' in meta.message) {
+                        newSettings.brightness = meta.message.brightness;
+                        newState.brightness = meta.message.brightness;
+                    }
+                    if ('color' in meta.message) {
+                        // The Z2M UI sends `{ hex:'#xxxxxx' }`.
+                        // Home Assistant sends `{ h: xxx, s: xxx }`.
+                        // We convert the former into the latter.
+                        const c = libColor.Color.fromConverterArg(meta.message.color);
+                        if (c.isRGB()) {
+                            // https://github.com/Koenkk/zigbee2mqtt/issues/13421#issuecomment-1426044963
+                            c.hsv = c.rgb.gammaCorrected().toXY().toHSV();
+                        }
+                        const color = c.hsv;
+
+                        newSettings.hue = color.hue;
+                        newSettings.saturation = color.saturation;
+
+                        newState.color = {
+                            h: color.hue,
+                            s: color.saturation,
+                        };
+                    }
+
+                    // Convert to device specific format and send
+                    const zclData = {
+                        brightness: utils.mapNumberRange(newSettings.brightness, 0, 254, 0, 1000),
+                        hue: newSettings.hue,
+                        saturation: utils.mapNumberRange(newSettings.saturation, 0, 100, 0, 1000),
+                    };
+                    // This command doesn't support a transition time
+                    await entity.command('lightingColorCtrl', 'tuyaMoveToHueAndSaturationBrightness2', zclData,
+                        utils.getOptions(meta.mapped, entity));
+                }
+            }
+
+            return {state: newState};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('lightingColorCtrl', ['currentHue', 'currentSaturation', 'currentLevel', 'tuyaRgbMode', 'colorTemperature']);
+        },
+    },
     zs_thermostat_child_lock: {
         key: ['child_lock'],
         convertSet: async (entity, key, value, meta) => {
@@ -739,7 +837,9 @@ module.exports = [
         model: '14149505L/14149506L',
         vendor: 'Lidl',
         description: 'Livarno Lux light bar RGB+CCT (black/white)',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
+        toZigbee: [tz.on_off, tzLocal.led_control],
+        fromZigbee: [fz.on_off, fz.tuya_led_controller, fz.brightness, fz.ignore_basic_report],
+        exposes: [e.light_brightness_colortemp_colorhs([153, 500]).removeFeature('color_temp_startup')],
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
         },

package/devices/makegood.js

@@ -5,7 +5,6 @@ const reporting = require('../lib/reporting');
 const tuya = require('../lib/tuya');
 const utils = require('../lib/utils');
 const e = exposes.presets;
-const ea = exposes.access;
 
 const fzLocal = {
     // MG-AUZG01 requires multiEndpoint only for on_off
@@ -30,7 +29,7 @@ module.exports = [
         description: 'Double Zigbee power point',
         fromZigbee: [fzLocal.MGAUZG01_on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report],
         toZigbee: [tz.on_off],
-        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'), e.power(), e.current(), e.voltage().withAccess(ea.STATE),
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'), e.power(), e.current(), e.voltage(),
             e.energy()],
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2};

package/devices/miboxer.js

@@ -36,7 +36,7 @@ module.exports = [
         model: 'FUT035Z',
         description: 'Dual white LED controller',
         vendor: 'Miboxer',
-        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
+        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], disablePowerOnBehavior: true}),
     },
     {
         fingerprint: [{modelID: 'TS0504B', manufacturerName: '_TZ3210_ttkgurpb'}],

package/devices/micromatic.js

@@ -3,8 +3,6 @@ const exposes = require('../lib/exposes');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
-const ea = exposes.access;
-
 
 module.exports = [
     {
@@ -26,6 +24,6 @@ module.exports = [
             await reporting.activePower(endpoint, {min: 10, change: 15}); // W - Min change of 1,5W
             await reporting.currentSummDelivered(endpoint, {min: 300}); // Report KWH every 5min
         },
-        exposes: [e.light_brightness(), e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy()],
+        exposes: [e.light_brightness(), e.power(), e.current(), e.voltage(), e.energy()],
     },
 ];

package/devices/robb.js

@@ -4,7 +4,6 @@ const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
-const ea = exposes.access;
 
 module.exports = [
     {
@@ -242,7 +241,7 @@ module.exports = [
             await reporting.temperature(endpoint);
             await reporting.currentSummDelivered(endpoint);
         },
-        exposes: [e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.switch(), e.energy(), e.temperature()],
+        exposes: [e.power(), e.current(), e.voltage(), e.switch(), e.energy(), e.temperature()],
     },
     {
         zigbeeModel: ['ROB_200-017-1'],
@@ -264,7 +263,7 @@ module.exports = [
             await reporting.temperature(endpoint);
             await reporting.currentSummDelivered(endpoint);
         },
-        exposes: [e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.switch(), e.energy(), e.temperature()],
+        exposes: [e.power(), e.current(), e.voltage(), e.switch(), e.energy(), e.temperature()],
     },
     {
         zigbeeModel: ['ROB_200-016-0'],

package/devices/sonoff.js

@@ -209,7 +209,7 @@ module.exports = [
         model: 'S26R2ZB',
         vendor: 'SONOFF',
         description: 'Zigbee smart plug',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
     },
     {
         zigbeeModel: ['S40LITE'],

package/devices/third_reality.js

@@ -171,17 +171,25 @@ module.exports = [
         model: '3RSP02028BZ',
         vendor: 'Third Reality',
         description: 'Zigbee / BLE smart plug with power',
-        fromZigbee: [fz.on_off, fz.electrical_measurement],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
         toZigbee: [tz.on_off],
         ota: ota.zigbeeOTA,
-        exposes: [e.switch(), e.power(), e.current(), e.voltage()],
+        exposes: [e.switch(), e.ac_frequency(), e.power(), e.power_factor(), e.energy(), e.current(), e.voltage()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
+            await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
             await reporting.onOff(endpoint);
-            await reporting.activePower(endpoint);
-            await reporting.rmsCurrent(endpoint);
-            await reporting.rmsVoltage(endpoint);
+            await reporting.activePower(endpoint, {change: 10});
+            await reporting.rmsCurrent(endpoint, {change: 50});
+            await reporting.rmsVoltage(endpoint, {change: 5});
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
+            endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {
+                acVoltageMultiplier: 1, acVoltageDivisor: 10, acCurrentMultiplier: 1, acCurrentDivisor: 1000, acPowerMultiplier: 1,
+                acPowerDivisor: 10,
+            });
+            device.save();
         },
     },
 ];

package/devices/tuya.js

@@ -1914,7 +1914,7 @@ module.exports = [
             endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
             device.save();
         },
-        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy(), tuya.exposes.switchType(),
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), tuya.exposes.switchType(),
             exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore']).withDescription('Recover state after power outage')],
     },
     {
@@ -1960,7 +1960,7 @@ module.exports = [
             device.save();
         },
         whiteLabel: [{vendor: 'Aubess', model: 'WHD02'}],
-        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy(), e.power_on_behavior(),
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.power_on_behavior(),
             tuya.exposes.switchType()],
     },
     {
@@ -2133,6 +2133,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_5sbebbzs'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_udank5zs'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_zuz7f94z'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_nv6nxo0c'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_68nvbio9'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_3ylew7b4'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_llm0epxg'},
@@ -2594,7 +2595,7 @@ module.exports = [
         options: [exposes.options.measurement_poll_interval()],
         // This device doesn't support reporting correctly.
         // https://github.com/Koenkk/zigbee-herdsman-converters/pull/1270
-        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE),
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(),
             e.energy(), exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
                 .withDescription('Recover state after power outage'),
             exposes.enum('indicator_mode', ea.ALL, ['off', 'off/on', 'on/off']).withDescription('LED indicator mode')],
@@ -3408,7 +3409,7 @@ module.exports = [
             endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
             device.save();
         },
-        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE),
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(),
             e.energy(), exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
                 .withDescription('Recover state after power outage'),
             exposes.enum('indicator_mode', ea.STATE_SET, ['off', 'on_off', 'off_on'])
@@ -4114,4 +4115,31 @@ module.exports = [
             ],
         },
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_r32ctezx']),
+        model: 'TS0601_fan_switch',
+        vendor: 'TuYa',
+        description: 'Fan switch',
+        fromZigbee: [tuya.fz.datapoints],
+        toZigbee: [tuya.tz.datapoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [
+            tuya.exposes.switch(), e.power_on_behavior(['off', 'on']).withAccess(ea.STATE_SET),
+            tuya.exposes.countdown().withValueMin(0).withValueMax(43200).withUnit('s').withDescription('Max ON time in seconds'),
+            exposes.numeric('fan_speed', ea.STATE_SET).withValueMin(1).withValueMax(5).withValueStep(1)
+                .withDescription('Speed off the fan'),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [1, 'state', tuya.valueConverter.onOff],
+                [2, 'countdown', tuya.valueConverter.countdown],
+                [3, 'fan_speed', tuya.valueConverterBasic
+                    .lookup({'1': tuya.enum(0), '2': tuya.enum(1), '3': tuya.enum(2), '4': tuya.enum(3), '5': tuya.enum(4)})],
+                [11, 'power_on_behavior', tuya.valueConverterBasic.lookup({'off': tuya.enum(0), 'on': tuya.enum(1)})],
+            ],
+        },
+        whiteLabel: [
+            {vendor: 'Lerlink', model: 'T2-Z67/T2-W67'},
+        ],
+    },
 ];

package/devices/ubisys.js

@@ -903,7 +903,8 @@ module.exports = [
                 {min: 0, max: constants.repInterval.HOUR, change: 50});
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint,
                 {min: 0, max: constants.repInterval.HOUR, change: 50});
-            await reporting.thermostatPIHeatingDemand(endpoint);
+            await reporting.thermostatPIHeatingDemand(endpoint,
+                {min: 15, max: constants.repInterval.HOUR, change: 1});
             await reporting.thermostatOccupancy(endpoint);
             await reporting.batteryPercentageRemaining(endpoint,
                 {min: constants.repInterval.HOUR, max: 43200, change: 1});

package/devices/vesternet.js

@@ -0,0 +1,188 @@
+const exposes = require('../lib/exposes');
+const fz = require('../converters/fromZigbee');
+const tz = require('../converters/toZigbee');
+const reporting = require('../lib/reporting');
+const extend = require('../lib/extend');
+const e = exposes.presets;
+
+module.exports = [
+    {
+        fingerprint: [{modelID: 'HK-SL-DIM-A', softwareBuildID: '2.5.3_r52'}],
+        model: 'VES-ZB-DIM-004',
+        vendor: 'Vesternet',
+        description: 'Zigbee dimmer',
+        fromZigbee: extend.light_onoff_brightness().fromZigbee
+            .concat([fz.electrical_measurement, fz.metering, fz.ignore_genOta]),
+        toZigbee: extend.light_onoff_brightness().toZigbee.concat([tz.power_on_behavior]),
+        exposes: [e.light_brightness(), e.power(), e.voltage(), e.current(), e.energy(), e.power_on_behavior(['off', 'on', 'previous'])],
+        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZG9040A'}],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.onOff(endpoint);
+            await reporting.brightness(endpoint);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.activePower(endpoint);
+            await reporting.rmsCurrent(endpoint, {min: 10, change: 10});
+            await reporting.rmsVoltage(endpoint, {min: 10});
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint);
+        },
+    },
+    {
+        fingerprint: [{modelID: 'ON/OFF -M', softwareBuildID: '2.9.2_r54'}],
+        model: 'VES-ZB-HLD-017',
+        vendor: 'Vesternet',
+        description: 'Zigbee high load switch',
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.power_on_behavior, fz.ignore_genOta],
+        toZigbee: [tz.on_off, tz.power_on_behavior],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.power_on_behavior(['off', 'on', 'previous'])],
+        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZG9101SAC-HP-SWITCH-B'}],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.onOff(endpoint);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.activePower(endpoint);
+            await reporting.rmsCurrent(endpoint, {min: 10, change: 10});
+            await reporting.rmsVoltage(endpoint, {min: 10});
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint);
+        },
+    },
+    {
+        fingerprint: [{modelID: 'HK-ZCC-A', softwareBuildID: '2.5.3_r48'}],
+        model: 'VES-ZB-MOT-019',
+        vendor: 'Vesternet',
+        description: 'Zigbee motor controller',
+        fromZigbee: [fz.cover_position_tilt, fz.ignore_genOta],
+        toZigbee: [tz.cover_state, tz.cover_position_tilt],
+        exposes: [e.cover_position()],
+        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZG9080A'}],
+        meta: {coverInverted: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['closuresWindowCovering']);
+            await reporting.currentPositionLiftPercentage(endpoint);
+        },
+    },
+    {
+        fingerprint: [{modelID: 'ZGRC-KEY-013', softwareBuildID: '2.5.3_r20'}],
+        model: 'VES-ZB-REM-013',
+        vendor: 'Vesternet',
+        description: 'Zigbee remote control - 12 button',
+        fromZigbee: [fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.command_recall, fz.battery, fz.ignore_genOta],
+        exposes: [e.battery(),
+            e.action(['on_*', 'off_*', 'stop_*', 'brightness_move_up_*', 'brightness_move_down_*', 'brightness_stop_*', 'recall_*'])],
+        toZigbee: [],
+        meta: {multiEndpoint: true, battery: {dontDividePercentage: true}, publishDuplicateTransaction: true},
+        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZG9001K12-DIM-Z4'}],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'genScenes', 'genPowerCfg']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'genScenes']);
+            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'genScenes']);
+            await reporting.bind(device.getEndpoint(4), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'genScenes']);
+            await reporting.batteryPercentageRemaining(device.getEndpoint(1));
+        },
+    },
+    {
+        fingerprint: [{modelID: 'HK-SL-RELAY-A', softwareBuildID: '2.5.3_r47'}],
+        model: 'VES-ZB-SWI-005',
+        vendor: 'Vesternet',
+        description: 'Zigbee switch',
+        fromZigbee: [fz.on_off, fz.power_on_behavior, fz.ignore_genOta],
+        toZigbee: [tz.on_off, tz.power_on_behavior],
+        exposes: [e.switch(), e.power_on_behavior(['off', 'on', 'previous'])],
+        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZG9100A-S'}],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
+    {
+        fingerprint: [{modelID: 'ON/OFF(2CH)', softwareBuildID: '2.5.3_r2'}],
+        model: 'VES-ZB-SWI-015',
+        vendor: 'Vesternet',
+        description: 'Zigbee 2 channel switch',
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.power_on_behavior, fz.ignore_genOta],
+        toZigbee: [tz.on_off, tz.power_on_behavior],
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'), e.power(), e.current(),
+            e.voltage(), e.energy(), e.power_on_behavior(['off', 'on', 'previous'])],
+        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZG9101SAC-HP-SWITCH-2CH'}],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint1 = device.getEndpoint(1);
+            const endpoint2 = device.getEndpoint(2);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.bind(endpoint2, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint1);
+            await reporting.onOff(endpoint2);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint1);
+            await reporting.activePower(endpoint1);
+            await reporting.rmsCurrent(endpoint1, {min: 10, change: 10});
+            await reporting.rmsVoltage(endpoint1, {min: 10});
+            await reporting.readMeteringMultiplierDivisor(endpoint1);
+            await reporting.currentSummDelivered(endpoint1);
+        },
+    },
+    {
+        fingerprint: [{modelID: 'ZG2833K2_EU07', softwareBuildID: '2.5.3_r20'}],
+        model: 'VES-ZB-WAL-006',
+        vendor: 'Vesternet',
+        description: 'Zigbee wall controller - 2 button',
+        fromZigbee: [fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.battery, fz.ignore_genOta],
+        exposes: [e.battery(), e.action([
+            'on_1', 'off_1', 'stop_1', 'brightness_move_up_1', 'brightness_move_down_1', 'brightness_stop_1'])],
+        toZigbee: [],
+        meta: {multiEndpoint: true, battery: {dontDividePercentage: true}},
+        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZG9001K2-DIM2'}],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'genPowerCfg']);
+            await reporting.batteryPercentageRemaining(device.getEndpoint(1));
+        },
+    },
+    {
+        fingerprint: [{modelID: 'ZG2833K4_EU06', softwareBuildID: '2.5.3_r20'}],
+        model: 'VES-ZB-WAL-011',
+        vendor: 'Vesternet',
+        description: 'Zigbee wall controller - 4 button',
+        fromZigbee: [fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.battery, fz.ignore_genOta],
+        exposes: [e.battery(), e.action([
+            'on_1', 'off_1', 'stop_1', 'brightness_move_up_1', 'brightness_move_down_1', 'brightness_stop_1',
+            'on_2', 'off_2', 'stop_2', 'brightness_move_up_2', 'brightness_move_down_2', 'brightness_stop_2'])],
+        toZigbee: [],
+        meta: {multiEndpoint: true, battery: {dontDividePercentage: true}},
+        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZG9001K4-DIM2'}],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'genPowerCfg']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.batteryPercentageRemaining(device.getEndpoint(1));
+        },
+    },
+    {
+        fingerprint: [{modelID: 'ZG2833K8_EU05', softwareBuildID: '2.5.3_r20'}],
+        model: 'VES-ZB-WAL-012',
+        vendor: 'Vesternet',
+        description: 'Zigbee wall controller - 8 button',
+        fromZigbee: [fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.battery, fz.ignore_genOta],
+        exposes: [e.battery(), e.action([
+            'on_1', 'off_1', 'stop_1', 'brightness_move_up_1', 'brightness_move_down_1', 'brightness_stop_1',
+            'on_2', 'off_2', 'stop_2', 'brightness_move_up_2', 'brightness_move_down_2', 'brightness_stop_2',
+            'on_3', 'off_3', 'stop_3', 'brightness_move_up_3', 'brightness_move_down_3', 'brightness_stop_3',
+            'on_4', 'off_4', 'stop_4', 'brightness_move_up_4', 'brightness_move_down_4', 'brightness_stop_4'])],
+        toZigbee: [],
+        meta: {multiEndpoint: true, battery: {dontDividePercentage: true}},
+        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZG9001K8-DIM'}],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'genPowerCfg']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.bind(device.getEndpoint(4), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.batteryPercentageRemaining(device.getEndpoint(1));
+        },
+    },
+];

package/devices/xiaomi.js

@@ -68,7 +68,7 @@ const fzLocal = {
         },
     },
     aqara_s1_pm25: {
-        cluster: 'heimanSpecificPM25Measurement',
+        cluster: 'pm25Measurement',
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
             if (msg.data['measuredValue']) {
@@ -1490,7 +1490,7 @@ module.exports = [
         exposes: [
             e.switch(), e.power().withAccess(ea.STATE_GET),
             e.energy(), e.device_temperature().withAccess(ea.STATE),
-            e.voltage().withAccess(ea.STATE), e.action(['single', 'release']),
+            e.voltage(), e.action(['single', 'release']),
             exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled'])
                 .withDescription('Decoupled mode'),
         ],
@@ -1539,7 +1539,7 @@ module.exports = [
             tz.xiaomi_led_disabled_night, tz.xiaomi_flip_indicator_light],
         exposes: [
             e.switch(), e.action(['single', 'double']), e.power().withAccess(ea.STATE), e.energy(),
-            e.voltage().withAccess(ea.STATE), e.device_temperature().withAccess(ea.STATE),
+            e.voltage(), e.device_temperature().withAccess(ea.STATE),
             e.power_outage_memory(), e.led_disabled_night(), e.flip_indicator_light(),
             exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled'])
                 .withDescription('Decoupled mode for left button'),
@@ -1561,7 +1561,7 @@ module.exports = [
         },
         exposes: [
             e.switch().withEndpoint('left'), e.switch().withEndpoint('right'),
-            e.power().withAccess(ea.STATE), e.energy(), e.voltage().withAccess(ea.STATE), e.flip_indicator_light(),
+            e.power().withAccess(ea.STATE), e.energy(), e.voltage(), e.flip_indicator_light(),
             e.power_outage_memory(), e.led_disabled_night(), e.device_temperature().withAccess(ea.STATE),
             e.action([
                 'single_left', 'double_left', 'single_right', 'double_right', 'single_both', 'double_both']),
@@ -1589,7 +1589,7 @@ module.exports = [
         },
         exposes: [
             e.switch().withEndpoint('left'), e.switch().withEndpoint('center'), e.switch().withEndpoint('right'),
-            e.power().withAccess(ea.STATE), e.energy(), e.voltage().withAccess(ea.STATE), e.flip_indicator_light(),
+            e.power().withAccess(ea.STATE), e.energy(), e.voltage(), e.flip_indicator_light(),
             e.power_outage_memory(), e.led_disabled_night(), e.device_temperature().withAccess(ea.STATE),
             e.action([
                 'single_left', 'double_left', 'single_center', 'double_center',
@@ -1908,7 +1908,7 @@ module.exports = [
         fromZigbee: [fz.on_off, fz.xiaomi_power, fz.xiaomi_basic, fz.ignore_occupancy_report, fz.ignore_illuminance_report],
         toZigbee: [tz.on_off, tz.xiaomi_power],
         exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature().withAccess(ea.STATE),
-            e.voltage().withAccess(ea.STATE)],
+            e.voltage()],
     },
     {
         zigbeeModel: ['lumi.plug.mmeu01'],
@@ -1921,7 +1921,7 @@ module.exports = [
             tz.xiaomi_overload_protection],
         exposes: [
             e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature().withAccess(ea.STATE),
-            e.voltage().withAccess(ea.STATE), e.current(), e.consumer_connected(), e.led_disabled_night(),
+            e.voltage(), e.current(), e.consumer_connected(), e.led_disabled_night(),
             e.power_outage_memory(), exposes.binary('auto_off', ea.STATE_SET, true, false)
                 .withDescription('Turn the device automatically off when attached device consumes less than 2W for 20 minutes'),
             exposes.numeric('overload_protection', exposes.access.ALL).withValueMin(100).withValueMax(2300).withUnit('W')
@@ -1938,7 +1938,7 @@ module.exports = [
             tz.xiaomi_overload_protection],
         exposes: [
             e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature().withAccess(ea.STATE),
-            e.voltage().withAccess(ea.STATE), e.current(), e.consumer_connected(), e.led_disabled_night(),
+            e.voltage(), e.current(), e.consumer_connected(), e.led_disabled_night(),
             e.power_outage_memory(), exposes.binary('auto_off', ea.STATE_SET, true, false)
                 .withDescription('Turn the device automatically off when attached device consumes less than 2W for 20 minutes'),
             exposes.numeric('overload_protection', exposes.access.ALL).withValueMin(100).withValueMax(2300).withUnit('W')
@@ -2002,7 +2002,7 @@ module.exports = [
             }
         },
         exposes: [e.switch(), e.power(), e.energy(), e.power_outage_memory(),
-            e.voltage().withAccess(ea.STATE), e.current(),
+            e.voltage(), e.current(),
             e.device_temperature().withDescription('Device temperature (polled every 30 min)')],
         ota: ota.zigbeeOTA,
     },
@@ -2014,7 +2014,7 @@ module.exports = [
         fromZigbee: [fz.on_off, fz.xiaomi_power, fz.ignore_occupancy_report, fz.xiaomi_basic],
         toZigbee: [tz.on_off, tz.xiaomi_power, tz.xiaomi_led_disabled_night,
             tz.xiaomi_switch_power_outage_memory, tz.xiaomi_auto_off],
-        exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature(), e.voltage().withAccess(ea.STATE),
+        exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature(), e.voltage(),
             e.power_outage_memory(), e.led_disabled_night(),
             exposes.binary('auto_off', ea.STATE_SET, true, false)
                 .withDescription('If the power is constantly lower than 2W within half an hour, ' +
@@ -2041,7 +2041,7 @@ module.exports = [
         fromZigbee: [fz.on_off, fz.xiaomi_power, fz.xiaomi_basic],
         toZigbee: [tz.on_off, tz.xiaomi_switch_power_outage_memory, tz.xiaomi_power],
         exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature().withAccess(ea.STATE),
-            e.voltage().withAccess(ea.STATE), e.power_outage_memory()],
+            e.voltage(), e.power_outage_memory()],
         ota: ota.zigbeeOTA,
     },
     {
@@ -2576,7 +2576,7 @@ module.exports = [
         fromZigbee: [fz.on_off, fz.xiaomi_power, fz.aqara_opple],
         toZigbee: [tz.on_off, tz.xiaomi_power, tz.xiaomi_switch_type, tz.xiaomi_switch_power_outage_memory, tz.xiaomi_led_disabled_night],
         exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature().withAccess(ea.STATE),
-            e.voltage().withAccess(ea.STATE), e.power_outage_memory(), e.led_disabled_night(), e.switch_type()],
+            e.voltage(), e.power_outage_memory(), e.led_disabled_night(), e.switch_type()],
         configure: async (device, coordinatorEndpoint, logger) => {
             await device.getEndpoint(1).write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
             device.powerSource = 'Mains (single phase)';
@@ -2822,7 +2822,7 @@ module.exports = [
         toZigbee: [tz.on_off, tz.xiaomi_switch_power_outage_memory, tz.xiaomi_led_disabled_night,
             tz.xiaomi_overload_protection, tz.xiaomi_socket_button_lock],
         exposes: [e.switch(), e.power().withAccess(ea.STATE), e.energy(), e.device_temperature().withAccess(ea.STATE),
-            e.voltage().withAccess(ea.STATE), e.current(), e.consumer_connected().withAccess(ea.STATE),
+            e.voltage(), e.current(), e.consumer_connected().withAccess(ea.STATE),
             e.power_outage_memory(), e.led_disabled_night(), e.button_lock(),
             exposes.numeric('overload_protection', exposes.access.ALL).withValueMin(100).withValueMax(2500).withUnit('W')
                 .withDescription('Maximum allowed load, turns off if exceeded')],
@@ -2891,7 +2891,7 @@ module.exports = [
         },
         exposes: [
             e.switch().withEndpoint('relay'), e.switch().withEndpoint('usb'),
-            e.power().withAccess(ea.STATE), e.energy(), e.device_temperature().withAccess(ea.STATE), e.voltage().withAccess(ea.STATE),
+            e.power().withAccess(ea.STATE), e.energy(), e.device_temperature().withAccess(ea.STATE), e.voltage(),
             e.current(), e.power_outage_memory(), e.led_disabled_night(), e.button_lock(),
             exposes.enum('button_switch_mode', exposes.access.ALL, ['relay', 'relay_and_usb'])
                 .withDescription('Control both relay and usb or only the relay with the physical switch button'),
@@ -2919,7 +2919,7 @@ module.exports = [
             tz.xiaomi_overload_protection, tz.xiaomi_socket_button_lock],
         exposes: [
             e.switch(), e.power().withAccess(ea.STATE), e.energy(),
-            e.device_temperature().withAccess(ea.STATE), e.voltage().withAccess(ea.STATE),
+            e.device_temperature().withAccess(ea.STATE), e.voltage(),
             e.current(), e.power_outage_memory(), e.led_disabled_night(), e.button_lock(),
             exposes.numeric('overload_protection', exposes.access.ALL).withValueMin(100).withValueMax(2500).withUnit('W')
                 .withDescription('Maximum allowed load, turns off if exceeded')],

package/lib/constants.js

@@ -210,10 +210,16 @@ const armNotification = {
 
 // ID's from ZCL mapped to ha names where appropriate
 // https://github.com/home-assistant/core/pull/47720
-const colorMode = {
-    0: 'hs',
-    1: 'xy',
-    2: 'color_temp',
+const ColorMode = {
+    HS: 0,
+    XY: 1,
+    ColorTemp: 2,
+};
+
+const colorModeLookup = {
+    [ColorMode.HS]: 'hs',
+    [ColorMode.XY]: 'xy',
+    [ColorMode.ColorTemp]: 'color_temp',
 };
 
 const lockSoundVolume = ['silent_mode', 'low_volume', 'high_volume'];
@@ -294,7 +300,8 @@ module.exports = {
     lockSourceName,
     armMode,
     armNotification,
-    colorMode,
+    colorModeLookup,
+    ColorMode,
     lockSoundVolume,
     lockUserStatus,
     easyCodeTouchActions,

package/lib/tuya.js

@@ -1615,7 +1615,7 @@ const tuyaTz = {
             'week_schedule_programming', 'online', 'holiday_mode_date', 'schedule', 'schedule_monday', 'schedule_tuesday',
             'schedule_wednesday', 'schedule_thursday', 'schedule_friday', 'schedule_saturday', 'schedule_sunday', 'clear_fault',
             'scale_protection', 'error', 'radar_scene', 'radar_sensitivity', 'tumble_alarm_time', 'tumble_switch', 'fall_sensitivity',
-            'min_temperature', 'max_temperature', 'window_detection', 'boost_heating', 'alarm_ringtone', 'alarm_time',
+            'min_temperature', 'max_temperature', 'window_detection', 'boost_heating', 'alarm_ringtone', 'alarm_time', 'fan_speed',
         ],
         convertSet: async (entity, key, value, meta) => {
             // A set converter is only called once; therefore we need to loop
@@ -1868,7 +1868,7 @@ const tuyaExtend = {
 
         if (options.electricalMeasurements) {
             fromZigbee.push(fz.electrical_measurement, fz.metering);
-            exposes.push(e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy());
+            exposes.push(e.power(), e.current(), e.voltage(), e.energy());
         }
         if (options.childLock) {
             fromZigbee.push(tuyaFz.child_lock);

package/package.json

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