zigbee-herdsman-converters 15.0.29 → 15.0.30

package/devices/bosch.js

@@ -528,6 +528,26 @@ const definition = [
         },
         exposes: [e.switch(), e.power_on_behavior(), e.power(), e.energy()],
     },
+    {
+        zigbeeModel: ['RBSH-SP-ZB-FR'],
+        model: 'BSP-EZ2',
+        vendor: 'Bosch',
+        description: 'Plug compact FR',
+        fromZigbee: [fz.on_off, fz.power_on_behavior, fz.electrical_measurement, fz.metering],
+        toZigbee: [tz.on_off, tz.power_on_behavior],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genOnOff', ['onOff', 'startUpOnOff']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['seMetering']);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint, {change: [0, 1]});
+            await reporting.bind(endpoint, coordinatorEndpoint, ['haElectricalMeasurement']);
+            await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
+            await reporting.activePower(endpoint);
+        },
+        exposes: [e.switch(), e.power_on_behavior(), e.power(), e.energy()],
+    },
 ];
 
 module.exports = definition;

package/devices/busch-jaeger.js

@@ -15,9 +15,13 @@ module.exports = [
         extend: extend.switch(),
     },
     {
-        // Busch-Jaeger 6735, 6736, and 6737 have been tested with the 6710 U (Power Adapter) and
-        // 6711 U (Relay) back-ends. The dimmer has not been verified to work yet, though it's
-        // safe to assume that it can at least been turned on or off with this integration.
+        // Busch-Jaeger 6735, 6736 and 6737 have been tested with the 6710 U (Power Adapter),
+        // 6711 U (Relay) and 6715 U (dimmer) back-ends. Unfortunately both the relay and the dimmer
+        // report as model 'RM01' with genLevelCtrl clusters, so we need to set up both of them
+        // as dimmable lights.
+        //
+        // The battery-powered version of the device ('RB01') is supported as well. These devices are
+        // sold as Busch-Jaeger 6735/01, 6736/01 and 6737/01.
         //
         // In order to manually capture scenes as described in the devices manual, the endpoint
         // corresponding to the row needs to be unbound (https://www.zigbee2mqtt.io/information/binding.html)
@@ -26,59 +30,85 @@ module.exports = [
         zigbeeModel: ['RM01', 'RB01'],
         model: '6735/6736/6737',
         vendor: 'Busch-Jaeger',
-        description: 'Zigbee Light Link power supply/relay/dimmer',
+        description: 'Zigbee Light Link power supply/relay/dimmer/wall-switch',
         endpoint: (device) => {
             return {'row_1': 0x0a, 'row_2': 0x0b, 'row_3': 0x0c, 'row_4': 0x0d, 'relay': 0x12};
         },
-        exposes: [e.switch(), e.action(['row_1_on', 'row_1_off', 'row_1_up', 'row_1_down', 'row_1_stop',
-            'row_2_on', 'row_2_off', 'row_2_up', 'row_2_down', 'row_2_stop',
-            'row_3_on', 'row_3_off', 'row_3_up', 'row_3_down', 'row_3_stop',
-            'row_4_on', 'row_4_off', 'row_4_up', 'row_4_down', 'row_4_stop'])],
+        exposes: (device, options) => {
+            const expose = [];
+
+            // If endpoint 0x12 (18) is present this means the following two things:
+            //  1. The device is connected to a relay or dimmer and needs to be exposed as a dimmable light
+            //  2. The top rocker will not be usable (not emit any events) as it's hardwired to the relay/dimmer
+            if (!device || device.getEndpoint(0x12) != null) {
+                expose.push(e.light_brightness().withEndpoint('relay'));
+                // Exposing the device as a switch without endpoint is actually wrong, but this is the historic
+                // definition and we are keeping it for compatibility reasons.
+                // DEPRECATED and should be removed in the future
+                expose.push(e.switch());
+            }
+            // Not all devices support all actions (depends on number of rocker rows and if relay/dimmer is installed),
+            // but defining all possible actions here won't do any harm.
+            expose.push(e.action([
+                'row_1_on', 'row_1_off', 'row_1_up', 'row_1_down', 'row_1_stop',
+                'row_2_on', 'row_2_off', 'row_2_up', 'row_2_down', 'row_2_stop',
+                'row_3_on', 'row_3_off', 'row_3_up', 'row_3_down', 'row_3_stop',
+                'row_4_on', 'row_4_off', 'row_4_up', 'row_4_down', 'row_4_stop',
+            ]));
+            expose.push(e.linkquality());
+
+            return expose;
+        },
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint10 = device.getEndpoint(0x0a);
-            if (endpoint10 != null) {
-                // The total number of bindings seems to be severely limited with these devices.
-                // In order to be able to toggle groups, we need to remove the scenes cluster
-
-                await reporting.bind(endpoint10, coordinatorEndpoint, ['genLevelCtrl']);
+            // Depending on the actual devices - 6735, 6736, or 6737 - there are 1, 2, or 4 endpoints for
+            // the rockers. If the module is installed on a dimmer or relay, there is an additional endpoint (18).
+            const endpoint18 = device.getEndpoint(0x12);
+            if (endpoint18 != null) {
+                await reporting.bind(endpoint18, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            } else {
+                // We only need to bind endpoint 10 (top rocker) if endoint 18 (relay/dimmer) is not present.
+                // Otherwise the top rocker is hard-wired to the relay/dimmer and cannot be used anyways.
+                const endpoint10 = device.getEndpoint(0x0a);
+                if (endpoint10 != null) {
+                    await reporting.bind(endpoint10, coordinatorEndpoint, ['genLevelCtrl']);
+                }
             }
-            // Depending on the actual devices - 6735, 6736, or 6737 - there are 1, 2, or 4 endpoints.
-            // Thef 1st endpoint ist most bound to hardware switch
+
+            // The total number of bindings seems to be severely limited with some of these devices.
+            // In order to be able to toggle groups, we need to remove the scenes cluster from RM01.
+            const dropScenesCluster = device.modelID == 'RM01';
+
             const endpoint11 = device.getEndpoint(0x0b);
             if (endpoint11 != null) {
-                // The total number of bindings seems to be severely limited with these devices.
-                // In order to be able to toggle groups, we need to remove the scenes cluster
-                const index = endpoint11.outputClusters.indexOf(5);
-                if (index > -1) {
-                    endpoint11.outputClusters.splice(index, 1);
+                if (dropScenesCluster) {
+                    const index = endpoint11.outputClusters.indexOf(5);
+                    if (index > -1) {
+                        endpoint11.outputClusters.splice(index, 1);
+                    }
                 }
                 await reporting.bind(endpoint11, coordinatorEndpoint, ['genLevelCtrl']);
             }
             const endpoint12 = device.getEndpoint(0x0c);
             if (endpoint12 != null) {
-                // The total number of bindings seems to be severely limited with these devices.
-                // In order to be able to toggle groups, we need to remove the scenes cluster
-                const index = endpoint12.outputClusters.indexOf(5);
-                if (index > -1) {
-                    endpoint12.outputClusters.splice(index, 1);
+                if (dropScenesCluster) {
+                    const index = endpoint12.outputClusters.indexOf(5);
+                    if (index > -1) {
+                        endpoint12.outputClusters.splice(index, 1);
+                    }
                 }
                 await reporting.bind(endpoint12, coordinatorEndpoint, ['genLevelCtrl']);
             }
             const endpoint13 = device.getEndpoint(0x0d);
             if (endpoint13 != null) {
-                // The total number of bindings seems to be severely limited with these devices.
-                // In order to be able to toggle groups, we need to remove the scenes cluster
-                const index = endpoint13.outputClusters.indexOf(5);
-                if (index > -1) {
-                    endpoint13.outputClusters.splice(index, 1);
+                if (dropScenesCluster) {
+                    const index = endpoint13.outputClusters.indexOf(5);
+                    if (index > -1) {
+                        endpoint13.outputClusters.splice(index, 1);
+                    }
                 }
                 await reporting.bind(endpoint13, coordinatorEndpoint, ['genLevelCtrl']);
             }
-            const endpoint18 = device.getEndpoint(0x12);
-            if (endpoint18 != null) {
-                await reporting.bind(endpoint18, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
-            }
         },
         fromZigbee: [fz.ignore_basic_report, fz.on_off, fz.brightness, fz.legacy.RM01_on_click, fz.legacy.RM01_off_click,
             fz.legacy.RM01_up_hold, fz.legacy.RM01_down_hold, fz.legacy.RM01_stop],

package/devices/danfoss.js

@@ -80,7 +80,8 @@ module.exports = [
                 'has no (noticable?) effect.'),
             exposes.binary('window_open_feature', ea.ALL, true, false)
                 .withDescription('Whether or not the window open feature is enabled'),
-            exposes.numeric('window_open_internal', ea.STATE_GET).withValueMin(0).withValueMax(4)
+            exposes.enum('window_open_internal', ea.STATE_GET,
+                ['quarantine', 'closed', 'hold', 'open', 'external_open'])
                 .withDescription('0=Quarantine, 1=Windows are closed, 2=Hold - Windows are maybe about to open, ' +
                     '3=Open window detected, 4=In window open state from external but detected closed locally'),
             exposes.binary('window_open_external', ea.ALL, true, false)

package/devices/hive.js

@@ -158,7 +158,7 @@ module.exports = [
         },
     },
     extendDevice(require('./danfoss'), '014G2461', {
-        zigbeeModel: ['TRV001'],
+        zigbeeModel: ['TRV001', 'TRV003'],
         model: 'UK7004240',
         vendor: 'Hive',
         description: 'Radiator valve based on Danfoss Ally (014G2461)',

package/devices/ikea.js

@@ -556,7 +556,14 @@ module.exports = [
         model: 'ICPSHC24-30-IL44-1',
         vendor: 'IKEA',
         description: 'SILVERGLANS IP44 LED driver for wireless control (30 watt)',
-        whiteLabel: [{vendor: 'IKEA', model: 'T2030', description: 'PILSKOTT LED pendant lamp'}],
+        extend: tradfriExtend.light_onoff_brightness(),
+        meta: {turnsOffAtBrightness1: true},
+    },
+    {
+        zigbeeModel: ['Pendant lamp WW'],
+        model: 'T2030',
+        vendor: 'IKEA',
+        description: 'PILSKOTT LED pendant lamp',
         extend: tradfriExtend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
     },

package/devices/samotech.js

@@ -1,5 +1,8 @@
+const fz = require('../converters/fromZigbee');
+const exposes = require('../lib/exposes');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+const e = exposes.presets;
 
 module.exports = [
     {
@@ -28,14 +31,22 @@ module.exports = [
         zigbeeModel: ['SM309-S'],
         model: 'SM309-S',
         vendor: 'Samotech',
-        description: 'Zigbee dimmer 400W',
-        extend: extend.light_onoff_brightness({noConfigure: true}),
+        description: 'Zigbee dimmer 400W with power and energy metering',
+        fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.electrical_measurement, fz.metering]),
+        toZigbee: extend.light_onoff_brightness().toZigbee,
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.rmsVoltage(endpoint, {min: 10, change: 20});
+            await reporting.rmsCurrent(endpoint, {min: 10, change: 10});
+            await reporting.activePower(endpoint, {min: 10, change: 15});
+            await reporting.currentSummDelivered(endpoint, {min: 300});
             await reporting.onOff(endpoint);
         },
+        exposes: extend.light_onoff_brightness().exposes.concat([e.power(), e.current(), e.voltage(), e.energy()]),
     },
     {
         zigbeeModel: ['SM309'],

package/devices/schneider_electric.js

@@ -1006,4 +1006,13 @@ module.exports = [
             await endpoint.read('genPowerCfg', ['batteryVoltage', 'batteryPercentageRemaining']);
         },
     },
+    {
+        zigbeeModel: ['CCT591011_AS'],
+        model: 'CCT591011_AS',
+        vendor: 'Schneider Electric',
+        description: 'Wiser window/door sensor',
+        fromZigbee: [fz.ias_contact_alarm_1, fz.ias_contact_alarm_1_report],
+        toZigbee: [],
+        exposes: [e.battery_low(), e.contact(), e.tamper()],
+    },
 ];

package/devices/sinope.js

@@ -484,6 +484,12 @@ module.exports = [
                 .withRunningState(['idle', 'heat'], ea.STATE),
             exposes.enum('thermostat_occupancy', ea.ALL, ['unoccupied', 'occupied'])
                 .withDescription('Occupancy state of the thermostat'),
+            exposes.binary('enable_outdoor_temperature', ea.ALL, 'ON', 'OFF')
+                .withDescription('Showing outdoor temperature on secondary display'),
+            exposes.enum('temperature_display_mode', ea.ALL, ['celsius', 'fahrenheit'])
+                .withDescription('The temperature format displayed on the thermostat screen'),
+            exposes.enum('time_format', ea.ALL, ['24h', '12h'])
+                .withDescription('The time format featured on the thermostat display'),
             exposes.enum('backlight_auto_dim', ea.ALL, ['on_demand', 'sensing'])
                 .withDescription('Control backlight dimming behavior'),
             exposes.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1'])
@@ -545,6 +551,12 @@ module.exports = [
                 .withRunningState(['idle', 'heat'], ea.STATE),
             exposes.enum('thermostat_occupancy', ea.ALL, ['unoccupied', 'occupied'])
                 .withDescription('Occupancy state of the thermostat'),
+            exposes.binary('enable_outdoor_temperature', ea.ALL, 'ON', 'OFF')
+                .withDescription('Showing outdoor temperature on secondary display'),
+            exposes.enum('temperature_display_mode', ea.ALL, ['celsius', 'fahrenheit'])
+                .withDescription('The temperature format displayed on the thermostat screen'),
+            exposes.enum('time_format', ea.ALL, ['24h', '12h'])
+                .withDescription('The time format featured on the thermostat display'),
             exposes.enum('backlight_auto_dim', ea.ALL, ['on_demand', 'sensing'])
                 .withDescription('Control backlight dimming behavior'),
             exposes.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1'])
@@ -606,6 +618,12 @@ module.exports = [
                 .withRunningState(['idle', 'heat'], ea.STATE),
             exposes.enum('thermostat_occupancy', ea.ALL, ['unoccupied', 'occupied'])
                 .withDescription('Occupancy state of the thermostat'),
+            exposes.binary('enable_outdoor_temperature', ea.ALL, 'ON', 'OFF')
+                .withDescription('Showing outdoor temperature on secondary display'),
+            exposes.enum('temperature_display_mode', ea.ALL, ['celsius', 'fahrenheit'])
+                .withDescription('The temperature format displayed on the thermostat screen'),
+            exposes.enum('time_format', ea.ALL, ['24h', '12h'])
+                .withDescription('The time format featured on the thermostat display'),
             exposes.enum('backlight_auto_dim', ea.ALL, ['on_demand', 'sensing'])
                 .withDescription('Control backlight dimming behavior'),
             exposes.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1'])
@@ -673,6 +691,12 @@ module.exports = [
                 .withRunningState(['idle', 'heat'], ea.STATE),
             exposes.enum('thermostat_occupancy', ea.ALL, ['unoccupied', 'occupied'])
                 .withDescription('Occupancy state of the thermostat'),
+            exposes.binary('enable_outdoor_temperature', ea.ALL, 'ON', 'OFF')
+                .withDescription('Showing outdoor temperature on secondary display'),
+            exposes.enum('temperature_display_mode', ea.ALL, ['celsius', 'fahrenheit'])
+                .withDescription('The temperature format displayed on the thermostat screen'),
+            exposes.enum('time_format', ea.ALL, ['24h', '12h'])
+                .withDescription('The time format featured on the thermostat display'),
             exposes.enum('backlight_auto_dim', ea.ALL, ['on_demand', 'sensing'])
                 .withDescription('Control backlight dimming behavior'),
             exposes.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1'])
@@ -741,6 +765,12 @@ module.exports = [
                 .withRunningState(['idle', 'heat'], ea.STATE),
             exposes.enum('thermostat_occupancy', ea.ALL, ['unoccupied', 'occupied'])
                 .withDescription('Occupancy state of the thermostat'),
+            exposes.binary('enable_outdoor_temperature', ea.ALL, 'ON', 'OFF')
+                .withDescription('Showing outdoor temperature on secondary display'),
+            exposes.enum('temperature_display_mode', ea.ALL, ['celsius', 'fahrenheit'])
+                .withDescription('The temperature format displayed on the thermostat screen'),
+            exposes.enum('time_format', ea.ALL, ['24h', '12h'])
+                .withDescription('The time format featured on the thermostat display'),
             exposes.enum('backlight_auto_dim', ea.ALL, ['on_demand', 'sensing'])
                 .withDescription('Control backlight dimming behavior'),
             exposes.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1'])
@@ -895,6 +925,12 @@ module.exports = [
                 .withRunningState(['idle', 'heat'], ea.STATE),
             exposes.enum('thermostat_occupancy', ea.ALL, ['unoccupied', 'occupied'])
                 .withDescription('Occupancy state of the thermostat'),
+            exposes.binary('enable_outdoor_temperature', ea.ALL, 'ON', 'OFF')
+                .withDescription('Showing outdoor temperature on secondary display'),
+            exposes.enum('temperature_display_mode', ea.ALL, ['celsius', 'fahrenheit'])
+                .withDescription('The temperature format displayed on the thermostat screen'),
+            exposes.enum('time_format', ea.ALL, ['24h', '12h'])
+                .withDescription('The time format featured on the thermostat display'),
             exposes.enum('backlight_auto_dim', ea.ALL, ['on_demand', 'sensing'])
                 .withDescription('Control backlight dimming behavior'),
             exposes.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1'])
@@ -997,6 +1033,7 @@ module.exports = [
             await reporting.activePower(endpoint, {min: 10, max: 305, change: 1}); // divider 10 : 0.1W
             await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 10}); // divider 100: 0.1Arms
             await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 10}); // divider 100: 0.1Vrms
+            endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 1000, multiplier: 1});
             await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [0, 1]}); // divider 1
         },
     },
@@ -1017,6 +1054,7 @@ module.exports = [
             await reporting.activePower(endpoint, {min: 10, max: 305, change: 1}); // divider 10 : 0.1W
             await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 10}); // divider 100: 0.1Arms
             await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 10}); // divider 100: 0.1Vrms
+            endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 1000, multiplier: 1});
             await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [0, 1]}); // divider 1
         },
     },

package/devices/xiaomi.js

@@ -235,7 +235,7 @@ const fzLocal = {
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
             /**
-             * @type {{ region_event?: string; }}
+             * @type {{ action?: string; }}
              */
             const payload = {};
             const log = utils.createLogger(meta.logger, 'xiaomi', 'aqara_fp1');
@@ -251,7 +251,7 @@ const fzLocal = {
                         !(typeof value[0] === 'string' || typeof value[0] === 'number') ||
                         !(typeof value[1] === 'string' || typeof value[1] === 'number')
                     ) {
-                        log('warn', `region_event: Unrecognized payload structure '${JSON.stringify(value)}'`);
+                        log('warn', `action: Unrecognized payload structure '${JSON.stringify(value)}'`);
                         break;
                     }
 
@@ -263,17 +263,17 @@ const fzLocal = {
                     const eventTypeCode = parseInt(eventTypeCodeRaw, 10);
 
                     if (Number.isNaN(regionId)) {
-                        log('warn', `region_event: Invalid regionId "${regionIdRaw}"`);
+                        log('warn', `action: Invalid regionId "${regionIdRaw}"`);
                         break;
                     }
                     if (!Object.values(fp1.constants.region_event_types).includes(eventTypeCode)) {
-                        log('warn', `region_event: Unknown region event type "${eventTypeCode}"`);
+                        log('warn', `action: Unknown region event type "${eventTypeCode}"`);
                         break;
                     }
 
                     const eventTypeName = fp1.mappers.aqara_fp1.region_event_type_names[eventTypeCode];
-                    log('debug', `region_event: Triggered event (region "${regionId}", type "${eventTypeName}")`);
-                    payload.region_event = `region_${regionId}_${eventTypeName}`;
+                    log('debug', `action: Triggered event (region "${regionId}", type "${eventTypeName}")`);
+                    payload.action = `region_${regionId}_${eventTypeName}`;
                     break;
                 }
                 case 0xf7: {

package/package.json

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