zigbee-herdsman-converters 14.0.464 → 14.0.467

package/converters/fromZigbee.js

@@ -4580,10 +4580,33 @@ const converters = {
             } else if (meta.device.manufacturerName === '_TZE200_swaamsoy') {
                 // https://github.com/Koenkk/zigbee-herdsman-converters/pull/3004
                 if (dpValue.dp === 2) {
+                    if (value < 10) {
+                        tuya.logUnexpectedDataValue('tuya_dimmer', msg, dpValue, meta, 'brightness', 10, 1000);
+                    }
                     return {brightness: mapNumberRange(value, 10, 1000, 0, 254)};
                 }
-            } else { // TODO: Unknown dp, assumed value type
-                return {brightness: mapNumberRange(value, 10, 1000, 0, 254), level: value};
+            } else if (meta.device.manufacturerName === '_TZE200_3p5ydos3') {
+                if (dpValue.dp === tuya.dataPoints.eardaDimmerLevel) {
+                    return {brightness: mapNumberRange(value, 0, 1000, 0, 254)};
+                } else if (dpValue.dp === tuya.dataPoints.dimmerMinLevel) {
+                    return {min_brightness: mapNumberRange(value, 0, 1000, 1, 255)};
+                } else if (dpValue.dp === tuya.dataPoints.dimmerMaxLevel) {
+                    return {max_brightness: mapNumberRange(value, 0, 1000, 1, 255)};
+                } else {
+                    tuya.logUnexpectedDataPoint('tuya_dimmer', msg, dpValue, meta);
+                }
+            } else {
+                if (dpValue.dp !== tuya.dataPoints.dimmerLevel) {
+                    tuya.logUnexpectedDataPoint('tuya_dimmer', msg, dpValue, meta);
+                }
+                if (dpValue.datatype !== tuya.dataTypes.value) {
+                    tuya.logUnexpectedDataType('tuya_dimmer', msg, dpValue, meta);
+                } else {
+                    if (value < 10) {
+                        tuya.logUnexpectedDataValue('tuya_dimmer', msg, dpValue, meta, 'brightness', 10, 1000);
+                    }
+                    return {brightness: mapNumberRange(value, 10, 1000, 0, 254), level: value};
+                }
             }
         },
     },
@@ -4593,14 +4616,6 @@ const converters = {
         convert: (model, msg, publis, options, meta) => {
             // Don't use in production!
             // Used in: https://www.zigbee2mqtt.io/how_tos/how_to_support_new_tuya_devices.html
-            const getType = (datatype) => {
-                const entry = Object.entries(tuya.dataTypes).find(([typeName, typeId]) => typeId === datatype);
-                return (entry ? entry[0] : 'unknown');
-            };
-            const getAllDpIds = (dp) => {
-                const entries = Object.entries(tuya.dataPoints).filter(([dpName, dpId]) => dpId === dp);
-                return entries.map(([dpName, dpId]) => dpName);
-            };
             const getHex = (value) => {
                 let hex = value.toString(16);
                 if (hex.length < 2) {
@@ -4611,11 +4626,7 @@ const converters = {
             const now = Date.now().toString();
             let dataStr = '';
             for (const [i, dpValue] of msg.data.dpValues.entries()) {
-                const value = tuya.getDataValue(dpValue);
-                meta.logger.info(`zigbee-herdsman-converters:tuya_data_point_dump: Received DP #${
-                    dpValue.dp} from ${meta.device.ieeeAddr} with raw data '${JSON.stringify(dpValue)}': type='${msg.type}', datatype='${
-                    getType(dpValue.datatype)}', value='${value}', known DP# usage: ${JSON.stringify(getAllDpIds(dpValue.dp))}`);
-
+                tuya.logDataPoint('tuya_data_point_dump', msg, dpValue, meta);
                 dataStr +=
                     now + ' ' +
                     meta.device.ieeeAddr + ' ' +

package/converters/toZigbee.js

@@ -3516,7 +3516,7 @@ const converters = {
         },
     },
     tuya_dimmer_level: {
-        key: ['brightness_min', 'brightness', 'brightness_percent', 'level'],
+        key: ['brightness_min', 'min_brightness', 'max_brightness', 'brightness', 'brightness_percent', 'level'],
         convertSet: async (entity, key, value, meta) => {
             // upscale to 1000
             let newValue;
@@ -3531,6 +3531,20 @@ const converters = {
                 } else {
                     throw new Error('Dimmer brightness_min is out of range 0..100');
                 }
+            } else if (key === 'min_brightness') {
+                if (value >= 1 && value <= 255) {
+                    newValue = utils.mapNumberRange(value, 1, 255, 0, 1000);
+                    dp = tuya.dataPoints.dimmerMinLevel;
+                } else {
+                    throw new Error('Dimmer min_brightness is out of range 1..255');
+                }
+            } else if (key === 'max_brightness') {
+                if (value >= 1 && value <= 255) {
+                    newValue = utils.mapNumberRange(value, 1, 255, 0, 1000);
+                    dp = tuya.dataPoints.dimmerMaxLevel;
+                } else {
+                    throw new Error('Dimmer min_brightness is out of range 1..255');
+                }
             } else if (key === 'level') {
                 if (value >= 0 && value <= 1000) {
                     newValue = Math.round(Number(value));
@@ -3543,11 +3557,11 @@ const converters = {
                 } else {
                     throw new Error('Dimmer brightness_percent is out of range 0..100');
                 }
-            } else {
-                if (value >= 0 && value <= 255) {
-                    newValue = utils.mapNumberRange(value, 0, 255, 0, 1000);
+            } else { // brightness
+                if (value >= 0 && value <= 254) {
+                    newValue = utils.mapNumberRange(value, 0, 254, 0, 1000);
                 } else {
-                    throw new Error('Dimmer brightness is out of range 0..255');
+                    throw new Error('Dimmer brightness is out of range 0..254');
                 }
             }
             // Always use same transid as tuya_dimmer_state (https://github.com/Koenkk/zigbee2mqtt/issues/6366)

package/devices/ikea.js

@@ -746,7 +746,7 @@ module.exports = [
         extend: tradfriExtend.light_onoff_brightness_colortemp_color({colorTempRange: [250, 454]}),
     },
     {
-        zigbeeModel: ['TRADFRI bulb E14 CWS 470lm', 'TRADFRI bulb E12 CWS 450lm'],
+        zigbeeModel: ['TRADFRI bulb E14 CWS 470lm', 'TRADFRI bulb E12 CWS 450lm', 'TRADFRI bulb E17 CWS 440lm'],
         model: 'LED1925G6',
         vendor: 'IKEA',
         description: 'TRADFRI LED bulb E14 470 lumen, opal, dimmable, white spectrum, color spectrum',
@@ -820,4 +820,11 @@ module.exports = [
         description: 'TRADFRI LED bulb E14 470 lumen, wireless dimmable white spectrum/chandelier opal white',
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
+    {
+        zigbeeModel: ['NYMANE PENDANT'],
+        model: '90504044',
+        vendor: 'IKEA',
+        description: 'NYMÅNE Pendant lamp',
+        extend: tradfriExtend.light_onoff_brightness_colortemp(),
+    },
 ];

package/devices/lidl.js

@@ -507,6 +507,17 @@ module.exports = [
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
         },
     },
+    {
+        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_z1vlyufu'}],
+        model: '14158704L',
+        vendor: 'Lidl',
+        description: 'Livarno Home LED floor lamp, RGBW',
+        ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, colorTempRange: [153, 500]}),
+        meta: {applyRedFix: true, enhancedHue: false},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
+        },
+    },
     {
         fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_quqaeew6'}],
         model: 'HG07834A',

package/devices/niko.js

@@ -77,7 +77,7 @@ module.exports = [
     },
     {
         zigbeeModel: ['Single connectable switch,10A'],
-        model: '552-72101',
+        model: '552-721X1',
         vendor: 'Niko',
         description: 'Single connectable switch',
         fromZigbee: [fz.on_off],
@@ -91,4 +91,27 @@ module.exports = [
             e.switch(),
         ],
     },
+    {
+        zigbeeModel: ['Double connectable switch,10A'],
+        model: '552-721X2',
+        vendor: 'Niko',
+        description: 'Double connectable switch',
+        fromZigbee: [fz.on_off],
+        toZigbee: [tz.on_off],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const ep1 = device.getEndpoint(1);
+            const ep2 = device.getEndpoint(2);
+            await reporting.bind(ep1, coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(ep2, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(ep1);
+            await reporting.onOff(ep2);
+        },
+        exposes: [
+            e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'),
+        ],
+    },
 ];

package/devices/orvibo.js

@@ -10,7 +10,7 @@ module.exports = [
         zigbeeModel: ['ORVIBO Socket'],
         model: 'OR-ZB-S010-3C',
         vendor: 'ORVIBO',
-        description: 'Smart Socket',
+        description: 'Smart socket',
         extend: extend.switch(),
     },
     {

package/devices/paul_neuhaus.js

@@ -43,7 +43,7 @@ module.exports = [
     },
     {
         zigbeeModel: ['NLG-RGBW light'],
-        model: 'NLG-RGBW light',
+        model: 'NLG-RGBW__light',
         vendor: 'Paul Neuhaus',
         description: 'Various RGBW lights (e.g. 100.111.57)',
         extend: extend.light_onoff_brightness_colortemp_color(),

package/devices/tuya.js

@@ -358,6 +358,11 @@ module.exports = [
         fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_occupancy_alarm_1_report],
         toZigbee: [],
         exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.battery(), e.battery_voltage()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
+        },
     },
     {
         fingerprint: [{modelID: 'TS0202', manufacturerName: '_TZ3000_mcxw5ehu'},
@@ -445,7 +450,9 @@ module.exports = [
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
         },
-        exposes: [e.light_brightness().setAccess('state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET)],
+        exposes: [e.light_brightness().withMinBrightness().withMaxBrightness().setAccess(
+            'state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET).setAccess(
+            'min_brightness', ea.STATE_SET).setAccess('max_brightness', ea.STATE_SET)],
         whiteLabel: [
             {vendor: 'Larkkey', model: 'ZSTY-SM-1DMZG-EU'},
             {vendor: 'Earda', model: 'EDM-1ZAA-EU'},
@@ -663,6 +670,7 @@ module.exports = [
             {modelID: 'TS0502B', manufacturerName: '_TZ3000_zw7wr5uo'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_pz9zmxjj'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3000_fzwhym79'},
+            {modelID: 'TS0502B', manufacturerName: '_TZ3000_ogceypug'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_rm0hthdo'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_zwqnazkb'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_ijsj2evj'},
@@ -697,10 +705,7 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color(),
     },
     {
-        fingerprint: [
-            {type: 'EndDevice', manufacturerID: 4098, endpoints: [{ID: 1, inputClusters: [], outputClusters: []}]},
-            {manufacturerName: '_TZ2000_a476raq2'},
-        ],
+        fingerprint: [{manufacturerName: '_TZ2000_a476raq2'}],
         zigbeeModel: ['TS0201', 'SNTZ003'],
         model: 'TS0201',
         vendor: 'TuYa',
@@ -709,6 +714,10 @@ module.exports = [
         fromZigbee: [fzLocal.TS0201_battery, fz.temperature, fz.humidity],
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+        },
     },
     {
         fingerprint: [{modelID: 'TS0201', manufacturerName: '_TZ3000_bguser20'}],
@@ -2170,7 +2179,8 @@ module.exports = [
         exposes: [e.illuminance_lux(), e.brightness_state()],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_kltffuzl'}, {modelID: 'TS0601', manufacturerName: '_TZE200_fwoorn8y'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_kltffuzl'}, {modelID: 'TS0601', manufacturerName: '_TZE200_fwoorn8y'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_pay2byax'}],
         model: 'TM001-ZA/TM081',
         vendor: 'TuYa',
         description: 'Door and window sensor',

package/lib/exposes.js

@@ -218,6 +218,12 @@ class Light extends Base {
         return this;
     }
 
+    withMaxBrightness() {
+        assert(!this.endpoint, 'Cannot add feature after adding endpoint');
+        this.features.push(new Numeric('max_brightness', access.ALL).withValueMin(1).withValueMax(255).withDescription('Maximum light brightness'));
+        return this;
+    }
+
     withLevelConfig() {
         assert(!this.endpoint, 'Cannot add feature after adding endpoint');
         const levelConfig = new Composite('level_config', 'level_config')

package/lib/tuya.js

@@ -58,6 +58,61 @@ function getDataValue(dpValue) {
     }
 }
 
+function getTypeName(dpValue) {
+    const entry = Object.entries(dataTypes).find(([typeName, typeId]) => typeId === dpValue.datatype);
+    return (entry ? entry[0] : 'unknown');
+}
+
+function getDataPointNames(dpValue) {
+    const entries = Object.entries(dataPoints).filter(([dpName, dpId]) => dpId === dpValue.dp);
+    return entries.map(([dpName, dpId]) => dpName);
+}
+
+function logDataPoint(where, msg, dpValue, meta) {
+    meta.logger.info(`zigbee-herdsman-converters:${where}: Received Tuya DataPoint #${
+        dpValue.dp} from ${meta.device.ieeeAddr} with raw data '${JSON.stringify(dpValue)}': type='${
+        msg.type}', datatype='${getTypeName(dpValue)}', value='${
+        getDataValue(dpValue)}', known DP# usage: ${JSON.stringify(getDataPointNames(dpValue))}`);
+}
+
+function logUnexpectedDataPoint(where, msg, dpValue, meta) {
+    meta.logger.warn(`zigbee-herdsman-converters:${where}: Received unexpected Tuya DataPoint #${
+        dpValue.dp} from ${meta.device.ieeeAddr} with raw data '${JSON.stringify(dpValue)}': type='${
+        msg.type}', datatype='${getTypeName(dpValue)}', value='${
+        getDataValue(dpValue)}', known DP# usage: ${JSON.stringify(getDataPointNames(dpValue))}`);
+}
+
+function logUnexpectedDataType(where, msg, dpValue, meta, expectedDataType) {
+    meta.logger.warn(`zigbee-herdsman-converters:${where}: Received Tuya DataPoint #${
+        dpValue.dp} with unexpected datatype from ${meta.device.ieeeAddr} with raw data '${
+        JSON.stringify(dpValue)}': type='${msg.type}', datatype='${
+        getTypeName(dpValue)}' (instead of '${expectedDataType}'), value='${
+        getDataValue(dpValue)}', known DP# usage: ${JSON.stringify(getDataPointNames(dpValue))}`);
+}
+
+function logUnexpectedDataValue(where, msg, dpValue, meta, valueKind, expectedMinValue=null, expectedMaxValue=null) {
+    if (expectedMinValue === null) {
+        if (expectedMaxValue === null) {
+            meta.logger.warn(`zigbee-herdsman-converters:${where}: Received Tuya DataPoint #${dpValue.dp
+            } with invalid value ${getDataValue(dpValue)} for ${valueKind} from ${meta.device.ieeeAddr}`);
+        } else {
+            meta.logger.warn(`zigbee-herdsman-converters:${where}: Received Tuya DataPoint #${dpValue.dp
+            } with invalid value ${getDataValue(dpValue)} for ${valueKind} from ${meta.device.ieeeAddr
+            } which is higher than the expected maximum of ${expectedMaxValue}`);
+        }
+    } else {
+        if (expectedMaxValue === null) {
+            meta.logger.warn(`zigbee-herdsman-converters:${where}: Received Tuya DataPoint #${dpValue.dp
+            } with invalid value ${getDataValue(dpValue)} for ${valueKind} from ${meta.device.ieeeAddr
+            } which is lower than the expected minimum of ${expectedMinValue}`);
+        } else {
+            meta.logger.warn(`zigbee-herdsman-converters:${where}: Received Tuya DataPoint #${dpValue.dp
+            } with invalid value ${getDataValue(dpValue)} for ${valueKind} from ${meta.device.ieeeAddr
+            } which is outside the expected range from ${expectedMinValue} to ${expectedMaxValue}`);
+        }
+    }
+}
+
 function convertDecimalValueTo4ByteHexArray(value) {
     const hexValue = Number(value).toString(16).padStart(8, '0');
     const chunk1 = hexValue.substr(0, 2);
@@ -229,11 +284,13 @@ const dataPoints = {
     heatingSetpoint: 2,
     coverPosition: 2,
     dimmerLevel: 3,
+    dimmerMinLevel: 3,
     localTemp: 3,
     coverArrived: 3,
     occupancy: 3,
     mode: 4,
     fanMode: 5,
+    dimmerMaxLevel: 5,
     motorDirection: 5,
     config: 5,
     childLock: 7,
@@ -873,6 +930,12 @@ module.exports = {
     sendDataPointStringBuffer,
     firstDpValue,
     getDataValue,
+    getTypeName,
+    getDataPointNames,
+    logDataPoint,
+    logUnexpectedDataPoint,
+    logUnexpectedDataType,
+    logUnexpectedDataValue,
     dataTypes,
     dataPoints,
     dpValueFromIntValue,

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.464",
+  "version": "14.0.467",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "zigbee-herdsman-converters",
-      "version": "14.0.464",
+      "version": "14.0.467",
       "license": "MIT",
       "dependencies": {
         "axios": "^0.26.1",

package/package.json

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