zigbee-herdsman-converters 14.0.689 → 14.0.690

package/devices/ctm.js

@@ -19,6 +19,19 @@ const dataType = {
 };
 
 const fzLocal = {
+    ctm_mbd_device_enabled: {
+        cluster: 'genOnOff',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            const data = msg.data;
+            if (data.hasOwnProperty('onOff')) {
+                result.device_enabled = data['onOff'] ? 'ON' : 'OFF';
+            }
+
+            return result;
+        },
+    },
     ctm_device_mode: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],
@@ -72,6 +85,19 @@ const fzLocal = {
             return result;
         },
     },
+    ctm_relay_state: {
+        cluster: 'genOnOff',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            const data = msg.data;
+            if (data.hasOwnProperty(0x5001)) {
+                result.state = data[0x5001] ? 'ON' : 'OFF';
+            }
+
+            return result;
+        },
+    },
     ctm_temperature_offset: {
         cluster: 'msTemperatureMeasurement',
         type: ['attributeReport', 'readResponse'],
@@ -281,6 +307,15 @@ const fzLocal = {
 
 
 const tzLocal = {
+    ctm_mbd_device_enabled: {
+        key: ['device_enabled'],
+        convertSet: async (entity, key, value, meta) => {
+            await entity.command('genOnOff', value.toLowerCase(), {}, utils.getOptions(meta.mapped, entity));
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('genOnOff', ['onOff']);
+        },
+    },
     ctm_device_mode: {
         key: ['device_mode'],
         convertGet: async (entity, key, meta) => {
@@ -308,6 +343,16 @@ const tzLocal = {
             await entity.read('genOnOff', [0x5000], {manufacturerCode: 0x1337});
         },
     },
+    ctm_relay_state: {
+        key: ['state'],
+        convertSet: async (entity, key, value, meta) => {
+            await entity.write('genOnOff',
+                {0x5001: {value: {'OFF': 0, 'ON': 1}[value], type: dataType.boolean}}, {manufacturerCode: 0x1337});
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('genOnOff', [0x5001], {manufacturerCode: 0x1337});
+        },
+    },
     ctm_temperature_offset: {
         key: ['temperature_offset'],
         convertSet: async (entity, key, value, meta) => {
@@ -728,7 +773,7 @@ module.exports = [
         ],
     },
     {
-        zigbeeModel: ['mStikk Outlet'],
+        zigbeeModel: ['mStikk Outlet', 'mStikk 16A', 'mStikk 25A', 'Tavlerele 25A'],
         model: 'mStikk_Outlet',
         vendor: 'CTM Lyng',
         description: 'mStikk OP, wall socket',
@@ -834,7 +879,7 @@ module.exports = [
             exposes.binary('child_lock', ea.STATE, 'locked', 'unlocked')
                 .withDescription('Physical input on the device enabled/disabled'),
             exposes.numeric('group_id', ea.STATE)
-                .withDescription('The device sends commands with this group ID. Put dvices in this group to control them.'),
+                .withDescription('The device sends commands with this group ID. Put devices in this group to control them.'),
         ],
     },
     {
@@ -866,10 +911,12 @@ module.exports = [
         meta: {disableDefaultResponse: true},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'ssIasZone']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
             await endpoint.read('genOnOff', ['onOff']);
             await reporting.onOff(endpoint);
-            await endpoint.read('ssIasZone', ['iasCieAddr', 'zoneState', 'zoneId']);
+            const endpoint2 = device.getEndpoint(2);
+            await reporting.bind(endpoint2, coordinatorEndpoint, ['ssIasZone']);
+            await endpoint2.read('ssIasZone', ['iasCieAddr', 'zoneState', 'zoneId']);
         },
         exposes: [e.switch(), e.water_leak(),
             exposes.binary('active_water_leak', ea.STATE, true, false)
@@ -897,7 +944,7 @@ module.exports = [
         exposes: [e.temperature(), e.battery(), e.battery_low(), e.smoke(),
             e.action(['on', 'off']),
             exposes.numeric('group_id', ea.STATE)
-                .withDescription('The device sends commands with this group ID. Put dvices in this group to control them.'),
+                .withDescription('The device sends commands with this group ID. Put devices in this group to control them.'),
         ],
     },
     {
@@ -924,8 +971,8 @@ module.exports = [
         model: 'MBD-S',
         vendor: 'CTM Lyng',
         description: 'MBD-S, motion detector with 16A relay',
-        fromZigbee: [fz.on_off, fz.illuminance, fz.occupancy, fzLocal.ctm_device_enabled],
-        toZigbee: [tz.on_off, tzLocal.ctm_device_enabled],
+        fromZigbee: [fz.illuminance, fz.occupancy, fzLocal.ctm_mbd_device_enabled, fzLocal.ctm_relay_state],
+        toZigbee: [tzLocal.ctm_mbd_device_enabled, tzLocal.ctm_relay_state],
         meta: {disableDefaultResponse: true},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -936,13 +983,13 @@ module.exports = [
             await reporting.illuminance(endpoint);
             await endpoint.read('msOccupancySensing', ['occupancy']);
             await reporting.occupancy(endpoint);
-            // Device enabled
-            await endpoint.read('genOnOff', [0x2201]);
+            // Relay State
+            await endpoint.read('genOnOff', [0x5001], {manufacturerCode: 0x1337});
             await endpoint.configureReporting('genOnOff', [{
-                attribute: {ID: 0x2201, type: dataType.boolean},
-                minimumReportInterval: 0,
+                attribute: {ID: 0x5001, type: dataType.boolean},
+                minimumReportInterval: 1,
                 maximumReportInterval: constants.repInterval.HOUR,
-                reportableChange: null}]);
+                reportableChange: 0}], {manufacturerCode: 0x1337});
         },
         exposes: [e.switch(), e.illuminance(), e.illuminance_lux(), e.occupancy(),
             exposes.binary('device_enabled', ea.ALL, 'ON', 'OFF')

package/devices/ikea.js

@@ -375,7 +375,7 @@ module.exports = [
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['TRADFRIbulbE26WSglobeclear800lm', 'TRADFRIbulbE27WSglobeclear806lm'],
+        zigbeeModel: ['TRADFRIbulbE26WSglobeclear800lm', 'TRADFRIbulbE27WSglobeclear806lm', 'TRADFRIbulbE26WSglobeclear806lm'],
         model: 'LED2004G8',
         vendor: 'IKEA',
         description: 'TRADFRI LED bulb E26/E27 800/806 lumen, dimmable, white spectrum, clear',

package/devices/osram.js

@@ -3,8 +3,24 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const ota = require('../lib/ota');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+const utils = require('../lib/utils');
 const e = exposes.presets;
 
+const fzLocal = {
+    pbc_level_to_action: {
+        cluster: 'genLevelCtrl',
+        type: ['commandMoveWithOnOff', 'commandStopWithOnOff', 'commandMove', 'commandStop', 'commandMoveToLevelWithOnOff'],
+        convert: (model, msg, publish, options, meta) => {
+            if (utils.hasAlreadyProcessedMessage(msg, model)) return;
+            const lookup = {
+                commandMoveWithOnOff: 'hold', commandMove: 'hold', commandStopWithOnOff: 'release',
+                commandStop: 'release', commandMoveToLevelWithOnOff: 'toggle',
+            };
+            return {[utils.postfixWithEndpointName('action', msg, model, meta)]: lookup[msg.type]};
+        },
+    },
+};
+
 module.exports = [
     {
         zigbeeModel: ['Gardenspot RGB'],
@@ -476,4 +492,28 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['PBC'],
+        model: '4052899930377',
+        vendor: 'OSRAM',
+        description: 'Lightify pro push button controller (PBC)',
+        meta: {multiEndpoint: true},
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4};
+        },
+        fromZigbee: [fzLocal.pbc_level_to_action],
+        exposes: [
+            e.action(['hold', 'release', 'toggle']).withEndpoint('l1'),
+            e.action(['hold', 'release', 'toggle']).withEndpoint('l2'),
+            e.action(['hold', 'release', 'toggle']).withEndpoint('l3'),
+            e.action(['hold', 'release', 'toggle']).withEndpoint('l4'),
+        ],
+        toZigbee: [],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genLevelCtrl']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genLevelCtrl']);
+            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genLevelCtrl']);
+            await reporting.bind(device.getEndpoint(4), coordinatorEndpoint, ['genLevelCtrl']);
+        },
+    },
 ];

package/devices/philips.js

@@ -112,10 +112,12 @@ const fzLocal = {
             cluster: 'manuSpecificPhilips2',
             type: ['attributeReport', 'readResponse'],
             convert: (model, msg, publish, options, meta) => {
-                if (msg.data.hasOwnProperty('state')) {
+                if (msg.data && msg.data.hasOwnProperty('state')) {
                     const input = msg.data['state'].toString('hex');
-                    const gradient = philips.decodeGradientColors(input, opts);
-                    return {gradient: gradient.colors};
+                    const decoded = philips.decodeGradientColors(input, opts);
+                    if (decoded.color_mode === 'gradient') {
+                        return {gradient: decoded.colors};
+                    }
                 }
                 return {};
             },

package/devices/tuya.js

@@ -1134,9 +1134,9 @@ module.exports = [
         model: 'IH012-RT01',
         vendor: 'TuYa',
         description: 'Motion sensor',
-        fromZigbee: [fz.ias_occupancy_alarm_1, fz.ignore_basic_report, fz.ZM35HQ_attr],
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.ignore_basic_report, fz.ZM35HQ_attr, fz.battery],
         toZigbee: [tz.ZM35HQ_attr],
-        exposes: [e.occupancy(), e.battery_low(), e.tamper(),
+        exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.battery(), e.battery_voltage(),
             exposes.enum('sensitivity', ea.ALL, ['low', 'medium', 'high']).withDescription('PIR sensor sensitivity'),
             exposes.enum('keep_time', ea.ALL, [30, 60, 120]).withDescription('PIR keep time in seconds'),
         ],
@@ -1840,8 +1840,9 @@ module.exports = [
             endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
             device.save();
         },
-        whiteLabel: [{vendor: 'Aubess', model: 'WDH02'}],
-        exposes: [e.switch(), e.power(), e.voltage().withAccess(ea.STATE), e.energy(), e.power_on_behavior(), tuya.exposes.switchType()],
+        whiteLabel: [{vendor: 'Aubess', model: 'WHD02'}],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy(), e.power_on_behavior(),
+            tuya.exposes.switchType()],
     },
     {
         zigbeeModel: ['TS0001'],
@@ -2840,7 +2841,7 @@ module.exports = [
         model: 'TS0014',
         vendor: 'TuYa',
         description: 'Smart light switch - 4 gang without neutral wire',
-        extend: tuya.extend.switch({endpoints: ['l1', 'l2', 'l3', 'l4']}),
+        extend: tuya.extend.switch({backlightMode: true, endpoints: ['l1', 'l2', 'l3', 'l4']}),
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4};
         },
@@ -2884,6 +2885,15 @@ module.exports = [
         exposes: [e.action(['scene_1', 'scene_2', 'scene_3', 'scene_4', 'scene_5', 'scene_6'])],
         toZigbee: [],
     },
+    {
+        zigbeeModel: ['TS0026'],
+        model: 'TS0026',
+        vendor: 'TuYa',
+        description: '6 button scene wall switch',
+        fromZigbee: [fzLocal.scenes_recall_scene_65029],
+        exposes: [e.action(['scene_1', 'scene_2', 'scene_3', 'scene_4', 'scene_5', 'scene_6'])],
+        toZigbee: [],
+    },
     {
         zigbeeModel: ['q9mpfhw'],
         model: 'SNTZ009',

package/lib/philips.js

@@ -27,25 +27,45 @@ const decodeScaledGradientToRGB = (p) => {
     return new ColorXY(xx, yy).toRGB().toHEX();
 };
 
-function decodeGradientColors(input, opts) {
-    // Example set:         500104001350000000f3297ff3bd52f3bd52f3297ff3bd522800
-    // Example get  4b010164fb74346b1350000000f3297fda7d55da7d55f3297fda7d552800
+const COLOR_MODE_GRADIENT = '4b01';
+const COLOR_MODE_COLOR_XY = '0b00';
+const COLOR_MODE_COLOR_TEMP = '0f00';
 
+// decoder for manuSpecificPhilips2.state
+function decodeGradientColors(input, opts) {
+    // Gradient mode (4b01)
+    // Example: 4b010164fb74346b1350000000f3297fda7d55da7d55f3297fda7d552800
     // 4b01 - mode? (4) (0b00 single color?, 4b01 gradient?)
-    //     01 - on/off (2) or is it 1 full byte?
+    //     01 - on/off (2)
     //       64 - brightness (2)
-    //         fb74346b - unknown (8)
+    //         fb74346b - unknown (8) - Might be XY Color?
     //                 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)
+    //
+    // Temperature mode (0f00)
+    // Example: 0f0000044d01ab6f7067
+    // 0f00 - mode (4)
+    //     01 - on/off (2)
+    //       1a - brightness (2)
+    //          4d01 - color temperature (4)
+    //              ab6f7067 - unknown (8)
+    //
+    // XY Color mode (0b00)
+    // Example: 0b00010460b09c4e
+    // 0b00 - mode (4) == 0b00 single color mode
+    //     01 - on/off (2)
+    //       04 - brightness (2)
+    //         60b09c4e - color (8) (xLow, xHigh, yLow, yHigh)
+
+    // Device color mode
+    const mode = input.slice(0, 4);
     input = input.slice(4);
 
-    // On/off (1 byte)
+    // On/off (2 bytes)
     const on = parseInt(input.slice(0, 2), 16) === 1;
     input = input.slice(2);
 
@@ -53,46 +73,85 @@ function decodeGradientColors(input, opts) {
     const brightness = parseInt(input.slice(0, 2), 16);
     input = input.slice(2);
 
-    // Unknown (8 bytes)
-    input = input.slice(8);
+    // Gradient mode
+    if (mode === COLOR_MODE_GRADIENT) {
+        // Unknown (8 bytes)
+        input = input.slice(8);
 
-    // Length (2 bytes)
-    input = input.slice(2);
+        // 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);
+        // 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);
+        // 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);
+        // 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);
+        // 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;
+        // Offset (2 bytes)
+        const offset = parseInt(input.slice(0, 2), 16) >> 3;
 
-    if (opts.reverse) {
-        colors.reverse();
-    }
+        if (opts && opts.reverse) {
+            colors.reverse();
+        }
 
-    return {
-        colors,
-
-        gradient_extras: {
-            colors: nColors,
+        return {
+            color_mode: 'gradient',
+            colors,
             segments,
             offset,
             brightness,
             on,
-        },
-    };
+        };
+    } else if (mode === COLOR_MODE_COLOR_XY) {
+        // XY Color mode
+        const xLow = parseInt(input.slice(0, 2), 16);
+        input = input.slice(2);
+        const xHigh = parseInt(input.slice(0, 2), 16) << 8;
+        input = input.slice(2);
+        const yHigh = parseInt(input.slice(0, 2), 16);
+        input = input.slice(2);
+        const yLow = parseInt(input.slice(0, 2), 16) << 8;
+        input = input.slice(2);
+
+        const x = xHigh | xLow;
+        const y = yHigh | yLow;
+
+        return {
+            color_mode: 'color_xy',
+            x: Math.round(x / 65535 * 10000) / 10000,
+            y: Math.round(y / 65535 * 10000) / 10000,
+            brightness,
+            on,
+        };
+    } else if (mode === COLOR_MODE_COLOR_TEMP) {
+        // Color temperature mode
+        const low = parseInt(input.slice(0, 2), 16);
+        input = input.slice(2);
+        const high = parseInt(input.slice(0, 2), 16) << 8;
+        input = input.slice(2);
+
+        const temp = high | low;
+
+        return {
+            color_mode: 'color_temp',
+            color_temp: temp,
+            brightness,
+            on,
+        };
+    }
+
+    // Unknown mode
+    return {};
 }
 
 // Value is a list of RGB HEX colors

package/package.json

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