zigbee-herdsman-converters 14.0.559 → 14.0.562

package/converters/fromZigbee.js

@@ -1946,7 +1946,9 @@ const converters = {
             case 1:
                 return {temperature: calibrateAndPrecisionRoundOptions(value / 10, options, 'temperature')};
             case 2:
-                return {humidity: calibrateAndPrecisionRoundOptions(value, options, 'humidity')};
+                return {humidity: calibrateAndPrecisionRoundOptions(
+                    (value / (meta.device.manufacturerName === '_TZE200_bjawzodf' ? 10 : 1)),
+                    options, 'humidity')};
             case 4:
                 return {battery: value};
             default:
@@ -3236,7 +3238,7 @@ const converters = {
                         };
 
                         let nameAlt = '';
-                        if (unit === 'A') {
+                        if (unit === 'A' || unit === 'pf') {
                             if (valRaw < 1) {
                                 val = precisionRound(valRaw, 3);
                             }

package/converters/toZigbee.js

@@ -2300,7 +2300,8 @@ const converters = {
         key: ['led_disabled_night'],
         convertSet: async (entity, key, value, meta) => {
             if (['ZNCZ04LM', 'ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM',
-                'QBKG31LM', 'QBKG34LM', 'DLKZMK11LM', 'SSM-U01', 'WS-EUK01', 'WS-EUK02'].includes(meta.mapped.model)) {
+                'QBKG31LM', 'QBKG34LM', 'DLKZMK11LM', 'SSM-U01', 'WS-EUK01', 'WS-EUK02',
+                'WS-EUK03', 'WS-EUK04'].includes(meta.mapped.model)) {
                 await entity.write('aqaraOpple', {0x0203: {value: value ? 1 : 0, type: 0x10}}, manufacturerOptions.xiaomi);
             } else if (['ZNCZ11LM'].includes(meta.mapped.model)) {
                 const payload = value ?
@@ -2315,7 +2316,8 @@ const converters = {
         },
         convertGet: async (entity, key, meta) => {
             if (['ZNCZ04LM', 'ZNCZ15LM', 'QBCZ15LM', 'QBCZ14LM', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM',
-                'QBKG31LM', 'QBKG34LM', 'DLKZMK11LM', 'SSM-U01', 'WS-EUK01', 'WS-EUK02'].includes(meta.mapped.model)) {
+                'QBKG31LM', 'QBKG34LM', 'DLKZMK11LM', 'SSM-U01', 'WS-EUK01', 'WS-EUK02',
+                'WS-EUK03', 'WS-EUK04'].includes(meta.mapped.model)) {
                 await entity.read('aqaraOpple', [0x0203], manufacturerOptions.xiaomi);
             } else {
                 throw new Error('Not supported');

package/devices/acova.js

@@ -63,4 +63,34 @@ module.exports = [
             await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
         },
     },
+    {
+        zigbeeModel: ['TAFFETAS2 D1.00P1.02Z1.00'],
+        model: 'TAFFETAS2',
+        vendor: 'Acova',
+        description: 'Taffetas 2 heater',
+        fromZigbee: [fz.thermostat, fz.hvac_user_interface],
+        toZigbee: [
+            tz.thermostat_local_temperature,
+            tz.thermostat_system_mode,
+            tz.thermostat_occupied_heating_setpoint,
+            tz.thermostat_unoccupied_heating_setpoint,
+            tz.thermostat_occupied_cooling_setpoint,
+            tz.thermostat_running_state,
+        ],
+        exposes: [
+            exposes.climate()
+                .withSetpoint('occupied_heating_setpoint', 7, 28, 0.5)
+                .withLocalTemperature()
+                .withSystemMode(['off', 'heat', 'auto'])
+                .withRunningState(['idle', 'heat']),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'hvacThermostat']);
+            await reporting.thermostatTemperature(endpoint);
+            await reporting.thermostatRunningState(endpoint);
+            await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
+            await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
+        },
+    },
 ];

package/devices/adeo.js

@@ -112,14 +112,28 @@ module.exports = [
         zigbeeModel: ['LXEK-2'],
         model: '9CZA-G1521-Q1A',
         vendor: 'ADEO',
-        description: 'ENKI Lexman E27 14W to 100W LED RGBW',
+        description: 'ENKI LEXMAN E27 14W to 100W LED RGBW',
         extend: extend.light_onoff_brightness_colortemp_color(),
     },
+    {
+        zigbeeModel: ['LDSENK07'],
+        model: 'LDSENK07',
+        vendor: 'ADEO',
+        description: 'ENKI LEXMAN wireless smart outdoor siren',
+        fromZigbee: [fz.battery, fz.ias_siren],
+        toZigbee: [tz.warning],
+        exposes: [e.warning(), e.battery(), e.battery_low(), e.tamper()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.defaultSendRequestWhen = 'immediate';
+            device.save();
+            await device.getEndpoint(1).unbind('genPollCtrl', coordinatorEndpoint);
+        },
+    },
     {
         zigbeeModel: ['ZBEK-2'],
         model: 'IG-CDZOTAAG014RA-MAN',
         vendor: 'ADEO',
-        description: 'ENKI Lexman E27 14W to 100W LED RGBW v2',
+        description: 'ENKI LEXMAN E27 14W to 100W LED RGBW v2',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
     },
     {
@@ -133,7 +147,7 @@ module.exports = [
         zigbeeModel: ['LXEK-7'],
         model: '9CZA-A806ST-Q1Z',
         vendor: 'ADEO',
-        description: 'ENKI Lexman E27 LED white',
+        description: 'ENKI LEXMAN E27 LED white',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
     },
     {
@@ -157,7 +171,7 @@ module.exports = [
         zigbeeModel: ['LDSENK10'],
         model: 'LDSENK10',
         vendor: 'ADEO',
-        description: 'LEXMAN motion sensor',
+        description: 'ENKI LEXMAN motion sensor',
         fromZigbee: [fz.ias_occupancy_alarm_1],
         toZigbee: [],
         exposes: [e.occupancy(), e.battery_low(), e.tamper()],

package/devices/bticino.js

@@ -26,7 +26,7 @@ module.exports = [
     },
     {
         zigbeeModel: [' Dimmer switch with neutral\u0000\u0000\u0000\u0000'],
-        model: 'L441C/N4411C/NT4411C',
+        model: 'L4411C/N4411C/NT4411C',
         vendor: 'BTicino',
         description: 'Dimmer switch with neutral',
         extend: extend.light_onoff_brightness({noConfigure: true}),

package/devices/envilar.js

@@ -5,6 +5,13 @@ const e = exposes.presets;
 const fz = require('../converters/fromZigbee');
 
 module.exports = [
+    {
+        zigbeeModel: ['ZG_LED_DRIVER42CC'],
+        model: 'ZG_LED_DRIVER42CC',
+        vendor: 'ENVILAR',
+        description: 'Zigbee LED driver',
+        extend: extend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['ZG50CC-CCT-DRIVER'],
         model: 'ZG50CC-CCT-DRIVER',

package/devices/insta.js

@@ -53,7 +53,7 @@ module.exports = [
                 {ID: 242, profileID: 41440, deviceID: 97},
             ]},
         ],
-        zigbeeModel: ['57005000'],
+        zigbeeModel: ['NEXENTRO Switching Actuator', '57005000'],
         model: '57005000',
         vendor: 'Insta',
         description: 'Switching Actuator Mini with input for wall switch',

package/devices/lidl.js

@@ -857,4 +857,12 @@ module.exports = [
             }),
         ],
     },
+    {
+        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_taspddvq'}],
+        model: 'HG08383A',
+        vendor: 'Lidl',
+        description: 'Livarno outdoor LED light chain',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], disableColorTempStartup: true}),
+        meta: {applyRedFix: true, enhancedHue: false},
+    },
 ];

package/devices/lonsonho.js

@@ -3,9 +3,47 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+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);
+                    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'}],
@@ -221,9 +259,19 @@ module.exports = [
         model: 'TS110E_2gang',
         vendor: 'Lonsonho',
         description: 'Zigbee smart dimmer module 2 gang with neutral',
-        extend: extend.light_onoff_brightness({noConfigure: true}),
+        fromZigbee: extend.light_onoff_brightness({disablePowerOnBehavior: true}).fromZigbee.concat([
+            fz.tuya_switch_power_outage_memory, fzLocal.TS110E_switch_type]),
+        toZigbee: extend.light_onoff_brightness({disablePowerOnBehavior: true}).toZigbee.concat([
+            tz.tuya_switch_power_outage_memory, tzLocal.TS110E_switch_type]),
         meta: {multiEndpoint: true},
-        exposes: [e.light_brightness().withEndpoint('l1'), e.light_brightness().withEndpoint('l2')],
+        exposes: [
+            e.light_brightness().withEndpoint('l1'),
+            e.light_brightness().withEndpoint('l2'),
+            exposes.enum('power_outage_memory', ea.STATE_SET, ['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']);

package/devices/neo.js

@@ -35,7 +35,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_t1blo2bj'}, {modelID: 'TS0202', manufacturerName: '_TZ3000_kmh5qpmb'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_t1blo2bj'}],
         zigbeeModel: ['1blo2bj'],
         model: 'NAS-AB02B2',
         vendor: 'Neo',
@@ -58,7 +58,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_7hfcudw5'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_7hfcudw5'}, {modelID: 'TS0202', manufacturerName: '_TZ3000_kmh5qpmb'}],
         model: 'NAS-PD07',
         vendor: 'Neo',
         description: 'Motion, temperature & humidity sensor',

package/devices/nous.js

@@ -17,7 +17,9 @@ module.exports = [
         exposes: [e.temperature(), e.humidity(), e.battery()],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_lve3dvpy'}, {modelID: 'TS0601', manufacturerName: '_TZE200_c7emyjom'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_lve3dvpy'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_c7emyjom'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_locansqn'}],
         model: 'SZ-T04',
         vendor: 'Nous',
         description: 'Temperature and humidity sensor with clock',

package/devices/nue_3a.js

@@ -4,6 +4,32 @@ const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
+const ea = exposes.access;
+
+const fzLocal = {
+    LXN59_cover_options: {
+        cluster: 'closuresWindowCovering',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            if (msg.data.hasOwnProperty('tuyaMovingState')) {
+                const value = msg.data['tuyaMovingState'];
+                const movingLookup = {0: 'DOWN', 1: 'UP', 2: 'STOP'};
+                result.moving = movingLookup[value];
+            }
+            return result;
+        },
+    },
+    LXN59_cover_state_via_onoff: {
+        cluster: 'genOnOff',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data.hasOwnProperty('onOff')) {
+                return {state: msg.data['onOff'] === 1 ? 'CLOSE' : 'OPEN'};
+            }
+        },
+    },
+};
 
 module.exports = [
     {
@@ -247,6 +273,40 @@ module.exports = [
         description: 'Smart 7W E27 light bulb',
         extend: extend.light_onoff_brightness_colortemp_color(),
     },
+    {
+        zigbeeModel: ['LXN59-CS27LX1.0'],
+        model: 'ZW-EU-4C',
+        vendor: 'Nue / 3A',
+        description: 'Zigbee smart curtain switch',
+        fromZigbee: [fz.cover_position_tilt, fzLocal.LXN59_cover_state_via_onoff, fzLocal.LXN59_cover_options],
+        toZigbee: [tz.cover_state, tz.cover_position_tilt],
+        meta: {disableDefaultResponse: true},
+        exposes: [e.cover_position(), exposes.enum('moving', ea.STATE, ['UP', 'STOP', 'DOWN'])],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint1 = device.getEndpoint(1);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint1);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['closuresWindowCovering']);
+            await reporting.currentPositionLiftPercentage(endpoint1);
+            device.powerSource = 'Mains (single phase)';
+            device.save();
+        },
+    },
+    {
+        zigbeeModel: ['LXX60-CS27LX1.0'],
+        model: 'ZW-EC-01',
+        vendor: 'Nue / 3A',
+        description: 'Zigbee smart curtain switch',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint1 = device.getEndpoint(1);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['closuresWindowCovering']);
+            await reporting.onOff(endpoint1);
+            device.powerSource = 'Mains (single phase)';
+            device.save();
+        },
+    },
     {
         zigbeeModel: ['LXN56-0S27LX1.1', 'LXN56-0S27LX1.3'],
         model: 'HGZB-20-UK',

package/devices/philips.js

@@ -2111,7 +2111,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['929003047101'],
+        zigbeeModel: ['929003047101', '929003045101_03'],
         model: '929003047101',
         vendor: 'Philips',
         description: 'Hue White ambiance Milliskin (round)',

package/devices/plugwise.js

@@ -2,8 +2,97 @@ 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 utils = require('../lib/utils');
 const e = exposes.presets;
 const ea = exposes.access;
+const herdsman = require('zigbee-herdsman');
+
+const manufacturerOptions = {manufacturerCode: herdsman.Zcl.ManufacturerCode.PLUGWISE_BV};
+
+const plugwisePushForce = {
+    0: 'standard',
+    0x60000: 'high',
+    0x70000: 'very_high',
+};
+
+const plugwiseRadioStrength = {
+    0: 'normal',
+    1: 'high',
+};
+
+const fzLocal = {
+    plugwise_radiator_valve: {
+        cluster: 'hvacThermostat',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = fz.thermostat.convert(model, msg, publish, options, meta);
+
+            // Reports pIHeatingDemand between 0 and 100 already
+            if (typeof msg.data['pIHeatingDemand'] == 'number') {
+                result.pi_heating_demand = utils.precisionRound(msg.data['pIHeatingDemand'], 0);
+            }
+
+            if (typeof msg.data[0x4003] == 'number') {
+                result.current_heating_setpoint = utils.precisionRound(msg.data[0x4003], 2) / 100;
+            }
+            if (typeof msg.data[0x4008] == 'number') {
+                result.plugwise_t_diff = msg.data[0x4008];
+            }
+            if (typeof msg.data[0x4002] == 'number') {
+                result.error_status = msg.data[0x4002];
+            }
+            if (typeof msg.data[0x4001] == 'number') {
+                result.valve_position = msg.data[0x4001];
+            }
+            return result;
+        },
+    },
+};
+
+const tzLocal = {
+    plugwise_calibrate_valve: {
+        key: ['calibrate_valve'],
+        convertSet: async (entity, key, value, meta) => {
+            await entity.command('hvacThermostat', 'plugwiseCalibrateValve', {},
+                {srcEndpoint: 11, disableDefaultResponse: true, sendWhen: 'active'});
+            return {state: {'calibrate_valve': value}};
+        },
+    },
+    plugwise_valve_position: {
+        key: ['plugwise_valve_position', 'valve_position'],
+        convertSet: async (entity, key, value, meta) => {
+            const payload = {0x4001: {value, type: 0x20}};
+            await entity.write('hvacThermostat', payload, manufacturerOptions);
+            // Tom does not automatically send back updated value so ask for it
+            await entity.read('hvacThermostat', [0x4001], manufacturerOptions);
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('hvacThermostat', [0x4001], manufacturerOptions);
+        },
+    },
+    plugwise_push_force: {
+        key: ['plugwise_push_force', 'force'],
+        convertSet: async (entity, key, value, meta) => {
+            const val = utils.getKey(plugwisePushForce, value, value, Number);
+            const payload = {0x4012: {value: val, type: 0x23}};
+            await entity.write('hvacThermostat', payload, manufacturerOptions);
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('hvacThermostat', [0x4012], manufacturerOptions);
+        },
+    },
+    plugwise_radio_strength: {
+        key: ['plugwise_radio_strength', 'radio_strength'],
+        convertSet: async (entity, key, value, meta) => {
+            const val = utils.getKey(plugwiseRadioStrength, value, value, Number);
+            const payload = {0x4014: {value: val, type: 0x10}};
+            await entity.write('hvacThermostat', payload, manufacturerOptions);
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('hvacThermostat', [0x4014], manufacturerOptions);
+        },
+    },
+};
 
 module.exports = [
     {
@@ -27,18 +116,37 @@ module.exports = [
         model: '106-03',
         vendor: 'Plugwise',
         description: 'Tom thermostatic radiator valve',
-        fromZigbee: [fz.thermostat, fz.temperature, fz.battery],
-        toZigbee: [tz.thermostat_system_mode, tz.thermostat_occupied_heating_setpoint, tz.thermostat_pi_heating_demand],
+        fromZigbee: [fz.thermostat, fz.temperature, fz.battery, fzLocal.plugwise_radiator_valve],
+        toZigbee: [
+            tz.thermostat_system_mode,
+            tz.thermostat_occupied_heating_setpoint,
+            tz.thermostat_pi_heating_demand,
+            tzLocal.plugwise_valve_position,
+            tzLocal.plugwise_push_force,
+            tzLocal.plugwise_radio_strength,
+            tzLocal.plugwise_calibrate_valve,
+        ],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic', 'genPowerCfg', 'hvacThermostat']);
             await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.thermostatTemperature(endpoint);
+            await reporting.thermostatPIHeatingDemand(endpoint);
         },
         exposes: [e.battery(),
             exposes.climate()
                 .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5, ea.ALL).withLocalTemperature(ea.STATE)
                 .withSystemMode(['off', 'auto'], ea.ALL)
                 .withPiHeatingDemand(ea.STATE_GET),
+            exposes.numeric('valve_position', ea.ALL).withValueMin(0).withValueMax(100)
+                .withDescription('Directly control the radiator valve. The values range from 0 (valve ' +
+                    'closed) to 100 (valve fully open)'),
+            exposes.enum('force', ea.ALL, ['standard', 'high', 'very_high'])
+                .withDescription('How hard the motor pushes the valve. The closer to the boiler, the higher the force needed'),
+            exposes.enum('radio_strength', ea.ALL, ['normal', 'high'])
+                .withDescription('Transmits with higher power when range is not sufficient'),
+            exposes.binary('calibrate_valve', ea.STATE_SET, 'calibrate', 'idle')
+                .withDescription('Calibrates valve on next wakeup'),
         ],
     },
 ];

package/devices/schneider_electric.js

@@ -357,6 +357,18 @@ module.exports = [
             await reporting.onOff(endpoint);
         },
     },
+    {
+        zigbeeModel: ['CH10AX/SWITCH/1'],
+        model: '41E10PBSWMZ-VW',
+        vendor: 'Schneider Electric',
+        description: 'Wiser 40/300-Series module switch 10A with ControlLink',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
     {
         zigbeeModel: ['SMARTPLUG/1'],
         model: 'CCT711119',

package/devices/third_reality.js

@@ -121,4 +121,17 @@ module.exports = [
         },
         exposes: [e.cover_position(), e.battery()],
     },
+    {
+        zigbeeModel: ['3RSB22BZ'],
+        model: '3RSB22BZ',
+        vendor: 'Third Reality',
+        description: 'Smart button',
+        fromZigbee: [fz.battery, fz.itcmdr_clicks],
+        toZigbee: [],
+        exposes: [e.battery(), e.battery_low(), e.battery_voltage(), e.action(['single', 'double', 'long'])],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.powerSource = 'Battery';
+            device.save();
+        },
+    },
 ];

package/devices/tuya.js

@@ -338,7 +338,9 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_8ygsuhe1'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_yvx5lh6k'}, {modelID: 'TS0601', manufacturerName: '_TZE200_ryfmq5rl'}],
+            {modelID: 'TS0601', manufacturerName: '_TZE200_yvx5lh6k'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_ryfmq5rl'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_c2fmom5z'}],
         model: 'TS0601_air_quality_sensor',
         vendor: 'TuYa',
         description: 'Air quality sensor',

package/devices/ubisys.js

@@ -640,7 +640,8 @@ module.exports = [
             fz.command_move, fz.command_stop, fz.lighting_ballast_configuration, fz.level_config, ubisys.fz.dimmer_setup,
             ubisys.fz.dimmer_setup_genLevelCtrl],
         toZigbee: [tz.light_onoff_brightness, tz.ballast_config, tz.level_config, ubisys.tz.dimmer_setup,
-            ubisys.tz.dimmer_setup_genLevelCtrl, ubisys.tz.configure_device_setup, tz.ignore_transition],
+            ubisys.tz.dimmer_setup_genLevelCtrl, ubisys.tz.configure_device_setup, tz.ignore_transition, tz.light_brightness_move,
+            tz.light_brightness_step],
         exposes: [e.light_brightness().withLevelConfig(), e.power(),
             exposes.numeric('ballast_physical_minimum_level', ea.ALL).withValueMin(1).withValueMax(254)
                 .withDescription('Specifies the minimum light output the ballast can achieve.'),

package/devices/weiser.js

@@ -40,14 +40,28 @@ module.exports = [
         model: '9GED21500-005',
         vendor: 'Weiser',
         description: 'SmartCode 10 Touch',
-        fromZigbee: [fz.lock, fz.lock_operation_event, fz.battery],
-        toZigbee: [tz.lock],
+        fromZigbee: [fz.lock, fz.lock_operation_event, fz.battery, fz.lock_programming_event, fz.lock_pin_code_response],
+        toZigbee: [tz.lock, tz.pincode_lock],
+        meta: {pinCodeCount: 30},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(2);
             await reporting.bind(endpoint, coordinatorEndpoint, ['closuresDoorLock', 'genPowerCfg']);
             await reporting.lockState(endpoint);
             await reporting.batteryPercentageRemaining(endpoint);
         },
-        exposes: [e.lock(), e.battery(), e.lock_action(), e.lock_action_source_name(), e.lock_action_source_user()],
+        // Note - Keypad triggered deletions do not cause a zigbee event, though Adds work fine.
+        onEvent: async (type, data, device) => {
+            // When we receive a code updated message, lets read the new value
+            if (data.type === 'commandProgrammingEventNotification' &&
+                data.cluster === 'closuresDoorLock' &&
+                data.data &&
+                data.data.userid !== undefined &&
+                // Don't read RF events, we can do this with retrieve_state
+                (data.data.programeventsrc === undefined || constants.lockSourceName[data.data.programeventsrc] != 'rf')
+            ) {
+                await device.endpoints[0].command('closuresDoorLock', 'getPinCode', {userid: data.data.userid}, {});
+            }
+        },
+        exposes: [e.lock(), e.battery(), e.pincode(), e.lock_action(), e.lock_action_source_name(), e.lock_action_source_user()],
     },
 ];

package/devices/xiaomi.js

@@ -47,7 +47,7 @@ module.exports = [
         description: 'Aqara E1 door & window contact sensor',
         fromZigbee: [fz.ias_contact_alarm_1, fz.aqara_opple, fz.battery],
         toZigbee: [],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.contact(), e.battery(), e.battery_low(), e.battery_voltage()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -63,7 +63,7 @@ module.exports = [
         description: 'Aqara P1 door & window contact sensor',
         fromZigbee: [fz. xiaomi_contact, fz.ias_contact_alarm_1, fz.aqara_opple],
         toZigbee: [],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.contact(), e.battery(), e.battery_voltage()],
     },
     {
@@ -168,7 +168,7 @@ module.exports = [
         whiteLabel: [{vendor: 'Xiaomi', model: 'YTC4040GL'}, {vendor: 'Xiaomi', model: 'YTC4006CN'},
             {vendor: 'Xiaomi', model: 'YTC4017CN'}, {vendor: 'Xiaomi', model: 'ZHTZ02LM'}],
         description: 'MiJia wireless switch',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.xiaomi_WXKG01LM_action, fz.legacy.WXKG01LM_click],
         exposes: [e.battery(), e.action(['single', 'double', 'triple', 'quadruple', 'hold', 'release', 'many']), e.battery_voltage(),
             e.power_outage_count(false)],
@@ -179,7 +179,7 @@ module.exports = [
         model: 'WXKG11LM',
         vendor: 'Xiaomi',
         description: 'Aqara wireless switch',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.battery(), e.battery_voltage(), e.action(['single', 'double', 'triple', 'quadruple', 'hold', 'release']),
             e.device_temperature(), e.power_outage_count()],
         fromZigbee: [fz.xiaomi_multistate_action, fz.xiaomi_WXKG11LM_action, fz.xiaomi_basic,
@@ -191,7 +191,7 @@ module.exports = [
         model: 'WXKG12LM',
         vendor: 'Xiaomi',
         description: 'Aqara wireless switch (with gyroscope)',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.battery(), e.action(['single', 'double', 'hold', 'release', 'shake']), e.battery_voltage()],
         fromZigbee: [fz.xiaomi_basic, fz.xiaomi_multistate_action, fz.legacy.WXKG12LM_action_click_multistate],
         toZigbee: [],
@@ -201,7 +201,7 @@ module.exports = [
         model: 'WXKG03LM_rev1',
         vendor: 'Xiaomi',
         description: 'Aqara single key wireless wall switch (2016 model)',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.battery(), e.action(['single']), e.battery_voltage()],
         fromZigbee: [fz.xiaomi_on_off_action, fz.xiaomi_basic, fz.legacy.WXKG03LM_click],
         toZigbee: [],
@@ -212,7 +212,7 @@ module.exports = [
         model: 'WXKG03LM_rev2',
         vendor: 'Xiaomi',
         description: 'Aqara single key wireless wall switch (2018 model)',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.battery(), e.action(['single', 'double', 'hold']), e.battery_voltage()],
         fromZigbee: [fz.xiaomi_on_off_action, fz.xiaomi_multistate_action, fz.xiaomi_basic,
             fz.legacy.WXKG03LM_click, fz.legacy.xiaomi_action_click_multistate],
@@ -230,7 +230,7 @@ module.exports = [
             e.action(['single', 'double', 'hold']),
             e.battery_voltage()],
         onEvent: preventReset,
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             try {
                 const endpoint = device.endpoints[1];
@@ -245,7 +245,7 @@ module.exports = [
         model: 'WXKG02LM_rev1',
         vendor: 'Xiaomi',
         description: 'Aqara double key wireless wall switch (2016 model)',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.battery(), e.action(['single_left', 'single_right', 'single_both']), e.battery_voltage(), e.power_outage_count(false)],
         fromZigbee: [fz.xiaomi_on_off_action, fz.xiaomi_basic, fz.legacy.WXKG02LM_click],
         toZigbee: [],
@@ -256,7 +256,7 @@ module.exports = [
         model: 'WXKG02LM_rev2',
         vendor: 'Xiaomi',
         description: 'Aqara double key wireless wall switch (2018 model)',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.battery(), e.action(['single_left', 'single_right', 'single_both', 'double_left', 'double_right', 'double_both',
             'hold_left', 'hold_right', 'hold_both']), e.battery_voltage()],
         fromZigbee: [fz.xiaomi_on_off_action, fz.xiaomi_multistate_action, fz.xiaomi_basic,
@@ -410,9 +410,9 @@ module.exports = [
         description: 'Aqara smart wall switch H1 EU (with neutral, single rocker)',
         fromZigbee: [fz.on_off, fz.xiaomi_power, fz.xiaomi_multistate_action, fz.aqara_opple],
         toZigbee: [tz.on_off, tz.xiaomi_power, tz.xiaomi_switch_operation_mode_opple, tz.xiaomi_switch_power_outage_memory,
-            tz.xiaomi_flip_indicator_light],
+            tz.xiaomi_flip_indicator_light, tz.xiaomi_led_disabled_night],
         exposes: [e.switch(), e.action(['single', 'double']), e.power().withAccess(ea.STATE_GET), e.energy(), e.flip_indicator_light(),
-            e.power_outage_memory(), e.device_temperature().withAccess(ea.STATE),
+            e.power_outage_memory(), e.device_temperature().withAccess(ea.STATE), e.led_disabled_night(), e.power_outage_count(),
             exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled']).withDescription('Decoupled mode')],
         onEvent: preventReset,
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -428,7 +428,7 @@ module.exports = [
         description: 'Aqara smart wall switch H1 EU (with neutral, double rocker)',
         fromZigbee: [fz.on_off, fz.xiaomi_power, fz.xiaomi_multistate_action, fz.aqara_opple],
         toZigbee: [tz.on_off, tz.xiaomi_power, tz.xiaomi_switch_operation_mode_opple, tz.xiaomi_switch_power_outage_memory,
-            tz.xiaomi_flip_indicator_light],
+            tz.xiaomi_flip_indicator_light, tz.xiaomi_led_disabled_night],
         meta: {multiEndpoint: true},
         endpoint: (device) => {
             return {'left': 1, 'right': 2};
@@ -439,7 +439,8 @@ module.exports = [
             exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled']).withDescription('Decoupled mode for right button')
                 .withEndpoint('right'),
             e.action(['single_left', 'double_left', 'single_right', 'double_right', 'single_both', 'double_both']),
-            e.device_temperature().withAccess(ea.STATE), e.power_outage_memory(), e.flip_indicator_light()],
+            e.device_temperature().withAccess(ea.STATE), e.power_outage_memory(), e.flip_indicator_light(),
+            e.led_disabled_night(), e.power_outage_count()],
         onEvent: preventReset,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint1 = device.getEndpoint(1);
@@ -560,7 +561,7 @@ module.exports = [
         model: 'WXKG07LM',
         vendor: 'Xiaomi',
         description: 'Aqara D1 double key wireless wall switch',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.legacy.xiaomi_on_off_action, fz.legacy.xiaomi_multistate_action],
         toZigbee: [],
         endpoint: (device) => {
@@ -840,7 +841,7 @@ module.exports = [
         whiteLabel: [{vendor: 'Xiaomi', model: 'YTC4042GL'}, {vendor: 'Xiaomi', model: 'YTC4007CN'},
             {vendor: 'Xiaomi', model: 'YTC4018CN'}],
         description: 'MiJia temperature & humidity sensor',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.xiaomi_temperature, fz.humidity],
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
@@ -850,7 +851,7 @@ module.exports = [
         model: 'WSDCGQ11LM',
         vendor: 'Xiaomi',
         description: 'Aqara temperature, humidity and pressure sensor',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.xiaomi_temperature, fz.humidity, fz.pressure],
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.pressure(), e.battery_voltage()],
@@ -868,7 +869,7 @@ module.exports = [
         toZigbee: [],
         exposes: [e.temperature(), e.humidity(), e.pressure(), e.device_temperature(), e.battery(), e.battery_voltage(),
             e.power_outage_count(false)],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = ['msTemperatureMeasurement', 'msRelativeHumidity', 'msPressureMeasurement'];
@@ -884,7 +885,7 @@ module.exports = [
         whiteLabel: [{vendor: 'Xiaomi', model: 'YTC4041GL'}, {vendor: 'Xiaomi', model: 'YTC4004CN'},
             {vendor: 'Xiaomi', model: 'YTC4016CN'}, {vendor: 'Xiaomi', model: 'ZHTZ02LM'}],
         description: 'MiJia human body movement sensor',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.occupancy_with_timeout],
         toZigbee: [],
         exposes: [e.battery(), e.occupancy(), e.battery_voltage(), e.power_outage_count(false)],
@@ -894,7 +895,7 @@ module.exports = [
         model: 'RTCGQ11LM',
         vendor: 'Xiaomi',
         description: 'Aqara human body movement and illuminance sensor',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.occupancy_with_timeout, fz.RTCGQ11LM_illuminance],
         toZigbee: [],
         exposes: [e.battery(), e.occupancy(), e.device_temperature(), e.battery_voltage(), e.illuminance_lux().withProperty('illuminance'),
@@ -912,7 +913,7 @@ module.exports = [
             exposes.numeric('detection_interval', ea.ALL).withValueMin(2).withValueMax(65535).withUnit('s')
                 .withDescription('Time interval for detecting actions'),
             e.device_temperature(), e.battery(), e.battery_voltage(), e.power_outage_count(false)],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.read('genPowerCfg', ['batteryVoltage']);
@@ -931,7 +932,7 @@ module.exports = [
             exposes.numeric('detection_interval', ea.ALL).withValueMin(2).withValueMax(65535).withUnit('s')
                 .withDescription('Time interval for detecting actions'),
             e.device_temperature(), e.battery(), e.battery_voltage(), e.power_outage_count(false)],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.read('genPowerCfg', ['batteryVoltage']);
@@ -959,7 +960,7 @@ module.exports = [
                 'blue LED will blink once when motion is detected. ' +
                 'Press pairing button right before changing this otherwise it will fail.'),
             e.device_temperature(), e.battery(), e.battery_voltage()],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.read('genPowerCfg', ['batteryVoltage']);
@@ -1005,7 +1006,7 @@ module.exports = [
         whiteLabel: [{vendor: 'Xiaomi', model: 'YTC4039GL'}, {vendor: 'Xiaomi', model: 'YTC4005CN'},
             {vendor: 'Xiaomi', model: 'YTC4015CN'}, {vendor: 'Xiaomi', model: 'ZHTZ02LM'}],
         description: 'MiJia door & window contact sensor',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.xiaomi_contact],
         toZigbee: [],
         exposes: [e.battery(), e.contact(), e.battery_voltage(), e.power_outage_count(false)],
@@ -1015,7 +1016,7 @@ module.exports = [
         model: 'MCCGQ11LM',
         vendor: 'Xiaomi',
         description: 'Aqara door & window contact sensor',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.xiaomi_contact],
         toZigbee: [],
         exposes: [e.battery(), e.contact(), e.device_temperature(), e.battery_voltage(), e.power_outage_count(false)],
@@ -1029,7 +1030,7 @@ module.exports = [
         model: 'SJCGQ11LM',
         vendor: 'Xiaomi',
         description: 'Aqara water leak sensor',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.ias_water_leak_alarm_1],
         toZigbee: [],
         exposes: [e.battery(), e.water_leak(), e.battery_low(), e.battery_voltage(), e.device_temperature(), e.power_outage_count(false)],
@@ -1039,7 +1040,7 @@ module.exports = [
         model: 'SJCGQ12LM',
         vendor: 'Xiaomi',
         description: 'Aqara T1 water leak sensor',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.ias_water_leak_alarm_1],
         toZigbee: [],
         exposes: [e.battery(), e.water_leak(), e.battery_low(), e.tamper(), e.battery_voltage()],
@@ -1050,7 +1051,7 @@ module.exports = [
         model: 'MFKZQ01LM',
         vendor: 'Xiaomi',
         description: 'Mi/Aqara smart home cube',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.MFKZQ01LM_action_multistate, fz.MFKZQ01LM_action_analog],
         exposes: [e.battery(), e.battery_voltage(), e.angle('action_angle'), e.device_temperature(), e.power_outage_count(false),
             e.cube_side('action_from_side'), e.cube_side('action_side'), e.cube_side('action_to_side'), e.cube_side('side'),
@@ -1210,7 +1211,7 @@ module.exports = [
         description: 'MiJia Honeywell smoke detector',
         vendor: 'Xiaomi',
         whiteLabel: [{vendor: 'Xiaomi', model: 'YTC4020RT'}],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.JTYJGD01LMBW_smoke],
         toZigbee: [tz.JTQJBF01LMBW_JTYJGD01LMBW_sensitivity, tz.JTQJBF01LMBW_JTYJGD01LMBW_selfest],
         exposes: [
@@ -1290,7 +1291,7 @@ module.exports = [
             exposes.binary('linkage_alarm', ea.ALL, true, false).withDescription('When this option is enabled and a smoke ' +
                 'is detected, other detectors with this option enabled will also sound the alarm buzzer'),
             e.device_temperature(), e.battery(), e.battery_voltage(), e.power_outage_count(false)],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.read('genPowerCfg', ['batteryVoltage']);
@@ -1316,7 +1317,7 @@ module.exports = [
         model: 'DJT11LM',
         vendor: 'Xiaomi',
         description: 'Aqara vibration sensor',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_basic, fz.DJT11LM_vibration],
         toZigbee: [tz.DJT11LM_vibration_sensitivity],
         exposes: [
@@ -1541,7 +1542,7 @@ module.exports = [
         ]), exposes.enum('operation_mode', ea.ALL, ['command', 'event'])
             .withDescription('Operation mode, select "command" to enable bindings (wake up the device before changing modes!)')],
         toZigbee: [tz.aqara_opple_operation_mode],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f});
@@ -1563,7 +1564,7 @@ module.exports = [
         ]), exposes.enum('operation_mode', ea.ALL, ['command', 'event'])
             .withDescription('Operation mode, select "command" to enable bindings (wake up the device before changing modes!)')],
         toZigbee: [tz.aqara_opple_operation_mode],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f});
@@ -1590,7 +1591,7 @@ module.exports = [
             .withDescription('Operation mode, select "command" to enable bindings (wake up the device before changing modes!)'),
         e.power_outage_count(false)],
         toZigbee: [tz.aqara_opple_operation_mode],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f});
@@ -1607,7 +1608,7 @@ module.exports = [
         description: 'MiJia light intensity sensor',
         fromZigbee: [fz.battery, fz.illuminance, fz.aqara_opple],
         toZigbee: [],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['msIlluminanceMeasurement']);
@@ -1761,7 +1762,7 @@ module.exports = [
         description: 'Aqara wireless remote switch H1 (double rocker)',
         fromZigbee: [fz.battery, fz.xiaomi_multistate_action, fz.aqara_opple, fz.command_toggle],
         toZigbee: [tz.xiaomi_switch_click_mode, tz.aqara_opple_operation_mode],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}, multiEndpoint: true},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}, multiEndpoint: true},
         exposes: [
             e.battery(), e.battery_voltage(), e.action([
                 'single_left', 'single_right', 'single_both',
@@ -1848,7 +1849,7 @@ module.exports = [
         description: 'Aqara TVOC air quality monitor',
         fromZigbee: [fz.xiaomi_tvoc, fz.battery, fz.temperature, fz.humidity, fz.aqara_opple],
         toZigbee: [],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.temperature(), e.humidity(), e.voc(), e.device_temperature(), e.battery(), e.battery_voltage()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -1927,7 +1928,7 @@ module.exports = [
         model: 'WXKG13LM',
         vendor: 'Xiaomi',
         description: 'Aqara T1 wireless mini switch',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.battery, fz.aqara_opple_multistate, fz.aqara_opple],
         toZigbee: [],
         exposes: [e.battery(), e.battery_voltage(), e.action(['single', 'double', 'triple', 'quintuple', 'hold', 'release', 'many'])],
@@ -1943,7 +1944,7 @@ module.exports = [
         description: 'Aqara T1 light intensity sensor',
         fromZigbee: [fz.battery, fz.illuminance, fz.aqara_opple],
         toZigbee: [tz.GZCGQ11LM_detection_period],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.battery(), e.battery_voltage(), e.illuminance(), e.illuminance_lux(),
             exposes.numeric('detection_period', exposes.access.ALL).withValueMin(1).withValueMax(59).withUnit('s')
                 .withDescription('Time interval in seconds to report after light changes')],
@@ -1982,7 +1983,7 @@ module.exports = [
         description: 'Aqara T1 door & window contact sensor',
         fromZigbee: [fz.xiaomi_contact, fz.aqara_opple],
         toZigbee: [],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.contact(), e.battery(), e.battery_voltage()],
     },
     {
@@ -2006,7 +2007,7 @@ module.exports = [
         model: 'ZNXNKG02LM',
         vendor: 'Xiaomi',
         description: 'Aqara knob H1 (wireless)',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.battery(), e.battery_voltage(),
             e.action(['single', 'double', 'hold', 'release', 'start_rotating', 'rotation', 'stop_rotating']),
             exposes.enum('operation_mode', ea.ALL, ['event', 'command']).withDescription('Button mode'),
@@ -2029,7 +2030,7 @@ module.exports = [
         model: 'WXKG16LM',
         vendor: 'Xiaomi',
         description: 'Aqara wireless remote switch E1 (single rocker)',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         fromZigbee: [fz.xiaomi_multistate_action, fz.aqara_opple],
         toZigbee: [tz.xiaomi_switch_click_mode],
         exposes: [e.battery(), e.battery_voltage(), e.action(['single', 'double', 'hold']),
@@ -2045,7 +2046,7 @@ module.exports = [
         model: 'WXKG17LM',
         vendor: 'Xiaomi',
         description: 'Aqara E1 double key wireless switch',
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         exposes: [e.battery(), e.battery_voltage(),
             e.action(['single_left', 'single_right', 'single_both', 'double_left', 'double_right', 'hold_left', 'hold_right']),
             // eslint-disable-next-line max-len
@@ -2073,7 +2074,7 @@ module.exports = [
                     'multi: supports more events like double and hold'),
             exposes.enum('operation_mode', ea.ALL, ['command', 'event'])
                 .withDescription('Operation mode, select "command" to enable bindings (wake up the device before changing modes!)')],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint1 = device.getEndpoint(1);
             await endpoint1.write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});

package/lib/extend.js

@@ -12,11 +12,16 @@ const extend = {
         return {exposes, fromZigbee, toZigbee};
     },
     light_onoff_brightness: (options={}) => {
-        options = {disableEffect: false, ...options};
+        options = {disableEffect: false, disablePowerOnBehavior: false, ...options};
         const exposes = [e.light_brightness(), ...(!options.disableEffect ? [e.effect()] : [])];
-        const fromZigbee = [fz.on_off, fz.brightness, fz.level_config, fz.power_on_behavior, fz.ignore_basic_report];
+        const fromZigbee = [fz.on_off, fz.brightness, fz.level_config, fz.ignore_basic_report];
         const toZigbee = [tz.light_onoff_brightness, tz.ignore_transition, tz.ignore_rate, tz.light_brightness_move,
-            tz.light_brightness_step, tz.level_config, tz.power_on_behavior, ...(!options.disableEffect ? [tz.effect] : [])];
+            tz.light_brightness_step, tz.level_config, ...(!options.disableEffect ? [tz.effect] : [])];
+
+        if (!options.disablePowerOnBehavior) {
+            fromZigbee.push(fz.power_on_behavior);
+            toZigbee.push(tz.power_on_behavior);
+        }
 
         const result = {exposes, fromZigbee, toZigbee};
         if (!options.noConfigure) {
@@ -28,18 +33,23 @@ const extend = {
         return result;
     },
     light_onoff_brightness_colortemp: (options={}) => {
-        options = {disableEffect: false, disableColorTempStartup: false, ...options};
+        options = {disableEffect: false, disableColorTempStartup: false, disablePowerOnBehavior: false, ...options};
         const exposes = [e.light_brightness_colortemp(options.colorTempRange), ...(!options.disableEffect ? [e.effect()] : [])];
         const toZigbee = [tz.light_onoff_brightness, tz.light_colortemp, tz.ignore_transition, tz.ignore_rate, tz.light_brightness_move,
             tz.light_colortemp_move, tz.light_brightness_step, tz.light_colortemp_step, tz.light_colortemp_startup, tz.level_config,
-            tz.power_on_behavior, tz.light_color_options, tz.light_color_mode, ...(!options.disableEffect ? [tz.effect] : [])];
-        const fromZigbee = [fz.color_colortemp, fz.on_off, fz.brightness, fz.level_config, fz.power_on_behavior, fz.ignore_basic_report];
+            tz.light_color_options, tz.light_color_mode, ...(!options.disableEffect ? [tz.effect] : [])];
+        const fromZigbee = [fz.color_colortemp, fz.on_off, fz.brightness, fz.level_config, fz.ignore_basic_report];
 
         if (options.disableColorTempStartup) {
             exposes[0].removeFeature('color_temp_startup');
             toZigbee.splice(toZigbee.indexOf(tz.light_colortemp_startup), 1);
         }
 
+        if (!options.disablePowerOnBehavior) {
+            fromZigbee.push(fz.power_on_behavior);
+            toZigbee.push(tz.power_on_behavior);
+        }
+
         const result = {exposes, fromZigbee, toZigbee};
         if (!options.noConfigure) {
             result.configure = async (device, coordinatorEndpoint, logger) => {
@@ -50,14 +60,19 @@ const extend = {
         return result;
     },
     light_onoff_brightness_color: (options={}) => {
-        options = {disableEffect: false, supportsHS: false, preferHS: false, ...options};
+        options = {disableEffect: false, supportsHS: false, preferHS: false, disablePowerOnBehavior: false, ...options};
         const exposes = [(options.supportsHS ? e.light_brightness_color(options.preferHS) : e.light_brightness_colorxy()),
             ...(!options.disableEffect ? [e.effect()] : [])];
-        const fromZigbee = [fz.color_colortemp, fz.on_off, fz.brightness, fz.level_config, fz.power_on_behavior, fz.ignore_basic_report];
+        const fromZigbee = [fz.color_colortemp, fz.on_off, fz.brightness, fz.level_config, fz.ignore_basic_report];
         const toZigbee = [tz.light_onoff_brightness, tz.light_color, tz.ignore_transition, tz.ignore_rate, tz.light_brightness_move,
-            tz.light_brightness_step, tz.level_config, tz.power_on_behavior, tz.light_hue_saturation_move,
+            tz.light_brightness_step, tz.level_config, tz.light_hue_saturation_move,
             tz.light_hue_saturation_step, tz.light_color_options, tz.light_color_mode, ...(!options.disableEffect ? [tz.effect] : [])];
 
+        if (!options.disablePowerOnBehavior) {
+            fromZigbee.push(fz.power_on_behavior);
+            toZigbee.push(tz.power_on_behavior);
+        }
+
         const result = {exposes, fromZigbee, toZigbee};
         if (!options.noConfigure) {
             result.configure = async (device, coordinatorEndpoint, logger) => {
@@ -68,14 +83,20 @@ const extend = {
         return result;
     },
     light_onoff_brightness_colortemp_color: (options={}) => {
-        options = {disableEffect: false, supportsHS: false, disableColorTempStartup: false, preferHS: false, ...options};
+        options = {
+            disableEffect: false,
+            supportsHS: false,
+            disableColorTempStartup: false,
+            preferHS: false,
+            disablePowerOnBehavior: false,
+            ...options};
         const exposes = [(options.supportsHS ? e.light_brightness_colortemp_color(options.colorTempRange, options.preferHS) :
             e.light_brightness_colortemp_colorxy(options.colorTempRange)), ...(!options.disableEffect ? [e.effect()] : [])];
-        const fromZigbee = [fz.color_colortemp, fz.on_off, fz.brightness, fz.level_config, fz.power_on_behavior, fz.ignore_basic_report];
+        const fromZigbee = [fz.color_colortemp, fz.on_off, fz.brightness, fz.level_config, fz.ignore_basic_report];
         const toZigbee = [
             tz.light_onoff_brightness, tz.light_color_colortemp, tz.ignore_transition, tz.ignore_rate, tz.light_brightness_move,
             tz.light_colortemp_move, tz.light_brightness_step, tz.light_colortemp_step, tz.light_hue_saturation_move,
-            tz.light_hue_saturation_step, tz.light_colortemp_startup, tz.level_config, tz.power_on_behavior, tz.light_color_options,
+            tz.light_hue_saturation_step, tz.light_colortemp_startup, tz.level_config, tz.light_color_options,
             tz.light_color_mode, ...(!options.disableEffect ? [tz.effect] : [])];
 
         if (options.disableColorTempStartup) {
@@ -83,6 +104,11 @@ const extend = {
             toZigbee.splice(toZigbee.indexOf(tz.light_colortemp_startup), 1);
         }
 
+        if (!options.disablePowerOnBehavior) {
+            fromZigbee.push(fz.power_on_behavior);
+            toZigbee.push(tz.power_on_behavior);
+        }
+
         const result = {exposes, fromZigbee, toZigbee};
         if (!options.noConfigure) {
             result.configure = async (device, coordinatorEndpoint, logger) => {

package/lib/utils.js

@@ -102,13 +102,7 @@ function toPercentage(value, min, max, log=false) {
     }
 
     const normalised = (value - min) / (max - min);
-    let percentage;
-    if (log == true) {
-        percentage = normalised === 0 ? 0 : normalised * (1 - Math.log( normalised ));
-    } else {
-        percentage = normalised;
-    }
-    return Math.round(percentage * 100);
+    return Math.round(normalised * 100);
 }
 
 function addActionGroup(payload, msg, definition) {
@@ -169,8 +163,6 @@ function batteryVoltageToPercentage(voltage, option) {
         percentage = Math.round(percentage);
     } else if (option === '3V_2850_3200') {
         percentage = toPercentage(voltage, 2850, 3200);
-    } else if (option === '3V_2850_3000_log') {
-        percentage = toPercentage(voltage, 2850, 3000, true);
     } else if (option === '4LR6AA1_5v') {
         percentage = toPercentage(voltage, 3000, 4200);
     } else {

package/package.json

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