zigbee-herdsman-converters 14.0.381 → 14.0.385

package/converters/fromZigbee.js

@@ -8115,14 +8115,15 @@ const converters = {
         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,
     },
+    ignore_electrical_measurement: {
+        cluster: 'haElectricalMeasurement',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => null,
+    },
     // #endregion
 };
 

package/devices/aurora_lighting.js

@@ -68,7 +68,7 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color(),
     },
     {
-        zigbeeModel: ['RGBBulb01UK', 'RGBBulb02UK'],
+        zigbeeModel: ['RGBBulb01UK', 'RGBBulb02UK', 'RGBBulb51AU'],
         model: 'AU-A1GSZ9RGBW_HV-GSCXZB269K',
         vendor: 'Aurora Lighting',
         description: 'AOne 9.5W smart RGBW GLS E27/B22',

package/devices/cleode.js

@@ -0,0 +1,20 @@
+const exposes = require('../lib/exposes');
+const reporting = require('../lib/reporting');
+const e = exposes.presets;
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['ZPLUG'],
+        model: 'ZPLUG_Boost',
+        vendor: 'CLEODE',
+        description: 'ZPlug boost',
+        extend: extend.switch(),
+        exposes: [e.switch(), e.power()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+        },
+    },
+];

package/devices/danalock.js

@@ -10,14 +10,15 @@ module.exports = [
         model: 'V3-BTZB/V3-BTZBE',
         vendor: 'Danalock',
         description: 'BT/ZB smartlock',
-        fromZigbee: [fz.lock, fz.lock_operation_event, fz.battery],
-        toZigbee: [tz.lock],
+        fromZigbee: [fz.lock, fz.lock_operation_event, fz.battery, fz.lock_programming_event, fz.lock_pin_code_response],
+        toZigbee: [tz.lock, tz.pincode_lock, tz.lock_userstatus],
+        meta: {pinCodeCount: 20},
         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);
         },
-        exposes: [e.lock(), e.battery()],
+        exposes: [e.lock(), e.battery(), e.pincode()],
     },
 ];

package/devices/gledopto.js

@@ -508,6 +508,13 @@ module.exports = [
         description: 'Zigbee 10W Floodlight RGB+CCT',
         extend: gledoptoExtend.light_onoff_brightness_colortemp_color(),
     },
+    {
+        zigbeeModel: ['GL-B-003P'],
+        model: 'GL-B-003P',
+        vendor: 'Gledopto',
+        description: 'Zigbee 7W E26/E27 Bulb RGB+CCT (pro)',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [155, 495]}),
+    },
     {
         zigbeeModel: ['GL-FL-004TZS'],
         model: 'GL-FL-004TZS',

package/devices/philips.js

@@ -29,6 +29,24 @@ const hueExtend = {
 };
 
 module.exports = [
+    {
+        zigbeeModel: ['929003056901'],
+        model: '929003056901',
+        vendor: 'Philips',
+        description: 'Hue Struana 27W',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        ota: ota.zigbeeOTA,
+    },
+    {
+        zigbeeModel: ['LWA018'],
+        model: '9290024693',
+        vendor: 'Philips',
+        description: 'Hue white A60 bulb B22 1055lm with Bluetooth',
+        meta: {turnsOffAtBrightness1: true},
+        extend: extend.light_onoff_brightness(),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['LCX004'],
         model: '929002994901',
@@ -920,7 +938,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue white ambiance E14 (with Bluetooth)',
         meta: {turnsOffAtBrightness1: true},
-        extend: hueExtend.light_onoff_brightness_colortemp(),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
         ota: ota.zigbeeOTA,
     },
     {

package/devices/tubeszb.js

@@ -0,0 +1,20 @@
+const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
+const reporting = require('../lib/reporting');
+
+module.exports = [
+    {
+        zigbeeModel: ['tubeszb.router'],
+        model: 'tubeszb.router',
+        vendor: 'TubesZB',
+        description: '[CC2652 Router](https://github.com/tube0013/tube_gateways/tree/main/tube_cc_router)',
+        fromZigbee: [fz.linkquality_from_basic],
+        toZigbee: [],
+        exposes: [],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(8);
+            const payload = [{attribute: 'zclVersion', minimumReportInterval: 0, maximumReportInterval: 3600, reportableChange: 0}];
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic']);
+            await endpoint.configureReporting('genBasic', payload);
+        },
+    },
+];

package/devices/tuya.js

@@ -163,6 +163,7 @@ module.exports = [
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_bicjqpg4'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_cmaky9gq'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_tza2vjxx'},
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_k1pe6ibm'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_bfwvfyx1'}],
         model: 'TS0505B',
         vendor: 'TuYa',
@@ -179,7 +180,8 @@ module.exports = [
         fingerprint: [{modelID: 'TS0503B', manufacturerName: '_TZ3000_i8l0nqdu'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3210_a5fxguxr'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3210_778drfdt'},
-            {modelID: 'TS0503B', manufacturerName: '_TZ3000_g5xawfcq'}],
+            {modelID: 'TS0503B', manufacturerName: '_TZ3000_g5xawfcq'},
+            {modelID: 'TS0503B', manufacturerName: '_TZ3210_trm3l2aw'}],
         model: 'TS0503B',
         vendor: 'TuYa',
         description: 'Zigbee RGB light',
@@ -221,9 +223,11 @@ module.exports = [
             {modelID: 'TS0202', manufacturerName: '_TZ3000_kmh5qpmb'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_zwvaj5wy'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_mcxw5ehu'},
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_bsvqrxru'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_msl6wxk9'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_tv3wxhcz'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_hqbdru35'},
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_tiwq83wk'},
             {modelID: 'WHD02', manufacturerName: '_TZ3000_hktqahrq'}],
         model: 'TS0202',
         vendor: 'TuYa',
@@ -504,6 +508,7 @@ module.exports = [
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_psgq7ysz'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3000_zw7wr5uo'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_pz9zmxjj'},
+            {modelID: 'TS0502B', manufacturerName: '_TZ3000_fzwhym79'},
         ],
         model: 'TS0502B',
         vendor: 'TuYa',

package/devices/xiaomi.js

@@ -81,11 +81,11 @@ module.exports = [
         model: 'ZNLDP12LM',
         vendor: 'Xiaomi',
         description: 'Aqara smart LED bulb',
-        toZigbee: xiaomiExtend.light_onoff_brightness_colortemp().toZigbee.concat([
+        toZigbee: xiaomiExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}).toZigbee.concat([
             tz.xiaomi_light_power_outage_memory]),
-        fromZigbee: xiaomiExtend.light_onoff_brightness_colortemp().fromZigbee,
+        fromZigbee: xiaomiExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}).fromZigbee,
         // power_on_behavior 'toggle' does not seem to be supported
-        exposes: xiaomiExtend.light_onoff_brightness_colortemp().exposes.concat([
+        exposes: xiaomiExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}).exposes.concat([
             e.power_outage_memory().withAccess(ea.STATE_SET)]),
         ota: ota.zigbeeOTA,
     },
@@ -1403,18 +1403,14 @@ module.exports = [
         vendor: 'Xiaomi',
         description: 'Aqara single switch module T1 (with neutral)',
         // 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],
+        fromZigbee: [fz.on_off, fz.device_temperature, fz.aqara_opple, fz.ignore_metering, fz.ignore_electrical_measurement,
+            fz.xiaomi_power],
         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) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering', 'genDeviceTempCfg']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genDeviceTempCfg']);
             await reporting.onOff(endpoint);
-            // Gives UNSUPPORTED_ATTRIBUTE on reporting.readEletricalMeasurementMultiplierDivisors.
-            await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
-            await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.currentSummDelivered(endpoint);
-            await reporting.activePower(endpoint, {min: 5, max: 600, change: 10});
             await reporting.deviceTemperature(endpoint);
             device.powerSource = 'Mains (single phase)';
             device.save();

package/devices/zemismart.js

@@ -5,6 +5,7 @@ const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
 const tuya = require('../lib/tuya');
+const ea = exposes.access;
 
 const fzLocal = {
     ZMRM02: {
@@ -102,4 +103,25 @@ module.exports = [
             'button_5_hold', 'button_5_single', 'button_5_double',
             'button_6_hold', 'button_6_single', 'button_6_double'])],
     },
+    {
+        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_zigisuyh'}],
+        model: 'ZIGBEE-B09-UK',
+        vendor: 'Zemismart',
+        description: 'Zigbee smart outlet universal socket with USB port',
+        fromZigbee: [fz.on_off, fz.tuya_switch_power_outage_memory],
+        toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory],
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'),
+            exposes.enum('power_outage_memory', ea.STATE_SET, ['on', 'off', 'restore'])
+                .withDescription('Recover state after power outage')],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(device.getEndpoint(1));
+            await reporting.onOff(device.getEndpoint(2));
+        },
+    },
 ];

package/lib/ota/common.js

@@ -265,6 +265,11 @@ async function isNewImageAvailable(current, logger, device, getImageMeta) {
     const meta = await getImageMeta(current, logger, device);
     const [currentS, metaS] = [JSON.stringify(current), JSON.stringify(meta)];
     logger.debug(`Is new image available for '${device.ieeeAddr}', current '${currentS}', latest meta '${metaS}'`);
+
+    if (meta.force) {
+        return -1; // Negative number means the new firmware is 'newer' than current one
+    }
+
     return Math.sign(current.fileVersion - meta.fileVersion);
 }
 
@@ -411,7 +416,7 @@ async function updateToLatest(device, logger, onProgress, getNewImage, getImageM
 async function getNewImage(current, logger, device, getImageMeta, downloadImage) {
     const meta = await getImageMeta(current, logger, device);
     logger.debug(`getNewImage for '${device.ieeeAddr}', meta ${JSON.stringify(meta)}`);
-    assert(meta.fileVersion > current.fileVersion, 'No new image available');
+    assert(meta.fileVersion > current.fileVersion || meta.force, 'No new image available');
 
     const download = downloadImage ? await downloadImage(meta, logger) :
         await getAxios().get(meta.url, {responseType: 'arraybuffer'});

package/lib/ota/zigbeeOTA.js

@@ -32,8 +32,18 @@ async function getIndexFile(urlOrName) {
     return JSON.parse(fs.readFileSync(urlOrName));
 }
 
+function readLocalFile(fileName, logger) {
+    // If the file name is not a full path, then treat it as a relative to the data directory
+    if (!path.isAbsolute(fileName) && dataDir) {
+        fileName = path.join(dataDir, fileName);
+    }
+
+    logger.debug(`ZigbeeOTA: getting local firmware file ${fileName}`);
+    return fs.readFileSync(fileName);
+}
+
 async function getFirmwareFile(image, logger) {
-    let urlOrName = image.url;
+    const urlOrName = image.url;
 
     // First try to download firmware file with the URL provided
     if (isValidUrl(urlOrName)) {
@@ -41,15 +51,33 @@ async function getFirmwareFile(image, logger) {
         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);
+    return {data: readLocalFile(urlOrName, logger)};
+}
+
+function fillImageInfo(meta, logger) {
+    // Web-hosted images must come with all fields filled already
+    if (isValidUrl(meta.url)) {
+        return meta;
     }
 
-    logger.debug(`ZigbeeOTA: getting local firmware file ${urlOrName}`);
-    return {data: fs.readFileSync(urlOrName)};
-}
+    // Nothing to do if needed fields were filled already
+    if (meta.hasOwnProperty('imageType') &&
+        meta.hasOwnProperty('manufacturerCode') &&
+        meta.hasOwnProperty('fileVersion')) {
+        return meta;
+    }
+
+    // If no fields provided - get them from the image file
+    const buffer = readLocalFile(meta.url, logger);
+    const start = buffer.indexOf(common.upgradeFileIdentifier);
+    const image = common.parseImage(buffer.slice(start));
 
+    // Will fill only those fields that were absent
+    if (!meta.hasOwnProperty('imageType')) meta.imageType = image.header.imageType;
+    if (!meta.hasOwnProperty('manufacturerCode')) meta.manufacturerCode = image.header.manufacturerCode;
+    if (!meta.hasOwnProperty('fileVersion')) meta.fileVersion = image.header.fileVersion;
+    return meta;
+}
 
 async function getIndex(logger) {
     const index = (await axios.get(url)).data;
@@ -61,7 +89,7 @@ async function getIndex(logger) {
         const localIndex = await getIndexFile(overrideIndexFileName);
 
         // Resulting index will have overriden items first
-        return localIndex.concat(index);
+        return localIndex.concat(index).map((item) => isValidUrl(item.url) ? item : fillImageInfo(item, logger));
     }
 
     return index;
@@ -88,6 +116,7 @@ async function getImageMeta(current, logger, device) {
         fileSize: image.fileSize,
         url: image.url,
         sha512: image.sha512,
+        force: image.force,
     };
 }
 

package/lib/reporting.js

@@ -84,7 +84,7 @@ module.exports = {
         await endpoint.configureReporting('msTemperatureMeasurement', p);
     },
     deviceTemperature: async (endpoint, overrides) => {
-        const p = payload('currentTemperature', 10, repInterval.HOUR, 1, overrides);
+        const p = payload('currentTemperature', 300, repInterval.HOUR, 1, overrides);
         await endpoint.configureReporting('genDeviceTempCfg', p);
     },
     pressure: async (endpoint, overrides) => {

package/npm-shrinkwrap.json

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

package/package.json

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