zigbee-herdsman-converters 14.0.524 → 14.0.527

package/devices/philips.js

@@ -3,27 +3,31 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const ota = require('../lib/ota');
 const reporting = require('../lib/reporting');
-const extend = require('../lib/extend');
 const e = exposes.presets;
 const ea = exposes.access;
 
+// Make sure extend.light_* is not used (hueExtend should be used instead)
+const extendDontUse = require('../lib/extend');
+const extend = {switch: extendDontUse.switch};
+
 const hueExtend = {
     light_onoff_brightness: (options={}) => ({
-        ...extend.light_onoff_brightness(options),
-        toZigbee: extend.light_onoff_brightness(options).toZigbee.concat([tz.hue_power_on_behavior, tz.hue_power_on_error]),
+        ...extendDontUse.light_onoff_brightness(options),
+        toZigbee: extendDontUse.light_onoff_brightness(options).toZigbee.concat([tz.hue_power_on_behavior, tz.hue_power_on_error]),
     }),
     light_onoff_brightness_colortemp: (options={}) => ({
-        ...extend.light_onoff_brightness_colortemp(options),
-        toZigbee: extend.light_onoff_brightness_colortemp(options).toZigbee.concat([tz.hue_power_on_behavior, tz.hue_power_on_error]),
+        ...extendDontUse.light_onoff_brightness_colortemp(options),
+        toZigbee: extendDontUse.light_onoff_brightness_colortemp(options).toZigbee
+            .concat([tz.hue_power_on_behavior, tz.hue_power_on_error]),
     }),
     light_onoff_brightness_color: (options={}) => ({
-        ...extend.light_onoff_brightness_color({supportsHS: true, ...options}),
-        toZigbee: extend.light_onoff_brightness_color({supportsHS: true, ...options}).toZigbee
+        ...extendDontUse.light_onoff_brightness_color({supportsHS: true, ...options}),
+        toZigbee: extendDontUse.light_onoff_brightness_color({supportsHS: true, ...options}).toZigbee
             .concat([tz.hue_power_on_behavior, tz.hue_power_on_error]),
     }),
     light_onoff_brightness_colortemp_color: (options={}) => ({
-        ...extend.light_onoff_brightness_colortemp_color({supportsHS: true, ...options}),
-        toZigbee: extend.light_onoff_brightness_colortemp_color({supportsHS: true, ...options})
+        ...extendDontUse.light_onoff_brightness_colortemp_color({supportsHS: true, ...options}),
+        toZigbee: extendDontUse.light_onoff_brightness_colortemp_color({supportsHS: true, ...options})
             .toZigbee.concat([tz.hue_power_on_behavior, tz.hue_power_on_error]),
     }),
 };
@@ -34,7 +38,7 @@ module.exports = [
         model: '929003055801',
         vendor: 'Philips',
         description: 'Hue white ambiance bathroom ceiling light Adore with Bluetooth',
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
     {
         zigbeeModel: ['929003045301_01', '929003045301_02', '929003045301_03'],
@@ -69,7 +73,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue white A60 bulb B22 1055lm with Bluetooth',
         meta: {turnsOffAtBrightness1: true},
-        extend: extend.light_onoff_brightness(),
+        extend: hueExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -117,6 +121,15 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['915005996601'],
+        model: '915005996601',
+        vendor: 'Philips',
+        description: 'Hue white ambiance ceiling white Enrave M with Bluetooth',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['915005996801', '915005996901'],
         model: '915005996901',
@@ -159,7 +172,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue Wellness table lamp',
         meta: {turnsOffAtBrightness1: true},
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -168,7 +181,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue white ambiance suspension Cher with bluetooth 3000lm',
         meta: {turnsOffAtBrightness1: true},
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -177,7 +190,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue White Ambiance Cher Pendant',
         meta: {turnsOffAtBrightness1: true},
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -221,7 +234,7 @@ module.exports = [
         model: '3418931P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Struana bathroom ceiling with bluetooth 2400lm',
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -398,7 +411,15 @@ module.exports = [
         model: '929003055901',
         vendor: 'Philips',
         description: 'Hue white ambiance bathroom ceiling light Adore with Bluetooth',
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        ota: ota.zigbeeOTA,
+    },
+    {
+        zigbeeModel: ['7602031N6'],
+        model: '7602031N6',
+        vendor: 'Philips',
+        description: 'Hue Go portable light',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -465,7 +486,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['LCT026', '7602031P7', '7602031U7', '7602031N6'],
+        zigbeeModel: ['LCT026', '7602031P7', '7602031U7'],
         model: '7602031P7',
         vendor: 'Philips',
         description: 'Hue Go with Bluetooth',
@@ -747,7 +768,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue white A60 bulb E27 1050lm with Bluetooth',
         meta: {turnsOffAtBrightness1: true},
-        extend: extend.light_onoff_brightness(),
+        extend: hueExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -1411,7 +1432,7 @@ module.exports = [
         model: '929003054101',
         vendor: 'Philips',
         description: 'Hue Wellner white ambiance E27 806lm with Bluetooth',
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
     {
         zigbeeModel: ['3261330P6'],
@@ -2355,7 +2376,18 @@ module.exports = [
         model: '929003055201',
         vendor: 'Philips',
         description: 'Hue Being',
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        ota: ota.zigbeeOTA,
+        meta: {turnsOffAtBrightness1: true},
+    },
+    {
+        zigbeeModel: ['4100448U9'],
+        model: '4100448U9',
+        vendor: 'Philips',
+        description: 'Hue Being',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        ota: ota.zigbeeOTA,
+        meta: {turnsOffAtBrightness1: true},
     },
     {
         zigbeeModel: ['1743630P7', '1743630V7'],
@@ -2804,7 +2836,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue White & Color Ambiance Xamento M',
         meta: {turnsOffAtBrightness1: true},
-        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -2813,7 +2845,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue White & Color Ambiance Surimu square panel',
         meta: {turnsOffAtBrightness1: true},
-        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -2971,7 +3003,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue white ambiance GU10 with Bluetooth',
         meta: {turnsOffAtBrightness1: true},
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -2980,7 +3012,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue white ambiance bathroom recessed downlight Adore with Bluetooth',
         meta: {turnsOffAtBrightness1: true},
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
         ota: ota.zigbeeOTA,
     },
     {

package/devices/tuya.js

@@ -2373,5 +2373,37 @@ module.exports = [
                 .withDescription('PIR keep time in seconds (refresh and update only while active)'),
         ],
     },
-
+    {
+        fingerprint: [{modelID: 'TS004F', manufacturerName: '_TZ3000_kjfzuycl'}],
+        model: 'ERS-10TZBVB-AA',
+        vendor: 'TuYa',
+        description: 'Smart button',
+        fromZigbee: [
+            fz.command_step, fz.command_on, fz.command_off, fz.command_move_to_color_temp, fz.command_move_to_level,
+            fz.tuya_multi_action, fz.tuya_operation_mode, fz.battery,
+        ],
+        toZigbee: [tz.tuya_operation_mode],
+        exposes: [
+            e.action([
+                'single', 'double', 'hold', 'brightness_move_to_level', 'color_temperature_move',
+                'brightness_step_up', 'brightness_step_down', 'on', 'off',
+            ]),
+            e.battery(),
+            exposes.enum('operation_mode', ea.ALL, ['command', 'event']).withDescription(
+                'Operation mode: "command" - for group control, "event" - for clicks'),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', [0x0004, 0x000, 0x0001, 0x0005, 0x0007, 0xfffe]);
+            await endpoint.write('genOnOff', {'tuyaOperationMode': 1});
+            await endpoint.read('genOnOff', ['tuyaOperationMode']);
+            try {
+                await endpoint.read(0xE001, [0xD011]);
+            } catch (err) {/* do nothing */}
+            await endpoint.read('genPowerCfg', ['batteryVoltage', 'batteryPercentageRemaining']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.batteryPercentageRemaining(endpoint);
+        },
+    },
 ];

package/lib/exposes.js

@@ -327,7 +327,6 @@ class Cover extends Base {
         super();
         this.type = 'cover';
         this.features = [];
-        this.features.push(new Enum('state', access.STATE_SET, ['OPEN', 'CLOSE', 'STOP']));
     }
 
     withPosition() {
@@ -341,6 +340,12 @@ class Cover extends Base {
         this.features.push(new Numeric('tilt', access.ALL).withValueMin(0).withValueMax(100).withDescription('Tilt of this cover'));
         return this;
     }
+
+    withState(property='state', access=a.STATE_SET, values=['OPEN', 'CLOSE', 'STOP']) {
+        assert(!this.endpoint, 'Cannot add feature after adding endpoint');
+        this.features.push(new Enum(property, access, values));
+        return this;
+    }
 }
 
 class Fan extends Base {
@@ -532,9 +537,9 @@ module.exports = {
         comfort_temperature: () => new Numeric('comfort_temperature', access.STATE_SET).withUnit('°C').withDescription('Comfort temperature').withValueMin(0).withValueMax(30),
         consumer_connected: () => new Binary('consumer_connected', access.STATE, true, false).withDescription('Indicates whether a plug is physically attached. Device does not have to pull power or even be connected electrically (state of this binary switch can be ON even if main power switch is OFF)'),
         contact: () => new Binary('contact', access.STATE, false, true).withDescription('Indicates if the contact is closed (= true) or open (= false)'),
-        cover_position: () => new Cover().withPosition(),
-        cover_position_tilt: () => new Cover().withPosition().withTilt(),
-        cover_tilt: () => new Cover().withTilt(),
+        cover_position: () => new Cover().withState().withPosition(),
+        cover_position_tilt: () => new Cover().withState().withPosition().withTilt(),
+        cover_tilt: () => new Cover().withState().withTilt(),
         cpu_temperature: () => new Numeric('cpu_temperature', access.STATE).withUnit('°C').withDescription('Temperature of the CPU'),
         cube_side: (name) => new Numeric(name, access.STATE).withDescription('Side of the cube').withValueMin(0).withValueMax(6).withValueStep(1),
         current: () => new Numeric('current', access.STATE).withUnit('A').withDescription('Instantaneous measured electrical current'),

package/package.json

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