zigbee-herdsman-converters 15.0.90 → 15.0.92

package/devices/bosch.js

@@ -4,6 +4,7 @@ const fz = require('../converters/fromZigbee');
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const utils = require('../lib/utils');
+const extend = require('../lib/extend');
 const constants = require('../lib/constants');
 const ota = require('../lib/ota');
 const e = exposes.presets;
@@ -737,6 +738,32 @@ const definition = [
         },
         exposes: [e.switch(), e.power_on_behavior(), e.power(), e.energy()],
     },
+    {
+        zigbeeModel: ['RBSH-MMS-ZB-EU'],
+        model: 'BMCT-SLZ',
+        vendor: 'Bosch',
+        description: 'Light/shutter control II',
+        extend: extend.switch(),
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2')],
+        endpoint: (device) => {
+            return {'l1': 2, 'l2': 3};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            // Configuration values:
+            //                   0x0000    0x0001
+            // Roller Shutter       1         3
+            // Window Blind         2         3
+            // Light Switch         4         3
+
+            // Configure device as dual switch.
+            // Device will perform a rejoin after this write
+            await device.getEndpoint(1).write(0xfca0, {0x0000: {value: 0x04, type: 0x30}, 0x0001: {value: 0x03, type: 0x30}});
+
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
+        },
+    },
 ];
 
 module.exports = definition;

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/heimgard_technologies.js

@@ -0,0 +1,79 @@
+const exposes = require('../lib/exposes');
+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 = [
+    {
+        zigbeeModel: ['HC-SLM-1'],
+        model: 'HC-SLM-1',
+        vendor: 'Heimgard Technologies',
+        description: 'Wattle door lock pro',
+        fromZigbee: [fz.lock, fz.battery],
+        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(), e.auto_relock_time().withValueMin(0).withValueMax(3600), e.sound_volume()],
+    },
+    {
+        zigbeeModel: ['HC-IWDIM-1'],
+        model: 'HC-IWDIM-1',
+        vendor: 'Heimgard Technologies',
+        description: 'Dimmer',
+        fromZigbee: [fz.on_off, fz.brightness, fz.electrical_measurement, fz.metering],
+        toZigbee: [tz.on_off, tz.light_brightness_move, tz.light_onoff_brightness],
+        ota: ota.zigbeeOTA,
+        exposes: [e.light_brightness(), e.power(), e.current(), e.voltage(), e.energy()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.rmsVoltage(endpoint, {change: 2});
+            await reporting.rmsCurrent(endpoint, {change: 5});
+            await reporting.activePower(endpoint, {change: 2});
+            await reporting.currentSummDelivered(endpoint, 2);
+            await reporting.onOff(endpoint);
+            await endpoint.read('haElectricalMeasurement', ['acVoltageMultiplier', 'acVoltageDivisor']);
+            await endpoint.read('haElectricalMeasurement', ['acCurrentMultiplier', 'acCurrentDivisor']);
+            await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
+            await endpoint.read('seMetering', ['unitOfMeasure', 'multiplier', 'divisor']);
+            device.save();
+        },
+    },
+    {
+        zigbeeModel: ['HT-MOT-2'],
+        model: 'HT-MOT-2',
+        vendor: 'Heimgard Technologies',
+        description: 'Motion sensor',
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.ias_occupancy_alarm_1_report, fz.battery],
+        toZigbee: [tz.identify],
+        exposes: [e.battery(), e.tamper(), e.occupancy()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.batteryVoltage(endpoint);
+        },
+    },
+    {
+        zigbeeModel: ['HC-IWSWI-1'],
+        model: 'HC-IWSWI-1',
+        vendor: 'Heimgard Technologies',
+        description: 'In wall light switch',
+        fromZigbee: [fz.on_off],
+        toZigbee: [tz.identify, tz.on_off],
+        exposes: [e.switch()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
+];

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

@@ -721,6 +721,24 @@ const fzLocal = {
             return result;
         },
     },
+    TS011F_electrical_measurement: {
+        ...fz.electrical_measurement,
+        convert: (model, msg, publish, options, meta) => {
+            const result = fz.electrical_measurement.convert(model, msg, publish, options, meta);
+
+            // Skip the first reported 0 values as this may be a false measurement
+            // https://github.com/Koenkk/zigbee2mqtt/issues/16709#issuecomment-1509599046
+            if (['_TZ3000_gvn91tmx', '_TZ3000_amdymr7l'].includes(meta.device.manufacturerName)) {
+                for (const key of ['power', 'current', 'voltage']) {
+                    if (result[key] === 0 && globalStore.getValue(msg.endpoint, key) !== 0) {
+                        delete result[key];
+                    }
+                    globalStore.putValue(msg.endpoint, key, result[key]);
+                }
+            }
+            return result;
+        },
+    },
 };
 
 module.exports = [
@@ -787,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',
@@ -1537,6 +1556,37 @@ module.exports = [
             ],
         },
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_mwvfvw8g']),
+        model: 'TS0601_switch_6_gang',
+        vendor: 'TuYa',
+        description: '6 gang switch',
+        fromZigbee: [tuya.fz.datapoints],
+        toZigbee: [tuya.tz.datapoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [
+            tuya.exposes.switch().withEndpoint('l1'),
+            tuya.exposes.switch().withEndpoint('l2'),
+            tuya.exposes.switch().withEndpoint('l3'),
+            tuya.exposes.switch().withEndpoint('l4'),
+            tuya.exposes.switch().withEndpoint('l5'),
+            tuya.exposes.switch().withEndpoint('l6'),
+        ],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 1, 'l3': 1, 'l4': 1, 'l5': 1, 'l6': 1};
+        },
+        meta: {
+            multiEndpoint: true,
+            tuyaDatapoints: [
+                [1, 'state_l1', tuya.valueConverter.onOff],
+                [2, 'state_l2', tuya.valueConverter.onOff],
+                [3, 'state_l3', tuya.valueConverter.onOff],
+                [4, 'state_l4', tuya.valueConverter.onOff],
+                [5, 'state_l5', tuya.valueConverter.onOff],
+                [6, 'state_l6', tuya.valueConverter.onOff],
+            ],
+        },
+    },
     {
         fingerprint: [
             {modelID: 'TS0601', manufacturerName: '_TZE200_nkjintbl'},
@@ -2069,7 +2119,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0004', manufacturerName: '_TZ3000_ltt60asa'}],
+        fingerprint: tuya.fingerprint('TS0004', ['_TZ3000_ltt60asa', '_TZ3000_5ajpkyq6']),
         model: 'TS0004_switch_module',
         vendor: 'TuYa',
         description: '4 gang switch module',
@@ -2652,7 +2702,9 @@ module.exports = [
             {vendor: 'MatSee Plus', model: 'PJ-ZSW01'}, {vendor: 'MODEMIX', model: 'MOD037'}, {vendor: 'MODEMIX', model: 'MOD048'},
             {vendor: 'Coswall', model: 'CS-AJ-DE2U-ZG-11'}, {vendor: 'Aubess', model: 'TS011F_plug_1'}, {vendor: 'Immax', model: '07752L'}],
         ota: ota.zigbeeOTA,
-        extend: tuya.extend.switch({electricalMeasurements: true, powerOutageMemory: true, indicatorMode: true, childLock: true}),
+        extend: tuya.extend.switch({
+            electricalMeasurements: true, electricalMeasurementsFzConverter: fzLocal.TS011F_electrical_measurement,
+            powerOutageMemory: true, indicatorMode: true, childLock: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
             const endpoint = device.getEndpoint(1);
@@ -2724,7 +2776,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ntcy3xu1', '_TZE200_ytibqbra']),
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ntcy3xu1']),
         model: 'TS0601_smoke_1',
         vendor: 'TuYa',
         description: 'Smoke sensor',
@@ -2798,7 +2850,7 @@ module.exports = [
         zigbeeModel: ['5p1vj8r'],
         fingerprint: tuya.fingerprint('TS0601', ['_TZE200_t5p1vj8r', '_TZE200_uebojraa', '_TZE200_vzekyi4c', '_TZE200_yh7aoahi',
             '_TZE200_dnz6yvl2', '_TZE200_dq1mfjug']),
-        model: 'TS0601_smoke',
+        model: 'TS0601_smoke_4',
         vendor: 'TuYa',
         description: 'Smoke sensor',
         fromZigbee: [tuya.fz.datapoints],
@@ -2812,6 +2864,27 @@ module.exports = [
             ],
         },
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ytibqbra']),
+        model: 'TS0601_smoke_5',
+        vendor: 'TuYa',
+        description: 'Smoke sensor',
+        fromZigbee: [tuya.fz.datapoints],
+        toZigbee: [tuya.tz.datapoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [e.smoke(), e.tamper(), e.battery(), tuya.exposes.faultAlarm(),
+            tuya.exposes.silence(), exposes.binary('alarm', ea.STATE_SET, 'ON', 'OFF').withDescription('Enable the alarm')],
+        meta: {
+            tuyaDatapoints: [
+                [1, 'smoke', tuya.valueConverter.trueFalse0],
+                [4, 'tamper', tuya.valueConverter.raw],
+                [11, 'fault_alarm', tuya.valueConverter.trueFalse1],
+                [15, 'battery', tuya.valueConverter.raw],
+                [16, 'silence', tuya.valueConverter.raw],
+                [17, 'alarm', tuya.valueConverter.onOff],
+            ],
+        },
+    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_5d3vhjro'}],
         model: 'SA12IZL',

package/devices/xiaomi.js

@@ -3155,6 +3155,24 @@ module.exports = [
         exposes: [e.battery(), e.battery_voltage(), e.action(['single', 'double', 'hold', 'release']),
             e.device_temperature(), e.power_outage_count()],
     },
+    {
+        zigbeeModel: ['lumi.remote.b286acn03'],
+        model: 'WXKG04LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara T1 double rocker wireless remote switch',
+        meta: {battery: {voltageToPercentage: '3V_2850_3000'}},
+        fromZigbee: [fz.xiaomi_basic, fz.aqara_opple_multistate, fz.aqara_opple],
+        toZigbee: [],
+        endpoint: (device) => {
+            return {left: 1, right: 2, both: 3};
+        },
+        exposes: [e.battery(), e.battery_voltage(), e.action([
+            'button_1_hold', 'button_1_release', 'button_1_single', 'button_1_double', 'button_1_triple',
+            'button_2_hold', 'button_2_release', 'button_2_single', 'button_2_double', 'button_2_triple',
+            'button_3_hold', 'button_3_release', 'button_3_single', 'button_3_double', 'button_3_triple',
+        ])],
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['lumi.remote.cagl02'],
         model: 'CTP-R01',

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/lib/tuya.js

@@ -1909,7 +1909,7 @@ const tuyaExtend = {
         }
 
         if (options.electricalMeasurements) {
-            fromZigbee.push(fz.electrical_measurement, fz.metering);
+            fromZigbee.push((options.electricalMeasurementsFzConverter || fz.electrical_measurement), fz.metering);
             exposes.push(e.power(), e.current(), e.voltage(), e.energy());
         }
         if (options.childLock) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.90",
+  "version": "15.0.92",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -38,7 +38,7 @@
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^3.0.0",
-    "zigbee-herdsman": "^0.14.105"
+    "zigbee-herdsman": "^0.14.107"
   },
   "devDependencies": {
     "eslint": "*",

package/devices/home_control_as.js

@@ -1,27 +0,0 @@
-const exposes = require('../lib/exposes');
-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 = [
-    {
-        zigbeeModel: ['HC-SLM-1'],
-        model: 'HC-SLM-1',
-        vendor: 'Home Control AS',
-        description: 'Heimgard (Wattle) door lock pro',
-        fromZigbee: [fz.lock, fz.battery],
-        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(), e.auto_relock_time().withValueMin(0).withValueMax(3600), e.sound_volume()],
-    },
-];