zigbee-herdsman-converters 14.0.493 → 14.0.496

package/devices/ikea.js

@@ -279,10 +279,10 @@ module.exports = [
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['TRADFRIbulbE27WSglobeopal1055lm'],
+        zigbeeModel: ['TRADFRIbulbE27WSglobeopal1055lm', 'TRADFRIbulbE26WSglobeopal1100lm'],
         model: 'LED2003G10',
         vendor: 'IKEA',
-        description: 'TRADFRI LED bulb E27 1055 lumen, dimmable, white spectrum, opal white',
+        description: 'TRADFRI LED bulb E26/27 1100/1055 lumen, dimmable, white spectrum, opal white',
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
     {

package/devices/innr.js

@@ -497,6 +497,18 @@ module.exports = [
         },
         exposes: [e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.switch(), e.energy()],
     },
+    {
+        zigbeeModel: ['SP 110'],
+        model: 'SP 110',
+        vendor: 'Innr',
+        description: 'Smart plug',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
     {
         zigbeeModel: ['SP 220'],
         model: 'SP 220',

package/devices/prolight.js

@@ -6,10 +6,10 @@ const e = exposes.presets;
 module.exports = [
     {
         zigbeeModel: ['PROLIGHT E27 WHITE AND COLOUR'],
-        model: '5412748727388',
+        model: '5412748727371',
         vendor: 'Prolight',
         description: 'E27 white and colour bulb',
-        extend: extend.light_onoff_brightness_colortemp_color(),
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555]}),
     },
     {
         zigbeeModel: ['PROLIGHT E27 WARM WHITE CLEAR'],
@@ -32,9 +32,16 @@ module.exports = [
         description: 'GU10 white and colour spot',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555]}),
     },
+    {
+        zigbeeModel: ['PROLIGHT GU10 WARM WHITE'],
+        model: '5412748727395',
+        vendor: 'Prolight',
+        description: 'GU10 spot dimmable',
+        extend: extend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['PROLIGHT REMOTE CONTROL'],
-        model: 'PROLIGHT_REMOTE_CONTROL',
+        model: '5412748727388',
         vendor: 'Prolight',
         description: 'Remote control',
         toZigbee: [],

package/devices/sinope.js

@@ -259,6 +259,22 @@ module.exports = [
             await reporting.activePower(endpoint, {min: 10, change: 1});
         },
     },
+    {
+        zigbeeModel: ['SP2610ZB'],
+        model: 'SP2610ZB',
+        vendor: 'Sinopé',
+        description: 'Zigbee smart outlet',
+        fromZigbee: [fz.on_off, fz.electrical_measurement],
+        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']);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.onOff(endpoint);
+            await reporting.activePower(endpoint, {min: 10, change: 1});
+        },
+    },
     {
         zigbeeModel: ['DM2500ZB'],
         model: 'DM2500ZB',

package/devices/tuya.js

@@ -13,7 +13,7 @@ const utils = require('../lib/utils');
 const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak', '_TZ3000_ew3ldmgx', '_TZ3000_gjnozsaz',
     '_TZ3000_jvzvulen', '_TZ3000_mraovvmm', '_TZ3000_nfnmi125', '_TZ3000_ps3dmato', '_TZ3000_w0qqde0g', '_TZ3000_u5u4cakc',
     '_TZ3000_rdtixbnu', '_TZ3000_typdpbpg', '_TZ3000_kx0pris5', '_TZ3000_amdymr7l', '_TZ3000_z1pnpsdo', '_TZ3000_ksw8qtmt',
-    '_TZ3000_nzkqcvvs'];
+    '_TZ3000_nzkqcvvs', '_TZ3000_1h2x4akh'];
 
 const tzLocal = {
     TS0504B_color: {

package/devices/woox.js

@@ -7,6 +7,75 @@ const extend = require('../lib/extend');
 const e = exposes.presets;
 const ea = exposes.access;
 
+const fzLocal = {
+    R7049_status: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataResponse', 'commandDataReport'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            for (const dpValue of msg.data.dpValues) {
+                const dp = dpValue.dp; // First we get the data point ID
+                const value = tuya.getDataValue(dpValue); // This function will take care of converting the data to proper JS type
+                switch (dp) {
+                case 1:
+                    result.smoke = Boolean(!value);
+                    break;
+                case 8:
+                    result.test_alarm = value;
+                    break;
+                case 9: {
+                    const testAlarmResult = {0: 'checking', 1: 'check_success', 2: 'check_failure', 3: 'others'};
+                    result.test_alarm_result = testAlarmResult[value];
+                    break;
+                }
+                case 11:
+                    result.fault_alarm = Boolean(value);
+                    break;
+                case 14: {
+                    const batteryLevels = {0: 'low', 1: 'middle', 2: 'high'};
+                    result.battery_level = batteryLevels[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:Woox Smoke Detector: NOT RECOGNIZED DP #${
+                        dp} with data ${JSON.stringify(dpValue)}`);
+                }
+            }
+            return result;
+        },
+    },
+};
+
+const tzLocal = {
+    R7049_silenceSiren: {
+        key: ['silence_siren'],
+        convertSet: async (entity, key, value, meta) => {
+            await tuya.sendDataPointBool(entity, 16, value);
+        },
+    },
+    R7049_testAlarm: {
+        key: ['test_alarm'],
+        convertSet: async (entity, key, value, meta) => {
+            await tuya.sendDataPointBool(entity, 8, value);
+        },
+    },
+    R7049_alarm: {
+        key: ['alarm'],
+        convertSet: async (entity, key, value, meta) => {
+            const linkAlarm = {true: 0, false: 1};
+            await tuya.sendDataPointEnum(entity, 20, linkAlarm[value]);
+        },
+    },
+};
+
 module.exports = [
     {
         fingerprint: [{modelID: 'TS0101', manufacturerName: '_TZ3210_eymunffl'}],
@@ -50,10 +119,19 @@ module.exports = [
         model: 'R7049',
         vendor: 'Woox',
         description: 'Smart smoke alarm',
-        fromZigbee: [fz.tuya_woox_smoke, fz.ignore_tuya_set_time],
-        toZigbee: [],
+        meta: {timeout: 30000, disableDefaultResponse: true},
+        fromZigbee: [fzLocal.R7049_status, fz.ignore_tuya_set_time, fz.ignore_time_read],
+        toZigbee: [tzLocal.R7049_silenceSiren, tzLocal.R7049_testAlarm, tzLocal.R7049_alarm],
+        exposes: [e.battery_low(),
+            exposes.binary('smoke', ea.STATE, true, false).withDescription('Smoke alarm status'),
+            exposes.binary('test_alarm', ea.STATE_SET, true, false).withDescription('Test alarm'),
+            exposes.enum('test_alarm_result', ea.STATE, ['checking', 'check_success', 'check_failure', 'others'])
+                .withDescription('Test alarm result'),
+            exposes.enum('battery_level', ea.STATE, ['low', 'middle', 'high']).withDescription('Battery level state'),
+            exposes.binary('alarm', ea.STATE_SET, true, false).withDescription('Alarm enable'),
+            exposes.binary('fault_alarm', ea.STATE, true, false).withDescription('Fault alarm status'),
+            exposes.binary('silence_siren', ea.STATE_SET, true, false).withDescription('Silence siren')],
         onEvent: tuya.onEventsetTime,
-        exposes: [e.smoke(), e.battery_low()],
     },
     {
         fingerprint: [{modelID: 'TS0219', manufacturerName: '_TYZB01_ynsiasng'}],

package/lib/ota/OTA_URLs.md

@@ -0,0 +1,99 @@
+# Zigbee OTA source provider sources for these and others
+
+Collection of external Zigbee OTA firmware images from official and unofficial OTA provider sources.
+
+### Koenkk zigbee-OTA repository
+
+Koenkk zigbee-OTA repository host third-party OTA firmware images and external URLs for many third-party Zigbee OTA firmware images.
+
+https://github.com/Koenkk/zigbee-OTA/tree/master/images
+
+https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/index.json
+
+### Dresden Elektronik
+
+Dresden Elektronik Zigbee OTA firmware images are made publicly available by Dresden Elektronik (first-party) at the following URL:
+
+https://github.com/dresden-elektronik/deconz-rest-plugin/wiki/OTA-Image-Types---Firmware-versions
+
+Dresden Elektronik also provide third-party OTA firmware images and external URLs for many third-party Zigbee OTA firmware images.
+
+### EUROTRONICS
+
+EUROTRONICS Zigbee OTA firmware images are made publicly available by EUROTRONIC Technology (first-party) at the following URL:
+
+https://github.com/EUROTRONIC-Technology/Spirit-ZigBee/releases/download/
+
+### IKEA Trådfri 
+
+IKEA Tradfi Zigbee OTA firmware images are made publicly available by IKEA (first-party) at the following URL:
+
+Download-URL: 
+
+http://fw.ota.homesmart.ikea.net/feed/version_info.json
+
+Download-URL (Test/Beta-Version): 
+
+http://fw.test.ota.homesmart.ikea.net/feed/version_info.json
+
+Release changelogs
+
+https://ww8.ikea.com/ikeahomesmart/releasenotes/releasenotes.html
+
+### LEDVANCE/Sylvania and OSRAM Lightify
+
+LEDVANCE/Sylvania and OSRAM Lightify Zigbee OTA firmware images are made publicly available by LEDVANCE (first-party) at the following URL:
+
+https://update.ledvance.com/firmware-overview
+
+https://api.update.ledvance.com/v1/zigbee/firmwares/download
+
+https://consumer.sylvania.com/our-products/smart/sylvania-smart-zigbee-products-menu/index.jsp
+
+### Legrand/Netatmo
+
+Legrand/Netatmo Zigbee OTA firmware images are made publicly available by Legrand (first-party) at the following URL:
+
+https://developer.legrand.com/documentation/operating-manual/ https://developer.legrand.com/documentation/firmwares-download/
+
+### LiXee
+
+LiXee Zigbee OTA firmware images are made publicly available by Fairecasoimeme / ZiGate (first-party) at the following URL:
+
+https://github.com/fairecasoimeme/Zlinky_TIC/releases
+
+### SALUS/Computime
+
+SALUS/Computime Hue Zigbee OTA firmware images are made publicly available by SALUS (first-party) at the following URL:
+
+https://eu.salusconnect.io/demo/default/status/firmware
+
+### Sengled
+
+Sengled Zigbee OTA firmware images are made publicly available by Dresden Elektronik (third-party) at the following URL:
+
+https://github.com/dresden-elektronik/deconz-rest-plugin/wiki/OTA-Image-Types---Firmware-versions#sengled
+
+### Philips Hue (Signify)
+
+Philips Hue OTA firmware images are available for different Hue devices for several official sources that do not all use the same APIs:
+
+https://firmware.meethue.com/v1/checkUpdate
+
+https://firmware.meethue.com/storage/
+
+http://fds.dc1.philips.com/firmware/
+
+Philips Hue (Signify) Zigbee OTA firmware images direct URLs are available by Koenkk zigbee-OTA repository (third-party) at following URL:
+
+https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/index.json
+
+Philips Hue (Signify) Zigbee OTA firmware images are also made publicly available by Dresden Elektronik (third-party) at following URL:
+
+https://github.com/dresden-elektronik/deconz-rest-plugin/wiki/OTA-Image-Types---Firmware-versions#philips-hue
+
+### Ubisys
+
+Ubisys Zigbee OTA firmware images are made publicly available by Ubisys (first-party) at the following URL:
+
+https://www.ubisys.de/en/support/firmware/

package/lib/tuya.js

@@ -219,7 +219,8 @@ function convertStringToHexArray(value) {
 // Default is 100 = open, 0 = closed; Devices listed here will use 0 = open, 100 = closed instead
 // Use manufacturerName to identify device!
 // Dont' invert _TZE200_cowvfni3: https://github.com/Koenkk/zigbee2mqtt/issues/6043
-const coverPositionInvert = ['_TZE200_wmcdj3aq', '_TZE200_nogaemzt', '_TZE200_xuzcvlku', '_TZE200_xaabybja', '_TZE200_rmymn92d'];
+const coverPositionInvert = ['_TZE200_wmcdj3aq', '_TZE200_nogaemzt', '_TZE200_xuzcvlku', '_TZE200_xaabybja', '_TZE200_rmymn92d',
+    '_TZE200_gubdgai2'];
 
 // Gets a boolean indicating whether the cover by this manufacturerName needs reversed positions
 function isCoverInverted(manufacturerName) {

package/package.json

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