zigbee-herdsman-converters 14.0.685 → 14.0.687

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/danfoss.js

@@ -11,7 +11,7 @@ module.exports = [
     {
         // eTRV0100 is the same as Hive TRV001 and Popp eT093WRO. If implementing anything, please consider
         // changing those two too.
-        zigbeeModel: ['eTRV0100', 'eTRV0101'],
+        zigbeeModel: ['eTRV0100', 'eTRV0101', 'eTRV0103'],
         model: '014G2461',
         vendor: 'Danfoss',
         description: 'Ally thermostat',

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: gradient.colors};
+                }
+                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/sinope.js

@@ -549,14 +549,20 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = [
-                'genBasic', 'genIdentify', 'hvacThermostat', 'hvacUserInterfaceCfg',
+                'genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg',
                 'msTemperatureMeasurement', 'haElectricalMeasurement', 'seMetering',
                 'manuSpecificSinope'];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
+            const thermostatDate = new Date();
+            const thermostatTimeSec = thermostatDate.getTime() / 1000;
+            const thermostatTimezoneOffsetSec = thermostatDate.getTimezoneOffset() * 60;
+            const currentTimeToDisplay = Math.round(thermostatTimeSec - thermostatTimezoneOffsetSec - 946684800);
+            await endpoint.write('manuSpecificSinope', {currentTimeToDisplay}, {manufacturerCode: 0x119C});
+            await endpoint.write('manuSpecificSinope', {'secondScreenBehavior': 0}, {manufacturerCode: 0x119C}); // Mode auto
+
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
-            await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
             await reporting.thermostatSystemMode(endpoint);
 
             await reporting.readMeteringMultiplierDivisor(endpoint);
@@ -566,13 +572,10 @@ module.exports = [
             await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 100}); // divider 1000: 0.1Arms
             await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 5}); // divider 10: 0.5Vrms
 
-            const thermostatDate = new Date();
-            const thermostatTimeSec = thermostatDate.getTime() / 1000;
-            const thermostatTimezoneOffsetSec = thermostatDate.getTimezoneOffset() * 60;
-            const currentTimeToDisplay = Math.round(thermostatTimeSec - thermostatTimezoneOffsetSec - 946684800);
-            await endpoint.write('manuSpecificSinope', {currentTimeToDisplay}, {manufacturerCode: 0x119C});
-
             await reporting.temperature(endpoint, {min: 1, max: 0xFFFF}); // Disable default reporting
+            try {
+                await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
+            } catch (error) {/* Do nothing */} // Not enought space but shall pass
             try {
                 await reporting.thermostatRunningState(endpoint);
             } catch (error) {/* Do nothing */} // Not enought space

package/devices/tuya.js

@@ -2080,6 +2080,7 @@ module.exports = [
     },
     {
         fingerprint: tuya.fingerprint('TS0601', [
+            '_TZE200_sur6q7ko', /* model: '3012732', vendor: 'LSC Smart Connect' */
             '_TZE200_hue3yfsn', /* model: 'TV02-Zigbee', vendor: 'TuYa' */
             '_TZE200_e9ba97vf', /* model: 'TV01-ZB', vendor: 'Moes' */
             '_TZE200_husqqvux', /* model: 'TSL-TRV-TV01ZG', vendor: 'Tesla Smart' */
@@ -2233,6 +2234,7 @@ module.exports = [
     {
         fingerprint: tuya.fingerprint('TS0601', [
             '_TZE200_bvu2wnxz', /* model: 'ME167', vendor: 'Avatto' */
+            '_TZE200_6rdj8dzm', /* model: 'ME167', vendor: 'Avatto' */
         ]),
         model: 'TS0601_thermostat_3',
         vendor: 'TuYa',
@@ -2824,7 +2826,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 +3077,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,152 @@
+'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
+
+    // 4b01 - mode? (4) (0b00 single color?, 4b01 gradient?)
+    //     01 - on/off (2) or is it 1 full byte?
+    //       64 - brightness (2)
+    //         fb74346b - unknown (8)
+    //                 13 - length (2)
+    //                   50 - ncolors (2)
+    //                     000000 - unknown (6)
+    //                           f3297fda7d55da7d55f3297fda7d55 - colors (6 * ncolors)
+    //                                                         28 - segments (2)
+    //                                                           00 - offset (2)
+
+    // Skip the unknown prefix (4 bytes)
+    input = input.slice(4);
+
+    // On/off (1 byte)
+    const on = parseInt(input.slice(0, 2), 16) === 1;
+    input = input.slice(2);
+
+    // Brightness (2 bytes)
+    const brightness = parseInt(input.slice(0, 2), 16);
+    input = input.slice(2);
+
+    // Unknown (8 bytes)
+    input = input.slice(8);
+
+    // Length (2 bytes)
+    input = input.slice(2);
+
+    // Number of colors (2 bytes)
+    const nColors = parseInt(input.slice(0, 2), 16) >> 4;
+    input = input.slice(2);
+
+    // Unknown (6 bytes)
+    input = input.slice(6);
+
+    // Colors (6 * nColors bytes)
+    const colorsPayload = input.slice(0, 6 * nColors);
+    input = input.slice(6 * nColors);
+    const colors = colorsPayload.match(/.{6}/g).map(decodeScaledGradientToRGB);
+
+    // Segments (2 bytes)
+    const segments = parseInt(input.slice(0, 2), 16) >> 3;
+    input = input.slice(2);
+
+    // Offset (2 bytes)
+    const offset = parseInt(input.slice(0, 2), 16) >> 3;
+
+    if (opts.reverse) {
+        colors.reverse();
+    }
+
+    return {
+        colors,
+
+        gradient_extras: {
+            colors: nColors,
+            segments,
+            offset,
+            brightness,
+            on,
+        },
+    };
+}
+
+// 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).padStart(2, '0');
+
+    let segments = value.length;
+    if (opts.segments) {
+        segments = opts.segments;
+    }
+
+    if (segments < 1 || segments > 31) {
+        throw new Error(`Expected segments to be between 1 and 31 (inclusive), got ${segments}`);
+    }
+    const segmentsPayload = (segments << 3).toString(16).padStart(2, '0');
+
+    // Encode the colors
+    const colorsPayload = value.map(encodeRGBToScaledGradient).join('');
+
+    // Offset of the first color. 0 means the first segment uses the first color. (min 0, max 31)
+    let offset = 0;
+    if (opts.offset) {
+        offset = opts.offset;
+    }
+    const offsetPayload = (offset << 3).toString(16).padStart(2, '0');
+
+    // Payload length
+    const length = (1 + 3 * (value.length + 1)).toString(16).padStart(2, '0');
+
+    // 5001 - mode? set gradient?
+    // 0400 - unknown
+    const scene = `50010400${length}${nColors}000000${colorsPayload}${segmentsPayload}${offsetPayload}`;
+
+    return scene;
+}
+
+module.exports = {
+    decodeGradientColors,
+    encodeGradientColors,
+};

package/lib/tuya.js

@@ -1652,6 +1652,17 @@ const tuyaFz = {
     datapoints: {
         cluster: 'manuSpecificTuya',
         type: ['commandDataResponse', 'commandDataReport', 'commandActiveStatusReport', 'commandActiveStatusReportAlt'],
+        options: (definition) => {
+            const result = [];
+            for (const datapoint of definition.meta.tuyaDatapoints) {
+                const dpKey = datapoint[1];
+                if (dpKey in utils.calibrateAndPrecisionRoundOptionsDefaultPrecision) {
+                    const type = utils.calibrateAndPrecisionRoundOptionsIsPercentual(dpKey) ? 'percentual' : 'absolute';
+                    result.push(exposes.options.precision(dpKey), exposes.options.calibration(dpKey, type));
+                }
+            }
+            return result;
+        },
         convert: (model, msg, publish, options, meta) => {
             let result = {};
             if (!model.meta || !model.meta.tuyaDatapoints) throw new Error('No datapoints map defined');
@@ -1671,6 +1682,14 @@ const tuyaFz = {
                         `with data ${JSON.stringify(dpValue)}`);
                 }
             }
+
+            // Apply calibrateAndPrecisionRoundOptions
+            const keys = Object.keys(utils.calibrateAndPrecisionRoundOptionsDefaultPrecision);
+            for (const entry of Object.entries(result)) {
+                if (keys.includes(entry[0])) {
+                    result[entry[0]] = utils.calibrateAndPrecisionRoundOptions(entry[1], options, entry[0]);
+                }
+            }
             return result;
         },
     },

package/lib/utils.js

@@ -75,13 +75,18 @@ function hasAlreadyProcessedMessage(msg, model, ID=null, key=null) {
     return false;
 }
 
-const defaultPrecision = {temperature: 2, humidity: 2, pressure: 1, pm25: 0, power: 2, current: 2, current_phase_b: 2, current_phase_c: 2,
-    voltage: 2, voltage_phase_b: 2, voltage_phase_c: 2, power_phase_b: 2, power_phase_c: 2};
+const calibrateAndPrecisionRoundOptionsDefaultPrecision = {
+    temperature: 2, humidity: 2, pressure: 1, pm25: 0, power: 2, current: 2, current_phase_b: 2, current_phase_c: 2,
+    voltage: 2, voltage_phase_b: 2, voltage_phase_c: 2, power_phase_b: 2, power_phase_c: 2,
+};
+function calibrateAndPrecisionRoundOptionsIsPercentual(type) {
+    return type.startsWith('current') || type.startsWith('voltage') || type.startsWith('power') || type.startsWith('illuminance');
+}
 function calibrateAndPrecisionRoundOptions(number, options, type) {
     // Calibrate
     const calibrateKey = `${type}_calibration`;
     let calibrationOffset = options && options.hasOwnProperty(calibrateKey) ? options[calibrateKey] : 0;
-    if (type.startsWith('current') || type.startsWith('voltage') || type.startsWith('power') || type.startsWith('illuminance')) {
+    if (calibrateAndPrecisionRoundOptionsIsPercentual(type)) {
         // linear calibration because measured value is zero based
         // +/- percent
         calibrationOffset = Math.round(number * calibrationOffset / 100);
@@ -90,7 +95,7 @@ function calibrateAndPrecisionRoundOptions(number, options, type) {
 
     // Precision round
     const precisionKey = `${type}_precision`;
-    const defaultValue = defaultPrecision[type] || 0;
+    const defaultValue = calibrateAndPrecisionRoundOptionsDefaultPrecision[type] || 0;
     const precision = options && options.hasOwnProperty(precisionKey) ? options[precisionKey] : defaultValue;
     return precisionRound(number, precision);
 }
@@ -436,6 +441,8 @@ module.exports = {
     mapNumberRange,
     hasAlreadyProcessedMessage,
     calibrateAndPrecisionRoundOptions,
+    calibrateAndPrecisionRoundOptionsIsPercentual,
+    calibrateAndPrecisionRoundOptionsDefaultPrecision,
     toPercentage,
     addActionGroup,
     postfixWithEndpointName,

package/package.json

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