zigbee-herdsman-converters 14.0.685 → 14.0.686

package/converters/fromZigbee.js

@@ -6278,6 +6278,10 @@ const converters = {
                     result.position = options.invert_cover ? 100 - result.position : result.position;
                 }
             }
+            // Add the state
+            if ('position' in result) {
+                result.state = result.position === 0 ? 'CLOSE' : 'OPEN';
+            }
             return result;
         },
     },

package/devices/philips.js

@@ -4,6 +4,7 @@ const tz = require('../converters/toZigbee');
 const ota = require('../lib/ota');
 const reporting = require('../lib/reporting');
 const globalStore = require('../lib/store');
+const philips = require('../lib/philips');
 const utils = require('../lib/utils');
 const e = exposes.presets;
 const ea = exposes.access;
@@ -40,6 +41,30 @@ const hueExtend = {
         toZigbee: extendDontUse.light_onoff_brightness_colortemp_color({supportsHS: true, ...options})
             .toZigbee.concat([tz.hue_power_on_behavior, tz.hue_power_on_error]),
     }),
+    light_onoff_brightness_colortemp_color_gradient: (options={}) => ({
+        ...extendDontUse.light_onoff_brightness_colortemp_color({supportsHS: true, noConfigure: true, ...options}),
+        ota: ota.zigbeeOTA,
+        meta: {turnsOffAtBrightness1: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extendDontUse.light_onoff_brightness_colortemp_color({supportsHS: true, ...options})
+                .configure(device, coordinatorEndpoint, logger);
+            for (const ep of device.endpoints) {
+                await ep.bind('manuSpecificPhilips2', coordinatorEndpoint);
+            }
+        },
+        exposes: extendDontUse.light_onoff_brightness_colortemp_color({supportsHS: true, ...options}).exposes.concat([
+            // gradient_scene is deprecated, use gradient instead
+            exposes.enum('gradient_scene', ea.SET, Object.keys(gradientScenes)),
+            exposes.list('gradient', ea.ALL, exposes.text('hex', 'Color in RGB HEX format (eg #663399)'))
+                .withLengthMin(1)
+                .withLengthMax(9)
+                .withDescription('List of RGB HEX colors'),
+        ]),
+        fromZigbee: extendDontUse.light_onoff_brightness_colortemp_color({supportsHS: true, ...options}).fromZigbee.concat(
+            [fzLocal.gradient({reverse: true})]),
+        toZigbee: extendDontUse.light_onoff_brightness_colortemp_color({supportsHS: true, ...options}).toZigbee.concat(
+            [tz.hue_power_on_behavior, tz.hue_power_on_error, tzLocal.gradient_scene, tzLocal.gradient({reverse: true})]),
+    }),
 };
 
 const fzLocal = {
@@ -82,6 +107,20 @@ const fzLocal = {
             return payload;
         },
     },
+    gradient: (opts = {reverse: false}) => {
+        return {
+            cluster: 'manuSpecificPhilips2',
+            type: ['attributeReport', 'readResponse'],
+            convert: (model, msg, publish, options, meta) => {
+                if (msg.data.hasOwnProperty('state')) {
+                    const input = msg.data['state'].toString('hex');
+                    const gradient = philips.decodeGradientColors(input, opts);
+                    return {gradient};
+                }
+                return {};
+            },
+        };
+    },
 };
 
 const gradientScenes = {
@@ -172,6 +211,19 @@ const tzLocal = {
             await entity.command('manuSpecificPhilips2', 'multiColor', payload);
         },
     },
+    gradient: (opts = {reverse: false}) => {
+        return {
+            key: ['gradient'],
+            convertSet: async (entity, key, value, meta) => {
+                const scene = philips.encodeGradientColors(value, opts);
+                const payload = {data: Buffer.from(scene, 'hex')};
+                await entity.command('manuSpecificPhilips2', 'multiColor', payload);
+            },
+            convertGet: async (entity, key, meta) => {
+                await entity.read('manuSpecificPhilips2', ['state']);
+            },
+        };
+    },
 };
 
 module.exports = [
@@ -1650,20 +1702,14 @@ module.exports = [
         model: '4080248U9',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Signe floor light',
-        toZigbee: [tzLocal.gradient_scene, ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).toZigbee],
-        exposes: [exposes.enum('gradient_scene', ea.SET, Object.keys(gradientScenes)),
-            ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).exposes],
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['915005987601'],
         model: '915005987601',
         vendor: 'Philips',
         description: 'Hue Gradient Signe floor lamp (black)',
-        toZigbee: [tzLocal.gradient_scene, ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).toZigbee],
-        exposes: [exposes.enum('gradient_scene', ea.SET, Object.keys(gradientScenes)),
-            ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).exposes],
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['LCT020'],
@@ -2954,20 +3000,14 @@ module.exports = [
         model: '929003535301',
         vendor: 'Philips',
         description: 'Hue Festavia gradient light string 250',
-        toZigbee: [tzLocal.gradient_scene, ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).toZigbee],
-        exposes: [exposes.enum('gradient_scene', ea.SET, Object.keys(gradientScenes)),
-            ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).exposes],
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['915005987101'],
         model: '915005987101',
         vendor: 'Philips',
         description: 'Hue Gradient Signe floor lamp (white)',
-        toZigbee: [tzLocal.gradient_scene, ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).toZigbee],
-        exposes: [exposes.enum('gradient_scene', ea.SET, Object.keys(gradientScenes)),
-            ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).exposes],
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['929003526301'],

package/devices/tuya.js

@@ -2824,7 +2824,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: tuya.fingerprint('TS0014', ['_TZ3000_jr2atpww', '_TYZB01_dvakyzhd',
+        fingerprint: tuya.fingerprint('TS0014', ['_TZ3000_jr2atpww', '_TYZB01_dvakyzhd', '_TZ3000_mrduubod',
             '_TZ3210_w3hl6rao', '_TYZB01_bagt1e4o', '_TZ3000_r0pmi2p3', '_TZ3000_fxjdcikv', '_TZ3000_q6vxaod1']),
         model: 'TS0014',
         vendor: 'TuYa',
@@ -3075,7 +3075,8 @@ module.exports = [
         fingerprint: [{modelID: 'TS0210', manufacturerName: '_TYZB01_3zv6oleo'},
             {modelID: 'TS0210', manufacturerName: '_TYZB01_j9xxahcl'},
             {modelID: 'TS0210', manufacturerName: '_TYZB01_kulduhbj'},
-            {modelID: 'TS0210', manufacturerName: '_TZ3000_bmfw9ykl'}],
+            {modelID: 'TS0210', manufacturerName: '_TZ3000_bmfw9ykl'},
+            {modelID: 'TS0210', manufacturerName: '_TZ3000_fkxmyics'}],
         model: 'TS0210',
         vendor: 'TuYa',
         description: 'Vibration sensor',

package/lib/color.js

@@ -180,6 +180,17 @@ class ColorRGB {
         }
         return new ColorRGB(transform(this.red), transform(this.green), transform(this.blue));
     }
+
+    /**
+     * Create hex string from RGB color
+     * @return {ColorRGB} hex hex encoded RGB color
+     */
+    toHEX() {
+        return '#' +
+            parseInt((this.red * 255).toFixed(0)).toString(16).padStart(2, '0')+
+            parseInt((this.green * 255).toFixed(0)).toString(16).padStart(2, '0')+
+            parseInt((this.blue * 255).toFixed(0)).toString(16).padStart(2, '0');
+    }
 }
 
 /**

package/lib/exposes.js

@@ -124,6 +124,16 @@ class List extends Base {
         this.item_type = itemType;
         delete this.item_type.property;
     }
+
+    withLengthMin(value) {
+        this.length_min = value;
+        return this;
+    }
+
+    withLengthMax(value) {
+        this.length_max = value;
+        return this;
+    }
 }
 
 class Numeric extends Base {

package/lib/philips.js

@@ -0,0 +1,84 @@
+'use strict';
+
+const ColorXY = require('./color').ColorXY;
+const ColorRGB = require('./color').ColorRGB;
+
+const encodeRGBToScaledGradient = (hex) => {
+    const xy = ColorRGB.fromHex(hex).toXY();
+    const x = xy.x * 4095 / 0.7347;
+    const y = xy.y * 4095 / 0.8413;
+    const xx = Math.round(x).toString(16);
+    const yy = Math.round(y).toString(16);
+
+    return [
+        xx[1], xx[2],
+        yy[2], xx[0],
+        yy[0], yy[1],
+    ].join('');
+};
+
+const decodeScaledGradientToRGB = (p) => {
+    const x = p[3] + p[0] + p[1];
+    const y = p[4] + p[5] + p[2];
+
+    const xx = (parseInt(x, 16) * 0.7347 / 4095).toFixed(4);
+    const yy = (parseInt(y, 16) * 0.8413 / 4095).toFixed(4);
+
+    return new ColorXY(xx, yy).toRGB().toHEX();
+};
+
+function decodeGradientColors(input, opts) {
+    // Example set:         500104001350000000f3297ff3bd52f3bd52f3297ff3bd522800
+    // Example get  4b010164fb74346b1350000000f3297fda7d55da7d55f3297fda7d552800
+    const offset = input.indexOf('0000000') + 7;
+    const points = input.slice(offset, - 4);
+    const pairs = points.match(/.{6}/g);
+    const colors = pairs.map(decodeScaledGradientToRGB);
+
+    if (opts.reverse) {
+        colors.reverse();
+    }
+
+    return colors;
+}
+
+// Value is a list of RGB HEX colors
+function encodeGradientColors(value, opts) {
+    if (value.length > 9) {
+        throw new Error(`Expected up to 9 colors, got ${value.length}`);
+    }
+    if (value.length < 1) {
+        throw new Error(`Expected at least 1 color, got 0`);
+    }
+
+    // For devices where it makes more sense to specify the colors in reverse
+    // For example Hue Signe, where the last color is the top color.
+    if (opts.reverse) {
+        value.reverse();
+    }
+
+    // The number of colors and segments can technically differ. Here they are always the same, but we could
+    // support it by extending the API.
+    // If number of colors is less than the number of segments, the colors will repeat.
+    // It seems like the maximum number of colors is 9, and the maximum number of segments is 31.
+    const nColors = (value.length << 4).toString(16);
+    const segments = (value.length << 3).toString(16);
+
+    // Encode the colors
+    const colorsPayload = value.map(encodeRGBToScaledGradient).join('');
+
+    // Offset of the first color, left shifted 3 bits. 0 means the first segment uses the first color.
+    const offset = '00';
+
+    // Payload length
+    const length = (1 + 3 * (value.length + 1)).toString(16);
+
+    const scene = `50010400${length}${nColors}000000${colorsPayload}${segments}${offset}`;
+
+    return scene;
+}
+
+module.exports = {
+    decodeGradientColors,
+    encodeGradientColors,
+};

package/package.json

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