zigbee-herdsman-converters 15.0.55 → 15.0.57

package/devices/develco.js

@@ -534,6 +534,26 @@ module.exports = [
             await reporting.batteryVoltage(endpoint38);
         },
     },
+    {
+        zigbeeModel: ['WISZB-138'],
+        model: 'WISZB-138',
+        vendor: 'Develco',
+        description: 'Window sensor',
+        fromZigbee: [fz.ias_contact_alarm_1, fz.battery, develco.fz.temperature],
+        toZigbee: [],
+        exposes: [e.contact(), e.battery(), e.battery_low(), e.temperature()],
+        meta: {battery: {voltageToPercentage: '3V_2500'}},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint35 = device.getEndpoint(35);
+            const endpoint38 = device.getEndpoint(38);
+            await reporting.bind(endpoint35, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.bind(endpoint38, coordinatorEndpoint, ['msTemperatureMeasurement']);
+            await reporting.batteryVoltage(endpoint35);
+            await reporting.temperature(endpoint38);
+
+            await develco.configure.read_sw_hw_version(device, logger);
+        },
+    },
     {
         zigbeeModel: ['MOSZB-130'],
         model: 'MOSZB-130',

package/devices/iluminize.js

@@ -26,7 +26,7 @@ module.exports = [
         zigbeeModel: ['511.201'],
         model: '511.201',
         vendor: 'Iluminize',
-        description: 'ZigBee 3.0 Dimm-Aktor mini 1x 230V',
+        description: 'ZigBee 3.0 dimming actuator mini 1x 230V',
         extend: extend.light_onoff_brightness({noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
@@ -39,7 +39,7 @@ module.exports = [
         zigbeeModel: ['5120.1100'],
         model: '5120.1100',
         vendor: 'Iluminize',
-        description: 'ZigBee 3.0 Dimm-Aktor mini 1x 230V',
+        description: 'ZigBee 3.0 dimming actuator mini 1x 230V',
         extend: extend.light_onoff_brightness({noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
@@ -52,7 +52,20 @@ module.exports = [
         zigbeeModel: ['5120.1110'],
         model: '5120.1110',
         vendor: 'Iluminize',
-        description: 'ZigBee 3.0 Dimm-Aktor mini 1x 230V',
+        description: 'ZigBee 3.0 dimming actuator mini 1x 230V',
+        extend: extend.light_onoff_brightness({noConfigure: true}),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.onOff(endpoint);
+        },
+    },
+    {
+        zigbeeModel: ['5120.2110'],
+        model: '5120.2110',
+        vendor: 'Iluminize',
+        description: 'ZigBee 3.0 dimming actuator mini 1x 230V',
         extend: extend.light_onoff_brightness({noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);

package/devices/lidl.js

@@ -8,7 +8,7 @@ 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 {ColorMode, colorModeLookup} = require('../lib/constants');
 const libColor = require('../lib/color');
 
 const tuyaLocal = {
@@ -152,18 +152,18 @@ const tzLocal = {
             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;
+            let colorMode = meta.state.color_mode ?? colorModeLookup[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 ('color_temp' in meta.message) colorMode = colorModeLookup[ColorMode.ColorTemp];
+            if ('color' in meta.message) colorMode = colorModeLookup[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);
+                const rgbMode = (colorMode == colorModeLookup[ColorMode.HS]);
                 await entity.command('lightingColorCtrl', 'tuyaRgbMode', {enable: rgbMode}, {}, {disableDefaultResponse: true});
             }
 
@@ -171,7 +171,7 @@ const tzLocal = {
             // 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 (colorMode == colorModeLookup[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));
@@ -183,7 +183,7 @@ const tzLocal = {
                     await entity.command('lightingColorCtrl', 'moveToColorTemp', zclData, utils.getOptions(meta.mapped, entity));
                     newState.color_temp = meta.message.color_temp;
                 }
-            } else if (colorMode == ColorMode.HS) {
+            } else if (colorMode == colorModeLookup[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

package/devices/sunricher.js

@@ -388,7 +388,7 @@ module.exports = [
             'cw_ww_release', 'cw_dec_ww_inc', 'ww_inc_cw_dec', 'r_g_b', 'b_g_r', 'rgb_release'])],
     },
     {
-        zigbeeModel: ['ZG9092'],
+        zigbeeModel: ['ZG9092', 'HK-LN-HEATER-A'],
         model: 'SR-ZG9092A',
         vendor: 'Sunricher',
         description: 'Touch thermostat',

package/devices/third_reality.js

@@ -184,7 +184,7 @@ module.exports = [
             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('seMetering', {divisor: 3600000, multiplier: 1});
             endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {
                 acVoltageMultiplier: 1, acVoltageDivisor: 10, acCurrentMultiplier: 1, acCurrentDivisor: 1000, acPowerMultiplier: 1,
                 acPowerDivisor: 10,

package/devices/tuya.js

@@ -117,6 +117,22 @@ const tzLocal = {
             }
         },
     },
+    TS0224: {
+        key: ['light', 'duration', 'volume'],
+        convertSet: async (entity, key, value, meta) => {
+            if (key === 'light') {
+                await entity.command('genOnOff', value.toLowerCase() === 'on' ? 'on' : 'off', {}, utils.getOptions(meta.mapped, entity));
+            } else if (key === 'duration') {
+                await entity.write('ssIasWd', {'maxDuration': value}, utils.getOptions(meta.mapped, entity));
+            } else if (key === 'volume') {
+                const lookup = {'mute': 0, 'low': 10, 'medium': 30, 'high': 50};
+                value = value.toLowerCase();
+                utils.validateValue(value, Object.keys(lookup));
+                await entity.write('ssIasWd', {0x0002: {value: lookup[value], type: 0x0a}}, utils.getOptions(meta.mapped, entity));
+            }
+            return {state: {[key]: value}};
+        },
+    },
     power_on_behavior: {
         key: ['power_on_behavior'],
         convertSet: async (entity, key, value, meta) => {
@@ -2115,6 +2131,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_cowvfni3'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_rddyvrci'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_nueqqe6k'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_bqcqqjpb'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_xaabybja'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_rmymn92d'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_3i3exuay'},
@@ -4142,4 +4159,19 @@ module.exports = [
             {vendor: 'Lerlink', model: 'T2-Z67/T2-W67'},
         ],
     },
+    {
+        zigbeeModel: ['TS0224'],
+        model: 'TS0224',
+        vendor: 'TuYa',
+        description: 'Smart light & sound siren',
+        fromZigbee: [],
+        toZigbee: [tz.warning, tzLocal.TS0224],
+        exposes: [e.warning(),
+            exposes.binary('light', ea.STATE_SET, 'ON', 'OFF').withDescription('Turn the light of the alarm ON/OFF'),
+            exposes.numeric('duration', ea.STATE_SET).withValueMin(60).withValueMax(3600).withValueStep(1).withUnit('s')
+                .withDescription('Duration of the alarm'),
+            exposes.enum('volume', ea.STATE_SET, ['mute', 'low', 'medium', 'high'])
+                .withDescription('Volume of the alarm'),
+        ],
+    },
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.55",
+  "version": "15.0.57",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -34,11 +34,11 @@
   },
   "homepage": "https://github.com/Koenkk/zigbee-herdsman-converters",
   "dependencies": {
-    "axios": "^1.3.3",
+    "axios": "^1.3.4",
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^3.0.0",
-    "zigbee-herdsman": "^0.14.93"
+    "zigbee-herdsman": "^0.14.95"
   },
   "devDependencies": {
     "eslint": "*",