zigbee-herdsman-converters 14.0.460 → 14.0.461

package/converters/fromZigbee.js

@@ -4823,6 +4823,7 @@ const converters = {
                 0x1e: 'press_1_and_4', 0x1f: 'release_1_and_4', 0x1c: 'press_2_and_3', 0x1d: 'release_2_and_3', 0x1a: 'press_2_and_4',
                 0x1b: 'release_2_and_4', 0x16: 'press_3_and_4', 0x17: 'release_3_and_4', 0x10: 'press_energy_bar',
                 0x11: 'release_energy_bar', 0x0: 'press_or_release_all',
+                0x50: 'lock', 0x51: 'unlock', 0x52: 'half_open', 0x53: 'tilt',
             };
 
             if (!lookup.hasOwnProperty(commandID)) {

package/converters/toZigbee.js

@@ -2446,10 +2446,7 @@ const converters = {
 
                 value = typeof value === 'string' ? value.toLowerCase() : value;
                 value = lookup.hasOwnProperty(value) ? lookup[value] : value;
-
-                if (key === 'position') {
-                    value = meta.options.invert_cover ? 100 - value : value;
-                }
+                value = meta.options.invert_cover ? 100 - value : value;
 
                 const payload = {0x0055: {value, type: 0x39}};
                 await entity.write('genAnalogOutput', payload);

package/devices/enocean.js

@@ -28,7 +28,8 @@ module.exports = [
         exposes: [e.action(['press_1', 'release_1', 'press_2', 'release_2', 'press_3', 'release_3', 'press_4', 'release_4',
             'press_1_and_2', 'release_1_and_2', 'press_1_and_3', 'release_1_and_3', 'press_1_and_4', 'release_1_and_4',
             'press_2_and_3', 'release_2_and_3', 'press_2_and_4', 'release_2_and_4', 'press_3_and_4', 'release_3_and_4',
-            'press_energy_bar', 'release_energy_bar', 'press_or_release_all'])],
+            'press_energy_bar', 'release_energy_bar', 'press_or_release_all',
+            'lock', 'unlock', 'half_open', 'tilt'])],
         whiteLabel: [
             {vendor: 'Easyfit by EnOcean', description: 'Wall switch for Zigbee', model: 'EWSxZ'},
             {vendor: 'Trio2sys', description: 'Zigbee Green Power complete switch', model: '20020002'},

package/devices/keen_home.js

@@ -22,7 +22,7 @@ module.exports = [
     },
     {
         zigbeeModel: ['SV01-410-MP-1.0', 'SV01-410-MP-1.1', 'SV01-410-MP-1.4', 'SV01-410-MP-1.5', 'SV01-412-MP-1.0',
-            'SV01-412-MP-1.4', 'SV01-610-MP-1.0', 'SV01-610-MP-1.1', 'SV01-612-MP-1.0', 'SV01-610-MP-1.4'],
+            'SV01-412-MP-1.1', 'SV01-412-MP-1.4', 'SV01-610-MP-1.0', 'SV01-610-MP-1.1', 'SV01-612-MP-1.0', 'SV01-610-MP-1.4'],
         model: 'SV01',
         vendor: 'Keen Home',
         description: 'Smart vent',

package/devices/orvibo.js

@@ -6,6 +6,13 @@ const extend = require('../lib/extend');
 const e = exposes.presets;
 
 module.exports = [
+    {
+        zigbeeModel: ['ORVIBO Socket'],
+        model: 'OR-ZB-S010-3C',
+        vendor: 'ORVIBO',
+        description: 'Smart Socket',
+        extend: extend.switch(),
+    },
     {
         zigbeeModel: ['3c4e4fc81ed442efaf69353effcdfc5f', '51725b7bcba945c8a595b325127461e9'],
         model: 'CR11S8UZ',

package/devices/philips.js

@@ -1513,6 +1513,15 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['4023331P6'],
+        model: '4023331P6',
+        vendor: 'Philips',
+        description: 'Hue white ambiance Amaze',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['929003054801'],
         model: '929003054801',
@@ -2732,6 +2741,15 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['1746530P7'],
+        model: '1746530P7',
+        vendor: 'Philips',
+        description: 'Hue White and color ambiance Daylo outdoor wall lamp',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['1746547P7'],
         model: '1746547P7',

package/devices/spotmau.js

@@ -0,0 +1,33 @@
+const exposes = require('../lib/exposes');
+const reporting = require('../lib/reporting');
+const extend = require('../lib/extend');
+const e = exposes.presets;
+
+module.exports = [
+    {
+        zigbeeModel: ['1719SP-PS1-02'],
+        model: 'SP-PS1-02',
+        vendor: 'Spotmau',
+        description: 'Smart wall switch - 1 gang',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(16), coordinatorEndpoint, ['genOnOff', 'genBasic']);
+        },
+    },
+    {
+        zigbeeModel: ['1719SP-PS2-02'],
+        model: 'SP-PS2-02',
+        vendor: 'Spotmau',
+        description: 'Smart wall switch - 2 gang',
+        extend: extend.switch(),
+        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right')],
+        endpoint: (device) => {
+            return {'left': 16, 'right': 17};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(16), coordinatorEndpoint, ['genOnOff', 'genBasic']);
+            await reporting.bind(device.getEndpoint(17), coordinatorEndpoint, ['genOnOff', 'genBasic']);
+        },
+    },
+];

package/devices/tuya.js

@@ -53,6 +53,29 @@ const fzLocal = {
             return fz.battery.convert(model, msg, publish, options, meta);
         },
     },
+    TS0222: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataResponse', 'commandDataReport'],
+        convert: (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 2:
+                    result.illuminance = value;
+                    result.illuminance_lux = value;
+                    break;
+                case 4:
+                    result.battery = value;
+                    break;
+                default:
+                    meta.logger.warn(`zigbee-herdsman-converters:TS0222 Unrecognized DP #${dp} with data ${JSON.stringify(dpValue)}`);
+                }
+            }
+            return result;
+        },
+    },
 };
 
 module.exports = [
@@ -1804,9 +1827,13 @@ module.exports = [
         model: 'TS0222',
         vendor: 'TuYa',
         description: 'Light intensity sensor',
-        fromZigbee: [fz.battery, fz.illuminance],
+        fromZigbee: [fz.battery, fz.illuminance, fzLocal.TS0222],
         toZigbee: [],
         exposes: [e.battery(), e.illuminance(), e.illuminance_lux()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+        },
     },
     {
         fingerprint: [{modelID: 'TS0210', manufacturerName: '_TYZB01_3zv6oleo'},

package/devices/xinghuoyuan.js

@@ -0,0 +1,11 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['X2SK11'],
+        model: 'X2SK11',
+        vendor: 'XingHuoYuan',
+        description: 'Smart socket',
+        extend: extend.switch(),
+    },
+];

package/lib/xiaomi.js

@@ -416,7 +416,8 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             break;
         case '1028':
             payload = {...payload,
-                motor_state: {0: 'stopped', 1: 'opening', 2: 'closing'}[value],
+                motor_state: (options.invert_cover ? {0: 'stopped', 1: 'closing', 2: 'opening'} :
+                    {0: 'stopped', 1: 'opening', 2: 'closing'})[value],
                 running: !!value,
             };
             break;

package/npm-shrinkwrap.json

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

package/package.json

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