zigbee-herdsman-converters 14.0.377 → 14.0.381

package/converters/fromZigbee.js

@@ -1380,8 +1380,8 @@ const converters = {
             const payload = {
                 action: postfixWithEndpointName(`color_move`, msg, model),
                 action_color: {
-                    x: precisionRound(msg.data.colorx / 65535, 3),
-                    y: precisionRound(msg.data.colory / 65535, 3),
+                    x: precisionRound(msg.data.colorx / 65536, 3),
+                    y: precisionRound(msg.data.colory / 65536, 3),
                 },
                 action_transition_time: msg.data.transtime,
             };
@@ -7928,6 +7928,34 @@ const converters = {
             return result;
         },
     },
+    command_stop_move_raw: {
+        cluster: 'lightingColorCtrl',
+        type: 'raw',
+        convert: (model, msg, publish, options, meta) => {
+            // commandStopMove without params
+            if (msg.data[2] !== 71) return;
+            if (hasAlreadyProcessedMessage(msg)) return;
+            const movestop = 'stop';
+            const action = postfixWithEndpointName(`hue_${movestop}`, msg, model);
+            const payload = {action};
+            addActionGroup(payload, msg, model);
+            return payload;
+        },
+    },
+    tuya_multi_action: {
+        cluster: 'genOnOff',
+        type: 'raw',
+        convert: (model, msg, publish, options, meta) => {
+            if (hasAlreadyProcessedMessage(msg, msg.data[2])) return;
+            let action;
+            if (msg.data[2] == 253) {
+                action = {0: 'single', 1: 'double', 2: 'hold'}[msg.data[3]];
+            } else if (msg.data[2] == 252) {
+                action = {0: 'rotate_right', 1: 'rotate_left'}[msg.data[3]];
+            }
+            return {action};
+        },
+    },
     // #endregion
 
     // #region Ignore converters (these message dont need parsing).
@@ -8086,6 +8114,15 @@ const converters = {
         type: ['raw'],
         convert: (model, msg, publish, options, meta) => null,
     },
+    ignore_metering: {
+        /**
+         * When using this converter also add the following to the configure method of the device:
+         * await readMeteringPowerConverterAttributes(endpoint);
+         */
+        cluster: 'seMetering',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => null,
+    },
     // #endregion
 };
 

package/converters/toZigbee.js

@@ -6471,10 +6471,12 @@ const converters = {
                 } else {
                     throw new Error('Dimmer brightness is out of range 0..255');
                 }
-                await tuya.sendDataPointEnum(entity, tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white);
-                await tuya.sendDataPointValue(entity, tuya.dataPoints.dimmerLevel, newValue);
+                await tuya.sendDataPoints(entity, [
+                    tuya.dpValueFromEnum(tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white),
+                    tuya.dpValueFromIntValue(tuya.dataPoints.dimmerLevel, newValue),
+                ], 'dataRequest', 1);
 
-                return {state: {white_brightness: value}};
+                return {state: (key == 'white_brightness') ? {white_brightness: value} : {brightness: value}};
             } else if (key == 'color_temp') {
                 const [colorTempMin, colorTempMax] = [250, 454];
                 const preset = {
@@ -6496,8 +6498,10 @@ const converters = {
                 }
                 const data = utils.mapNumberRange(value, colorTempMax, colorTempMin, 0, 1000);
 
-                await tuya.sendDataPointEnum(entity, tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white);
-                await tuya.sendDataPointValue(entity, tuya.dataPoints.silvercrestSetColorTemp, data);
+                await tuya.sendDataPoints(entity, [
+                    tuya.dpValueFromEnum(tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white),
+                    tuya.dpValueFromIntValue(tuya.dataPoints.silvercrestSetColorTemp, data),
+                ], 'dataRequest', 1);
 
                 return {state: {color_temp: value}};
             } else if (key == 'color' || (separateWhite && (key == 'brightness'))) {
@@ -6550,12 +6554,11 @@ const converters = {
                     }
 
                     // Scale 0-255 to 0-1000 what the device expects.
-                    if (b) {
+                    if (b != null) {
                         hsb.b = make4sizedString(utils.mapNumberRange(b, 0, 255, 0, 1000).toString(16));
-                    } else if (state.brightness) {
+                    } else if (state.brightness != null) {
                         hsb.b = make4sizedString(utils.mapNumberRange(state.brightness, 0, 255, 0, 1000).toString(16));
                     }
-
                     return hsb;
                 };
 
@@ -6572,15 +6575,18 @@ const converters = {
                 data = data.concat(tuya.convertStringToHexArray(hsb.s));
                 data = data.concat(tuya.convertStringToHexArray(hsb.b));
 
-                await tuya.sendDataPointEnum(entity, tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.color);
-                await tuya.sendDataPointStringBuffer(entity, tuya.dataPoints.silvercrestSetColor, data);
+                const commands = [
+                    tuya.dpValueFromEnum(tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.color),
+                    tuya.dpValueFromStringBuffer(tuya.dataPoints.silvercrestSetColor, data),
+                ];
 
                 if (separateWhite && meta.state.white_brightness != undefined) {
                     // restore white state
                     const newValue = utils.mapNumberRange(meta.state.white_brightness, 0, 255, 0, 1000);
-                    await tuya.sendDataPointEnum(entity, tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white);
-                    await tuya.sendDataPointValue(entity, tuya.dataPoints.dimmerLevel, newValue);
+                    commands.push(tuya.dpValueFromEnum(tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white));
+                    commands.push(tuya.dpValueFromIntValue(tuya.dataPoints.dimmerLevel, newValue));
                 }
+                await tuya.sendDataPoints(entity, commands, 'dataRequest', 1);
 
                 return {state: newState};
             }

package/devices/adeo.js

@@ -6,6 +6,18 @@ const tz = require('../converters/toZigbee');
 const e = exposes.presets;
 
 module.exports = [
+    {
+        zigbeeModel: ['LDSENK01F'],
+        model: 'LDSENK01F',
+        vendor: 'ADEO',
+        description: '10A EU smart plug',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
     {
         zigbeeModel: ['LXEK-5'],
         model: 'HR-C99C-Z-C045',

package/devices/philips.js

@@ -29,6 +29,15 @@ const hueExtend = {
 };
 
 module.exports = [
+    {
+        zigbeeModel: ['LCX004'],
+        model: '929002994901',
+        vendor: 'Philips',
+        description: 'Hue gradient lightstrip',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['929003047501'],
         model: '929003047501',

package/devices/rgb_genie.js

@@ -71,7 +71,8 @@ module.exports = [
         fromZigbee: [fz.battery, fz.command_on, fz.command_off, fz.command_step, fz.command_move, fz.command_stop, fz.command_recall,
             fz.command_move_hue, fz.command_move_to_color, fz.command_move_to_color_temp],
         exposes: [e.battery(), e.action(['on', 'off', 'brightness_step_up', 'brightness_step_down', 'brightness_move_up',
-            'brightness_move_down', 'brightness_stop', 'recall_1', 'recall_2', 'recall_3'])],
+            'brightness_move_down', 'brightness_stop', 'recall_1', 'recall_2', 'recall_3', 'hue_move', 'color_temperature_move',
+            'color_move', 'hue_stop'])],
         toZigbee: [],
         meta: {multiEndpoint: true, battery: {dontDividePercentage: true}},
         configure: async (device, coordinatorEndpoint) => {

package/devices/skydance.js

@@ -5,7 +5,10 @@ const ea = exposes.access;
 
 module.exports = [
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_6qoazbre'}],
+        fingerprint: [
+            {modelID: 'TS0601', manufacturerName: '_TZE200_6qoazbre'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_fcooykb4'},
+        ],
         model: 'WZ5_dim',
         vendor: 'Skydance',
         description: 'Zigbee & RF 5 in 1 LED controller (DIM mode)',
@@ -17,7 +20,10 @@ module.exports = [
         ],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_gz3n0tzf'}],
+        fingerprint: [
+            {modelID: 'TS0601', manufacturerName: '_TZE200_gz3n0tzf'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_nthosjmx'},
+        ],
         model: 'WZ5_cct',
         vendor: 'Skydance',
         description: 'Zigbee & RF 5 in 1 LED controller (CCT mode)',
@@ -29,7 +35,10 @@ module.exports = [
         ],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_9hghastn'}],
+        fingerprint: [
+            {modelID: 'TS0601', manufacturerName: '_TZE200_9hghastn'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_9mt3kgn0'},
+        ],
         model: 'WZ5_rgb',
         vendor: 'Skydance',
         description: 'Zigbee & RF 5 in 1 LED controller (RGB mode)',
@@ -41,7 +50,10 @@ module.exports = [
         ],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_3thxjahu'}],
+        fingerprint: [
+            {modelID: 'TS0601', manufacturerName: '_TZE200_3thxjahu'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_g9jdneiu'},
+        ],
         model: 'WZ5_rgbw',
         vendor: 'Skydance',
         description: 'Zigbee & RF 5 in 1 LED controller (RGBW mode)',
@@ -56,7 +68,10 @@ module.exports = [
         meta: {separateWhite: true},
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_mde0utnv'}],
+        fingerprint: [
+            {modelID: 'TS0601', manufacturerName: '_TZE200_mde0utnv'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_aa9awrng'},
+        ],
         model: 'WZ5_rgbcct',
         vendor: 'Skydance',
         description: 'Zigbee & RF 5 in 1 LED controller (RGB+CCT mode)',

package/devices/tuya.js

@@ -12,7 +12,7 @@ const utils = require('../lib/utils');
 
 const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak', '_TZ3000_ew3ldmgx', '_TZ3000_gjnozsaz',
     '_TZ3000_jvzvulen', '_TZ3000_mraovvmm', '_TZ3000_nfnmi125', '_TZ3000_ps3dmato', '_TZ3000_w0qqde0g', '_TZ3000_u5u4cakc',
-    '_TZ3000_rdtixbnu', '_TZ3000_typdpbpg', '_TZ3000_v1pdxuqq', '_TZ3000_bfn1w0mm'];
+    '_TZ3000_rdtixbnu', '_TZ3000_typdpbpg', '_TZ3000_v1pdxuqq'];
 
 const tzLocal = {
     TS0504B_color: {
@@ -162,7 +162,8 @@ module.exports = [
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_0rn9qhnu'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_bicjqpg4'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_cmaky9gq'},
-            {modelID: 'TS0505B', manufacturerName: '_TZ3000_tza2vjxx'}],
+            {modelID: 'TS0505B', manufacturerName: '_TZ3000_tza2vjxx'},
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_bfwvfyx1'}],
         model: 'TS0505B',
         vendor: 'TuYa',
         description: 'Zigbee RGB+CCT light',
@@ -177,6 +178,7 @@ module.exports = [
     {
         fingerprint: [{modelID: 'TS0503B', manufacturerName: '_TZ3000_i8l0nqdu'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3210_a5fxguxr'},
+            {modelID: 'TS0503B', manufacturerName: '_TZ3210_778drfdt'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3000_g5xawfcq'}],
         model: 'TS0503B',
         vendor: 'TuYa',
@@ -187,7 +189,9 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS0504B', manufacturerName: '_TZ3000_ukuvyhaa'},
-            {modelID: 'TS0504B', manufacturerName: '_TZ3210_bfvybixd'}, {modelID: 'TS0504B', manufacturerName: '_TZ3210_sroezl0s'}],
+            {modelID: 'TS0504B', manufacturerName: '_TZ3210_bfvybixd'},
+            {modelID: 'TS0504B', manufacturerName: '_TZ3210_sroezl0s'},
+            {modelID: 'TS0504B', manufacturerName: '_TZ3210_1elppmba'}],
         model: 'TS0504B',
         vendor: 'TuYa',
         description: 'Zigbee RGBW light',
@@ -199,7 +203,8 @@ module.exports = [
         fingerprint: [{modelID: 'TS0501B', manufacturerName: '_TZ3000_4whigl8i'},
             {modelID: 'TS0501B', manufacturerName: '_TZ3210_4whigl8i'},
             {modelID: 'TS0501B', manufacturerName: '_TZ3210_9q49basr'},
-            {modelID: 'TS0501B', manufacturerName: '_TZ3210_grnwgegn'}],
+            {modelID: 'TS0501B', manufacturerName: '_TZ3210_grnwgegn'},
+            {modelID: 'TS0501B', manufacturerName: '_TZ3210_wuheofsg'}],
         model: 'TS0501B',
         description: 'Zigbee light',
         vendor: 'TuYa',
@@ -309,7 +314,8 @@ module.exports = [
         ],
     },
     {
-        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_oiymh3qu'}],
+        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_oiymh3qu'},
+            {modelID: 'TS011F', manufacturerName: '_TZ3000_o1jzcxou'}],
         model: 'TS011F_socket_module',
         vendor: 'TuYa',
         description: 'Socket module',
@@ -901,7 +907,7 @@ module.exports = [
                     'Mode of this device, in the `heat` mode the TS0601 will remain continuously heating, i.e. it does not regulate ' +
                     'to the desired temperature. If you want TRV to properly regulate the temperature you need to use mode `auto` ' +
                     'instead setting the desired temperature.')
-                .withLocalTemperatureCalibration(-30, 30, 0.1, ea.STATE_SET)
+                .withLocalTemperatureCalibration(-9, 9, 1, ea.STATE_SET)
                 .withAwayMode().withPreset(['schedule', 'manual', 'boost', 'complex', 'comfort', 'eco']),
             e.auto_lock(), e.away_mode(), e.away_preset_days(), e.boost_time(), e.comfort_temperature(), e.eco_temperature(), e.force(),
             e.max_temperature(), e.min_temperature(), e.away_preset_temperature(),
@@ -1116,7 +1122,8 @@ module.exports = [
     {
         fingerprint: [
             {modelID: 'TS011F', manufacturerName: '_TZ3000_hyfvrar3'},
-            {modelID: 'TS011F', manufacturerName: '_TZ3000_cymsnfvf'}],
+            {modelID: 'TS011F', manufacturerName: '_TZ3000_cymsnfvf'},
+            {modelID: 'TS011F', manufacturerName: '_TZ3000_bfn1w0mm'}],
         model: 'TS011F_plug_2',
         description: 'Smart plug (without power monitoring)',
         vendor: 'TuYa',
@@ -1831,9 +1838,29 @@ module.exports = [
         model: 'ERS-10TZBVK-AA',
         vendor: 'TuYa',
         description: 'Smart knob',
-        fromZigbee: [fz.command_step, fz.command_toggle, fz.command_move_hue],
-        toZigbee: [],
-        exposes: [e.action(['toggle', 'brightness_step_up', 'brightness_step_down'])],
+        fromZigbee: [
+            fz.command_step, fz.command_toggle, fz.command_move_hue, fz.command_step_color_temperature, fz.command_stop_move_raw,
+            fz.tuya_multi_action, fz.tuya_operation_mode, fz.battery,
+        ],
+        toZigbee: [tz.tuya_operation_mode],
+        exposes: [
+            e.action([
+                'toggle', 'brightness_step_up', 'brightness_step_down', 'color_temperature_step_up', 'color_temperature_step_down',
+                'saturation_move', 'hue_move', 'hue_stop', 'single', 'double', 'hold', 'rotate_left', 'rotate_right',
+            ]),
+            exposes.numeric('action_step_size', ea.STATE).withValueMin(0).withValueMax(255),
+            exposes.numeric('action_transition_time', ea.STATE).withUnit('s'),
+            exposes.numeric('action_rate', ea.STATE).withValueMin(0).withValueMax(255),
+            e.battery(),
+            exposes.enum('operation_mode', ea.ALL, ['command', 'event']).withDescription(
+                'Operation mode: "command" - for group control, "event" - for clicks'),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await endpoint.read('genOnOff', ['tuyaOperationMode']);
+        },
     },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_kzm5w4iz'}],

package/devices/xiaomi.js

@@ -1402,7 +1402,8 @@ module.exports = [
         model: 'SSM-U01',
         vendor: 'Xiaomi',
         description: 'Aqara single switch module T1 (with neutral)',
-        fromZigbee: [fz.on_off, fz.metering, fz.electrical_measurement, fz.device_temperature, fz.aqara_opple],
+        // Ignore energy metering reports, rely on aqara_opple: https://github.com/Koenkk/zigbee2mqtt/issues/10709
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.device_temperature, fz.aqara_opple, fz.ignore_metering],
         exposes: [e.switch(), e.energy(), e.power(), e.device_temperature(), e.power_outage_memory(), e.switch_type()],
         toZigbee: [tz.xiaomi_switch_type, tz.on_off, tz.xiaomi_switch_power_outage_memory],
         configure: async (device, coordinatorEndpoint, logger) => {

package/index.js

@@ -77,7 +77,7 @@ function addDefinition(definition) {
 
     definition.toZigbee.push(tz.scene_store, tz.scene_recall, tz.scene_add, tz.scene_remove, tz.scene_remove_all, tz.read, tz.write);
 
-    if (definition.exposes && Array.isArray(definition.exposes)) {
+    if (definition.exposes && Array.isArray(definition.exposes) && !definition.exposes.find((e) => e.name === 'linkquality')) {
         definition.exposes = definition.exposes.concat([exposes.presets.linkquality()]);
     }
 

package/lib/ota/zigbeeOTA.js

@@ -4,8 +4,10 @@ const common = require('./common');
 const axios = common.getAxios();
 const fs = require('fs');
 const URI = require('uri-js');
+const path = require('path');
 
-let overrideFileName = null;
+let overrideIndexFileName = null;
+let dataDir = null;
 
 /**
  * Helper functions
@@ -22,7 +24,7 @@ function isValidUrl(url) {
     return parsed.scheme === 'http' || parsed.scheme === 'https';
 }
 
-async function getFile(urlOrName) {
+async function getIndexFile(urlOrName) {
     if (isValidUrl(urlOrName)) {
         return (await axios.get(urlOrName)).data;
     }
@@ -30,14 +32,33 @@ async function getFile(urlOrName) {
     return JSON.parse(fs.readFileSync(urlOrName));
 }
 
+async function getFirmwareFile(image, logger) {
+    let urlOrName = image.url;
+
+    // First try to download firmware file with the URL provided
+    if (isValidUrl(urlOrName)) {
+        logger.debug(`ZigbeeOTA: downloading firmware image from ${urlOrName}`);
+        return await axios.get(urlOrName, {responseType: 'arraybuffer'});
+    }
+
+    // If the file name is not a full path, then treat it as a relative to the data directory
+    if (!path.isAbsolute(urlOrName) && dataDir) {
+        urlOrName = path.join(dataDir, urlOrName);
+    }
+
+    logger.debug(`ZigbeeOTA: getting local firmware file ${urlOrName}`);
+    return {data: fs.readFileSync(urlOrName)};
+}
+
+
 async function getIndex(logger) {
     const index = (await axios.get(url)).data;
 
     logger.debug(`ZigbeeOTA: downloaded main index`);
 
-    if (overrideFileName) {
-        logger.debug(`ZigbeeOTA: Loading override index ${overrideFileName}`);
-        const localIndex = await getFile(overrideFileName);
+    if (overrideIndexFileName) {
+        logger.debug(`ZigbeeOTA: Loading override index ${overrideIndexFileName}`);
+        const localIndex = await getIndexFile(overrideIndexFileName);
 
         // Resulting index will have overriden items first
         return localIndex.concat(index);
@@ -58,6 +79,7 @@ async function getImageMeta(current, logger, device) {
     // For this case additional identification through the modelId is done.
     // In the case of Tuya and Moes, additional identification is carried out through the manufacturerName.
     const image = images.find((i) => i.imageType === imageType && i.manufacturerCode === manufacturerCode &&
+        (!i.minFileVersion || current.fileVersion >= i.minFileVersion) && (!i.maxFileVersion || current.fileVersion <= i.maxFileVersion) &&
         (!i.modelId || i.modelId === modelId) && (!i.manufacturerName || i.manufacturerName.includes(manufacturerName)));
 
     assert(image !== undefined, `No image available for imageType '${imageType}'`);
@@ -78,7 +100,7 @@ async function isUpdateAvailable(device, logger, requestPayload=null) {
 }
 
 async function updateToLatest(device, logger, onProgress) {
-    return common.updateToLatest(device, logger, onProgress, common.getNewImage, getImageMeta);
+    return common.updateToLatest(device, logger, onProgress, common.getNewImage, getImageMeta, getFirmwareFile);
 }
 
 module.exports = {
@@ -86,6 +108,9 @@ module.exports = {
     isUpdateAvailable,
     updateToLatest,
     useIndexOverride: (indexFileName) => {
-        overrideFileName = indexFileName;
+        overrideIndexFileName = indexFileName;
+    },
+    setDataDir: (dir) => {
+        dataDir = dir;
     },
 };

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.377",
+  "version": "14.0.381",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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