zigbee-herdsman-converters 14.0.680 → 14.0.681

package/converters/toZigbee.js

@@ -4260,6 +4260,9 @@ const converters = {
             await entity.write('hvacThermostat', {SinopeOccupancy});
             return {state: {'thermostat_occupancy': value}};
         },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('hvacThermostat', ['SinopeOccupancy']);
+        },
     },
     sinope_thermostat_backlight_autodim_param: {
         key: ['backlight_auto_dim'],
@@ -4269,6 +4272,9 @@ const converters = {
             await entity.write('hvacThermostat', {SinopeBacklight});
             return {state: {'backlight_auto_dim': value}};
         },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('hvacThermostat', ['SinopeBacklight']);
+        },
     },
     sinope_thermostat_enable_outdoor_temperature: {
         key: ['enable_outdoor_temperature'],

package/devices/alecto.js

@@ -63,6 +63,7 @@ module.exports = [
         fingerprint: [
             {modelID: 'daqwrsj\u0000', manufacturerName: '_TYST11_8daqwrsj'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_qtbrwrfv'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_8daqwrsj'},
         ],
         model: 'SMART-HEAT10',
         vendor: 'Alecto',

package/devices/leviton.js

@@ -47,6 +47,19 @@ module.exports = [
             await reporting.onOff(endpoint);
         },
     },
+    {
+        zigbeeModel: ['DG3HL'],
+        model: 'DG3HL-1BW',
+        vendor: 'Leviton',
+        description: 'Indoor Decora smart Zigbee 3.0 certified plug-in dimmer',
+        extend: extend.light_onoff_brightness({disableEffect: true, noConfigure: true}),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
     {
         zigbeeModel: ['DG15A'],
         model: 'DG15A-1BW',

package/devices/lonsonho.js

@@ -4,47 +4,9 @@ const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const tuya = require('../lib/tuya');
-const utils = require('../lib/utils');
 const e = exposes.presets;
 const ea = exposes.access;
 
-const fzLocal = {
-    TS110E_switch_type: {
-        cluster: 'genLevelCtrl',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            const property = 0xfc02;
-            if (msg.data.hasOwnProperty(property)) {
-                const value = msg.data[property];
-                const lookup = {0: 'momentary', 1: 'toggle', 2: 'state'};
-                if (lookup.hasOwnProperty(value)) {
-                    const propertyName = utils.postfixWithEndpointName('switch_type', msg, model, meta);
-                    return {[propertyName]: lookup[value]};
-                }
-            }
-        },
-    },
-};
-
-const tzLocal = {
-    TS110E_switch_type: {
-        key: ['switch_type'],
-        convertSet: async (entity, key, value, meta) => {
-            value = value.toLowerCase();
-            const lookup = {'momentary': 0, 'toggle': 1, 'state': 2};
-
-            utils.validateValue(value, Object.keys(lookup));
-            const payload = lookup[value];
-
-            await entity.write('genLevelCtrl', {0xfc02: {value: payload, type: 0x20}});
-            return {state: {switch_type: value}};
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('genLevelCtrl', [0xfc02]);
-        },
-    },
-};
-
 module.exports = [
     {
         fingerprint: [{modelID: 'TS130F', manufacturerName: '_TZ3000_vd43bbfq'}, {modelID: 'TS130F', manufacturerName: '_TZ3000_fccpjz5z'}],
@@ -260,38 +222,4 @@ module.exports = [
             exposes.binary('calibration', ea.ALL, 'ON', 'OFF'), exposes.binary('motor_reversal', ea.ALL, 'ON', 'OFF'),
             exposes.numeric('calibration_time', ea.STATE).withUnit('S').withDescription('Calibration time')],
     },
-    {
-        fingerprint: [{modelID: 'TS110E', manufacturerName: '_TZ3210_zxbtub8r'}],
-        model: 'TS110E_1gang',
-        vendor: 'Lonsonho',
-        description: 'Zigbee smart dimmer module 1 gang with neutral',
-        extend: extend.light_onoff_brightness(),
-    },
-    {
-        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',
-        fromZigbee: extend.light_onoff_brightness({disablePowerOnBehavior: true, disableMoveStep: true, disableTransition: true})
-            .fromZigbee.concat([tuya.fz.power_outage_memory, fzLocal.TS110E_switch_type]),
-        toZigbee: extend.light_onoff_brightness({disablePowerOnBehavior: true, disableMoveStep: true, disableTransition: true})
-            .toZigbee.concat([tuya.tz.power_on_behavior, tzLocal.TS110E_switch_type]),
-        meta: {multiEndpoint: true},
-        exposes: [
-            e.light_brightness().withEndpoint('l1'),
-            e.light_brightness().withEndpoint('l2'),
-            exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore']).withDescription('Recover state after power outage')
-                .withEndpoint('l1'),
-            exposes.presets.switch_type_2().withEndpoint('l1'),
-            exposes.presets.switch_type_2().withEndpoint('l2'),
-        ],
-        configure: async (device, coordinatorEndpoint, logger) => {
-            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
-            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
-            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
-        },
-        endpoint: (device) => {
-            return {l1: 1, l2: 2};
-        },
-    },
 ];

package/devices/sinope.js

@@ -14,26 +14,30 @@ module.exports = [
         vendor: 'Sinopé',
         description: 'Zigbee line volt thermostat',
         meta: {thermostat: {dontMapPIHeatingDemand: true}},
-        fromZigbee: [
-            fz.legacy.sinope_thermostat_att_report, fz.legacy.hvac_user_interface, fz.electrical_measurement, fz.metering,
+        fromZigbee: [fz.legacy.sinope_thermostat_att_report, fz.legacy.hvac_user_interface, fz.electrical_measurement, fz.metering,
             fz.ignore_temperature_report, fz.legacy.sinope_thermostat_state, fz.sinope_thermostat],
-        toZigbee: [
-            tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
+        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
             tz.thermostat_temperature_display_mode, tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.thermostat_running_state,
-            tz.sinope_thermostat_occupancy, tz.sinope_thermostat_backlight_autodim_param, tz.sinope_thermostat_time,
-            tz.sinope_thermostat_enable_outdoor_temperature, tz.sinope_thermostat_outdoor_temperature, tz.sinope_time_format],
+            tz.sinope_thermostat_backlight_autodim_param, tz.sinope_thermostat_time, tz.sinope_thermostat_enable_outdoor_temperature,
+            tz.sinope_thermostat_outdoor_temperature, tz.thermostat_pi_heating_demand, tz.sinope_thermostat_occupancy,
+            tz.electrical_measurement_power],
         exposes: [
             exposes.climate()
                 .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5)
                 .withSetpoint('unoccupied_heating_setpoint', 5, 30, 0.5)
                 .withLocalTemperature()
-                .withSystemMode(['off', 'heat']).withRunningState(['idle', 'heat'])
-                .withPiHeatingDemand(),
-            exposes.enum('thermostat_occupancy', ea.SET, ['unoccupied', 'occupied'])
+                .withSystemMode(['off', 'heat'], ea.ALL, 'Mode of the thermostat')
+                .withPiHeatingDemand(ea.STATE_GET)
+                .withRunningState(['idle', 'heat']),
+            exposes.enum('thermostat_occupancy', ea.ALL, ['unoccupied', 'occupied'])
                 .withDescription('Occupancy state of the thermostat'),
-            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing'])
+            exposes.enum('backlight_auto_dim', ea.ALL, ['on demand', 'sensing'])
                 .withDescription('Control backlight dimming behavior'),
-            e.keypad_lockout(), e.energy(), e.power(), e.current(), e.voltage()],
+            exposes.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1'])
+                .withDescription('Enables or disables the device’s buttons'),
+            e.power().withAccess(ea.STATE_GET), e.current(), e.voltage(), e.energy(),
+        ],
+
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = [
@@ -44,36 +48,26 @@ module.exports = [
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
-
             try {
                 await reporting.thermostatSystemMode(endpoint);
             } catch (error) {/* Not all support this */}
-
             try {
                 await reporting.thermostatRunningState(endpoint);
             } catch (error) {/* Not all support this */}
 
             await reporting.readMeteringMultiplierDivisor(endpoint);
             await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [1, 1]});
-            try {
-                await reporting.instantaneousDemand(endpoint, {min: 10, max: 304, change: 1});
-            } catch (error) {/* Do nothing*/}
-
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
             try {
-                await reporting.activePower(endpoint, {min: 10, max: 305, change: 1});
-            } catch (error) {/* Do nothing*/}
-            try {
-                await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 100}); // divider 1000: 0.1Arms
-            } catch (error) {/* Do nothing*/}
-            try {
-                await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 5}); // divider 10: 0.5Vrms
-            } catch (error) {/* Do nothing*/}
+                await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
+                await reporting.activePower(endpoint, {min: 10, max: 305, change: 1}); // divider 1: 1W
+            } catch (error) {
+                endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {'acPowerMultiplier': 1, 'acPowerDivisor': 1});
+            }
+            await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 100}); // divider 1000: 0.1Arms
+            await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 5}); // divider 10: 0.5Vrms
 
-            // Disable default reporting
-            await reporting.temperature(endpoint, {min: 1, max: 0xFFFF});
-            await endpoint.configureReporting('msTemperatureMeasurement', [
-                {attribute: 'tolerance', minimumReportInterval: 1, maximumReportInterval: 0xFFFF, reportableChange: 1}]);
+            await reporting.temperature(endpoint, {min: 1, max: 0xFFFF}); // Disable default reporting
         },
     },
     {
@@ -82,26 +76,30 @@ module.exports = [
         vendor: 'Sinopé',
         description: 'Zigbee line volt thermostat',
         meta: {thermostat: {dontMapPIHeatingDemand: true}},
-        fromZigbee: [
-            fz.legacy.sinope_thermostat_att_report, fz.legacy.hvac_user_interface, fz.electrical_measurement, fz.metering,
+        fromZigbee: [fz.legacy.sinope_thermostat_att_report, fz.legacy.hvac_user_interface, fz.electrical_measurement, fz.metering,
             fz.ignore_temperature_report, fz.legacy.sinope_thermostat_state, fz.sinope_thermostat],
-        toZigbee: [
-            tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
+        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
             tz.thermostat_temperature_display_mode, tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.thermostat_running_state,
-            tz.sinope_thermostat_occupancy, tz.sinope_thermostat_backlight_autodim_param, tz.sinope_thermostat_time,
-            tz.sinope_thermostat_enable_outdoor_temperature, tz.sinope_thermostat_outdoor_temperature, tz.sinope_time_format],
+            tz.sinope_thermostat_backlight_autodim_param, tz.sinope_thermostat_time, tz.sinope_thermostat_enable_outdoor_temperature,
+            tz.sinope_thermostat_outdoor_temperature, tz.thermostat_pi_heating_demand, tz.sinope_thermostat_occupancy,
+            tz.electrical_measurement_power],
         exposes: [
             exposes.climate()
                 .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5)
                 .withSetpoint('unoccupied_heating_setpoint', 5, 30, 0.5)
                 .withLocalTemperature()
-                .withSystemMode(['off', 'heat']).withRunningState(['idle', 'heat'])
-                .withPiHeatingDemand(),
-            exposes.enum('thermostat_occupancy', ea.SET, ['unoccupied', 'occupied'])
+                .withSystemMode(['off', 'heat'], ea.ALL, 'Mode of the thermostat')
+                .withPiHeatingDemand(ea.STATE_GET)
+                .withRunningState(['idle', 'heat']),
+            exposes.enum('thermostat_occupancy', ea.ALL, ['unoccupied', 'occupied'])
                 .withDescription('Occupancy state of the thermostat'),
-            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing'])
+            exposes.enum('backlight_auto_dim', ea.ALL, ['on demand', 'sensing'])
                 .withDescription('Control backlight dimming behavior'),
-            e.keypad_lockout(), e.energy(), e.power(), e.current(), e.voltage()],
+            exposes.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1'])
+                .withDescription('Enables or disables the device’s buttons'),
+            e.power().withAccess(ea.STATE_GET), e.current(), e.voltage(), e.energy(),
+        ],
+
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = [
@@ -112,32 +110,26 @@ module.exports = [
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
-
+            try {
+                await reporting.thermostatSystemMode(endpoint);
+            } catch (error) {/* Not all support this */}
             try {
                 await reporting.thermostatRunningState(endpoint);
             } catch (error) {/* Not all support this */}
 
             await reporting.readMeteringMultiplierDivisor(endpoint);
             await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [1, 1]});
-            try {
-                await reporting.instantaneousDemand(endpoint, {min: 10, max: 304, change: 1});
-            } catch (error) {/* Do nothing*/}
-
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
             try {
-                await reporting.activePower(endpoint, {min: 10, max: 305, change: 1});
-            } catch (error) {/* Do nothing*/}
-            try {
-                await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 100}); // divider 1000: 0.1Arms
-            } catch (error) {/* Do nothing*/}
-            try {
-                await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 5}); // divider 10: 0.5Vrms
-            } catch (error) {/* Do nothing*/}
+                await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
+                await reporting.activePower(endpoint, {min: 10, max: 305, change: 1}); // divider 1: 1W
+            } catch (error) {
+                endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {'acPowerMultiplier': 1, 'acPowerDivisor': 1});
+            }
+            await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 100}); // divider 1000: 0.1Arms
+            await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 5}); // divider 10: 0.5Vrms
 
-            // Disable default reporting
-            await reporting.temperature(endpoint, {min: 1, max: 0xFFFF});
-            await endpoint.configureReporting('msTemperatureMeasurement', [
-                {attribute: 'tolerance', minimumReportInterval: 1, maximumReportInterval: 0xFFFF, reportableChange: 1}]);
+            await reporting.temperature(endpoint, {min: 1, max: 0xFFFF}); // Disable default reporting
         },
     },
     {
@@ -163,7 +155,7 @@ module.exports = [
                 .withSystemMode(['off', 'auto', 'heat'])
                 .withRunningState(['idle', 'heat'])
                 .withPiHeatingDemand(),
-            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing'])
+            exposes.enum('backlight_auto_dim', ea.ALL, ['on demand', 'sensing'])
                 .withDescription('Control backlight dimming behavior'),
             e.keypad_lockout(), e.power(), e.current(), e.voltage()],
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -228,7 +220,7 @@ module.exports = [
                 .withSystemMode(['off', 'auto', 'heat'])
                 .withRunningState(['idle', 'heat'])
                 .withPiHeatingDemand(),
-            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing'])
+            exposes.enum('backlight_auto_dim', ea.ALL, ['on demand', 'sensing'])
                 .withDescription('Control backlight dimming behavior')],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -264,7 +256,7 @@ module.exports = [
                 .withSystemMode(['off', 'auto', 'heat'])
                 .withRunningState(['idle', 'heat'])
                 .withPiHeatingDemand(),
-            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing'])
+            exposes.enum('backlight_auto_dim', ea.ALL, ['on demand', 'sensing'])
                 .withDescription('Control backlight dimming behavior')],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -350,8 +342,8 @@ module.exports = [
         vendor: 'Sinopé',
         description: 'Zigbee smart plug',
         fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
-        toZigbee: [tz.on_off],
-        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.ac_frequency(), e.energy()],
+        toZigbee: [tz.on_off, tz.frequency],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.ac_frequency().withAccess(ea.STATE_GET)],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = ['genBasic', 'genIdentify', 'genOnOff', 'haElectricalMeasurement', 'seMetering'];

package/devices/sonoff.js

@@ -199,7 +199,7 @@ module.exports = [
             await reporting.batteryVoltage(endpoint);
             await reporting.batteryPercentageRemaining(endpoint);
         },
-        exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.battery(), e.battery_voltage()],
+        exposes: [e.occupancy(), e.battery_low(), e.battery(), e.battery_voltage()],
     },
     {
         zigbeeModel: ['S26R2ZB'],

package/devices/tuya.js

@@ -17,23 +17,24 @@ const globalStore = require('../lib/store');
 
 const tzLocal = {
     TS110E_options: {
-        key: ['min_brightness', 'max_brightness', 'light_type'],
+        key: ['min_brightness', 'max_brightness', 'light_type', 'switch_type'],
         convertSet: async (entity, key, value, meta) => {
             let payload = null;
             if (key === 'min_brightness' || key == 'max_brightness') {
                 const id = key === 'min_brightness' ? 64515 : 64516;
                 payload = {[id]: {value: utils.mapNumberRange(value, 1, 255, 0, 1000), type: 0x21}};
-            } else if (key === 'light_type') {
-                const lookup = {led: 0, incandescent: 1, halogen: 2};
+            } else if (key === 'light_type' || key === 'switch_type') {
+                const lookup = key === 'light_type' ? {led: 0, incandescent: 1, halogen: 2} : {momentary: 0, toggle: 1, state: 2};
                 payload = {64514: {value: lookup[value], type: 0x20}};
             }
             await entity.write('genLevelCtrl', payload, utils.getOptions(meta.mapped, entity));
+            return {state: {[key]: value}};
         },
         convertGet: async (entity, key, meta) => {
             let id = null;
             if (key === 'min_brightness') id = 64515;
             if (key === 'max_brightness') id = 64516;
-            if (key === 'light_type') id = 64514;
+            if (key === 'light_type' || key === 'switch_type') id = 64514;
             await entity.read('genLevelCtrl', [id]);
         },
     },
@@ -337,12 +338,33 @@ const fzLocal = {
             if (msg.data.hasOwnProperty('64516')) {
                 result['max_brightness'] = utils.mapNumberRange(msg.data['64516'], 0, 1000, 1, 255);
             }
+            if (msg.data.hasOwnProperty('61440')) {
+                result['brightness'] = utils.mapNumberRange(msg.data['61440'], 0, 1000, 0, 254);
+            }
+            return result;
+        },
+    },
+    TS110E_light_type: {
+        cluster: 'genLevelCtrl',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
             if (msg.data.hasOwnProperty('64514')) {
                 const lookup = {0: 'led', 1: 'incandescent', 2: 'halogen'};
                 result['light_type'] = lookup[msg.data['64514']];
             }
-            if (msg.data.hasOwnProperty('61440')) {
-                result['brightness'] = utils.mapNumberRange(msg.data['61440'], 0, 1000, 0, 254);
+            return result;
+        },
+    },
+    TS110E_switch_type: {
+        cluster: 'genLevelCtrl',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            if (msg.data.hasOwnProperty('64514')) {
+                const lookup = {0: 'momentary', 1: 'toggle', 2: 'state'};
+                const propertyName = utils.postfixWithEndpointName('switch_type', msg, model, meta);
+                result[propertyName] = lookup[msg.data['64514']];
             }
             return result;
         },
@@ -1178,7 +1200,7 @@ module.exports = [
         fromZigbee: [tuya.fz.datapoints],
         toZigbee: [tuya.tz.datapoints],
         configure: tuya.configureMagicPacket,
-        exposes: [tuya.exposes.lightBrightnessWithMinMax(), tuya.exposes.powerOnBehavior(),
+        exposes: [tuya.exposes.lightBrightnessWithMinMax(), e.power_on_behavior(),
             tuya.exposes.countdown(), tuya.exposes.lightType()],
         meta: {
             tuyaDatapoints: [
@@ -1734,7 +1756,7 @@ module.exports = [
             endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
             device.save();
         },
-        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy(), e.switch_type_2(),
+        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy(), tuya.exposes.switchType(),
             exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore']).withDescription('Recover state after power outage')],
     },
     {
@@ -1756,7 +1778,7 @@ module.exports = [
             device.save();
         },
         whiteLabel: [{vendor: 'Aubess', model: 'WDH02'}],
-        exposes: [e.switch(), e.power(), e.voltage().withAccess(ea.STATE), e.energy(), e.power_on_behavior(), e.switch_type_2()],
+        exposes: [e.switch(), e.power(), e.voltage().withAccess(ea.STATE), e.energy(), e.power_on_behavior(), tuya.exposes.switchType()],
     },
     {
         zigbeeModel: ['TS0001'],
@@ -2324,7 +2346,7 @@ module.exports = [
     },
     {
         fingerprint: [160, 69, 68, 65, 64].map((applicationVersion) => {
-            return {modelID: 'TS011F', applicationVersion};
+            return {modelID: 'TS011F', applicationVersion, priority: -1};
         }),
         model: 'TS011F_plug_3',
         description: 'Smart plug (with power monitoring by polling)',
@@ -3483,23 +3505,56 @@ module.exports = [
             ],
         },
     },
+    {
+        fingerprint: [{modelID: 'TS110E', manufacturerName: '_TZ3210_zxbtub8r'}],
+        model: 'TS110E_1gang_1',
+        vendor: 'TuYa',
+        description: '1 channel dimmer',
+        extend: extend.light_onoff_brightness(),
+    },
     {
         fingerprint: tuya.fingerprint('TS110E', ['_TZ3210_ngqk6jia']),
-        model: 'TS110E',
+        model: 'TS110E_1gang_2',
         vendor: 'TuYa',
         description: '1 channel dimmer',
         whiteLabel: [{vendor: 'RTX', model: 'QS-Zigbee-D02-TRIAC-LN'}],
-        fromZigbee: [fzLocal.TS110E, tuya.fz.power_on_behavior, fz.on_off],
+        fromZigbee: [fzLocal.TS110E, fzLocal.TS110E_light_type, tuya.fz.power_on_behavior, fz.on_off],
         toZigbee: [tzLocal.TS110E_onoff_brightness, tzLocal.TS110E_options, tuya.tz.power_on_behavior, tz.light_brightness_move],
         exposes: [
             e.light_brightness().withMinBrightness().withMaxBrightness(),
-            tuya.exposes.lightType().withAccess(ea.ALL), tuya.exposes.powerOnBehavior().withAccess(ea.ALL)],
+            tuya.exposes.lightType().withAccess(ea.ALL), e.power_on_behavior().withAccess(ea.ALL)],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
             await reporting.onOff(endpoint);
         },
     },
+    {
+        fingerprint: [{modelID: 'TS110E', manufacturerName: '_TZ3210_wdexaypg'}, {modelID: 'TS110E', manufacturerName: '_TZ3210_3mpwqzuu'}],
+        model: 'TS110E_2gang',
+        vendor: 'TuYa',
+        description: '2 channel dimmer',
+        fromZigbee: extend.light_onoff_brightness({disablePowerOnBehavior: true, disableMoveStep: true, disableTransition: true})
+            .fromZigbee.concat([tuya.fz.power_on_behavior, fzLocal.TS110E_switch_type, fzLocal.TS110E]),
+        toZigbee: extend.light_onoff_brightness({disablePowerOnBehavior: true, disableMoveStep: true, disableTransition: true})
+            .toZigbee.concat([tuya.tz.power_on_behavior, tzLocal.TS110E_options]),
+        meta: {multiEndpoint: true},
+        exposes: [
+            e.light_brightness().withMinBrightness().withMaxBrightness().withEndpoint('l1'),
+            e.light_brightness().withMinBrightness().withMaxBrightness().withEndpoint('l2'),
+            e.power_on_behavior(),
+            tuya.exposes.switchType().withEndpoint('l1'),
+            tuya.exposes.switchType().withEndpoint('l2'),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+        },
+        endpoint: (device) => {
+            return {l1: 1, l2: 2};
+        },
+    },
     {
         fingerprint: tuya.fingerprint('TS0601', ['_TZE200_nslr42tt']),
         model: 'TS0601_3_phase_clamp_meter',

package/index.js

@@ -142,16 +142,23 @@ function findByDevice(device) {
         return candidates[0];
     } else {
         // First try to match based on fingerprint, return the first matching one.
+        const fingerprintMatch = {priority: null, definition: null};
         for (const candidate of candidates) {
             if (candidate.hasOwnProperty('fingerprint')) {
                 for (const fingerprint of candidate.fingerprint) {
-                    if (fingerprintMatch(fingerprint, device)) {
-                        return candidate;
+                    const priority = fingerprint.hasOwnProperty('priority') ? fingerprint.priority : 0;
+                    if (isFingerprintMatch(fingerprint, device) && (!fingerprintMatch.definition || priority > fingerprintMatch.priority)) {
+                        fingerprintMatch.definition = candidate;
+                        fingerprintMatch.priority = priority;
                     }
                 }
             }
         }
 
+        if (fingerprintMatch.definition) {
+            return fingerprintMatch.definition;
+        }
+
         // Match based on fingerprint failed, return first matching definition based on zigbeeModel
         for (const candidate of candidates) {
             if (candidate.hasOwnProperty('zigbeeModel') && candidate.zigbeeModel.includes(device.modelID)) {
@@ -163,7 +170,7 @@ function findByDevice(device) {
     return null;
 }
 
-function fingerprintMatch(fingerprint, device) {
+function isFingerprintMatch(fingerprint, device) {
     let match =
         (!fingerprint.applicationVersion || device.applicationVersion === fingerprint.applicationVersion) &&
         (!fingerprint.manufacturerID || device.manufacturerID === fingerprint.manufacturerID) &&

package/lib/exposes.js

@@ -612,7 +612,6 @@ module.exports = {
         sound_volume: () => new Enum('sound_volume', access.ALL, constants.lockSoundVolume).withDescription('Sound volume of the lock'),
         switch: () => new Switch().withState('state', true, 'On/off state of the switch'),
         switch_type: () => new Enum('switch_type', access.ALL, ['toggle', 'momentary']).withDescription('Wall switch type'),
-        switch_type_2: () => new Enum('switch_type', access.ALL, ['toggle', 'state', 'momentary']).withDescription('Switch type settings'),
         tamper: () => new Binary('tamper', access.STATE, true, false).withDescription('Indicates whether the device is tampered'),
         temperature: () => new Numeric('temperature', access.STATE).withUnit('°C').withDescription('Measured temperature value'),
         temperature_sensor_select: (sensor_names) => new Enum('sensor', access.STATE_SET, sensor_names).withDescription('Select temperature sensor to use'),

package/lib/tuya.js

@@ -1117,8 +1117,6 @@ async function sendDataPointStringBuffer(entity, dp, value, cmd, seq=undefined)
 }
 
 const tuyaExposes = {
-    powerOnBehavior: () => exposes.enum('power_on_behavior', ea.STATE_SET, ['off', 'on', 'previous'])
-        .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()

package/package.json

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