zigbee-herdsman-converters 14.0.617 → 14.0.620

package/devices/ikea.js

@@ -871,6 +871,13 @@ module.exports = [
         description: 'TRADFRI LED bulb E12/E14 WW clear 250 lumen, dimmable',
         extend: tradfriExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['TRADFRIbulbE12WWcandleclear250lm'],
+        model: 'LED2009C3',
+        vendor: 'IKEA',
+        description: 'TRADFRI LED bulb E12 WW candle clear 250 lumen, dimmable',
+        extend: tradfriExtend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['TRADFRIbulbGU10WS345lm', 'TRADFRI bulb GU10 WW 345lm', 'TRADFRIbulbGU10WS380lm'],
         model: 'LED2005R5',

package/devices/lonsonho.js

@@ -77,7 +77,7 @@ module.exports = [
         description: 'Dual curtain/blind module',
         fromZigbee: [fz.cover_position_tilt, fz.tuya_cover_options],
         toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.tuya_cover_calibration, tz.tuya_cover_reversal],
-        meta: {multiEndpoint: true},
+        meta: {multiEndpoint: true, coverInverted: true},
         endpoint: (device) => {
             return {'left': 1, 'right': 2};
         },

package/devices/owon.js

@@ -233,19 +233,22 @@ module.exports = [
         vendor: 'OWON',
         description: 'HVAC fan coil',
         fromZigbee: [fz.fan, fz.thermostat, fz.humidity, fz.occupancy, fz.legacy.hvac_user_interface],
-        toZigbee: [tz.fan_mode, tz.thermostat_system_mode,
+        toZigbee: [tz.fan_mode,
             tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
             tz.thermostat_occupied_cooling_setpoint, tz.thermostat_unoccupied_cooling_setpoint,
             tz.thermostat_min_heat_setpoint_limit, tz.thermostat_max_heat_setpoint_limit,
             tz.thermostat_min_cool_setpoint_limit, tz.thermostat_max_cool_setpoint_limit,
-            tz.thermostat_local_temperature, tz.thermostat_running_state,
-            tz.thermostat_keypad_lockout],
-        exposes: [e.humidity(), e.occupancy(),
-            exposes.climate().withSystemMode(['off', 'heat', 'cool', 'fan_only']).withRunningState(['idle', 'heat', 'cool', 'fan_only'])
+            tz.thermostat_local_temperature,
+            tz.thermostat_keypad_lockout,
+            tz.thermostat_system_mode, tz.thermostat_running_mode, tz.thermostat_running_state, tz.thermostat_programming_operation_mode],
+        exposes: [e.local_temperature(), e.humidity(), e.occupancy(),
+            exposes.climate().withSystemMode(['off', 'heat', 'cool', 'fan_only', 'sleep'])
+                .withRunningMode(['off', 'heat', 'cool'])
+                .withRunningState(['idle', 'heat', 'cool', 'fan_only'])
                 .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5).withSetpoint('unoccupied_heating_setpoint', 5, 30, 0.5)
-                .withSetpoint('occupied_cooling_setpoint', 7, 35, 0.5).withSetpoint('unoccupied_cooling_setpoint', 7, 35, 0.5)
-                .withLocalTemperature(),
-            e.fan().withModes(['low', 'medium', 'high', 'on', 'auto']), e.keypad_lockout(),
+                .withSetpoint('occupied_cooling_setpoint', 7, 35, 0.5).withSetpoint('unoccupied_cooling_setpoint', 7, 35, 0.5),
+            e.fan().withModes(['low', 'medium', 'high', 'on', 'auto']),
+            e.programming_operation_mode(['setpoint', 'eco']), e.keypad_lockout(),
             e.max_heat_setpoint_limit(5, 30, 0.5), e.min_heat_setpoint_limit(5, 30, 0.5),
             e.max_cool_setpoint_limit(7, 35, 0.5), e.min_cool_setpoint_limit(7, 35, 0.5)],
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -261,12 +264,14 @@ module.exports = [
             await reporting.thermostatUnoccupiedCoolingSetpoint(endpoint);
             await reporting.thermostatTemperature(endpoint, {min: 60, max: 600, change: 0.1});
             await reporting.thermostatSystemMode(endpoint);
+            await reporting.thermostatRunningMode(endpoint);
+            await reporting.thermostatRunningState(endpoint);
             await reporting.humidity(endpoint, {min: 60, max: 600, change: 1});
             await reporting.thermostatKeypadLockMode(endpoint);
 
-            await endpoint.read('hvacThermostat', ['systemMode', 'runningState', 'occupiedHeatingSetpoint', 'unoccupiedHeatingSetpoint',
-                'occupiedCoolingSetpoint', 'unoccupiedCoolingSetpoint', 'localTemp'],
-            'minHeatSetpointLimit', 'maxHeatSetpointLimit', 'minCoolSetpointLimit', 'maxCoolSetpointLimit');
+            await endpoint.read('hvacThermostat', ['systemMode', 'runningMode', 'runningState',
+                'occupiedHeatingSetpoint', 'unoccupiedHeatingSetpoint',
+                'occupiedCoolingSetpoint', 'unoccupiedCoolingSetpoint', 'localTemp']);
             await endpoint.read('msRelativeHumidity', ['measuredValue']);
 
             const endpoint2 = device.getEndpoint(2);

package/devices/philips.js

@@ -984,7 +984,14 @@ module.exports = [
         zigbeeModel: ['929003053001'],
         model: '929003053001',
         vendor: 'Philips',
-        description: 'Hue Sana wall light',
+        description: 'Hue Sana wall light (white)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['929003052901'],
+        model: '929003052901',
+        vendor: 'Philips',
+        description: 'Hue Sana wall light (black)',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {

package/devices/sengled.js

@@ -235,10 +235,16 @@ module.exports = [
         model: 'E1D-G73WNA',
         vendor: 'Sengled',
         description: 'Smart window and door sensor',
-        fromZigbee: [fz.ias_contact_alarm_1],
+        fromZigbee: [fz.ias_contact_alarm_1, fz.battery],
         toZigbee: [],
         ota: ota.zigbeeOTA,
-        exposes: [e.contact(), e.battery_low(), e.tamper()],
+        exposes: [e.contact(), e.battery_low(), e.battery(), e.battery_voltage(), e.tamper()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryVoltage(endpoint);
+            await reporting.batteryPercentageRemaining(endpoint);
+        },
     },
     {
         zigbeeModel: ['E1C-NB6'],

package/devices/siglis.js

@@ -146,9 +146,9 @@ module.exports = [
             e.light_brightness().withEndpoint('l3'),
             e.light_brightness().withEndpoint('l4'),
             e.light_brightness().withEndpoint('l5'),
-            exposes.cover().withState('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
+            exposes.cover().setAccess('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
                 .withPosition().withTilt().withEndpoint('l6'),
-            exposes.cover().withState('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
+            exposes.cover().setAccess('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
                 .withPosition().withTilt().withEndpoint('l7'),
             e.action([
                 'button_1_single', 'button_1_double', 'button_1_hold', 'button_1_release',
@@ -184,7 +184,7 @@ module.exports = [
             tz.cover_position_tilt,
             coverAndLightToZigbee,
         ],
-        meta: {multiEndpoint: true, coverInverted: true},
+        meta: {multiEndpoint: true},
         endpoint: (device) => {
             return {
                 'l1': zigfredEndpoint,

package/devices/tuya.js

@@ -23,6 +23,18 @@ const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak',
     '_TZ3000_ss98ec5d', '_TZ3000_gznh2xla', '_TZ3000_hdopuwv6', '_TZ3000_gvn91tmx', '_TZ3000_dksbtrzs', '_TZ3000_b28wrpvx'];
 
 const tzLocal = {
+    SA12IZL_silence_siren: {
+        key: ['silence_siren'],
+        convertSet: async (entity, key, value, meta) => {
+            await tuya.sendDataPointBool(entity, 16, value);
+        },
+    },
+    SA12IZL_alarm: {
+        key: ['alarm'],
+        convertSet: async (entity, key, value, meta) => {
+            await tuya.sendDataPointEnum(entity, 20, {true: 0, false: 1}[value]);
+        },
+    },
     hpsz: {
         key: ['led_state'],
         convertSet: async (entity, key, value, meta) => {
@@ -277,6 +289,37 @@ const tzLocal = {
 };
 
 const fzLocal = {
+    SA12IZL: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataResponse', 'commandDataReport'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            for (const dpValue of msg.data.dpValues) {
+                const dp = dpValue.dp;
+                const value = tuya.getDataValue(dpValue);
+                switch (dp) {
+                case tuya.dataPoints.state:
+                    result.smoke = value === 0;
+                    break;
+                case 15:
+                    result.battery = value;
+                    break;
+                case 16:
+                    result.silence_siren = value;
+                    break;
+                case 20: {
+                    const alarm = {0: true, 1: false};
+                    result.alarm = alarm[value];
+                    break;
+                }
+                default:
+                    meta.logger.warn(`zigbee-herdsman-converters:SA12IZL: NOT RECOGNIZED DP #${
+                        dp} with data ${JSON.stringify(dpValue)}`);
+                }
+            }
+            return result;
+        },
+    },
     tuya_dinrail_switch2: {
         cluster: 'manuSpecificTuya',
         type: ['commandDataReport', 'commandDataResponse', 'commandActiveStatusReport'],
@@ -933,7 +976,8 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS0202', manufacturerName: '_TYZB01_jytabjkb'},
-            {modelID: 'TS0202', manufacturerName: '_TZ3000_lltemgsf'}],
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_lltemgsf'},
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_mg4dy6z6'}],
         model: 'TS0202_1',
         vendor: 'TuYa',
         description: 'Motion sensor',
@@ -1327,11 +1371,15 @@ module.exports = [
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_qamcypen'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_zdrhqmo0'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_2cjfbpy0'},
+            {modelID: 'TS0502B', manufacturerName: '_TZ3000_bujv0r9b'},
         ],
         model: 'TS0502B',
         vendor: 'TuYa',
         description: 'Light controller',
-        whiteLabel: [{vendor: 'Mercator Ikuü', model: 'SMI7040', description: 'Ford Batten Light'}],
+        whiteLabel: [
+            {vendor: 'Mercator Ikuü', model: 'SMI7040', description: 'Ford Batten Light'},
+            {vendor: 'Mercator Ikuü', model: 'SMD9300', description: 'Donovan Panel Light'},
+        ],
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
     },
     {
@@ -1558,6 +1606,27 @@ module.exports = [
         },
         exposes: [e.battery(), e.water_leak()],
     },
+    {
+        fingerprint: [{modelID: 'TS0001', manufacturerName: '_TZ3000_xkap8wtb'}],
+        model: 'TS0001_power',
+        description: 'Switch with power monitoring',
+        vendor: 'TuYa',
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report],
+        toZigbee: [tz.on_off],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.rmsVoltage(endpoint, {change: 5});
+            await reporting.rmsCurrent(endpoint, {change: 50});
+            await reporting.activePower(endpoint, {change: 10});
+            await reporting.currentSummDelivered(endpoint);
+            endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {acCurrentDivisor: 1000, acCurrentMultiplier: 1});
+            endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
+            device.save();
+        },
+        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE)],
+    },
     {
         zigbeeModel: ['TS0001'],
         model: 'TS0001',
@@ -1610,7 +1679,8 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0002', manufacturerName: '_TZ3000_01gpyda5'}, {modelID: 'TS0002', manufacturerName: '_TZ3000_bvrlqyj7'}],
+        fingerprint: [{modelID: 'TS0002', manufacturerName: '_TZ3000_01gpyda5'}, {modelID: 'TS0002', manufacturerName: '_TZ3000_bvrlqyj7'},
+            {modelID: 'TS0002', manufacturerName: '_TZ3000_7ed9cqgi'}],
         model: 'TS0002_switch_module',
         vendor: 'TuYa',
         description: '2 gang switch module',
@@ -1628,6 +1698,8 @@ module.exports = [
         },
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
+            await device.getEndpoint(1).read('genBasic',
+                ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
             await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
         },
@@ -1737,6 +1809,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_fctwhugx'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_zah67ekd'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_hsgrhjpf'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_pw7mji0l'},
             // Window pushers:
             {modelID: 'TS0601', manufacturerName: '_TZE200_g5wdnuow'},
             // Tubular motors:
@@ -1753,6 +1826,7 @@ module.exports = [
             {vendor: 'Binthen', model: 'BCM100D'},
             {vendor: 'Binthen', model: 'CV01A'},
             {vendor: 'Zemismart', model: 'M515EGB'},
+            {vendor: 'OZ Smart Things', model: 'ZM85EL-1Z'},
             {vendor: 'TuYa', model: 'M515EGZT'},
             {vendor: 'TuYa', model: 'DT82LEMA-1.2N'},
             {vendor: 'TuYa', model: 'ZD82TN', description: 'Curtain motor'},
@@ -2117,6 +2191,21 @@ module.exports = [
         toZigbee: [],
         exposes: [e.smoke(), e.battery()],
     },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_5d3vhjro'}, {modelID: 'TS0601', manufacturerName: '_TZE200_ntcy3xu1'}],
+        model: 'SA12IZL',
+        vendor: 'TuYa',
+        description: 'Smart smoke alarm',
+        meta: {timeout: 30000, disableDefaultResponse: true},
+        fromZigbee: [fzLocal.SA12IZL],
+        toZigbee: [tzLocal.SA12IZL_silence_siren, tzLocal.SA12IZL_alarm],
+        exposes: [e.battery(),
+            exposes.binary('smoke', ea.STATE, true, false).withDescription('Smoke alarm status'),
+            exposes.enum('battery_level', ea.STATE, ['low', 'middle', 'high']).withDescription('Battery level state'),
+            exposes.binary('alarm', ea.STATE_SET, true, false).withDescription('Enable the alarm'),
+            exposes.binary('silence_siren', ea.STATE_SET, true, false).withDescription('Silence the siren')],
+        onEvent: tuya.onEventsetTime,
+    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_byzdayie'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_fsb6zw01'},

package/devices/woolley.js

@@ -3,7 +3,7 @@ const reporting = require('../lib/reporting');
 
 module.exports = [
     {
-        zigbeeModel: ['Z111PL0H-1JX'],
+        zigbeeModel: ['Z111PL0H-1JX', 'SA-029-1'],
         model: 'SA-029',
         vendor: 'Woolley',
         description: 'Smart Plug',

package/devices/ynoa.js

@@ -1,5 +1,6 @@
 const exposes = require('../lib/exposes');
-const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
+const fz = require('../converters/fromZigbee');
+const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const e = exposes.presets;
 const extend = require('..//lib/extend');
@@ -42,4 +43,19 @@ module.exports = [
             await reporting.batteryPercentageRemaining(endpoint);
         },
     },
+    {
+        zigbeeModel: ['ZBT-ONOFFPlug-D0009'],
+        model: 'LA-PLUG-10Amp',
+        vendor: 'Ynoa',
+        description: 'Smart plug Zigbee 3.0',
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
+        toZigbee: [tz.on_off],
+        exposes: [e.switch(), e.power()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.onOff(endpoint);
+            await reporting.activePower(endpoint);
+        },
+    },
 ];

package/devices/zemismart.js

@@ -201,6 +201,15 @@ module.exports = [
         toZigbee: [tz.tuya_cover_control, tz.tuya_cover_options, tz.tuya_data_point_test],
         exposes: [e.cover_position().setAccess('position', ea.STATE_SET)],
     },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_7eue9vhc'}],
+        model: 'ZM25RX-08/30',
+        vendor: 'Zemismart',
+        description: 'Tubular motor',
+        fromZigbee: [fz.tuya_cover, fz.ignore_basic_report],
+        toZigbee: [tz.tuya_cover_control, tz.tuya_cover_options],
+        exposes: [e.cover_position().setAccess('position', ea.STATE_SET)],
+    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_1n2kyphz'}],
         model: 'TB26-4',

package/lib/exposes.js

@@ -327,6 +327,7 @@ class Cover extends Base {
         super();
         this.type = 'cover';
         this.features = [];
+        this.features.push(new Enum('state', a.STATE_SET, ['OPEN', 'CLOSE', 'STOP']));
     }
 
     withPosition() {
@@ -340,12 +341,6 @@ class Cover extends Base {
         this.features.push(new Numeric('tilt', access.ALL).withValueMin(0).withValueMax(100).withDescription('Tilt of this cover'));
         return this;
     }
-
-    withState(property='state', access=a.STATE_SET, values=['OPEN', 'CLOSE', 'STOP']) {
-        assert(!this.endpoint, 'Cannot add feature after adding endpoint');
-        this.features.push(new Enum(property, access, values));
-        return this;
-    }
 }
 
 class Fan extends Base {
@@ -545,9 +540,9 @@ module.exports = {
         comfort_temperature: () => new Numeric('comfort_temperature', access.STATE_SET).withUnit('°C').withDescription('Comfort temperature').withValueMin(0).withValueMax(30),
         consumer_connected: () => new Binary('consumer_connected', access.STATE, true, false).withDescription('Indicates whether a plug is physically attached. Device does not have to pull power or even be connected electrically (state of this binary switch can be ON even if main power switch is OFF)'),
         contact: () => new Binary('contact', access.STATE, false, true).withDescription('Indicates if the contact is closed (= true) or open (= false)'),
-        cover_position: () => new Cover().withState().withPosition(),
-        cover_position_tilt: () => new Cover().withState().withPosition().withTilt(),
-        cover_tilt: () => new Cover().withState().withTilt(),
+        cover_position: () => new Cover().withPosition(),
+        cover_position_tilt: () => new Cover().withPosition().withTilt(),
+        cover_tilt: () => new Cover().withTilt(),
         cpu_temperature: () => new Numeric('cpu_temperature', access.STATE).withUnit('°C').withDescription('Temperature of the CPU'),
         cube_side: (name) => new Numeric(name, access.STATE).withDescription('Side of the cube').withValueMin(0).withValueMax(6).withValueStep(1),
         current: () => new Numeric('current', access.STATE).withUnit('A').withDescription('Instantaneous measured electrical current'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.617",
+  "version": "14.0.620",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -38,7 +38,7 @@
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^2.2.0",
-    "zigbee-herdsman": "^0.14.53"
+    "zigbee-herdsman": "^0.14.54"
   },
   "devDependencies": {
     "eslint": "*",