zigbee-herdsman-converters 14.0.643 → 14.0.644

package/devices/adurosmart.js

@@ -59,6 +59,13 @@ module.exports = [
         description: 'ERIA E14 Candle Color',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['AD-DimmableLight3001'],
+        model: '81810',
+        vendor: 'AduroSmart',
+        description: 'Zigbee Aduro Eria B22 bulb - warm white',
+        extend: extend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['Adurolight_NCC'],
         model: '81825',

package/devices/awox.js

@@ -159,6 +159,7 @@ module.exports = [
         whiteLabel: [{vendor: 'EGLO', model: '12239'}],
     },
     {
+        zigbeeModel: ['EGLO_ZM_TW'],
         fingerprint: [
             {
                 type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [

package/devices/develco.js

@@ -91,14 +91,14 @@ const develco = {
             type: ['attributeReport', 'readResponse'],
             convert: (model, msg, publish, options, meta) => {
                 const result = {};
-                if (0x8000 in msg.data) {
-                    const firmware = msg.data[0x8000].join('.');
+                if (msg.data.hasOwnProperty('develcoPrimarySwVersion')) {
+                    const firmware = msg.data.develcoPrimarySwVersion.join('.');
                     result.current_firmware = firmware;
                     meta.device.softwareBuildID = firmware;
                 }
 
-                if (0x8020 in msg.data) {
-                    meta.device.hardwareVersion = msg.data[0x8020].join('.');
+                if (msg.data.hasOwnProperty('develcoPrimaryHwVersion')) {
+                    meta.device.hardwareVersion = msg.data.develcoPrimaryHwVersion.join('.');
                 }
 
                 return result;
@@ -218,7 +218,7 @@ const develco = {
             key: ['interface_mode'],
             convertSet: async (entity, key, value, meta) => {
                 const payload = {'develcoInterfaceMode': utils.getKey(constants.develcoInterfaceMode, value, undefined, Number)};
-                await entity.write('seMetering', payload, manufacturerOptions.develco);
+                await entity.write('seMetering', payload, manufacturerOptions);
                 return {readAfterWriteTime: 200, state: {'interface_mode': value}};
             },
             convertGet: async (entity, key, meta) => {
@@ -379,7 +379,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(2);
-            await endpoint.read('genBasic', [0x8000, 0x8010, 0x8020], manufacturerOptions);
+            await endpoint.read('genBasic', ['develcoPrimarySwVersion', 'develcoPrimaryHwVersion'], manufacturerOptions);
             await reporting.bind(endpoint, coordinatorEndpoint, ['haElectricalMeasurement', 'seMetering']);
 
             try {
@@ -424,7 +424,7 @@ module.exports = [
 
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'ssIasZone', 'ssIasWd', 'genBasic', 'genBinaryInput']);
             await reporting.batteryVoltage(endpoint);
-            await endpoint.read('genBasic', [0x8000, 0x8010, 0x8020], manufacturerOptions);
+            await endpoint.read('genBasic', ['develcoPrimarySwVersion', 'develcoPrimaryHwVersion'], manufacturerOptions);
             await endpoint.read('ssIasZone', ['iasCieAddr', 'zoneState', 'zoneId']);
             await endpoint.read('genBinaryInput', ['reliability', 'statusFlags']);
             await endpoint.read('ssIasWd', ['maxDuration']);
@@ -457,7 +457,7 @@ module.exports = [
 
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'ssIasZone', 'ssIasWd', 'genBasic', 'genBinaryInput']);
             await reporting.batteryVoltage(endpoint);
-            await endpoint.read('genBasic', [0x8000], manufacturerOptions);
+            await endpoint.read('genBasic', ['develcoPrimarySwVersion'], manufacturerOptions);
             await endpoint.read('ssIasZone', ['iasCieAddr', 'zoneState', 'zoneId']);
             await endpoint.read('genBinaryInput', ['reliability', 'statusFlags']);
             await endpoint.read('ssIasWd', ['maxDuration']);
@@ -519,7 +519,7 @@ module.exports = [
         description: 'Motion sensor',
         fromZigbee: [
             fz.temperature, fz.illuminance, fz.ias_occupancy_alarm_1, fz.battery,
-            develco.fz.led_control, develco.fz.ias_occupancy_timeout,
+            develco.fz.led_control, develco.fz.ias_occupancy_timeout, develco.fz.firmware_version,
         ],
         toZigbee: [develco.tz.led_control, develco.tz.ias_occupancy_timeout],
         exposes: [
@@ -538,6 +538,7 @@ module.exports = [
             await reporting.bind(endpoint35, coordinatorEndpoint, ['genPowerCfg']);
             await reporting.batteryVoltage(endpoint35, {min: constants.repInterval.HOUR, max: 43200, change: 100});
             try {
+                await endpoint35.read('genBasic', ['develcoPrimarySwVersion', 'develcoPrimaryHwVersion'], manufacturerOptions);
                 await endpoint35.read('ssIasZone', ['develcoAlarmOffDelay'], manufacturerOptions);
                 await endpoint35.read('genBasic', ['develcoLedControl'], manufacturerOptions);
             } catch (error) {/* some reports of timeouts on reading these */}
@@ -682,7 +683,7 @@ module.exports = [
             const endpoint = device.getEndpoint(43);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'ssIasZone', 'ssIasWd', 'genBasic']);
             await reporting.batteryVoltage(endpoint);
-            await endpoint.read('genBasic', [0x8000], manufacturerOptions);
+            await endpoint.read('genBasic', ['develcoPrimarySwVersion', 'develcoPrimaryHwVersion'], manufacturerOptions);
             await endpoint.read('ssIasZone', ['iasCieAddr', 'zoneState', 'zoneId']);
             await endpoint.read('ssIasWd', ['maxDuration']);
 
@@ -758,7 +759,7 @@ module.exports = [
             const ep2 = device.getEndpoint(112);
             await reporting.bind(ep2, coordinatorEndpoint, ['genBinaryInput', 'genBasic']);
             await reporting.presentValue(ep2, {min: 0});
-            await ep2.read('genBasic', [0x8000, 0x8010, 0x8020], options);
+            await ep2.read('genBasic', ['develcoPrimarySwVersion', 'develcoPrimaryHwVersion'], options);
 
             const ep3 = device.getEndpoint(113);
             await reporting.bind(ep3, coordinatorEndpoint, ['genBinaryInput']);

package/devices/fantem.js

@@ -9,10 +9,11 @@ const tuya = require('../lib/tuya');
 
 module.exports = [
     {
-        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TZ3210_lfbz816s'}],
+        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TZ3210_lfbz816s'},
+            {modelID: 'TS110F', manufacturerName: '_TZ3210_ebbfkvoy'}],
         model: 'ZB006-X',
         vendor: 'Fantem',
-        description: 'Smart dimmer module without neutral',
+        description: 'Smart dimmer module',
         extend: extend.light_onoff_brightness({noConfigure: true}),
         fromZigbee: [...extend.light_onoff_brightness({noConfigure: true}).fromZigbee,
             fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.ZB006X_settings],

package/devices/heiman.js

@@ -11,7 +11,7 @@ const tuya = require('../lib/tuya');
 module.exports = [
     {
         fingerprint: [{modelID: 'TS0212', manufacturerName: '_TYZB01_wpmo3ja3'}],
-        zigbeeModel: ['CO_V15', 'CO_YDLV10', 'CO_V16', '1ccaa94c49a84abaa9e38687913947ba'],
+        zigbeeModel: ['CO_V15', 'CO_YDLV10', 'CO_V16', '1ccaa94c49a84abaa9e38687913947ba', 'CO_CTPG'],
         model: 'HS1CA-M',
         description: 'Smart carbon monoxide sensor',
         vendor: 'HEIMAN',
@@ -104,7 +104,7 @@ module.exports = [
         model: 'HS3CG',
         vendor: 'HEIMAN',
         description: 'Combustible gas sensor',
-        fromZigbee: [fz.ias_gas_alarm_1],
+        fromZigbee: [fz.ias_gas_alarm_2],
         toZigbee: [],
         exposes: [e.gas(), e.battery_low(), e.tamper()],
     },

package/devices/lidl.js

@@ -716,7 +716,8 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0502A', manufacturerName: '_TZ3000_rylaozuc'}],
+        fingerprint: [{modelID: 'TS0502A', manufacturerName: '_TZ3000_rylaozuc'},
+            {modelID: 'TS0502A', manufacturerName: '_TZ3000_5fkufhn1'}],
         model: '14147206L',
         vendor: 'Lidl',
         description: 'Livarno Lux ceiling light',

package/devices/lonsonho.js

@@ -260,7 +260,7 @@ module.exports = [
         extend: extend.light_onoff_brightness(),
     },
     {
-        fingerprint: [{modelID: 'TS110E', manufacturerName: '_TZ3210_wdexaypg'}],
+        fingerprint: [{modelID: 'TS110E', manufacturerName: '_TZ3210_wdexaypg'}, {modelID: 'TS110E', manufacturerName: '_TZ3210_3mpwqzuu'}],
         model: 'TS110E_2gang',
         vendor: 'Lonsonho',
         description: 'Zigbee smart dimmer module 2 gang with neutral',

package/devices/mecrator.js

@@ -81,7 +81,7 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3210_pfbzs1an'}],
-        model: 'SPUSB02',
+        model: 'SPPUSB02',
         vendor: 'Mercator',
         description: 'Ikuü double power point with USB',
         fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, fz.tuya_switch_power_outage_memory],

package/devices/philips.js

@@ -2842,10 +2842,24 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
     {
-        zigbeeModel: ['929003048301'],
+        zigbeeModel: ['929003048301_01', '929003048301_02', '929003048301_03', '929003048301_04'],
         model: '8719514339163',
         vendor: 'Philips',
         description: 'Hue white ambiance Buckram quadruple spotlight with Bluetooth',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['929003048101_01', '929003048101_02', '929003048101_03'],
+        model: '8719514339125',
+        vendor: 'Philips',
+        description: 'Hue white ambiance Buckram triple spotlight with Bluetooth',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
+    {
+        zigbeeModel: ['929003047901_01', '929003047901_02'],
+        model: '871951433908',
+        vendor: 'Philips',
+        description: 'Hue white ambiance Buckram double spotlight with Bluetooth',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
 ];

package/devices/sercomm.js

@@ -120,4 +120,21 @@ module.exports = [
         },
         exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.battery()],
     },
+    {
+        zigbeeModel: ['SZ-PIR04N', 'SZ-PIR04N_EU'],
+        model: 'SZ-PIR04N',
+        vendor: 'Sercomm',
+        description: 'PIR motion & temperature sensor',
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.illuminance, fz.temperature, fz.battery],
+        toZigbee: [],
+        meta: {battery: {voltageToPercent: '3V_2500_3200'}},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['msIlluminanceMeasurement', 'msTemperatureMeasurement', 'genPowerCfg']);
+            await reporting.illuminance(endpoint);
+            await reporting.temperature(endpoint);
+            await reporting.batteryVoltage(endpoint);
+        },
+        exposes: [e.occupancy(), e.tamper(), e.illuminance(), e.temperature(), e.battery(), e.battery_voltage()],
+    },
 ];

package/devices/tuya.js

@@ -1332,7 +1332,10 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_nkjintbl'}],
+        fingerprint: [
+            {modelID: 'TS0601', manufacturerName: '_TZE200_nkjintbl'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_ji1gn7rw'},
+        ],
         model: 'TS0601_switch_2_gang',
         vendor: 'TuYa',
         description: '2 gang switch',
@@ -1521,9 +1524,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [
-            {modelID: 'TS0201', manufacturerName: '_TZ3000_dowj6gyi'},
-        ],
+        fingerprint: tuya.fingerprint('TS0201', ['_TZ3000_dowj6gyi', '_TZ3000_8ybe88nf']),
         model: 'IH-K009',
         vendor: 'TuYa',
         description: 'Temperature & humidity sensor',
@@ -1822,14 +1823,16 @@ module.exports = [
             e.switch().withEndpoint('l1'),
             e.switch().withEndpoint('l2'),
             e.switch().withEndpoint('l3'),
-            exposes.presets.power_on_behavior(),
-            exposes.presets.switch_type_2(),
+            e.power_on_behavior(),
+            e.switch_type_2(),
         ],
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2, 'l3': 3};
         },
         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']);
             await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
@@ -1848,14 +1851,16 @@ module.exports = [
             e.switch().withEndpoint('l2'),
             e.switch().withEndpoint('l3'),
             e.switch().withEndpoint('l4'),
-            exposes.presets.power_on_behavior(),
-            exposes.presets.switch_type_2(),
+            e.power_on_behavior(),
+            e.switch_type_2(),
         ],
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4};
         },
         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']);
             await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
@@ -1955,6 +1960,7 @@ module.exports = [
             {vendor: 'SHOJZJ', model: '378RT'},
             {vendor: 'Silvercrest', model: 'TVR01'},
             {vendor: 'Immax', model: '07732B'},
+            {vendor: 'Evolveo', model: 'Heat M30'},
         ],
         meta: {tuyaThermostatPreset: tuya.thermostatPresets, tuyaThermostatSystemMode: tuya.thermostatSystemModes3},
         ota: ota.zigbeeOTA,

package/devices/villeroy_boch.js

@@ -5,7 +5,14 @@ module.exports = [
         zigbeeModel: ['5991711'],
         model: 'C5850000',
         vendor: 'Villeroy & Boch',
-        description: 'Subway 3.0 Zigbee home Aautomation kit ',
+        description: 'Subway 3.0 Zigbee home automation kit',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [160, 450]}),
+    },
+    {
+        zigbeeModel: ['EC1300'],
+        model: 'C0040000',
+        vendor: 'Villeroy & Boch',
+        description: 'Zigbee home automation kit for mirror',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [160, 450]}),
     },
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.643",
+  "version": "14.0.644",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -34,7 +34,7 @@
   },
   "homepage": "https://github.com/Koenkk/zigbee-herdsman-converters",
   "dependencies": {
-    "axios": "^1.1.2",
+    "axios": "^1.1.3",
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^2.2.0",