zigbee-herdsman-converters 15.0.91 → 15.0.92

package/devices/climax.js

@@ -82,14 +82,14 @@ module.exports = [
         vendor: 'Climax',
         description: 'Smart siren',
         fromZigbee: [fz.battery, fz.ias_wd, fz.ias_enroll, fz.ias_siren],
-        toZigbee: [tz.warning_simple, tz.ias_max_duration, tz.warning],
+        toZigbee: [tz.warning_simple, tz.ias_max_duration, tz.warning, tz.squawk],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic', 'ssIasZone', 'ssIasWd']);
             await endpoint.read('ssIasZone', ['zoneState', 'iasCieAddr', 'zoneId']);
             await endpoint.read('ssIasWd', ['maxDuration']);
         },
-        exposes: [e.battery_low(), e.tamper(), e.warning(),
+        exposes: [e.battery_low(), e.tamper(), e.warning(), e.squawk(),
             exposes.numeric('max_duration', ea.ALL).withUnit('s').withValueMin(0).withValueMax(600).withDescription('Duration of Siren'),
             exposes.binary('alarm', ea.SET, 'START', 'OFF').withDescription('Manual start of siren')],
     },

package/devices/niko.js

@@ -1,6 +1,7 @@
 const exposes = require('../lib/exposes');
 const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
 const tz = require('../converters/toZigbee');
+const utils = require('../lib/utils');
 const reporting = require('../lib/reporting');
 const e = exposes.presets;
 const ea = exposes.access;
@@ -13,9 +14,8 @@ const local = {
             convert: (model, msg, publish, options, meta) => {
                 const state = {};
                 if (msg.data.hasOwnProperty('switchOperationMode')) {
-                    const operationModeProperty = `operation_mode${meta.endpoint_name ? `_${meta.endpoint_name}` : ''}`;
                     const operationModeMap = {0x02: 'control_relay', 0x01: 'decoupled', 0x00: 'unknown'};
-                    state[operationModeProperty] = operationModeMap[msg.data.switchOperationMode];
+                    state['operation_mode'] = operationModeMap[msg.data.switchOperationMode];
                 }
                 return state;
             },
@@ -29,9 +29,22 @@ const local = {
                 if (msg.data.hasOwnProperty('switchAction')) {
                     // NOTE: a single press = two seperate values reported, 16 followed by 64
                     //       a hold/release cyle = three seperate values, 16, 32, and 48
-                    const actionProperty = `action${meta.endpoint_name ? `_${meta.endpoint_name}` : ''}`;
-                    const actionMap = {16: null, 64: 'single', 32: 'hold', 48: 'release'};
-                    state[actionProperty] = actionMap[msg.data.switchAction];
+                    const actionMap = (model.model == '552-721X1') ? {
+                        16: null,
+                        64: 'single',
+                        32: 'hold',
+                        48: 'release',
+                    } : {
+                        16: null,
+                        64: 'single_left',
+                        32: 'hold_left',
+                        48: 'release_left',
+                        4096: 'single_right',
+                        8192: 'hold_right',
+                        12288: 'release_right',
+                    };
+
+                    state['action'] = actionMap[msg.data.switchAction];
                 }
                 return state;
             },
@@ -75,12 +88,18 @@ const local = {
                 if (!operationModeLookup.hasOwnProperty(value)) {
                     throw new Error(`operation_mode was called with an invalid value (${value})`);
                 } else {
-                    await entity.write('manuSpecificNiko1', {'switchOperationMode': operationModeLookup[value]});
+                    await utils.enforceEndpoint(entity, key, meta).write(
+                        'manuSpecificNiko1',
+                        {'switchOperationMode': operationModeLookup[value]},
+                    );
                     return {state: {operation_mode: value.toLowerCase()}};
                 }
             },
             convertGet: async (entity, key, meta) => {
-                await entity.read('manuSpecificNiko1', ['switchOperationMode']);
+                await utils.enforceEndpoint(entity, key, meta).read(
+                    'manuSpecificNiko1',
+                    ['switchOperationMode'],
+                );
             },
         },
         switch_led_enable: {
@@ -259,7 +278,7 @@ module.exports = [
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2};
         },
-        meta: {multiEndpoint: true},
+        meta: {multiEndpointEnforce: {'operation_mode': 1}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const ep1 = device.getEndpoint(1);
             const ep2 = device.getEndpoint(2);
@@ -272,10 +291,11 @@ module.exports = [
         },
         exposes: [
             e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'),
-            e.action(['single', 'hold', 'release']).withEndpoint('l1'),
-            e.action(['single', 'hold', 'release']).withEndpoint('l2'),
-            exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled']).withEndpoint('l1'),
-            exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled']).withEndpoint('l2'),
+            e.action([
+                'single_left', 'hold_left', 'release_left',
+                'single_right', 'hold_right', 'release_right',
+            ]),
+            exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled']),
             exposes.binary('led_enable', ea.ALL, true, false).withEndpoint('l1').withDescription('Enable LED'),
             exposes.binary('led_enable', ea.ALL, true, false).withEndpoint('l2').withDescription('Enable LED'),
             exposes.binary('led_state', ea.ALL, 'ON', 'OFF').withEndpoint('l1').withDescription('LED State'),

package/devices/tuya.js

@@ -805,6 +805,7 @@ module.exports = [
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_bq5c8xfe'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_bjawzodf'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_qyflbnbj'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_vs0skpuc'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_9yapgbuv'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_zl1kmjqx'}],
         model: 'TS0601_temperature_humidity_sensor',

package/devices/zemismart.js

@@ -199,7 +199,7 @@ module.exports = [
         exposes: [e.cover_position().setAccess('position', ea.STATE_SET)],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_1n2kyphz'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_1n2kyphz'}, {modelID: 'TS0601', manufacturerName: '_TZE200_shkxsgis'}],
         model: 'TB26-4',
         vendor: 'Zemismart',
         description: '4-gang smart wall switch',

package/package.json

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