zigbee-herdsman-converters 14.0.642 → 14.0.644

package/converters/fromZigbee.js

@@ -1760,8 +1760,7 @@ const converters = {
                 result.hysterersis = precisionRound(data[0x100A], 2) / 10;
             }
             if (data.hasOwnProperty(0x100B)) { // DisplayAutoOffEnable
-                const lookup = {0: 'enabled', 1: 'disabled'};
-                result.display_auto_off_enabled = lookup[data[0x100B]];
+                result.display_auto_off_enabled = data[0x100B] ? 'enabled' : 'disabled';
             }
             if (data.hasOwnProperty(0x2001)) { // AlarmAirTempOverValue
                 result.alarm_airtemp_overvalue = data[0x2001];

package/converters/toZigbee.js

@@ -3182,7 +3182,7 @@ const converters = {
                 const payload = {0x100A: {value: value * 10, type: 0x20}};
                 await entity.write('hvacThermostat', payload, manufacturerOptions.sunricher);
             } else if (key==='display_auto_off_enabled') {
-                const lookup = {'enabled': 0, 'disabled': 1};
+                const lookup = {'disabled': 0, 'enabled': 1};
                 const payload = {0x100B: {value: lookup[value], type: herdsman.Zcl.DataType.enum8}};
                 await entity.write('hvacThermostat', payload, manufacturerOptions.sunricher);
             } else if (key==='alarm_airtemp_overvalue') {

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

@@ -48,7 +48,7 @@ const fzLocal = {
 
             for (const at of elements) {
                 const at_snake = at.split(/(?=[A-Z])/).join('_').toLowerCase();
-                if (msg.data[at]) {
+                if (msg.data[at] != null) {
                     result[at_snake] = msg.data[at];
                 }
             }
@@ -104,7 +104,7 @@ const fzLocal = {
             for (const at of elements) {
                 const at_snake = at.split(/(?=[A-Z])/).join('_').toLowerCase();
                 let val = msg.data[at];
-                if (val) {
+                if (val != null) {
                     if (val.hasOwnProperty('type') && val.type === 'Buffer') {
                         val = Buffer.from(val.data);
                     }
@@ -155,7 +155,7 @@ const fzLocal = {
             for (const at of elements) {
                 const at_snake = at.split(/(?=[A-Z])/).join('_').toLowerCase();
                 const val = msg.data[at];
-                if (val) {
+                if (val != null) {
                     result[at_snake] = val; // By default we assign raw value
                     switch (at) {
                     // If we receive a Buffer, transform to human readable text

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

@@ -391,19 +391,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_la2c2uo9'}],
-        model: 'MS-105Z',
-        vendor: 'Moes',
-        description: '1 gang 2 way Zigbee dimmer switch',
-        fromZigbee: [fz.moes_105_dimmer, fz.ignore_basic_report],
-        toZigbee: [tz.moes_105_dimmer],
-        meta: {turnsOffAtBrightness1: true},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
-        },
-        exposes: [e.light_brightness().setAccess('state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET)],
-    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_fjjbhx9d'}],
         model: 'ZS-EUD',

package/devices/philips.js

@@ -2841,4 +2841,25 @@ module.exports = [
         description: 'Hue white ambiance Fair ceiling with Bluetooth white',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        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/sunricher.js

@@ -2,6 +2,7 @@ const exposes = require('../lib/exposes');
 const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
+const globalStore = require('../lib/store');
 const constants = require('../lib/constants');
 const extend = require('../lib/extend');
 const utils = require('../lib/utils');
@@ -40,6 +41,14 @@ const fzLocal = {
     },
 };
 
+function syncTime(endpoint) {
+    try {
+        const time = Math.round(((new Date()).getTime() - constants.OneJanuary2000) / 1000 + ((new Date()).getTimezoneOffset() * -1) * 60);
+        const values = {time: time};
+        endpoint.write('genTime', values);
+    } catch (error) {/* Do nothing*/}
+}
+
 module.exports = [
     {
         zigbeeModel: ['SR-ZG9023A-EU'],
@@ -351,13 +360,12 @@ module.exports = [
         model: 'SR-ZG9092A',
         vendor: 'Sunricher',
         description: 'Touch thermostat',
-        fromZigbee: [fz.thermostat, fz.namron_thermostat, fz.metering, fz.electrical_measurement],
+        fromZigbee: [fz.thermostat, fz.namron_thermostat, fz.metering, fz.electrical_measurement, fz.namron_hvac_user_interface],
         toZigbee: [tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint, tz.thermostat_occupancy,
             tz.thermostat_local_temperature_calibration, tz.thermostat_local_temperature, tz.thermostat_outdoor_temperature,
             tz.thermostat_system_mode, tz.thermostat_control_sequence_of_operation, tz.thermostat_running_state,
-            tz.namron_thermostat],
+            tz.namron_thermostat, tz.namron_thermostat_child_lock],
         exposes: [
-            e.local_temperature(),
             exposes.numeric('outdoor_temperature', ea.STATE_GET).withUnit('°C')
                 .withDescription('Current temperature measured from the floor sensor'),
             exposes.climate()
@@ -369,7 +377,11 @@ module.exports = [
                 .withRunningState(['idle', 'heat']),
             exposes.binary('away_mode', ea.ALL, 'ON', 'OFF')
                 .withDescription('Enable/disable away mode'),
+            exposes.binary('child_lock', ea.ALL, 'UNLOCK', 'LOCK')
+                .withDescription('Enables/disables physical input on the device'),
             e.power(), e.current(), e.voltage(), e.energy(),
+            exposes.enum('lcd_brightness', ea.ALL, ['low', 'mid', 'high'])
+                .withDescription('OLED brightness when operating the buttons.  Default: Medium.'),
             exposes.enum('button_vibration_level', ea.ALL, ['off', 'low', 'high'])
                 .withDescription('Key beep volume and vibration level.  Default: Low.'),
             exposes.enum('floor_sensor_type', ea.ALL, ['10k', '15k', '50k', '100k', '12k'])
@@ -398,11 +410,24 @@ module.exports = [
                 .withUnit('°C')
                 .withValueMin(0.5).withValueMax(2).withValueStep(0.1)
                 .withDescription('Hysteresis setting, between 0.5 and 2 in 0.1 °C.  Default: 0.5.'),
+            exposes.enum('display_auto_off_enabled', ea.ALL, ['disabled', 'enabled']),
             exposes.numeric('alarm_airtemp_overvalue', ea.ALL)
                 .withUnit('°C')
                 .withValueMin(20).withValueMax(60)
                 .withDescription('Room temperature alarm threshold, between 20 and 60 in °C.  0 means disabled.  Default: 45.'),
         ],
+        onEvent: async (type, data, device, options) => {
+            if (type === 'stop') {
+                clearInterval(globalStore.getValue(device, 'time'));
+                globalStore.clearValue(device, 'time');
+            } else if (!globalStore.hasValue(device, 'time')) {
+                const endpoint = device.getEndpoint(1);
+                const hours24 = 1000 * 60 * 60 * 24;
+                // Device does not ask for the time with binding, therefore we write the time every 24 hours
+                const interval = setInterval(async () => syncTime(endpoint), hours24);
+                globalStore.putValue(device, 'time', interval);
+            }
+        },
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = [
@@ -415,6 +440,7 @@ module.exports = [
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
             await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
+            await reporting.thermostatKeypadLockMode(endpoint);
 
             await endpoint.configureReporting('hvacThermostat', [{
                 attribute: 'ocupancy',
@@ -425,16 +451,24 @@ module.exports = [
 
             await endpoint.read('haElectricalMeasurement', ['acVoltageMultiplier', 'acVoltageDivisor', 'acCurrentMultiplier']);
             await endpoint.read('haElectricalMeasurement', ['acCurrentDivisor']);
+            await endpoint.read('seMetering', ['multiplier', 'divisor']);
 
-            await reporting.activePower(endpoint);
-            await reporting.rmsCurrent(endpoint, {min: 10, change: 10});
-            await reporting.rmsVoltage(endpoint, {min: 10});
+            await reporting.activePower(endpoint, {min: 30, change: 10}); // Min report change 10W
+            await reporting.rmsCurrent(endpoint, {min: 30, change: 50}); // Min report change 0.05A
+            await reporting.rmsVoltage(endpoint, {min: 30, change: 20}); // Min report change 2V
+            await reporting.readMeteringMultiplierDivisor(endpoint);
             await reporting.currentSummDelivered(endpoint);
 
             // Custom attributes
             const options = {manufacturerCode: 0x1224}; // Sunricher Manufacturer Code
 
-            // OperateDisplayLcdBrightnesss - removed as it has no effect
+            // OperateDisplayLcdBrightnesss
+            await endpoint.configureReporting('hvacThermostat', [{
+                attribute: {ID: 0x1000, type: 0x30},
+                minimumReportInterval: 0,
+                maximumReportInterval: constants.repInterval.HOUR,
+                reportableChange: null}],
+            options);
             // ButtonVibrationLevel
             await endpoint.configureReporting('hvacThermostat', [{
                 attribute: {ID: 0x1001, type: 0x30},
@@ -507,6 +541,14 @@ module.exports = [
                 reportableChange: 0}],
             options);
 
+            // DisplayAutoOffEnable
+            await endpoint.configureReporting('hvacThermostat', [{
+                attribute: {ID: 0x100B, type: 0x30},
+                minimumReportInterval: 0,
+                maximumReportInterval: constants.repInterval.HOUR,
+                reportableChange: null}],
+            options);
+
             // AlarmAirTempOverValue
             await endpoint.configureReporting('hvacThermostat', [{
                 attribute: {ID: 0x2001, type: 0x20},
@@ -523,12 +565,13 @@ module.exports = [
             options);
 
             // Device does not asks for the time with binding, we need to write time during configure
+            syncTime(endpoint);
 
             // Trigger initial read
             await endpoint.read('hvacThermostat', ['systemMode', 'runningState', 'occupiedHeatingSetpoint']);
-            await endpoint.read('hvacThermostat', [0x1001, 0x1002, 0x1003], options);
+            await endpoint.read('hvacThermostat', [0x1000, 0x1001, 0x1002, 0x1003], options);
             await endpoint.read('hvacThermostat', [0x1004, 0x1005, 0x1006, 0x1007], options);
-            await endpoint.read('hvacThermostat', [0x1008, 0x1009, 0x100A], options);
+            await endpoint.read('hvacThermostat', [0x1008, 0x1009, 0x100A, 0x100B], options);
             await endpoint.read('hvacThermostat', [0x2001, 0x2002], options);
         },
     },

package/devices/tuya.js

@@ -793,6 +793,7 @@ module.exports = [
         fingerprint: [{modelID: 'TS0001', manufacturerName: '_TZ3000_hktqahrq'}, {manufacturerName: '_TZ3000_hktqahrq'},
             {manufacturerName: '_TZ3000_q6a3tepg'}, {modelID: 'TS000F', manufacturerName: '_TZ3000_m9af2l6g'},
             {modelID: 'TS000F', manufacturerName: '_TZ3000_mx3vgyea'},
+            {modelID: 'TS000F', manufacturerName: '_TZ3000_xkap8wtb'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_npzfdcof'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_5ng23zjs'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_rmjr4ufz'},
@@ -1168,7 +1169,7 @@ module.exports = [
         ],
     },
     {
-        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ip2akl4w', '_TZE200_1agwnems']),
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ip2akl4w', '_TZE200_1agwnems', '_TZE200_la2c2uo9', '_TZE200_579lguh2']),
         model: 'TS0601_dimmer_1',
         vendor: 'TuYa',
         description: 'Zigbee smart dimmer',
@@ -1188,6 +1189,10 @@ module.exports = [
                 [14, 'power_on_behavior', tuya.valueConverter.powerOnBehavior],
             ],
         },
+        whiteLabel: [
+            {vendor: 'Moes', model: 'MS-105Z'},
+            {vendor: 'Lerlink', model: 'X706U'},
+        ],
     },
     {
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_oiymh3qu'}],
@@ -1327,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',
@@ -1516,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',
@@ -1817,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']);
@@ -1843,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']);
@@ -1950,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,
@@ -2315,19 +2326,20 @@ module.exports = [
         fromZigbee: [tuya.fzDataPoints],
         toZigbee: [tuya.tzDataPoints],
         configure: tuya.configureMagicPacket,
-        exposes: [tuya.exposes.switch(), e.ac_frequency(), e.energy(), e.power(), e.power_factor(), e.voltage(), e.current()],
+        exposes: [tuya.exposes.switch(), e.ac_frequency(), e.energy(), e.power(), e.power_factor(), e.voltage(), e.current(),
+            e.produced_energy()],
         meta: {
             tuyaDatapoints: [
                 [1, 'energy', tuya.valueConverter.divideBy100],
                 [6, null, tuya.valueConverter.phaseA], // voltage and current
                 [16, 'state', tuya.valueConverter.onOff],
+                [102, 'produced_energy', tuya.valueConverter.divideBy100],
                 [103, 'power', tuya.valueConverter.raw],
                 [105, 'ac_frequency', tuya.valueConverter.divideBy100],
                 [111, 'power_factor', tuya.valueConverter.divideBy10],
                 // Ignored for now; we don't know what the values mean
                 [109, null, null], // reactive_power in VArh, ignored for now
                 [101, null, null], // total active power (translated from chinese) - same as energy dp 1??
-                [102, null, null], // Reverse active power (translated from chinese), produced power? (e.g. if solar panels are connected)
                 [9, null, null], // Fault - we don't know the possible values here
                 [110, null, null], // total reactive power (translated from chinese) - value is 0.03kvar, we already have kvarh on dp 109
                 [17, null, null], // Alarm set1 - value seems garbage "AAAAAAAAAAAAAABkAAEOAACqAAAAAAAKAAAAAAAA"
@@ -3221,6 +3233,7 @@ module.exports = [
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_ikvncluo'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_lyetpprm'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_jva8ink8'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_holel4dk'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_wukb7rhc'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_ztc6ggyl'}],
         model: 'TS0601_smart_human_presense_sensor',

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

@@ -549,6 +549,7 @@ module.exports = {
         eco_temperature: () => new Numeric('eco_temperature', access.STATE_SET).withUnit('°C').withDescription('Eco temperature').withValueMin(0).withValueMax(35),
         effect: () => new Enum('effect', access.SET, ['blink', 'breathe', 'okay', 'channel_change', 'finish_effect', 'stop_effect']).withDescription('Triggers an effect on the light (e.g. make light blink for a few seconds)'),
         energy: () => new Numeric('energy', access.STATE).withUnit('kWh').withDescription('Sum of consumed energy'),
+        produced_energy: () => new Numeric('produced_energy', access.STATE).withUnit('kWh').withDescription('Sum of produced energy'),
         fan: () => new Fan(),
         flip_indicator_light: () => new Binary('flip_indicator_light', access.ALL, 'ON', 'OFF').withDescription('After turn on, the indicator light turns on while switch is off, and vice versa'),
         force: () => new Enum('force', access.STATE_SET, ['normal', 'open', 'close']).withDescription('Force the valve position'),

package/package.json

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

package/devices/lerlink.js

@@ -1,19 +0,0 @@
-const exposes = require('../lib/exposes');
-const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
-const tz = require('../converters/toZigbee');
-const e = exposes.presets;
-const ea = exposes.access;
-
-module.exports = [
-    {
-        fingerprint: [
-            {modelID: 'TS0601', manufacturerName: '_TZE200_579lguh2'},
-        ],
-        model: 'X706U',
-        vendor: 'Lerlink',
-        description: 'Zigbee dimmer switch',
-        fromZigbee: [fz.moes_105_dimmer, fz.ignore_basic_report],
-        toZigbee: [tz.moes_105_dimmer],
-        exposes: [e.light_brightness().setAccess('state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET)],
-    },
-];