zigbee-herdsman-converters 14.0.578 → 14.0.581

package/converters/fromZigbee.js

@@ -1094,9 +1094,9 @@ const converters = {
         cluster: 'genScenes',
         type: 'commandStore',
         convert: (model, msg, publish, options, meta) => {
-            if (utils.hasAlreadyProcessedMessage(msg)) return;
-            const payload = {action: utils.postfixWithEndpointName(`store_${msg.data.sceneid}`, msg, model, meta)};
-            utils.addActionGroup(payload, msg, model);
+            if (hasAlreadyProcessedMessage(msg)) return;
+            const payload = {action: postfixWithEndpointName(`store_${msg.data.sceneid}`, msg, model, meta)};
+            addActionGroup(payload, msg, model);
             return payload;
         },
     },

package/devices/adeo.js

@@ -36,6 +36,13 @@ module.exports = [
         description: 'ENKI LEXMAN E27 LED white',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['ZBEK-6'],
+        model: 'IG-CDZB2AG009RA-MZN-01',
+        vendor: 'ADEO',
+        description: 'ENKI LEXMAN E27 Led white bulb',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 454]}),
+    },
     {
         zigbeeModel: ['ZBEK-4'],
         model: 'IM-CDZDGAAA0005KA_MAN',
@@ -57,6 +64,13 @@ module.exports = [
         description: 'ENKI LEXMAN E27 LED white',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['ZBEK-14'],
+        model: 'IC-CDZFB2AC005HA-MZN',
+        vendor: 'ADEO',
+        description: 'ENKI LEXMAN E14 LED white',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
     {
         zigbeeModel: ['ZBEK-5'],
         model: 'IST-CDZFB2AS007NA-MZN-01',

package/devices/ajax_online.js

@@ -30,4 +30,12 @@ module.exports = [
         description: 'Smart Zigbee pro 12W A60 RGBCW bulb',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_hzy4rjz3'}],
+        model: 'AJ_RGBCCT_CTRL',
+        vendor: 'Ajax Online',
+        description: 'Smart Zigbee LED strip RGB+CCT',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], disableColorTempStartup: true}),
+        meta: {applyRedFix: true, enhancedHue: false},
+    },
 ];

package/devices/bitron.js

@@ -136,7 +136,11 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
             await reporting.instantaneousDemand(endpoint);
             await reporting.currentSummDelivered(endpoint);
-            await reporting.currentSummReceived(endpoint);
+            try {
+                await reporting.currentSummReceived(endpoint);
+            } catch (error) {
+                /* fails for some: https://github.com/Koenkk/zigbee2mqtt/issues/13258 */
+            }
             endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 10000, multiplier: 1});
         },
     },

package/devices/halemeier.js

@@ -0,0 +1,11 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['HA-ZM12/24-1K'],
+        model: 'HA-ZM12/24-1K',
+        vendor: 'Halemeier',
+        description: '1-channel smart receiver',
+        extend: extend.light_onoff_brightness(),
+    },
+];

package/devices/home_control_as.js

@@ -1,8 +1,9 @@
 const exposes = require('../lib/exposes');
-const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
+const fz = require('../converters/fromZigbee');
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const e = exposes.presets;
+const ota = require('../lib/ota');
 
 module.exports = [
     {
@@ -11,13 +12,16 @@ module.exports = [
         vendor: 'Home Control AS',
         description: 'Heimgard (Wattle) door lock pro',
         fromZigbee: [fz.lock, fz.battery],
-        toZigbee: [tz.lock],
+        toZigbee: [tz.lock, tz.lock_auto_relock_time, tz.lock_sound_volume],
+        ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['closuresDoorLock', 'genPowerCfg']);
             await reporting.lockState(endpoint);
             await reporting.batteryPercentageRemaining(endpoint);
+            await endpoint.read('closuresDoorLock', ['lockState', 'soundVolume']);
         },
-        exposes: [e.lock(), e.battery()],
+        exposes: [
+            e.lock(), e.battery(), e.auto_relock_time().withValueMin(0).withValueMax(3600), e.sound_volume()],
     },
 ];

package/devices/legrand.js

@@ -266,6 +266,24 @@ module.exports = [
             // Read configuration values that are not sent periodically as well as current power (activePower).
             await endpoint.read('haElectricalMeasurement', ['activePower', 0xf000, 0xf001, 0xf002]);
         },
+        onEvent: async (type, data, device, options, state) => {
+            /**
+             * The DIN power consumption module loses the configure reporting
+             * after device restart/powerloss.
+             *
+             * We reconfigure the reporting at deviceAnnounce.
+             */
+            if (type === 'deviceAnnounce') {
+                for (const endpoint of device.endpoints) {
+                    for (const c of endpoint.configuredReportings) {
+                        await endpoint.configureReporting(c.cluster.name, [{
+                            attribute: c.attribute.name, minimumReportInterval: c.minimumReportInterval,
+                            maximumReportInterval: c.maximumReportInterval, reportableChange: c.reportableChange,
+                        }]);
+                    }
+                }
+            }
+        },
     },
     {
         zigbeeModel: ['Remote switch Wake up / Sleep'],

package/devices/lellki.js

@@ -115,6 +115,7 @@ module.exports = [
         toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
             endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {acCurrentDivisor: 1000, acCurrentMultiplier: 1});
             endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});

package/devices/mecrator.js

@@ -6,6 +6,30 @@ const e = exposes.presets;
 const ea = exposes.access;
 
 module.exports = [
+    {
+        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3210_yvxjawlt'}],
+        model: 'SPP04G',
+        vendor: 'Mercator',
+        description: 'Ikuü Quad Power Point',
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, fz.tuya_switch_power_outage_memory],
+        toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory],
+        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right'),
+            e.power().withEndpoint('left'), e.current().withEndpoint('left'),
+            e.voltage().withEndpoint('left').withAccess(ea.STATE), e.energy(),
+            exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
+                .withDescription('Recover state after power outage')],
+        endpoint: (device) => {
+            return {left: 1, right: 2};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+            endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {acCurrentDivisor: 1000, acCurrentMultiplier: 1});
+            endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
+            device.save();
+        },
+    },
     {
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3210_7jnk7l3k'}],
         model: 'SPP02GIP',

package/devices/orvibo.js

@@ -5,7 +5,32 @@ const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
 
+const tzLocal = {
+    DD10Z_brightness: {
+        key: ['brightness'],
+        options: [exposes.options.transition()],
+        convertSet: async (entity, key, value, meta) => {
+            // Device doesn't support moveToLevelWithOnOff therefore this converter is needed.
+            await entity.command('genLevelCtrl', 'moveToLevel', {level: Number(value), transtime: 0}, {disableDefaultResponse: true});
+            return {state: {brightness: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('genLevelCtrl', ['currentLevel']);
+        },
+    },
+};
+
 module.exports = [
+    {
+        zigbeeModel: ['ccb9f56837ab41dcad366fb1452096b6'],
+        model: 'DD10Z',
+        vendor: 'ORVIBO',
+        description: 'Smart spotlight',
+        // https://github.com/Koenkk/zigbee2mqtt/issues/13123#issuecomment-1198793749
+        meta: {disableDefaultResponse: true},
+        toZigbee: [tz.on_off, tzLocal.DD10Z_brightness, tz.light_colortemp, tz.effect],
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370], disableColorTempStartup: true}),
+    },
     {
         zigbeeModel: ['4a33f5ea766a4c96a962b371ffde9943'],
         model: 'DS20Z07B',

package/devices/philips.js

@@ -406,7 +406,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness(),
     },
     {
-        zigbeeModel: ['LCT026', '7602031P7', '7602031U7'],
+        zigbeeModel: ['LCT026', '7602031P7', '7602031U7', '7602031PU'],
         model: '7602031P7',
         vendor: 'Philips',
         description: 'Hue Go with Bluetooth',
@@ -1469,6 +1469,13 @@ module.exports = [
         description: 'Hue White and color ambiance Gradient Signe table lamp (white)',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['915005987001'],
+        model: '915005987001',
+        vendor: 'Philips',
+        description: 'Hue White and color ambiance Gradient Signe table lamp (black)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['5060730P7_01', '5060730P7_02', '5060730P7_03', '5060730P7_04', '5060730P7_05'],
         model: '5060730P7',
@@ -2139,7 +2146,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['929003047101', '929003045101_03'],
+        zigbeeModel: ['929003047101', '929003045101_03', '929003045101_01', '929003045101_02'],
         model: '929003047101',
         vendor: 'Philips',
         description: 'Hue White ambiance Milliskin (round)',

package/devices/plugwise.js

@@ -149,4 +149,27 @@ module.exports = [
                 .withDescription('Calibrates valve on next wakeup'),
         ],
     },
+    {
+        zigbeeModel: ['158-01'],
+        model: '158-01',
+        vendor: 'Plugwise',
+        description: 'Lisa zone thermostat',
+        fromZigbee: [fz.thermostat, fz.temperature, fz.battery],
+        toZigbee: [
+            tz.thermostat_system_mode,
+            tz.thermostat_occupied_heating_setpoint,
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic', 'genPowerCfg', 'hvacThermostat']);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.thermostatTemperature(endpoint);
+        },
+        exposes: [e.battery(),
+            exposes.climate()
+                .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5, ea.ALL)
+                .withLocalTemperature(ea.STATE)
+                .withSystemMode(['off', 'auto'], ea.ALL),
+        ],
+    },
 ];

package/devices/profalux.js

@@ -17,6 +17,7 @@ module.exports = [
         exposes: [],
     },
     {
+        zigbeeModel: ['MOT-C1Z06C\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000'],
         fingerprint: [{manufId: 4368, endpoints: [{ID: 1, profileID: 260, deviceID: 512,
             inputClusters: [0, 3, 4, 5, 6, 8, 10, 21, 256, 64544, 64545], outputClusters: [3, 64544]}]}],
         model: 'NSAV061',

package/devices/sengled.js

@@ -137,13 +137,21 @@ module.exports = [
         model: 'E11-N1EA',
         vendor: 'Sengled',
         description: 'Element plus color (A19)',
-        extend: extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
+        fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.metering]),
+        toZigbee: extend.light_onoff_brightness().toZigbee,
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
             device.powerSource = 'Mains (single phase)';
             device.save();
+
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint);
+            await reporting.instantaneousDemand(endpoint);
         },
+        exposes: extend.light_onoff_brightness().exposes.concat([e.power(), e.energy()]),
     },
     {
         zigbeeModel: ['E11-U2E'],

package/devices/tuya.js

@@ -438,7 +438,8 @@ module.exports = [
             {modelID: 'TS0001', manufacturerName: '_TZ3000_rmjr4ufz'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_v7gnj3ad'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_mx3vgyea'},
-            {modelID: 'TS0001', manufacturerName: '_TZ3000_qsp2pwtf'}],
+            {modelID: 'TS0001', manufacturerName: '_TZ3000_qsp2pwtf'},
+            {modelID: 'TS0001', manufacturerName: '_TZ3000_46t1rvdu'}],
         model: 'WHD02',
         vendor: 'TuYa',
         whiteLabel: [{vendor: 'TuYa', model: 'iHSW02'}],
@@ -594,7 +595,8 @@ module.exports = [
             {modelID: 'TS0501B', manufacturerName: '_TZ3210_grnwgegn'},
             {modelID: 'TS0501B', manufacturerName: '_TZ3210_nehayyhx'},
             {modelID: 'TS0501B', manufacturerName: '_TZ3210_wuheofsg'},
-            {modelID: 'TS0501B', manufacturerName: '_TZ3210_e5t9bfdv'}],
+            {modelID: 'TS0501B', manufacturerName: '_TZ3210_e5t9bfdv'},
+            {modelID: 'TS0501B', manufacturerName: '_TZ3210_19qb27da'}],
         model: 'TS0501B',
         description: 'Zigbee light',
         vendor: 'TuYa',
@@ -627,6 +629,7 @@ module.exports = [
             {modelID: 'TS0202', manufacturerName: '_TZ3000_tiwq83wk'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_ykwcwxmz'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_hgu1dlak'},
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_h4wnrtck'},
             {modelID: 'WHD02', manufacturerName: '_TZ3000_hktqahrq'}],
         model: 'TS0202',
         vendor: 'TuYa',
@@ -981,6 +984,7 @@ module.exports = [
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_2p6wbry3'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_qamcypen'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_zdrhqmo0'},
+            {modelID: 'TS0502B', manufacturerName: '_TZ3210_2cjfbpy0'},
         ],
         model: 'TS0502B',
         vendor: 'TuYa',
@@ -2520,7 +2524,7 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS004F', manufacturerName: '_TZ3000_4fjiwweb'}, {modelID: 'TS004F', manufacturerName: '_TZ3000_uri7ongn'},
-            {modelID: 'TS004F', manufacturerName: '_TZ3000_ixla93vd'}],
+            {modelID: 'TS004F', manufacturerName: '_TZ3000_ixla93vd'}, {modelID: 'TS004F', manufacturerName: '_TZ3000_qja6nq5z'}],
         model: 'ERS-10TZBVK-AA',
         vendor: 'TuYa',
         description: 'Smart knob',

package/devices/xiaomi.js

@@ -40,6 +40,21 @@ const preventReset = async (type, data, device) => {
 };
 
 module.exports = [
+    {
+        zigbeeModel: ['lumi.flood.acn001'],
+        model: 'SJCGQ13LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara E1 water leak sensor',
+        fromZigbee: [fz.ias_water_leak_alarm_1, fz.aqara_opple, fz.battery],
+        toZigbee: [],
+        exposes: [e.water_leak(), e.battery(), e.battery_low(), e.battery_voltage(), e.device_temperature(), e.power_outage_count(false)],
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genPowerCfg', ['batteryVoltage']);
+        },
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['lumi.magnet.acn001'],
         model: 'MCCGQ14LM',

package/lib/ota/ubisys.js

@@ -21,22 +21,25 @@ async function getImageMeta(current, logger, device) {
 
     imageRegex.lastIndex = 0; // reset (global) regex for next exec to match from the beginning again
     let imageMatch = imageRegex.exec(firmwarePageHtml);
+    let highestMatch = null;
     while (imageMatch != null) {
         logger.debug(`OTA ubisys: image found: ${imageMatch[0]}`);
         if (parseInt(imageMatch[1], 16) === imageType &&
             parseInt(imageMatch[2], 16) <= hardwareVersion && hardwareVersion <= parseInt(imageMatch[3], 16)) {
-            break;
+            if (highestMatch === null || parseInt(highestMatch[4], 16) < parseInt(imageMatch[4], 16)) {
+                highestMatch = imageMatch;
+            }
         }
         imageMatch = imageRegex.exec(firmwarePageHtml);
     }
-    assert(imageMatch !== null,
+    assert(highestMatch !== null,
         `No image available for imageType '0x${imageType.toString(16)}' with hardware version ${hardwareVersion}`);
 
     return {
-        hardwareVersionMin: parseInt(imageMatch[2], 16),
-        hardwareVersionMax: parseInt(imageMatch[3], 16),
-        fileVersion: parseInt(imageMatch[4], 16),
-        url: url.resolve(firmwareHtmlPageUrl, imageMatch[0]),
+        hardwareVersionMin: parseInt(highestMatch[2], 16),
+        hardwareVersionMax: parseInt(highestMatch[3], 16),
+        fileVersion: parseInt(highestMatch[4], 16),
+        url: url.resolve(firmwareHtmlPageUrl, highestMatch[0]),
     };
 }
 

package/lib/xiaomi.js

@@ -191,10 +191,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             }
             break;
         case '11':
-            if (['JT-BZ-01AQ/A', 'QBKG25LM', 'ZNLDP13LM'].includes(model.model)) {
-                // We don't know what the value means for these devices.
-                // https://github.com/Koenkk/zigbee2mqtt/issues/12451
-            } else {
+            if (['RTCGQ11LM'].includes(model.model)) {
                 payload.illuminance = calibrateAndPrecisionRoundOptions(value, options, 'illuminance');
                 // DEPRECATED: remove illuminance_lux here.
                 payload.illuminance_lux = calibrateAndPrecisionRoundOptions(value, options, 'illuminance_lux');
@@ -241,6 +238,8 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             } else if (['SJCGQ11LM'].includes(model.model)) {
                 // Ignore the message. It seems not reliable. See discussion here https://github.com/Koenkk/zigbee2mqtt/issues/12018
                 // payload.water_leak = value === 1;
+            } else if (['SJCGQ13LM'].includes(model.model)) {
+                payload.water_leak = value === 1;
             } else if (['JTYJ-GD-01LM/BW'].includes(model.model)) {
                 payload.smoke_density = value;
             } else if (['GZCGQ01LM'].includes(model.model)) {

package/package.json

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