zigbee-herdsman-converters 14.0.690 → 14.0.691

package/converters/fromZigbee.js

@@ -6260,17 +6260,6 @@ const converters = {
             return result;
         },
     },
-    D10110_cover_position_tilt: {
-        cluster: 'closuresWindowCovering',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            if (msg.data.hasOwnProperty('currentPositionLiftPercentage') && msg.data['currentPositionLiftPercentage'] <= 100) {
-                // The Yookee D10110 SENDs it's position reversed, relative to the spec.
-                msg.data['currentPositionLiftPercentage'] = 100 - msg.data['currentPositionLiftPercentage'];
-            }
-            return converters.cover_position_tilt.convert(model, msg, publish, options, meta);
-        },
-    },
     PGC410EU_presence: {
         cluster: 'manuSpecificSmartThingsArrivalSensor',
         type: 'commandArrivalSensorNotify',

package/devices/aurora_lighting.js

@@ -100,6 +100,13 @@ module.exports = [
         description: 'AOne 5.4W smart tuneable GU10 lamp',
         extend: extend.light_onoff_brightness_colortemp(),
     },
+    {
+        zigbeeModel: ['TWMPROZXBulb50AU'],
+        model: 'AU-A1ZBMPRO1ZX',
+        vendor: 'Aurora Lighting',
+        description: 'AOne MPROZX fixed IP65 fire rated smart tuneable LED downlight',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [200, 455]}),
+    },
     {
         zigbeeModel: ['FWG125Bulb50AU'],
         model: 'AU-A1VG125Z5E/19',

package/devices/fantem.js

@@ -49,6 +49,7 @@ module.exports = [
     {
         fingerprint: [{modelID: 'TS0202', manufacturerName: '_TZ3210_rxqls8v0'},
             {modelID: 'TS0202', manufacturerName: '_TZ3210_zmy9hjay'},
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_6ygjfyll'},
             {modelID: 'TS0202', manufacturerName: '_TZ3210_wuhzzfqg'}],
         model: 'ZB003-X',
         vendor: 'Fantem',

package/devices/philips.js

@@ -3025,4 +3025,11 @@ module.exports = [
         description: 'Hue White E17 470 lumen',
         extend: hueExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['929003046901'],
+        model: '8719514338524',
+        vendor: 'Philips',
+        description: 'Hue white ambiance Pillar spotlight with Bluetooth (black)',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
 ];

package/devices/schneider_electric.js

@@ -307,6 +307,27 @@ module.exports = [
             await reporting.brightness(endpoint);
         },
     },
+    {
+        zigbeeModel: ['NHROTARY/UNIDIM/1'],
+        model: 'WDE002961',
+        vendor: 'Schneider Electric',
+        description: 'Rotary dimmer',
+        fromZigbee: [fz.on_off, fz.brightness, fz.level_config, fz.wiser_lighting_ballast_configuration],
+        toZigbee: [tz.light_onoff_brightness, tz.level_config, tz.ballast_config, tz.wiser_dimmer_mode],
+        exposes: [e.light_brightness().withLevelConfig(),
+            exposes.numeric('ballast_minimum_level', ea.ALL).withValueMin(1).withValueMax(254)
+                .withDescription('Specifies the minimum light output of the ballast'),
+            exposes.numeric('ballast_maximum_level', ea.ALL).withValueMin(1).withValueMax(254)
+                .withDescription('Specifies the maximum light output of the ballast'),
+            exposes.enum('dimmer_mode', ea.ALL, ['auto', 'rc', 'rl', 'rl_led'])
+                .withDescription('Sets dimming mode to autodetect or fixed RC/RL/RL_LED mode (max load is reduced in RL_LED)')],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(3);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'lightingBallastCfg']);
+            await reporting.onOff(endpoint);
+            await reporting.brightness(endpoint);
+        },
+    },
     {
         zigbeeModel: ['NHPB/DIMMER/1'],
         model: 'WDE002386',

package/devices/tuya.js

@@ -3103,7 +3103,7 @@ module.exports = [
         description: 'Vibration sensor',
         fromZigbee: [fz.battery, fz.ias_vibration_alarm_1_with_timeout],
         toZigbee: [tz.TS0210_sensitivity],
-        exposes: [e.battery(), e.vibration(), exposes.enum('sensitivity', exposes.access.STATE_SET, ['low', 'medium', 'high'])],
+        exposes: [e.battery(), e.battery_voltage(), e.vibration(), exposes.enum('sensitivity', ea.STATE_SET, ['low', 'medium', 'high'])],
     },
     {
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_8bxrzyxz'},

package/devices/ubisys.js

@@ -20,6 +20,14 @@ const manufacturerOptions = {
     tint: {manufacturerCode: herdsman.Zcl.ManufacturerCode.MUELLER_LICHT_INT},
 };
 
+const ubisysOnEventReadCurrentSummDelivered = async function(type, data, devic) {
+    if (data.type === 'attributeReport' && data.cluster === 'seMetering') {
+        try {
+            await data.endpoint.read('seMetering', ['currentSummDelivered']);
+        } catch (error) {/* Do nothing*/}
+    }
+};
+
 const ubisys = {
     fz: {
         dimmer_setup: {
@@ -533,7 +541,7 @@ module.exports = [
                 'toggle', 'on', 'off', 'recall_*',
                 'brightness_move_up', 'brightness_move_down', 'brightness_stop',
             ]),
-            e.power_on_behavior()],
+            e.power_on_behavior(), e.energy()],
         fromZigbee: [fz.on_off, fz.metering, fz.command_toggle, fz.command_on, fz.command_off, fz.command_recall, fz.command_move,
             fz.command_stop, fz.power_on_behavior, ubisys.fz.configure_device_setup],
         toZigbee: [tz.on_off, tz.metering_power, ubisys.tz.configure_device_setup, tz.power_on_behavior],
@@ -561,6 +569,8 @@ module.exports = [
                 const ep1 = device.getEndpoint(1);
                 const ep2 = device.getEndpoint(2);
                 ep2.addBinding('genOnOff', ep1);
+            } else {
+                await ubisysOnEventReadCurrentSummDelivered(type, data, device);
             }
         },
         ota: ota.ubisys,
@@ -575,7 +585,7 @@ module.exports = [
                 'toggle', 'on', 'off', 'recall_*',
                 'brightness_move_up', 'brightness_move_down', 'brightness_stop',
             ]),
-            e.power_on_behavior()],
+            e.power_on_behavior(), e.energy()],
         fromZigbee: [fz.on_off, fz.metering, fz.command_toggle, fz.command_on, fz.command_off, fz.command_recall, fz.command_move,
             fz.command_stop, fz.power_on_behavior, ubisys.fz.configure_device_setup],
         toZigbee: [tz.on_off, tz.metering_power, ubisys.tz.configure_device_setup, tz.power_on_behavior],
@@ -603,6 +613,8 @@ module.exports = [
                 const ep1 = device.getEndpoint(1);
                 const ep2 = device.getEndpoint(2);
                 ep2.addBinding('genOnOff', ep1);
+            } else {
+                await ubisysOnEventReadCurrentSummDelivered(type, data, device);
             }
         },
         ota: ota.ubisys,
@@ -615,6 +627,7 @@ module.exports = [
         exposes: [
             e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'),
             e.power().withAccess(ea.STATE_GET).withEndpoint('meter').withProperty('power'),
+            e.energy(),
             e.action(['toggle_s1', 'toggle_s2', 'on_s1', 'on_s2', 'off_s1', 'off_s2', 'recall_*_s1', 'recal_*_s2', 'brightness_move_up_s1',
                 'brightness_move_up_s2', 'brightness_move_down_s1', 'brightness_move_down_s2', 'brightness_stop_s1',
                 'brightness_stop_s2']),
@@ -655,6 +668,8 @@ module.exports = [
                 const ep4 = device.getEndpoint(4);
                 ep3.addBinding('genOnOff', ep1);
                 ep4.addBinding('genOnOff', ep2);
+            } else {
+                await ubisysOnEventReadCurrentSummDelivered(type, data, device);
             }
         },
         ota: ota.ubisys,
@@ -670,13 +685,41 @@ module.exports = [
         toZigbee: [tz.light_onoff_brightness, tz.ballast_config, tz.level_config, ubisys.tz.dimmer_setup,
             ubisys.tz.dimmer_setup_genLevelCtrl, ubisys.tz.configure_device_setup, tz.ignore_transition, tz.light_brightness_move,
             tz.light_brightness_step],
-        exposes: [e.light_brightness().withLevelConfig(), e.power(), e.energy(),
+        exposes: [
+            e.action(['toggle_s1', 'toggle_s2', 'on_s1', 'on_s2', 'off_s1', 'off_s2', 'recall_*_s1', 'recal_*_s2', 'brightness_move_up_s1',
+                'brightness_move_up_s2', 'brightness_move_down_s1', 'brightness_move_down_s2', 'brightness_stop_s1',
+                'brightness_stop_s2']),
+            e.light_brightness(),
+            exposes.composite('level_config', 'level_config')
+                .withFeature(exposes.numeric('on_off_transition_time', ea.ALL)
+                    .withDescription('Specifies the amount of time, in units of 0.1 seconds, which will be used during a transition to ' +
+                    'either the on or off state, when an on/off/toggle command of the on/off cluster is used to turn the light on or off'))
+                .withFeature(exposes.numeric('on_level', ea.ALL)
+                    .withValueMin(1).withValueMax(254)
+                    .withPreset('previous', 255, 'Use previous value')
+                    .withDescription('Specifies the level that shall be applied, when an on/toggle command causes the light to turn on.'))
+                .withFeature(exposes.binary('execute_if_off', ea.ALL, true, false)
+                    .withDescription('Defines if you can send a brightness change without to turn on the light'))
+                .withFeature(exposes.numeric('current_level_startup', ea.ALL)
+                    .withValueMin(1).withValueMax(254)
+                    .withPreset('previous', 255, 'Use previous value')
+                    .withDescription('Specifies the initial level to be applied after the device is supplied with power')),
+            e.power(), e.energy(),
             exposes.numeric('ballast_minimum_level', ea.ALL).withValueMin(1).withValueMax(254)
                 .withDescription('Specifies the minimum light output of the ballast'),
             exposes.numeric('ballast_maximum_level', ea.ALL).withValueMin(1).withValueMax(254)
                 .withDescription('Specifies the maximum light output of the ballast'),
             exposes.numeric('minimum_on_level', ea.ALL).withValueMin(0).withValueMax(255)
-                .withDescription('Specifies the minimum light output after switching on'),
+                .withDescription('Specifies the minimum level that shall be applied, when an on/toggle command causes the ' +
+                'light to turn on. When this attribute is set to the invalid value (255) this feature is disabled ' +
+                'and standard rules apply: The light will either return to the previously active level (before it ' +
+                'was turned off) if the OnLevel attribute is set to the invalid value (255/previous); or to the specified ' +
+                'value of the OnLevel attribute if this value is in the range 0…254. Otherwise, if the ' +
+                'MinimumOnLevel is in the range 0…254, the light will be set to the the previously ' +
+                'active level (before it was turned off), or the value specified here, whichever is the larger ' +
+                'value. For example, if the previous level was 30 and the MinimumOnLevel was 40 then ' +
+                'the light would turn on and move to level 40. Conversely, if the previous level was 50, ' +
+                'and the MinimumOnLevel was 40, then the light would turn on and move to level 50.'),
             exposes.binary('capabilities_forward_phase_control', ea.ALL, true, false)
                 .withDescription('The dimmer supports AC forward phase control.'),
             exposes.binary('capabilities_reverse_phase_control', ea.ALL, true, false)
@@ -705,13 +748,11 @@ module.exports = [
             await reporting.readMeteringMultiplierDivisor(endpoint);
             await reporting.instantaneousDemand(endpoint);
         },
+        meta: {multiEndpoint: true, multiEndpointSkip: ['state', 'brightness']},
+        endpoint: (device) => {
+            return {'default': 1, 's1': 2, 's2': 3, 'meter': 4};
+        },
         onEvent: async (type, data, device) => {
-            if (data.type === 'attributeReport' && data.cluster === 'seMetering') {
-                const endpoint = device.getEndpoint(4);
-                try {
-                    await endpoint.read('seMetering', ['currentSummDelivered']);
-                } catch (error) {/* Do nothing*/}
-            }
             /*
              * As per technical doc page 23 section 7.3.4, 7.3.5
              * https://www.ubisys.de/wp-content/uploads/ubisys-d1-technical-reference.pdf
@@ -723,6 +764,8 @@ module.exports = [
                 const ep2 = device.getEndpoint(2);
                 ep2.addBinding('genOnOff', ep1);
                 ep2.addBinding('genLevelCtrl', ep1);
+            } else {
+                await ubisysOnEventReadCurrentSummDelivered(type, data, device);
             }
         },
         ota: ota.ubisys,
@@ -736,7 +779,7 @@ module.exports = [
         toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.metering_power,
             ubisys.tz.configure_j1, ubisys.tz.configure_device_setup],
         exposes: [e.cover_position_tilt(),
-            e.power().withAccess(ea.STATE_GET).withEndpoint('meter').withProperty('power')],
+            e.power().withAccess(ea.STATE_GET).withEndpoint('meter').withProperty('power'), e.energy()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint1 = device.getEndpoint(1);
             const endpoint3 = device.getEndpoint(3);
@@ -760,6 +803,8 @@ module.exports = [
                 const ep1 = device.getEndpoint(1);
                 const ep2 = device.getEndpoint(2);
                 ep2.addBinding('closuresWindowCovering', ep1);
+            } else {
+                await ubisysOnEventReadCurrentSummDelivered(type, data, device);
             }
         },
         ota: ota.ubisys,

package/devices/woox.js

@@ -155,7 +155,8 @@ module.exports = [
         onEvent: tuya.onEventsetTime,
     },
     {
-        fingerprint: [{modelID: 'TS0219', manufacturerName: '_TYZB01_ynsiasng'}, {modelID: 'TS0219', manufacturerName: '_TYZB01_bwsijaty'}],
+        fingerprint: [{modelID: 'TS0219', manufacturerName: '_TYZB01_ynsiasng'}, {modelID: 'TS0219', manufacturerName: '_TYZB01_bwsijaty'},
+            {modelID: 'TS0219', manufacturerName: '_TYZB01_rs7ff6o7'}],
         model: 'R7051',
         vendor: 'Woox',
         description: 'Smart siren',

package/devices/xiaomi.js

@@ -58,6 +58,22 @@ const daysLookup = {
 
 
 const fzLocal = {
+    aqara_s1_co2: {
+        cluster: 'msCO2',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            return {co2: Math.floor(msg.data.measuredValue)};
+        },
+    },
+    aqara_s1_pm25: {
+        cluster: 'heimanSpecificPM25Measurement',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data['measuredValue']) {
+                return {pm25: msg.data['measuredValue'] / 1000};
+            }
+        },
+    },
     aqara_trv: {
         cluster: 'aqaraOpple',
         type: ['attributeReport', 'readResponse'],
@@ -417,6 +433,15 @@ module.exports = [
         },
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['lumi.airm.fhac01'],
+        model: 'KQJCMB11LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara air monitoring panel S1',
+        fromZigbee: [fz.temperature, fz.humidity, fzLocal.aqara_s1_pm25, fzLocal.aqara_s1_co2],
+        toZigbee: [],
+        exposes: [e.temperature(), e.humidity(), e.pm25(), e.co2()],
+    },
     {
         zigbeeModel: ['lumi.magnet.acn001'],
         model: 'MCCGQ14LM',

package/devices/yookee.js

@@ -10,9 +10,8 @@ module.exports = [
         model: 'D10110',
         vendor: 'Yookee',
         description: 'Smart blind controller',
-        fromZigbee: [fz.D10110_cover_position_tilt, fz.battery],
+        fromZigbee: [fz.cover_position_tilt, fz.battery],
         toZigbee: [tz.cover_state, tz.cover_position_tilt],
-        meta: {coverInverted: true},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'closuresWindowCovering']);

package/lib/philips.js

@@ -127,7 +127,7 @@ function decodeGradientColors(input, opts) {
         const y = yHigh | yLow;
 
         return {
-            color_mode: 'color_xy',
+            color_mode: 'xy',
             x: Math.round(x / 65535 * 10000) / 10000,
             y: Math.round(y / 65535 * 10000) / 10000,
             brightness,

package/lib/utils.js

@@ -124,7 +124,8 @@ function postfixWithEndpointName(value, msg, definition, meta) {
         meta.logger.warn(`No meta passed to postfixWithEndpointName, update your external converter!`);
         meta = {device: null};
     }
-    if (definition.meta && definition.meta.multiEndpoint) {
+    if (definition.meta && definition.meta.multiEndpoint &&
+            (!definition.meta.multiEndpointSkip || !definition.meta.multiEndpointSkip.includes(value))) {
         const endpointName = definition.hasOwnProperty('endpoint') ?
             getKey(definition.endpoint(meta.device), msg.endpoint.ID) : msg.endpoint.ID;
 

package/package.json

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