zigbee-herdsman-converters 14.0.607 → 14.0.608

package/converters/fromZigbee.js

@@ -1540,14 +1540,15 @@ const converters = {
             // HomeAssistant etc. work the other way round.
             // For zigbee-herdsman-converters: open = 100, close = 0
             // ubisys J1 will report 255 if lift or tilt positions are not known, so skip that.
-            const invert = model.meta && model.meta.coverInverted ? !options.invert_cover : options.invert_cover;
+            const metaInvert = model.meta && model.meta.coverInverted;
+            const invert = metaInvert ? !options.invert_cover : options.invert_cover;
             const coverStateFromTilt = model.meta && model.meta.coverStateFromTilt;
             if (msg.data.hasOwnProperty('currentPositionLiftPercentage') && msg.data['currentPositionLiftPercentage'] <= 100) {
                 const value = msg.data['currentPositionLiftPercentage'];
                 result[postfixWithEndpointName('position', msg, model, meta)] = invert ? value : 100 - value;
                 if (!coverStateFromTilt) {
                     result[postfixWithEndpointName('state', msg, model, meta)] =
-                        invert ? (value === 100 ? 'CLOSE' : 'OPEN') : (value === 0 ? 'CLOSE' : 'OPEN');
+                        metaInvert ? (value === 0 ? 'CLOSE' : 'OPEN') : (value === 100 ? 'CLOSE' : 'OPEN');
                 }
             }
             if (msg.data.hasOwnProperty('currentPositionTiltPercentage') && msg.data['currentPositionTiltPercentage'] <= 100) {
@@ -1555,7 +1556,7 @@ const converters = {
                 result[postfixWithEndpointName('tilt', msg, model, meta)] = invert ? value : 100 - value;
                 if (coverStateFromTilt) {
                     result[postfixWithEndpointName('state', msg, model, meta)] =
-                        invert ? (value === 100 ? 'OPEN' : 'CLOSE') : (value === 0 ? 'OPEN' : 'CLOSE');
+                        metaInvert ? (value === 100 ? 'OPEN' : 'CLOSE') : (value === 0 ? 'OPEN' : 'CLOSE');
                 }
             }
             return result;

package/devices/moes.js

@@ -8,10 +8,78 @@ const extend = require('../lib/extend');
 const e = exposes.presets;
 const ea = exposes.access;
 const zosung = require('../lib/zosung');
+const utils = require('../lib/utils');
 const fzZosung = zosung.fzZosung;
 const tzZosung = zosung.tzZosung;
 const ez = zosung.presetsZosung;
 
+const fzLocal = {
+    ZSEUD: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataResponse', 'commandDataReport'],
+        convert: async (model, msg, publish, options, meta) => {
+            const result = {};
+            for (const dpValue of msg.data.dpValues) {
+                const dp = dpValue.dp;
+                const value = tuya.getDataValue(dpValue);
+                switch (dp) {
+                case 1:
+                    result.state_l1 = value ? 'ON' : 'OFF';
+                    break;
+                case 2:
+                    result.brightness_l1 = utils.mapNumberRange(value, 0, 1000, 0, 254);
+                    break;
+                case 7:
+                    result.state_l2 = value ? 'ON' : 'OFF';
+                    break;
+                case 8:
+                    result.brightness_l2 = utils.mapNumberRange(value, 0, 1000, 0, 254);
+                    break;
+                default:
+                    meta.logger.warn(`zigbee-herdsman-converters:ZSEUD: NOT RECOGNIZED DP #${dp} with data ${JSON.stringify(dpValue)}`);
+                }
+            }
+            return result;
+        },
+    },
+};
+
+const tzLocal = {
+    ZSEUD_state: {
+        key: ['state'],
+        convertSet: async (entity, key, value, meta) => {
+            const lookup = {l1: 1, l2: 7};
+            const dp = lookup[meta.endpoint_name];
+            await tuya.sendDataPointBool(entity, dp, value === 'ON');
+        },
+    },
+    ZSEUD_brightness: {
+        key: ['brightness'],
+        convertSet: async (entity, key, value, meta) => {
+            const lookup = {l1: 2, l2: 8};
+            const dp = lookup[meta.endpoint_name];
+
+            if (key == 'brightness') {
+                // upscale to 1000
+                if (value >= 0 && value <= 254) {
+                    const newValue = utils.mapNumberRange(value, 0, 254, 0, 1000);
+                    // Always use same transid as tuya_dimmer_state (https://github.com/Koenkk/zigbee2mqtt/issues/6366)
+                    if (meta.state[`state_${meta.endpoint_name}`] === 'ON') {
+                        await tuya.sendDataPointValue(entity, dp, newValue, 'dataRequest', 1);
+                    } else {
+                        await tuya.sendDataPoints(entity, [tuya.dpValueFromBool(dp-1, true), tuya.dpValueFromIntValue(dp, newValue)],
+                            'dataRequest', 1);
+                    }
+                } else {
+                    throw new Error('Dimmer brightness is out of range 0..254');
+                }
+            } else {
+                meta.logger.warn(`ZSEUD TZ unsupported key=${key} value=${value}`);
+            }
+        },
+    },
+};
+
 module.exports = [
     {
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_cymsnfvf'},
@@ -285,8 +353,25 @@ module.exports = [
         exposes: [e.light_brightness().setAccess('state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET)],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_e3oitdyu'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_fjjbhx9d'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_fjjbhx9d'}],
+        model: 'ZS-EUD',
+        vendor: 'Moes',
+        description: '2 gang light dimmer switch',
+        fromZigbee: [fzLocal.ZSEUD, fz.ignore_basic_report],
+        toZigbee: [tzLocal.ZSEUD_brightness, tzLocal.ZSEUD_state],
+        meta: {turnsOffAtBrightness1: true, multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            if (device.getEndpoint(2)) await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+        },
+        exposes: [e.light_brightness().withEndpoint('l1').setAccess('state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET),
+            e.light_brightness().withEndpoint('l2').setAccess('state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET)],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 1};
+        },
+    },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_e3oitdyu'}],
         model: 'MS-105B',
         vendor: 'Moes',
         description: 'Smart dimmer module (2 gang)',

package/devices/tuya.js

@@ -26,9 +26,7 @@ const tzLocal = {
     hpsz: {
         key: ['led_state'],
         convertSet: async (entity, key, value, meta) => {
-            const ledState = value.toUpperCase() === 'ON' ? true : false;
-            await tuya.sendDataPointBool(entity, tuya.dataPoints.HPSZLEDState, ledState);
-            return {led_state: value};
+            await tuya.sendDataPointBool(entity, tuya.dataPoints.HPSZLEDState, value);
         },
     },
     TS0504B_color: {
@@ -888,7 +886,8 @@ module.exports = [
             {modelID: 'TS0501B', manufacturerName: '_TZ3210_nehayyhx'},
             {modelID: 'TS0501B', manufacturerName: '_TZ3210_wuheofsg'},
             {modelID: 'TS0501B', manufacturerName: '_TZ3210_e5t9bfdv'},
-            {modelID: 'TS0501B', manufacturerName: '_TZ3210_19qb27da'}],
+            {modelID: 'TS0501B', manufacturerName: '_TZ3210_19qb27da'},
+            {modelID: 'TS0501B', manufacturerName: '_TZ3210_4zinq6io'}],
         model: 'TS0501B',
         description: 'Zigbee light',
         vendor: 'TuYa',
@@ -3133,7 +3132,7 @@ module.exports = [
                 .withDescription('Shows the presence duration in minutes'),
             exposes.numeric('duration_of_absence', ea.STATE).withUnit('minutes')
                 .withDescription('Shows the duration of the absence in minutes'),
-            exposes.enum('led_state', ea.STATE_SET, ['on', 'off'])
+            exposes.binary('led_state', ea.STATE_SET, true, false)
                 .withDescription('Turns the onboard LED on or off'),
         ],
     },

package/package.json

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