zigbee-herdsman-converters 15.0.14 → 15.0.15

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/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']);

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);
@@ -428,4 +428,23 @@ 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']);
+        },
+    },
 ];

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/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([
@@ -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',
@@ -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);
@@ -3245,6 +3259,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
@@ -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/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.15",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [