zigbee-herdsman-converters 15.0.14 → 15.0.16

package/converters/fromZigbee.js

@@ -2622,10 +2622,10 @@ const converters = {
                 result.current_heating_setpoint = precisionRound(msg.data[0x4003], 2) / 100;
             }
             if (typeof msg.data[0x4008] == 'number') {
-                result.child_protection = (result.eurotronic_host_flags & (1 << 7)) != 0;
-                result.mirror_display = (result.eurotronic_host_flags & (1 << 1)) != 0;
-                result.boost = (result.eurotronic_host_flags & 1 << 2) != 0;
-                result.window_open = (result.eurotronic_host_flags & (1 << 4)) != 0;
+                result.child_protection = (msg.data[0x4008] & (1 << 7)) != 0;
+                result.mirror_display = (msg.data[0x4008] & (1 << 1)) != 0;
+                result.boost = (msg.data[0x4008] & 1 << 2) != 0;
+                result.window_open = (msg.data[0x4008] & (1 << 4)) != 0;
 
                 if (result.boost) result.system_mode = constants.thermostatSystemModes[4];
                 else if (result.window_open) result.system_mode = constants.thermostatSystemModes[0];

package/converters/toZigbee.js

@@ -4166,6 +4166,7 @@ const converters = {
         convertSet: async (entity, key, value, meta) => {
             const payload = {0x4001: {value, type: 0x20}};
             await entity.write('hvacThermostat', payload, manufacturerOptions.eurotronic);
+            return {state: {[key]: value}};
         },
         convertGet: async (entity, key, meta) => {
             await entity.read('hvacThermostat', [0x4001], manufacturerOptions.eurotronic);

package/devices/blitzwolf.js

@@ -22,7 +22,7 @@ module.exports = [
         vendor: 'BlitzWolf',
         description: 'Zigbee 3.0 smart light switch module 1 gang',
         extend: extend.switch(),
-        toZigbee: [tz.TYZB01_on_off],
+        toZigbee: [tz.TYZB01_on_off, tz.power_on_behavior],
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
         },

package/devices/dlink.js

@@ -0,0 +1,37 @@
+const fz = require('../converters/fromZigbee');
+const exposes = require('../lib/exposes');
+const reporting = require('../lib/reporting');
+const e = exposes.presets;
+
+const fzLocal = {
+    DCH_B112: {
+        cluster: 'ssIasZone',
+        type: 'commandStatusChangeNotification',
+        convert: (model, msg, publish, options, meta) => {
+            const zoneStatus = msg.data.zonestatus;
+            return {
+                contact: !((zoneStatus & 1) > 0),
+                vibration: (zoneStatus & 1<<1) > 0,
+                tamper: (zoneStatus & 1<<2) > 0,
+                battery_low: (zoneStatus & 1<<3) > 0,
+            };
+        },
+    },
+};
+
+module.exports = [
+    {
+        zigbeeModel: ['DCH-B112'],
+        model: 'DCH-B112',
+        vendor: 'D-Link',
+        description: 'Wireless smart door window sensor with vibration',
+        fromZigbee: [fzLocal.DCH_B112, fz.battery],
+        toZigbee: [],
+        exposes: [e.battery_low(), e.contact(), e.vibration(), e.tamper(), e.battery()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
+        },
+    },
+];

package/devices/gidealed.js

@@ -6,6 +6,6 @@ module.exports = [
         model: 'ZC05M',
         vendor: 'GIDEALED',
         description: 'Smart Zigbee RGB LED strip controller',
-        extend: extend.light_onoff_brightness_colortemp_color({supportsHS: true, colorTempRange: [153, 500]}),
+        extend: extend.light_onoff_brightness_colortemp_color({supportsHS: true, colorTempRange: [153, 370]}),
     },
 ];

package/devices/ikea.js

@@ -602,11 +602,6 @@ module.exports = [
         description: 'TRADFRI control outlet',
         vendor: 'IKEA',
         extend: extend.switch(),
-        toZigbee: extend.switch().toZigbee.concat([tz.power_on_behavior]),
-        fromZigbee: extend.switch().fromZigbee.concat([fz.power_on_behavior]),
-        // power_on_behavior 'toggle' does not seem to be supported
-        exposes: extend.switch().exposes.concat([exposes.enum('power_on_behavior', ea.ALL, ['off', 'previous', 'on'])
-            .withDescription('Controls the behaviour when the device is powered on')]),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
@@ -982,4 +977,11 @@ module.exports = [
         description: 'TRADFRI E26 PAR38 LED bulb 900 lumen, dimmable, white spectrum, downlight',
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
+    {
+        zigbeeModel: ['Floor lamp WW'],
+        model: 'G2015',
+        vendor: 'IKEA',
+        description: 'PILSKOTT LED floor lamp',
+        extend: tradfriExtend.light_onoff_brightness(),
+    },
 ];

package/devices/inovelli.js

@@ -1304,9 +1304,9 @@ module.exports = [
             ]);
             await reporting.readMeteringMultiplierDivisor(endpoint);
 
-            await reporting.activePower(endpoint, {min: 1, max: 3600, change: 1});
+            await reporting.activePower(endpoint, {min: 15, max: 3600, change: 1});
             await reporting.currentSummDelivered(endpoint, {
-                min: 1,
+                min: 15,
                 max: 3600,
                 change: 0,
             });

package/devices/legrand.js

@@ -262,8 +262,8 @@ module.exports = [
         description: 'Wired micromodule switch',
         extend: extend.switch(),
         ota: ota.zigbeeOTA,
-        fromZigbee: [fz.identify, fz.on_off],
-        toZigbee: [tz.on_off, tz.legrand_identify],
+        fromZigbee: [...extend.switch().fromZigbee, fz.identify],
+        toZigbee: [...extend.switch().toZigbee, tz.legrand_identify],
         whiteLabel: [{vendor: 'BTicino', model: '3584C'}],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -303,7 +303,7 @@ module.exports = [
         description: 'DIN power consumption module',
         fromZigbee: [fz.identify, fz.metering, fz.electrical_measurement, fz.ignore_basic_report, fz.ignore_genOta, fz.legrand_power_alarm],
         toZigbee: [tz.legrand_settingEnableLedInDark, tz.legrand_identify, tz.electrical_measurement_power, tz.legrand_powerAlarm],
-        exposes: [e.power().withAccess(ea.STATE_GET), exposes.binary('power_alarm_active', ea.STATE, true, false),
+        exposes: [e.power().withAccess(ea.STATE_GET), e.power_apparent(), exposes.binary('power_alarm_active', ea.STATE, true, false),
             exposes.binary('power_alarm', ea.ALL, true, false).withDescription('Enable/disable the power alarm')],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -428,4 +428,42 @@ module.exports = [
             await reporting.activePower(endpoint);
         },
     },
+    {
+        zigbeeModel: ['Remote dimmer switch'],
+        model: 'WNAL63',
+        vendor: 'Legrand',
+        // led blink RED when battery is low
+        description: 'Remote dimmer switch',
+        fromZigbee: [fz.identify, fz.command_on, fz.command_off, fz.command_toggle, fz.legacy.cmd_move, fz.legacy.cmd_stop,
+            fz.battery],
+        exposes: [e.battery(), e.action(['identify', 'on', 'off', 'toggle', 'brightness_move_up',
+            'brightness_move_down', 'brightness_stop'])],
+        toZigbee: [],
+        meta: {battery: {voltageToPercentage: '3V_2500'}, publishDuplicateTransaction: true},
+        onEvent: readInitialBatteryState,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genIdentify', 'genOnOff', 'genLevelCtrl']);
+        },
+    },
+    {
+        zigbeeModel: [' Centralized ventilation SW', ' Centralized ventilation SW\u0000\u0000\u0000\u0000'],
+        model: '067766',
+        vendor: 'Legrand',
+        description: 'Centralized ventilation switch',
+        fromZigbee: [fz.identify, fz.on_off, fz.power_on_behavior],
+        toZigbee: [tz.on_off, tz.legrand_settingEnableLedInDark, tz.legrand_identify, tz.legrand_settingEnableLedIfOn,
+            tz.power_on_behavior],
+        exposes: [e.switch(), e.action(['identify']),
+            exposes.binary('led_in_dark', ea.ALL, 'ON', 'OFF').withDescription(`Enables the LED when the power socket is turned off,
+                allowing to see it in the dark`),
+            exposes.binary('led_if_on', ea.ALL, 'ON', 'OFF').withDescription('Enables the LED when the device is turned on'),
+            e.power_on_behavior()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genIdentify', 'genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
 ];

package/devices/lidl.js

@@ -510,7 +510,7 @@ module.exports = [
         model: 'HG06104A',
         vendor: 'Lidl',
         description: 'Livarno Lux smart LED light strip 2.5m',
-        ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true}),
+        ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, disablePowerOnBehavior: true}),
         meta: {applyRedFix: true, enhancedHue: false},
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});

package/devices/linkind.js

@@ -157,10 +157,6 @@ module.exports = [
         vendor: 'Linkind',
         description: 'Control outlet',
         extend: extend.switch(),
-        toZigbee: extend.switch().toZigbee.concat([tz.power_on_behavior]),
-        fromZigbee: extend.switch().fromZigbee.concat([fz.power_on_behavior]),
-        exposes: extend.switch().exposes.concat([exposes.enum('power_on_behavior', ea.ALL, ['off', 'previous', 'on', 'toggle'])
-            .withDescription('Controls the behaviour when the device is powered on')]),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);

package/devices/livolo.js

@@ -65,8 +65,8 @@ module.exports = [
         model: 'TI0001-switch',
         description: 'Zigbee switch 1 gang',
         vendor: 'Livolo',
-        fromZigbee: [fz.livolo_new_switch_state],
-        toZigbee: [tz.livolo_socket_switch_on_off],
+        fromZigbee: [fz.livolo_new_switch_state, fz.power_on_behavior],
+        toZigbee: [tz.livolo_socket_switch_on_off, tz.power_on_behavior],
         extend: extend.switch(),
         configure: poll,
         endpoint: (device) => {
@@ -151,8 +151,8 @@ module.exports = [
         description: 'Zigbee socket',
         vendor: 'Livolo',
         extend: extend.switch(),
-        fromZigbee: [fz.livolo_socket_state],
-        toZigbee: [tz.livolo_socket_switch_on_off],
+        fromZigbee: [fz.livolo_socket_state, fz.power_on_behavior],
+        toZigbee: [tz.livolo_socket_switch_on_off, tz.power_on_behavior],
         configure: poll,
         onEvent: async (type, data, device) => {
             if (type === 'stop') {

package/devices/lonsonho.js

@@ -205,7 +205,7 @@ module.exports = [
         vendor: 'Lonsonho',
         description: '1 gang switch module with neutral wire',
         extend: extend.switch(),
-        toZigbee: [tz.TYZB01_on_off],
+        toZigbee: [tz.power_on_behavior, tz.TYZB01_on_off],
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
         },

package/devices/m/303/274ller_licht.js

@@ -8,7 +8,7 @@ const e = exposes.presets;
 module.exports = [
     {
         zigbeeModel: ['tint-ExtendedColor'],
-        model: '404036/45327/45317',
+        model: '404036/45327/45317/45328',
         vendor: 'Müller Licht',
         description: 'Tint LED white+color',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 556]}),

package/devices/philips.js

@@ -75,8 +75,8 @@ const hueExtend = {
         return result;
     },
     light_onoff_brightness_colortemp_color_gradient: (options={}) => {
-        options = {supportsHS: true, disableEffect: true, noConfigure: true, extraEffects: [], ...options};
-        const result = extendDontUse.light_onoff_brightness_colortemp_color({supportsHS: true, ...options});
+        options = {supportsHS: true, disableEffect: true, extraEffects: [], ...options};
+        const result = extendDontUse.light_onoff_brightness_colortemp_color({noConfigure: true, ...options});
         result['ota'] = ota.zigbeeOTA;
         result['meta'] = {turnsOffAtBrightness1: true};
         result['toZigbee'] = result['toZigbee'].concat([
@@ -458,7 +458,7 @@ module.exports = [
         model: '929002994901',
         vendor: 'Philips',
         description: 'Hue gradient lightstrip',
-        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['929003045401'],
@@ -642,6 +642,13 @@ module.exports = [
         description: 'Hue white E27 LED bulb filament giant globe',
         extend: hueExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['LWO004'],
+        model: '8719514279155',
+        vendor: 'Philips',
+        description: 'Hue white G125 B22 LED bulb filament giant globe',
+        extend: hueExtend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['LTD011'],
         model: '5110131H5',
@@ -731,14 +738,14 @@ module.exports = [
         model: '4090331P9',
         vendor: 'Philips',
         description: 'Hue Ensis (white)',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['4090330P9_01', '4090330P9_02', '929003052501_01', '929003052501_02'],
         model: '4090330P9',
         vendor: 'Philips',
         description: 'Hue Ensis (black)',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['929003055901', '929003055901_01', '929003055901_02', '929003055901_03'],
@@ -1078,6 +1085,13 @@ module.exports = [
         description: 'Hue white A60 bulb B22 bluetooth',
         extend: hueExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['929003047001'],
+        model: '929003047001',
+        vendor: 'Philips',
+        description: 'Hue White ambiance Milliskin (round)',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
     {
         zigbeeModel: ['LWA017'],
         model: '929002469202',
@@ -1216,7 +1230,7 @@ module.exports = [
         model: '8718699703424',
         vendor: 'Philips',
         description: 'Hue white and color ambiance LightStrip plus',
-        extend: hueExtend.light_onoff_brightness_colortemp_color(),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false}),
     },
     {
         zigbeeModel: ['LCL002'],
@@ -2343,7 +2357,7 @@ module.exports = [
         model: '929002240401',
         vendor: 'Philips',
         description: 'Hue smart plug - EU',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         toZigbee: [tz.on_off].concat([tzLocal.hue_power_on_behavior, tzLocal.hue_power_on_error]),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(11);
@@ -2357,7 +2371,7 @@ module.exports = [
         model: '046677552343',
         vendor: 'Philips',
         description: 'Hue smart plug bluetooth',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         toZigbee: [tz.on_off].concat([tzLocal.hue_power_on_behavior, tzLocal.hue_power_on_error]),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(11);
@@ -2371,7 +2385,7 @@ module.exports = [
         model: '8718699689308',
         vendor: 'Philips',
         description: 'Hue smart plug - UK',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         toZigbee: [tz.on_off].concat([tzLocal.hue_power_on_behavior, tzLocal.hue_power_on_error]),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(11);
@@ -2385,7 +2399,7 @@ module.exports = [
         model: '9290022408',
         vendor: 'Philips',
         description: 'Hue smart plug - AU',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         toZigbee: [tz.on_off].concat([tzLocal.hue_power_on_behavior, tzLocal.hue_power_on_error]),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(11);
@@ -2399,7 +2413,7 @@ module.exports = [
         model: '8719514342361',
         vendor: 'Philips',
         description: 'Hue smart plug - AU',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         toZigbee: [tz.on_off].concat([tzLocal.hue_power_on_behavior, tzLocal.hue_power_on_error]),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(11);
@@ -2413,7 +2427,7 @@ module.exports = [
         model: '9290024426',
         vendor: 'Philips',
         description: 'Hue smart plug - CH',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         toZigbee: [tz.on_off].concat([tzLocal.hue_power_on_behavior, tzLocal.hue_power_on_error]),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(11);
@@ -2427,7 +2441,7 @@ module.exports = [
         model: '929003050601',
         vendor: 'Philips',
         description: 'Hue smart plug',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         toZigbee: [tz.on_off].concat([tzLocal.hue_power_on_behavior, tzLocal.hue_power_on_error]),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(11);
@@ -2441,7 +2455,7 @@ module.exports = [
         model: '9290030509',
         vendor: 'Philips',
         description: 'Hue smart plug - EU',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         toZigbee: [tz.on_off].concat([tzLocal.hue_power_on_behavior, tzLocal.hue_power_on_error]),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(11);
@@ -3091,6 +3105,13 @@ module.exports = [
         description: 'Hue Bluetooth white & color ambiance ceiling lamp Infuse large',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['929003531702'],
+        model: '929003531702',
+        vendor: 'Philips',
+        description: 'Hue Bluetooth white & color ambiance ceiling lamp Infuse medium',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['929003045001_01', '929003045001_02', '929003045001_03'],
         model: '9290019533',
@@ -3245,6 +3266,14 @@ module.exports = [
         description: 'Hue White & Color Ambiance Xamento M',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['929003074801_01', '929003074801_02', '929003074801_03'],
+        model: '929003074801',
+        vendor: 'Philips',
+        description: 'Hue White and Color Ambiance GU10 (Xamento)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        meta: {turnsOffAtBrightness1: true},
+    },
     {
         zigbeeModel: ['LWE008'],
         model: '929003021301',

package/devices/sinope.js

@@ -801,7 +801,10 @@ module.exports = [
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
-            await reporting.thermostatSystemMode(endpoint);
+
+            try {
+                await reporting.thermostatSystemMode(endpoint);
+            } catch (error) {/* Not all support this */}
 
             await endpoint.read('hvacThermostat', ['occupiedHeatingSetpoint', 'localTemp', 'systemMode', 'pIHeatingDemand',
                 'SinopeBacklight', 'maxHeatSetpointLimit', 'minHeatSetpointLimit', 'SinopeMainCycleOutput', 'SinopeAuxCycleOutput']);

package/devices/sonoff.js

@@ -1,6 +1,5 @@
 const exposes = require('../lib/exposes');
-const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
-const tz = require('../converters/toZigbee');
+const fz = require('../converters/fromZigbee');
 const constants = require('../lib/constants');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
@@ -47,9 +46,6 @@ module.exports = [
         description: 'Zigbee smart switch (no neutral)',
         ota: ota.zigbeeOTA,
         extend: extend.switch(),
-        toZigbee: extend.switch().toZigbee.concat([tz.power_on_behavior]),
-        fromZigbee: extend.switch().fromZigbee.concat([fz.power_on_behavior]),
-        exposes: extend.switch().exposes.concat([e.power_on_behavior()]),
         configure: async (device, coordinatorEndpoint, logger) => {
             // Unbind genPollCtrl to prevent device from sending checkin message.
             // Zigbee-herdsmans responds to the checkin message which causes the device
@@ -67,9 +63,6 @@ module.exports = [
         description: 'Zigbee smart switch (no neutral)',
         ota: ota.zigbeeOTA,
         extend: extend.switch(),
-        toZigbee: extend.switch().toZigbee.concat([tz.power_on_behavior]),
-        fromZigbee: extend.switch().fromZigbee.concat([fz.power_on_behavior]),
-        exposes: extend.switch().exposes.concat([e.power_on_behavior()]),
         configure: async (device, coordinatorEndpoint, logger) => {
             // Unbind genPollCtrl to prevent device from sending checkin message.
             // Zigbee-herdsmans responds to the checkin message which causes the device
@@ -123,8 +116,8 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
-            await reporting.batteryVoltage(endpoint);
-            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.batteryVoltage(endpoint, {min: 3600, max: 7200});
+            await reporting.batteryPercentageRemaining(endpoint, {min: 3600, max: 7200});
         },
     },
     {
@@ -139,8 +132,8 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genPowerCfg']);
-            await reporting.batteryVoltage(endpoint);
-            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.batteryVoltage(endpoint, {min: 3600, max: 7200});
+            await reporting.batteryPercentageRemaining(endpoint, {min: 3600, max: 7200});
         },
     },
     {
@@ -172,8 +165,8 @@ module.exports = [
                 await reporting.bind(endpoint, coordinatorEndpoint, bindClusters);
                 await reporting.temperature(endpoint, {min: 5, max: constants.repInterval.MINUTES_30, change: 20});
                 await reporting.humidity(endpoint);
-                await reporting.batteryVoltage(endpoint);
-                await reporting.batteryPercentageRemaining(endpoint);
+                await reporting.batteryVoltage(endpoint, {min: 3600, max: 7200});
+                await reporting.batteryPercentageRemaining(endpoint, {min: 3600, max: 7200});
             } catch (e) {/* Not required for all: https://github.com/Koenkk/zigbee2mqtt/issues/5562 */
                 logger.error(`Configure failed: ${e}`);
             }
@@ -218,8 +211,10 @@ module.exports = [
             const endpoint = device.getEndpoint(1);
             const bindClusters = ['genPowerCfg'];
             await reporting.bind(endpoint, coordinatorEndpoint, bindClusters);
-            await reporting.batteryVoltage(endpoint);
-            await reporting.batteryPercentageRemaining(endpoint);
+            // 3600/7200 prevents disconnect
+            // https://github.com/Koenkk/zigbee2mqtt/issues/13600#issuecomment-1283827935
+            await reporting.batteryVoltage(endpoint, {min: 3600, max: 7200});
+            await reporting.batteryPercentageRemaining(endpoint, {min: 3600, max: 7200});
         },
         exposes: [e.occupancy(), e.battery_low(), e.battery(), e.battery_voltage()],
     },

package/devices/sunricher.js

@@ -359,6 +359,8 @@ module.exports = [
     {
         fingerprint: [{modelID: 'GreenPower_2', ieeeAddr: /^0x000000005d5.....$/},
             {modelID: 'GreenPower_2', ieeeAddr: /^0x0000000057e.....$/},
+            {modelID: 'GreenPower_2', ieeeAddr: /^0x000000001fa.....$/},
+            {modelID: 'GreenPower_2', ieeeAddr: /^0x0000000034b.....$/},
             {modelID: 'GreenPower_2', ieeeAddr: /^0x00000000f12.....$/}],
         model: 'SR-ZGP2801K4-DIM',
         vendor: 'Sunricher',

package/devices/tuya.js

@@ -3493,7 +3493,7 @@ module.exports = [
         exposes: [e.contact(), e.battery(), e.vibration()],
     },
     {
-        fingerprint: [{modelID: `TS0601`, manufacturerName: `_TZE200_yi4jtqq1`}],
+        fingerprint: [{modelID: `TS0601`, manufacturerName: `_TZE200_yi4jtqq1`}, {modelID: `TS0601`, manufacturerName: `_TZE200_khx7nnka`}],
         model: `XFY-CGQ-ZIGB`,
         vendor: `TuYa`,
         description: `Illuminance sensor`,
@@ -3769,7 +3769,6 @@ module.exports = [
             .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(), e.power_on_behavior(), tuya.exposes.switchType()],
         configure: async (device, coordinatorEndpoint, logger) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);

package/lib/extend.js

@@ -6,9 +6,15 @@ const light = require('./light');
 
 const extend = {
     switch: (options={}) => {
+        options = {disablePowerOnBehavior: false, ...options};
         const exposes = [e.switch()];
         const fromZigbee = [fz.on_off, fz.ignore_basic_report];
         const toZigbee = [tz.on_off];
+        if (!options.disablePowerOnBehavior) {
+            exposes.push(e.power_on_behavior(['off', 'on', 'toggle', 'previous']));
+            fromZigbee.push(fz.power_on_behavior);
+            toZigbee.push(tz.power_on_behavior);
+        }
         return {exposes, fromZigbee, toZigbee};
     },
     light_onoff_brightness: (options={}) => {

package/package.json

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