zigbee-herdsman-converters 14.0.643 → 14.0.645

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/inovelli.js

@@ -177,19 +177,19 @@ const ATTRIBUTES = {
         ID: 13,
         dataType: UINT8,
         min: 0,
-        max: 100,
+        max: 255,
         description:
       'Default level for the dimmer when it is turned on at the switch.' +
-      ' A setting of 0 means that the switch will return to the level that it was on before it was turned off.',
+      ' A setting of 255 means that the switch will return to the level that it was on before it was turned off.',
     },
     defaultLevelRemote: {
         ID: 14,
         dataType: UINT8,
         min: 0,
-        max: 100,
+        max: 255,
         description:
       'Default level for the dimmer when it is turned on from the hub.' +
-      ' A setting of 0 means that the switch will return to the level that it was on before it was turned off.',
+      ' A setting of 255 means that the switch will return to the level that it was on before it was turned off.',
     },
     stateAfterPowerRestored: {
         ID: 15,
@@ -197,7 +197,7 @@ const ATTRIBUTES = {
         min: 0,
         max: 255,
         description:
-      'The state the switch should return to when power is restored after power failure. 0 = off, 1-100 = level, 101 = previous.',
+      'The state the switch should return to when power is restored after power failure. 0 = off, 1-254 = level, 255 = previous.',
     },
     loadLevelIndicatorTimeout: {
         ID: 17,
@@ -225,12 +225,11 @@ const ATTRIBUTES = {
     },
     activePowerReports: {
         ID: 18,
-        dataType: UINT16,
+        dataType: UINT8,
         min: 0,
-        max: 32767,
+        max: 100,
         description:
-      'Power level change that will result in a new power report being sent. The value is a percentage of the previous report.' +
-      '0 = disabled, 1-32767 = 0.1W-3276.7W.',
+      'Percent power level change that will result in a new power report being sent. 0 = Disabled',
     },
     periodicPowerAndEnergyReports: {
         ID: 19,
@@ -256,6 +255,7 @@ const ATTRIBUTES = {
         values: {'Non Neutral': 0, 'Neutral': 1},
         min: 0,
         max: 1,
+        readOnly: true,
         description: 'Set the power type for the device.',
     },
     switchType: {
@@ -267,11 +267,13 @@ const ATTRIBUTES = {
         max: 2,
         description: 'Set the switch configuration.',
     },
-    physicalOnOffDelay: {
+    buttonDelay: {
         ID: 50,
         dataType: UINT8,
         values: {
             '0ms': 0,
+            '100ms': 1,
+            '200ms': 2,
             '300ms': 3,
             '400ms': 4,
             '500ms': 5,
@@ -285,7 +287,7 @@ const ATTRIBUTES = {
         max: 9,
         description:
       'This will set the button press delay. 0 = no delay (Disables Button Press Events),' +
-      ' 1 = 100ms, 2 = 200ms, 3 = 300ms, etc. up to 900ms. Default = 500ms.',
+      'Default = 500ms.',
     },
     smartBulbMode: {
         ID: 52,
@@ -610,7 +612,7 @@ const ATTRIBUTES = {
         description:
       'Intesity of LED strip when off. 101 = Syncronized with default all LED strip intensity parameter.',
     },
-    doubleTapUpEvent: {
+    doubleTapUpForFullBrightness: {
         ID: 53,
         dataType: BOOLEAN,
         min: 0,
@@ -620,6 +622,16 @@ const ATTRIBUTES = {
             'Button Press Event Only': 0,
             'Button Press Event + Set Load to 100%': 1,
         },
+        displayType: 'enum',
+    },
+    relayClick: {
+        ID: 261,
+        dataType: BOOLEAN,
+        min: 0,
+        max: 1,
+        description: 'Audible Click in On/Off mode.',
+        values: {'Enabled (Default)': 1, 'Disabled': 0},
+        displayType: 'enum',
     },
 };
 
@@ -644,11 +656,12 @@ tzLocal.inovelli_vzw31sn_parameters = {
             manufacturerCode: INOVELLI,
         });
 
-        meta.state[key] = value;
-
         return {
             state: {
-                [key]: value,
+                [key]:
+          ATTRIBUTES[key].displayType === 'enum' ?
+              ATTRIBUTES[key].values[value] :
+              value,
             },
         };
     },
@@ -700,7 +713,7 @@ tzLocal.inovelli_vzw31sn_parameters_readOnly = {
 };
 
 tzLocal.inovelli_led_effect = {
-    key: ['ledEffect'],
+    key: ['led_effect'],
     convertSet: async (entity, key, values, meta) => {
         await entity.command(
             'manuSpecificInovelliVZM31SN',
@@ -718,7 +731,7 @@ tzLocal.inovelli_led_effect = {
 };
 
 tzLocal.inovelli_individual_led_effect = {
-    key: ['individualLedEffect'],
+    key: ['individual_led_effect'],
     convertSet: async (entity, key, values, meta) => {
         await entity.command(
             'manuSpecificInovelliVZM31SN',
@@ -807,7 +820,6 @@ const inovelliOnOffConvertSet = async (entity, key, value, meta) => {
  */
 tzLocal.light_onoff_brightness_inovelli = {
     key: ['state', 'brightness', 'brightness_percent'],
-    // options: [exposes.options.transition()], this is a setting on the device
     convertSet: async (entity, key, value, meta) => {
         const {message} = meta;
         const transition = utils.getTransition(entity, 'brightness', meta);
@@ -1146,7 +1158,7 @@ Object.keys(ATTRIBUTES).forEach((key) => {
         const enumE = exposes
             .enum(
                 key,
-                ATTRIBUTES[key].readOnly ? ea.GET : ea.ALL,
+                ATTRIBUTES[key].readOnly ? ea.STATE_GET : ea.ALL,
                 Object.keys(ATTRIBUTES[key].values),
             )
             .withDescription(ATTRIBUTES[key].description);
@@ -1159,7 +1171,7 @@ Object.keys(ATTRIBUTES).forEach((key) => {
             exposes
                 .binary(
                     key,
-                    ATTRIBUTES[key].readOnly ? ea.GET : ea.ALL,
+                    ATTRIBUTES[key].readOnly ? ea.STATE_GET : ea.ALL,
                     ATTRIBUTES[key].values.Enabled,
                     ATTRIBUTES[key].values.Disabled,
                 )
@@ -1167,7 +1179,7 @@ Object.keys(ATTRIBUTES).forEach((key) => {
         );
     } else {
         const numeric = exposes
-            .numeric(key, ATTRIBUTES[key].readOnly ? ea.GET : ea.ALL)
+            .numeric(key, ATTRIBUTES[key].readOnly ? ea.STATE_GET : ea.ALL)
             .withValueMin(ATTRIBUTES[key].min)
             .withValueMax(ATTRIBUTES[key].max);
 
@@ -1206,20 +1218,26 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, [
-                'genOnOff',
-                'genLevelCtrl',
+                'seMetering',
+                'haElectricalMeasurement',
             ]);
-
             // Bind for Button Event Reporting
             const endpoint2 = device.getEndpoint(2);
             await reporting.bind(endpoint2, coordinatorEndpoint, [
                 'manuSpecificInovelliVZM31SN',
             ]);
+            await endpoint.read('haElectricalMeasurement', [
+                'acPowerMultiplier',
+                'acPowerDivisor',
+            ]);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
 
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            await reporting.readMeteringMultiplierDivisors(endpoint);
-            await reporting.activePower(endpoint);
-            await reporting.currentSummDelivered(endpoint);
+            await reporting.activePower(endpoint, {min: 1, max: 3600, change: 1});
+            await reporting.currentSummDelivered(endpoint, {
+                min: 1,
+                max: 3600,
+                change: 0,
+            });
         },
     },
 ];

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/moes.js

@@ -8,78 +8,10 @@ const extend = require('../lib/extend');
 const e = exposes.presets;
 const ea = exposes.access;
 const zosung = require('../lib/zosung');
-const utils = require('../lib/utils');
 const fzZosung = zosung.fzZosung;
 const tzZosung = zosung.tzZosung;
 const ez = zosung.presetsZosung;
 
-const fzLocal = {
-    ZSEUD: {
-        cluster: 'manuSpecificTuya',
-        type: ['commandDataResponse', 'commandDataReport'],
-        convert: async (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 1:
-                    result.state_l1 = value ? 'ON' : 'OFF';
-                    break;
-                case 2:
-                    result.brightness_l1 = utils.mapNumberRange(value, 0, 1000, 0, 254);
-                    break;
-                case 7:
-                    result.state_l2 = value ? 'ON' : 'OFF';
-                    break;
-                case 8:
-                    result.brightness_l2 = utils.mapNumberRange(value, 0, 1000, 0, 254);
-                    break;
-                default:
-                    meta.logger.warn(`zigbee-herdsman-converters:ZSEUD: NOT RECOGNIZED DP #${dp} with data ${JSON.stringify(dpValue)}`);
-                }
-            }
-            return result;
-        },
-    },
-};
-
-const tzLocal = {
-    ZSEUD_state: {
-        key: ['state'],
-        convertSet: async (entity, key, value, meta) => {
-            const lookup = {l1: 1, l2: 7};
-            const dp = lookup[meta.endpoint_name];
-            await tuya.sendDataPointBool(entity, dp, value === 'ON');
-        },
-    },
-    ZSEUD_brightness: {
-        key: ['brightness'],
-        convertSet: async (entity, key, value, meta) => {
-            const lookup = {l1: 2, l2: 8};
-            const dp = lookup[meta.endpoint_name];
-
-            if (key == 'brightness') {
-                // upscale to 1000
-                if (value >= 0 && value <= 254) {
-                    const newValue = utils.mapNumberRange(value, 0, 254, 0, 1000);
-                    // Always use same transid as tuya_dimmer_state (https://github.com/Koenkk/zigbee2mqtt/issues/6366)
-                    if (meta.state[`state_${meta.endpoint_name}`] === 'ON') {
-                        await tuya.sendDataPointValue(entity, dp, newValue, 'dataRequest', 1);
-                    } else {
-                        await tuya.sendDataPoints(entity, [tuya.dpValueFromBool(dp-1, true), tuya.dpValueFromIntValue(dp, newValue)],
-                            'dataRequest', 1);
-                    }
-                } else {
-                    throw new Error('Dimmer brightness is out of range 0..254');
-                }
-            } else {
-                meta.logger.warn(`ZSEUD TZ unsupported key=${key} value=${value}`);
-            }
-        },
-    },
-};
-
 const exposesLocal = {
     hour: (name) => exposes.numeric(name, ea.STATE_SET).withUnit('h').withValueMin(0).withValueMax(23),
     minute: (name) => exposes.numeric(name, ea.STATE_SET).withUnit('m').withValueMin(0).withValueMax(59),
@@ -369,7 +301,7 @@ module.exports = [
         exposes: [
             e.battery(), e.child_lock(), e.eco_mode(), e.eco_temperature(), e.max_temperature().withValueMax(45), e.min_temperature(),
             e.valve_state(), e.position(), e.window_detection(),
-            exposes.binary('window', ea.STATE, 'CLOSED', 'OPEN').withDescription('Window status closed or open '),
+            exposes.binary('window', ea.STATE, 'OPEN', 'CLOSED').withDescription('Window status closed or open '),
             exposes.climate()
                 .withLocalTemperature(ea.STATE).withSetpoint('current_heating_setpoint', 5, 35, 0.5, ea.STATE_SET)
                 .withLocalTemperatureCalibration(-9, 9, 1, ea.STATE_SET)
@@ -391,24 +323,6 @@ module.exports = [
             exposes.numeric('boost_heating_countdown_time_set', ea.STATE_SET).withUnit('second')
                 .withDescription('Boost Time Setting 100 sec - 900 sec, (default = 300 sec)').withValueMin(100).withValueMax(900)],
     },
-    {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_fjjbhx9d'}],
-        model: 'ZS-EUD',
-        vendor: 'Moes',
-        description: '2 gang light dimmer switch',
-        fromZigbee: [fzLocal.ZSEUD, fz.ignore_basic_report],
-        toZigbee: [tzLocal.ZSEUD_brightness, tzLocal.ZSEUD_state],
-        meta: {turnsOffAtBrightness1: true, multiEndpoint: true},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
-            if (device.getEndpoint(2)) await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
-        },
-        exposes: [e.light_brightness().withEndpoint('l1').setAccess('state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET),
-            e.light_brightness().withEndpoint('l2').setAccess('state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET)],
-        endpoint: (device) => {
-            return {'l1': 1, 'l2': 1};
-        },
-    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_e3oitdyu'}],
         model: 'MS-105B',

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/robb.js

@@ -209,18 +209,22 @@ module.exports = [
         model: 'ROB_200-017-0',
         vendor: 'ROBB',
         description: 'Zigbee smart plug',
-        fromZigbee: [fz.electrical_measurement, fz.on_off, fz.ignore_genLevelCtrl_report, fz.metering],
+        fromZigbee: [fz.electrical_measurement, fz.on_off, fz.ignore_genLevelCtrl_report, fz.metering, fz.temperature],
         toZigbee: [tz.on_off],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement']);
+            await reporting.bind(endpoint, coordinatorEndpoint,
+                ['genOnOff', 'haElectricalMeasurement', 'seMetering', 'msTemperatureMeasurement']);
             await reporting.onOff(endpoint);
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
             await reporting.rmsVoltage(endpoint);
             await reporting.rmsCurrent(endpoint);
             await reporting.activePower(endpoint);
+            await reporting.temperature(endpoint);
+            await reporting.currentSummDelivered(endpoint);
         },
-        exposes: [e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.switch(), e.energy()],
+        exposes: [e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.switch(), e.energy(), e.temperature()],
     },
     {
         zigbeeModel: ['ROB_200-017-1'],

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

@@ -1172,7 +1172,7 @@ module.exports = [
         fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ip2akl4w', '_TZE200_1agwnems', '_TZE200_la2c2uo9', '_TZE200_579lguh2']),
         model: 'TS0601_dimmer_1',
         vendor: 'TuYa',
-        description: 'Zigbee smart dimmer',
+        description: '1 gang smart dimmer',
         fromZigbee: [tuya.fzDataPoints],
         toZigbee: [tuya.tzDataPoints],
         configure: tuya.configureMagicPacket,
@@ -1192,6 +1192,60 @@ module.exports = [
         whiteLabel: [
             {vendor: 'Moes', model: 'MS-105Z'},
             {vendor: 'Lerlink', model: 'X706U'},
+            {vendor: 'Moes', model: 'ZS-EUD_1gang'},
+        ],
+    },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_fjjbhx9d']),
+        model: 'TS0601_dimmer_2',
+        vendor: 'TuYa',
+        description: '2 gang smart dimmer',
+        fromZigbee: [tuya.fzDataPoints],
+        toZigbee: [tuya.tzDataPoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [tuya.exposes.lightBrightness().withEndpoint('l1'), tuya.exposes.lightBrightness().withEndpoint('l2')],
+        meta: {
+            multiEndpoint: true,
+            tuyaDatapoints: [
+                [1, 'state_l1', tuya.valueConverter.onOff, {skip: tuya.skip.stateOnAndBrightnessPresent}],
+                [2, 'brightness_l1', tuya.valueConverter.scale0_254to0_1000],
+                [7, 'state_l2', tuya.valueConverter.onOff, {skip: tuya.skip.stateOnAndBrightnessPresent}],
+                [8, 'brightness_l2', tuya.valueConverter.scale0_254to0_1000],
+            ],
+        },
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 1};
+        },
+        whiteLabel: [
+            {vendor: 'Moes', model: 'ZS-EUD_2gang'},
+        ],
+    },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_vm1gyrso']),
+        model: 'TS0601_dimmer_3',
+        vendor: 'TuYa',
+        description: '3 gang smart dimmer',
+        fromZigbee: [tuya.fzDataPoints],
+        toZigbee: [tuya.tzDataPoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [tuya.exposes.lightBrightness().withEndpoint('l1'), tuya.exposes.lightBrightness().withEndpoint('l2'),
+            tuya.exposes.lightBrightness().withEndpoint('l3')],
+        meta: {
+            multiEndpoint: true,
+            tuyaDatapoints: [
+                [1, 'state_l1', tuya.valueConverter.onOff, {skip: tuya.skip.stateOnAndBrightnessPresent}],
+                [2, 'brightness_l1', tuya.valueConverter.scale0_254to0_1000],
+                [7, 'state_l2', tuya.valueConverter.onOff, {skip: tuya.skip.stateOnAndBrightnessPresent}],
+                [8, 'brightness_l2', tuya.valueConverter.scale0_254to0_1000],
+                [15, 'state_l3', tuya.valueConverter.onOff, {skip: tuya.skip.stateOnAndBrightnessPresent}],
+                [16, 'brightness_l3', tuya.valueConverter.scale0_254to0_1000],
+            ],
+        },
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 1, 'l3': 1};
+        },
+        whiteLabel: [
+            {vendor: 'Moes', model: 'ZS-EUD_3gang'},
         ],
     },
     {
@@ -1332,7 +1386,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 +1578,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 +1877,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 +1905,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 +2014,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/lib/ota/OTA_URLs.md

@@ -18,6 +18,20 @@ https://github.com/dresden-elektronik/deconz-rest-plugin/wiki/OTA-Image-Types---
 
 Dresden Elektronik also provide third-party OTA firmware images and external URLs for many third-party Zigbee OTA firmware images.
 
+### Inovelli OTA Firmware provider
+
+Inovelli Zigbee OTA firmware images are made publicly available by Inovelli (first-party) at the following URLs:
+
+https://files.inovelli.com/firmware/firmware.json
+
+https://files.inovelli.com/firmware
+
+### Sonoff OTA Firmware provider
+
+Sonoff Zigbee OTA firmware images are made publicly available by Sonoff (first-party) at the following URLs:
+
+https://zigbee-ota.sonoff.tech/releases/upgrade.json
+
 ### EUROTRONICS
 
 EUROTRONICS Zigbee OTA firmware images are made publicly available by EUROTRONIC Technology (first-party) at the following URL:

package/lib/tuya.js

@@ -1141,9 +1141,14 @@ const tuyaExposes = {
         .withDescription('Controls the behavior when the device is powered on'),
     lightType: () => exposes.enum('light_type', ea.STATE_SET, ['led', 'incandescent', 'halogen'])
         .withDescription('Type of light attached to the device'),
-    lightBrightnessWithMinMax: () => e.light_brightness().withMinBrightness().withMaxBrightness().setAccess(
-        'state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET).setAccess(
-        'min_brightness', ea.STATE_SET).setAccess('max_brightness', ea.STATE_SET),
+    lightBrightnessWithMinMax: () => e.light_brightness().withMinBrightness().withMaxBrightness()
+        .setAccess('state', ea.STATE_SET)
+        .setAccess('brightness', ea.STATE_SET)
+        .setAccess('min_brightness', ea.STATE_SET)
+        .setAccess('max_brightness', ea.STATE_SET),
+    lightBrightness: () => e.light_brightness()
+        .setAccess('state', ea.STATE_SET)
+        .setAccess('brightness', ea.STATE_SET),
     countdown: () => exposes.numeric('countdown', ea.STATE_SET).withValueMin(0).withValueMax(43200).withValueStep(1).withUnit('s')
         .withDescription('Countdown to turn device off after a certain time'),
     switch: () => e.switch().setAccess('state', ea.STATE_SET),
@@ -1235,7 +1240,7 @@ const tzDataPoints = {
             } else {
                 throw new Error(`Don't know how to send type '${typeof convertedValue}'`);
             }
-            state[convertedKey] = value;
+            state[key] = value;
         }
         return {state};
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.643",
+  "version": "14.0.645",
   "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",