zigbee-herdsman-converters 15.0.115 → 15.0.116

package/devices/bosch.js

@@ -812,6 +812,7 @@ const definition = [
         model: 'BSP-FZ2',
         vendor: 'Bosch',
         description: 'Plug compact EU',
+        ota: ota.zigbeeOTA,
         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) => {

package/devices/gledopto.js

@@ -578,6 +578,38 @@ module.exports = [
         description: 'Zigbee 12W Downlight RGB+CCT (pro)',
         extend: gledoptoExtend.light_onoff_brightness_colortemp_color({colorTempRange: [158, 495]}),
     },
+    {
+        zigbeeModel: ['GL-D-009P'],
+        model: 'GL-D-009P',
+        vendor: 'Gledopto',
+        ota: ota.zigbeeOTA,
+        description: 'Zigbee 12W Downlight RGB+CCT (pro)',
+        extend: gledoptoExtend.light_onoff_brightness_colortemp_color({colorTempRange: [158, 495]}),
+    },
+    {
+        zigbeeModel: ['GL-D-015P'],
+        model: 'GL-D-015P',
+        vendor: 'Gledopto',
+        ota: ota.zigbeeOTA,
+        description: 'Zigbee 12W Downlight RGB+CCT (pro)',
+        extend: gledoptoExtend.light_onoff_brightness_colortemp_color({colorTempRange: [158, 495]}),
+    },
+    {
+        zigbeeModel: ['GL-D-010P'],
+        model: 'GL-D-010P',
+        vendor: 'Gledopto',
+        ota: ota.zigbeeOTA,
+        description: 'Zigbee 12W Downlight RGB+CCT (pro)',
+        extend: gledoptoExtend.light_onoff_brightness_colortemp_color({colorTempRange: [158, 495]}),
+    },
+    {
+        zigbeeModel: ['GL-D-013P'],
+        model: 'GL-D-013P',
+        vendor: 'Gledopto',
+        ota: ota.zigbeeOTA,
+        description: 'Zigbee 6W Downlight RGB+CCT (pro)',
+        extend: gledoptoExtend.light_onoff_brightness_colortemp_color({colorTempRange: [158, 495]}),
+    },
     {
         zigbeeModel: ['GL-D-006P'],
         model: 'GL-D-006P',

package/devices/lonsonho.js

@@ -35,7 +35,7 @@ module.exports = [
             exposes.numeric('calibration_time', ea.STATE).withUnit('S').withDescription('Calibration time')],
     },
     {
-        fingerprint: [{modelID: 'TS130F', manufacturerName: '_TZ3000_j1xl73iw'}, {modelID: 'TS130F', manufacturerName: '_TZ3000_kmsbwdol'}],
+        fingerprint: tuya.fingerprint('TS130F', ['_TZ3000_j1xl73iw', '_TZ3000_kmsbwdol', '_TZ3000_esynmmox']),
         model: 'TS130F_dual',
         vendor: 'Lonsonho',
         description: 'Dual curtain/blind module',

package/devices/namron.js

@@ -773,4 +773,13 @@ module.exports = [
             await reporting.currentPositionLiftPercentage(endpoint);
         },
     },
+    {
+        zigbeeModel: ['4512763'],
+        model: '4512763',
+        vendor: 'Namron',
+        description: 'Zigbee movement sensor',
+        fromZigbee: [fz.ias_occupancy_alarm_1],
+        toZigbee: [],
+        exposes: [e.occupancy()],
+    },
 ];

package/devices/nodon.js

@@ -36,6 +36,21 @@ module.exports = [
         },
         exposes: [e.cover_position()],
     },
+    {
+        zigbeeModel: ['SIN-4-RS-20_LEX'],
+        model: 'SIN-4-RS-20_LEX',
+        vendor: 'NodOn',
+        description: 'Roller shutter controller (Leroy Merlin version)',
+        fromZigbee: [fz.cover_position_tilt],
+        toZigbee: [tz.cover_state, tz.cover_position_tilt],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'closuresWindowCovering']);
+            await reporting.currentPositionLiftPercentage(endpoint);
+            await reporting.currentPositionTiltPercentage(endpoint);
+        },
+        exposes: [e.cover_position()],
+    },
     {
         zigbeeModel: ['SIN-4-1-20'],
         model: 'SIN-4-1-20',

package/devices/tuya.js

@@ -1225,22 +1225,6 @@ module.exports = [
             await endpoint.read('genOnOff', ['onOff', 'moesStartUpOnOff']);
         },
     },
-    {
-        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_1hwjutgo'}, {modelID: 'TS011F', manufacturerName: '_TZ3000_lnggrqqi'}],
-        model: 'TS011F_circuit_breaker',
-        vendor: 'TuYa',
-        description: 'Circuit breaker',
-        extend: tuya.extend.switch(),
-        whiteLabel: [{vendor: 'Mumubiz', model: 'ZJSB9-80Z'}],
-    },
-    {
-        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_8fdayfch'}],
-        model: 'TS011F_relay_switch',
-        vendor: 'TuYa',
-        description: 'Dry contact relay switch',
-        extend: tuya.extend.switch(),
-        whiteLabel: [{vendor: 'KTNNKG', model: 'ZB1248-10A'}],
-    },
     {
         zigbeeModel: ['CK-BL702-AL-01(7009_Z102LG03-1)'],
         model: 'CK-BL702-AL-01',
@@ -1917,6 +1901,22 @@ module.exports = [
             ],
         },
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE204_ojtqawav']),
+        model: 'TS0601_switch_1_gang',
+        vendor: 'TuYa',
+        description: '1 gang switch',
+        exposes: [e.switch().setAccess('state', ea.STATE_SET)],
+        fromZigbee: [fz.ignore_basic_report, fz.tuya_switch],
+        toZigbee: [tz.tuya_switch_state],
+        whiteLabel: [
+            tuya.whitelabel('Shawader', 'SMKG-1KNL-US/TZB-W', '1 gang switch', ['_TZE204_ojtqawav']),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
+        },
+    },
     {
         fingerprint: [
             {modelID: 'TS0601', manufacturerName: '_TZE200_nkjintbl'},
@@ -2231,9 +2231,12 @@ module.exports = [
         model: 'TS0044',
         vendor: 'TuYa',
         description: 'Wireless switch with 4 buttons',
-        whiteLabel: [{vendor: 'Lonsonho', model: 'TS0044'}, {vendor: 'Haozee', model: 'ESW-OZAA-EU'},
+        whiteLabel: [
+            {vendor: 'Lonsonho', model: 'TS0044'}, {vendor: 'Haozee', model: 'ESW-OZAA-EU'},
             {vendor: 'LoraTap', model: 'SS6400ZB'}, {vendor: 'Moes', model: 'ZT-SY-EU-G-4S-WH-MS'},
-            tuya.whitelabel('Moes', 'ZT-SR-EU4', 'Star Ring 4 Gang Scene Switch', ['_TZ3000_a4xycprs'])],
+            tuya.whitelabel('Moes', 'ZT-SR-EU4', 'Star Ring 4 Gang Scene Switch', ['_TZ3000_a4xycprs']),
+            tuya.whitelabel('TuYa', 'TS0044_1', 'Zigbee 4 button remote - 12 scene', ['_TZ3000_dziaict4']),
+        ],
         fromZigbee: [fz.tuya_on_off_action, fz.battery],
         exposes: [e.battery(), e.action(['1_single', '1_double', '1_hold', '2_single', '2_double', '2_hold',
             '3_single', '3_double', '3_hold', '4_single', '4_double', '4_hold'])],
@@ -5237,6 +5240,20 @@ module.exports = [
             tuya.whitelabel('ZYXH', 'TS0601_switch_8', '8 Gang switch', ['_TZE200_vmcgja59']),
         ],
     },
+
+    // TS011F
+    {
+        fingerprint: tuya.fingerprint('TS01FF', ['_TZ3000_8fdayfch', '_TZ3000_1hwjutgo', '_TZ3000_lnggrqqi', '_TZ3000_tvuarksa']),
+        model: 'TS011F_1',
+        vendor: 'TuYa',
+        description: 'Switch',
+        extend: tuya.extend.switch(),
+        whiteLabel: [
+            {vendor: 'Mumubiz', model: 'ZJSB9-80Z'},
+            tuya.whitelabel('KTNNKG', 'ZB1248-10A', 'Relay switch', ['_TZ3000_8fdayfch']),
+            tuya.whitelabel('UseeLink', 'SM-AZ713', 'Smart water/gas valve', ['_TZ3000_tvuarksa']),
+        ],
+    },
     {
         fingerprint: tuya.fingerprint('TS01FF', ['_TZ3000_rqbjepe8']),
         model: 'TS011F_4',
@@ -5259,4 +5276,25 @@ module.exports = [
         options: [exposes.options.measurement_poll_interval()],
         onEvent: (type, data, device, options) => tuya.onEventMeasurementPoll(type, data, device, options, true, false),
     },
+    {
+        fingerprint: tuya.fingerprint('TS011F', ['_TZ3000_cfnprab5', '_TZ3000_o005nuxx']),
+        model: 'TS011F_5',
+        description: '5 gang switch',
+        vendor: 'TuYa',
+        extend: tuya.extend.switch({powerOutageMemory: true, childLock: true, endpoints: ['l1', 'l2', 'l3', 'l4', 'l5']}),
+        endpoint: (device) => {
+            return {l1: 1, l2: 2, l3: 3, l4: 4, l5: 5};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
+            for (const ID of [1, 2, 3, 4, 5]) {
+                await reporting.bind(device.getEndpoint(ID), coordinatorEndpoint, ['genOnOff']);
+            }
+        },
+        whiteLabel: [
+            tuya.whitelabel('UseeLink', 'SM-0306E-2W', '4 gang switch, with USB', ['_TZ3000_cfnprab5']),
+            tuya.whitelabel('UseeLink', 'SM-O301-AZ', 'AU 4 plug 10A power board + USB', ['_TZ3000_o005nuxx']),
+        ],
+    },
 ];

package/package.json

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

package/devices/useelink.js

@@ -1,52 +0,0 @@
-const exposes = require('../lib/exposes');
-const reporting = require('../lib/reporting');
-const extend = require('../lib/extend');
-const tuya = require('../lib/tuya');
-const e = exposes.presets;
-
-module.exports = [
-    {
-        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_o005nuxx'}],
-        model: 'SM-SO306EZ-10',
-        vendor: 'UseeLink',
-        description: '4 gang switch, with USB',
-        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'), e.switch().withEndpoint('l3'),
-            e.switch().withEndpoint('l4'), e.switch().withEndpoint('l5')],
-        extend: extend.switch(),
-        meta: {multiEndpoint: true},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            for (const ID of [1, 2, 3, 4, 5]) {
-                await reporting.bind(device.getEndpoint(ID), coordinatorEndpoint, ['genOnOff']);
-            }
-        },
-        endpoint: (device) => {
-            return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4, 'l5': 5};
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_cfnprab5'}],
-        model: 'SM-0306E-2W',
-        vendor: 'UseeLink',
-        description: '4 gang switch, with USB',
-        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'), e.switch().withEndpoint('l3'),
-            e.switch().withEndpoint('l4'), e.switch().withEndpoint('l5')],
-        extend: extend.switch(),
-        meta: {multiEndpoint: true},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
-            for (const ID of [1, 2, 3, 4, 5]) {
-                await reporting.bind(device.getEndpoint(ID), coordinatorEndpoint, ['genOnOff']);
-            }
-        },
-        endpoint: (device) => {
-            return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4, 'l5': 5};
-        },
-    },
-    {
-        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_tvuarksa'}],
-        model: 'SM-AZ713',
-        vendor: 'UseeLink',
-        description: 'Smart water/gas valve',
-        extend: extend.switch(),
-    },
-];