zigbee-herdsman-converters 15.0.33 → 15.0.35

package/devices/bosch.js

@@ -202,8 +202,22 @@ const tzLocal = {
 };
 
 
-// Radiator Thermostat II
 const fzLocal = {
+    bosch_contact: {
+        cluster: 'ssIasZone',
+        type: 'commandStatusChangeNotification',
+        convert: (model, msg, publish, options, meta) => {
+            const zoneStatus = msg.data.zonestatus;
+            const lookup = {0: 'none', 1: 'single', 2: 'long'};
+            const result = {
+                contact: !((zoneStatus & 1) > 0),
+                battery_low: (zoneStatus & 1<<3) > 0,
+                action: lookup[(zoneStatus >> 11) & 3],
+            };
+            if (result.action === 'none') delete result.action;
+            return result;
+        },
+    },
     bosch_thermostat: {
         cluster: 'hvacThermostat',
         type: ['attributeReport', 'readResponse'],
@@ -528,6 +542,15 @@ const definition = [
         },
         exposes: [e.switch(), e.power_on_behavior(), e.power(), e.energy()],
     },
+    {
+        zigbeeModel: ['RBSH-SWD-ZB'],
+        model: 'BSEN-C2',
+        vendor: 'Bosch',
+        description: 'Door/window contact II',
+        fromZigbee: [fzLocal.bosch_contact],
+        toZigbee: [],
+        exposes: [e.battery_low(), e.contact(), e.action(['single', 'long'])],
+    },
     {
         zigbeeModel: ['RBSH-SP-ZB-FR'],
         model: 'BSP-EZ2',

package/devices/frankever.js

@@ -7,7 +7,8 @@ const ea = exposes.access;
 module.exports = [
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_wt9agwf3'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_5uodvhgc'}],
+            {modelID: 'TS0601', manufacturerName: '_TZE200_5uodvhgc'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_1n2zev06'}],
         model: 'FK_V02',
         vendor: 'FrankEver',
         description: 'Zigbee smart water valve',

package/devices/heiman.js

@@ -475,6 +475,25 @@ module.exports = [
             await reporting.batteryPercentageRemaining(endpoint, {min: constants.repInterval.MINUTES_5, max: constants.repInterval.HOUR});
         },
     },
+    {
+        zigbeeModel: ['HS3HT-EFA-3.0'],
+        model: 'HS3HT',
+        vendor: 'HEIMAN',
+        description: 'Temperature & humidity sensor with display',
+        fromZigbee: [fz.temperature, fz.humidity, fz.battery],
+        toZigbee: [],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint1 = device.getEndpoint(1);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['msTemperatureMeasurement', 'genPowerCfg']);
+            await reporting.temperature(endpoint1);
+            await reporting.batteryPercentageRemaining(endpoint1);
+            await endpoint1.read('genPowerCfg', ['batteryPercentageRemaining']);
+            const endpoint2 = device.getEndpoint(2);
+            await reporting.bind(endpoint2, coordinatorEndpoint, ['msRelativeHumidity']);
+            await reporting.humidity(endpoint2);
+        },
+        exposes: [e.battery(), e.temperature(), e.humidity()],
+    },
     {
         zigbeeModel: ['GASSensor-EM', '358e4e3e03c644709905034dae81433e'],
         model: 'HS1CG-E',

package/devices/ikea.js

@@ -630,7 +630,8 @@ module.exports = [
             'brightness_up_click', 'brightness_up_hold', 'brightness_up_release', 'toggle'])],
         toZigbee: [],
         ota: ota.tradfri,
-        meta: {battery: {dontDividePercentage: true}},
+        // dontDividePercentage: true not needed with latest firmware
+        // https://github.com/Koenkk/zigbee2mqtt/issues/16412
         configure: configureRemote,
     },
     {

package/devices/lonsonho.js

@@ -139,7 +139,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TZ3000_92chsky7'}, {modelID: 'TS110E', manufacturerName: '_TZ3210_4ubylghk'}],
+        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TZ3000_92chsky7'}],
         model: 'QS-Zigbee-D02-TRIAC-2C-L',
         vendor: 'Lonsonho',
         description: '2 gang smart dimmer switch module without neutral',

package/devices/moes.js

@@ -401,7 +401,7 @@ module.exports = [
         model: 'ZS-EUB_1gang',
         vendor: 'Moes',
         description: 'Wall light switch (1 gang)',
-        extend: tuya.extend.switch({backlightModeLowMediumHigh: true, switchType: true}),
+        extend: tuya.extend.switch({backlightModeOffNormalInverted: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
             device.powerSource = 'Mains (single phase)';

package/devices/philips.js

@@ -815,7 +815,7 @@ module.exports = [
         model: '8718699688882',
         vendor: 'Philips',
         description: 'Hue white Filament bulb G93 E27 bluetooth',
-        extend: philips.extend.light_onoff_brightness(),
+        extend: philips.extend.light_onoff_brightness({disableHueEffects: false}),
     },
     {
         zigbeeModel: ['LST001'],

package/devices/third_reality.js

@@ -15,7 +15,12 @@ module.exports = [
         ota: ota.zigbeeOTA,
         fromZigbee: [fz.on_off, fz.battery],
         toZigbee: [tz.on_off, tz.ignore_transition],
-        exposes: [e.switch(), e.battery_voltage()],
+        meta: {battery: {dontDividePercentage: true}},
+        exposes: [e.switch(), e.battery(), e.battery_voltage()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.powerSource = 'Battery';
+            device.save();
+        },
     },
     {
         zigbeeModel: ['3RSS008Z'],

package/devices/tuya.js

@@ -1237,6 +1237,7 @@ module.exports = [
         fingerprint: [
             {modelID: 'TS0601', manufacturerName: '_TZE200_whpb9yts'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_ebwgzdqq'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_ctq0k47x'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_9i9dt8is'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_dfxkcots'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_w4cryh2i'},
@@ -3912,7 +3913,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: tuya.fingerprint('TS110E', ['_TZ3210_pagajpog']),
+        fingerprint: tuya.fingerprint('TS110E', ['_TZ3210_pagajpog', '_TZ3210_4ubylghk']),
         model: 'TS110E_2gang_2',
         vendor: 'TuYa',
         description: '2 channel dimmer',

package/lib/zosung.js

@@ -10,8 +10,9 @@ function nextSeq(entity) {
 
 function messagesGet(entity, seq) {
     const info = entity.irMessageInfo;
-    if (info.seq!=seq) {
-        throw new Error(`Unexpected sequence value (expected: ${info.seq} current: ${seq}).`);
+    const expected = (info&&info.seq) || 0;
+    if (expected!==seq) {
+        throw new Error(`Unexpected sequence value (expected: ${expected} current: ${seq}).`);
     }
     return info.data;
 }
@@ -21,18 +22,19 @@ function messagesSet(entity, seq, data) {
 
 function messagesClear(entity, seq) {
     const info = entity.irMessageInfo;
-    if (info.seq!=seq) {
-        throw new Error(`Unexpected sequence value (expected: ${info.seq} current: ${seq}).`);
+    const expected = (info&&info.seq) || 0;
+    if (expected!==seq) {
+        throw new Error(`Unexpected sequence value (expected: ${expected} current: ${seq}).`);
     }
     delete entity.irMessageInfo;
 }
 
 function calcArrayCrc(values) {
-    return Array.from(values.values()).reduce((a, b)=>a+b)%0x100;
+    return Array.from(values.values()).reduce((a, b)=>a+b, 0)%0x100;
 }
 
 function calcStringCrc(str) {
-    return str.split('').map((x)=>x.charCodeAt(0)).reduce((a, b)=>a+b)%0x100;
+    return str.split('').map((x)=>x.charCodeAt(0)).reduce((a, b)=>a+b, 0)%0x100;
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.33",
+  "version": "15.0.35",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -34,7 +34,7 @@
   },
   "homepage": "https://github.com/Koenkk/zigbee-herdsman-converters",
   "dependencies": {
-    "axios": "^1.2.3",
+    "axios": "^1.2.6",
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^3.0.0",