zigbee-herdsman-converters 14.0.623 → 14.0.625

package/devices/heiman.js

@@ -444,6 +444,20 @@ module.exports = [
             await reporting.batteryPercentageRemaining(endpoint);
         },
     },
+    {
+        fingerprint: [{modelID: 'ColorDimmerSw-EM-3.0', manufacturerName: 'HEIMAN'}],
+        model: 'HS2WDSR-E',
+        vendor: 'HEIMAN',
+        description: 'Remote dimmer and color control',
+        fromZigbee: [fz.battery, fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.command_move_to_color],
+        exposes: [e.battery(), e.action(['on', 'off', 'move', 'stop', 'color_move'])],
+        toZigbee: [],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'genOnOff', 'genLevelCtrl', 'lightingColorCtrl']);
+            await reporting.batteryPercentageRemaining(endpoint, {min: constants.repInterval.MINUTES_5, max: constants.repInterval.HOUR});
+        },
+    },
     {
         zigbeeModel: ['GASSensor-EM'],
         model: 'HS1CG-E',

package/devices/m/303/274ller_licht.js

@@ -149,7 +149,7 @@ module.exports = [
     },
     {
         zigbeeModel: ['tint-Remote-white'],
-        model: '404022',
+        model: '404022/404049C',
         description: 'Tint dim remote control',
         vendor: 'Müller Licht',
         fromZigbee: [fz.command_on, fz.command_off, fz.command_step, fz.command_move, fz.command_stop, fz.command_move_to_color_temp],

package/devices/tuya.js

@@ -20,7 +20,8 @@ const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak',
     '_TZ3000_rdtixbnu', '_TZ3000_typdpbpg', '_TZ3000_kx0pris5', '_TZ3000_amdymr7l', '_TZ3000_z1pnpsdo', '_TZ3000_ksw8qtmt',
     '_TZ3000_1h2x4akh', '_TZ3000_9vo5icau', '_TZ3000_cehuw1lw', '_TZ3000_ko6v90pg', '_TZ3000_f1bapcit', '_TZ3000_cjrngdr3',
     '_TZ3000_zloso4jk', '_TZ3000_r6buo8ba', '_TZ3000_iksasdbv', '_TZ3000_idrffznf', '_TZ3000_okaz9tjs', '_TZ3210_q7oryllx',
-    '_TZ3000_ss98ec5d', '_TZ3000_gznh2xla', '_TZ3000_hdopuwv6', '_TZ3000_gvn91tmx', '_TZ3000_dksbtrzs', '_TZ3000_b28wrpvx'];
+    '_TZ3000_ss98ec5d', '_TZ3000_gznh2xla', '_TZ3000_hdopuwv6', '_TZ3000_gvn91tmx', '_TZ3000_dksbtrzs', '_TZ3000_b28wrpvx',
+    '_TZ3000_aim0ztek'];
 
 const tzLocal = {
     SA12IZL_silence_siren: {
@@ -1861,6 +1862,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_2atgpdho'}, // HY367
             {modelID: 'TS0601', manufacturerName: '_TZE200_cpmgn2cf'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_4eeyebrt'}, // Immax 07732B
+            {modelID: 'TS0601', manufacturerName: '_TZE200_8whxpsiw'}, // EVOLVEO
         ],
         model: 'TS0601_thermostat',
         vendor: 'TuYa',
@@ -2102,7 +2104,7 @@ module.exports = [
         vendor: 'TuYa',
         whiteLabel: [{vendor: 'LELLKI', model: 'TS011F_plug'}, {vendor: 'NEO', model: 'NAS-WR01B'},
             {vendor: 'BlitzWolf', model: 'BW-SHP15'}, {vendor: 'Nous', model: 'A1Z'}, {vendor: 'BlitzWolf', model: 'BW-SHP13'},
-            {vendor: 'MatSee Plus', model: 'PJ-ZSW01'}],
+            {vendor: 'MatSee Plus', model: 'PJ-ZSW01'}, {vendor: 'MODEMIX', model: 'MOD037'}, {vendor: 'MODEMIX', model: 'MOD048'}],
         ota: ota.zigbeeOTA,
         fromZigbee: [fz.on_off, fzLocal.electrical_measurement_skip_duplicate, fzLocal.metering_skip_duplicate, fz.ignore_basic_report,
             fz.tuya_switch_power_outage_memory, fz.ts011f_plug_indicator_mode, fz.ts011f_plug_child_mode],
@@ -3271,7 +3273,8 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_0u3bj3rc'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_0u3bj3rc'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_v6ossqfy'}],
         model: 'TS0601_human_presence_sensor',
         vendor: 'TuYa',
         description: 'Human presence sensor Zigbee',

package/devices/yale.js

@@ -20,6 +20,40 @@ const lockExtend = (meta, lockStateOptions=null, binds=['closuresDoorLock', 'gen
     };
 };
 
+const fzLocal = {
+    c4_lock_operation_event: {
+        cluster: 'genAlarms',
+        type: ['commandAlarm'],
+        convert: async (model, msg, publish, options, meta) => {
+            let result = {};
+            if (msg.data.clusterid == 64512) {
+                const alarmcode = msg.data.alarmcode;
+                const lookup = {
+                    9: {action: 'error_jammed', state: 'UNLOCKED', lock_state: 'not_fully_locked'},
+                    21: {action: 'manual_lock', state: 'LOCKED', lock_state: 'locked'},
+                    22: {action: 'manual_unlock', state: 'UNLOCKED', lock_state: 'unlocked'},
+                    24: {action: 'lock', state: 'LOCKED', lock_state: 'locked'},
+                    25: {action: 'unlock', state: 'UNLOCKED', lock_state: 'unlocked'},
+                    27: {action: 'auto_lock', state: 'LOCKED', lock_state: 'locked'},
+                };
+                if (!lookup[alarmcode]) {
+                    result.action = 'unknown';
+                    meta.logger.warn(`zigbee-herdsman-converters:Yale Lock: Unrecognized Operation Event (${alarmcode})`);
+                    // We need to read the lock state as the alarm code is unknown
+                    try {
+                        await msg.endpoint.read('closuresDoorLock', ['lockState']);
+                    } catch (error) {
+                        meta.logger.warn(`zigbee-herdsman-converters:Yale Lock: failed to read lock state`);
+                    }
+                } else {
+                    result = lookup[alarmcode];
+                }
+            }
+            return result;
+        },
+    },
+};
+
 module.exports = [
     {
         zigbeeModel: ['YRD446 BLE TSDB'],
@@ -138,4 +172,22 @@ module.exports = [
         description: 'Real living lock / Intelligent biometric digital lock',
         extend: lockExtend({battery: {dontDividePercentage: true}}),
     },
+    {
+        fingerprint: [{
+            type: 'EndDevice',
+            manufacturerName: 'Yale',
+            manufacturerID: 43690,
+            powerSource: 'Battery',
+            endpoints: [
+                {ID: 1, profileID: 260, deviceID: 10, inputClusters: [0, 9, 10, 257, 64512, 1], outputClusters: []},
+                {ID: 196, profileID: 260, deviceID: 10, inputClusters: [1], outputClusters: []},
+            ]},
+        ],
+        model: 'ZYA-C4-MOD-S',
+        vendor: 'Yale',
+        description: 'Control4 module for Yale KeyFree/Keyless/Doorman/Assure/nexTouch locks',
+        fromZigbee: [fz.lock, fzLocal.c4_lock_operation_event],
+        toZigbee: [tz.lock],
+        exposes: [e.lock(), e.lock_action()],
+    },
 ];

package/package.json

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