zigbee-herdsman-converters 14.0.394 → 14.0.395

package/devices/custom_devices_diy.js

@@ -332,4 +332,25 @@ module.exports = [
         },
         exposes: [e.soil_moisture(), e.battery(), e.illuminance(), e.temperature(), e.humidity()],
     },
+    {
+        zigbeeModel: ['EFEKTA_PWS_MaxPro'],
+        model: 'EFEKTA_PWS_MaxPro',
+        vendor: 'Custom devices (DiY)',
+        description: '[Plant watering sensor EFEKTA PWS Max Pro,  long battery life](http://efektalab.com/PWS_MaxPro)',
+        fromZigbee: [fz.temperature, fz.humidity, fz.illuminance, fz.soil_moisture, fz.battery],
+        toZigbee: [tz.factory_reset],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const firstEndpoint = device.getEndpoint(1);
+            await reporting.bind(firstEndpoint, coordinatorEndpoint, [
+                'genPowerCfg', 'msTemperatureMeasurement', 'msRelativeHumidity', 'msIlluminanceMeasurement', 'msSoilMoisture']);
+            const overides = {min: 0, max: 21600, change: 0};
+            await reporting.batteryVoltage(firstEndpoint, overides);
+            await reporting.batteryPercentageRemaining(firstEndpoint, overides);
+            await reporting.temperature(firstEndpoint, overides);
+            await reporting.humidity(firstEndpoint, overides);
+            await reporting.illuminance(firstEndpoint, overides);
+            await reporting.soil_moisture(firstEndpoint, overides);
+        },
+        exposes: [e.soil_moisture(), e.battery(), e.illuminance(), e.temperature(), e.humidity()],
+    },
 ];

package/devices/philips.js

@@ -1021,7 +1021,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['3417931P6'],
+        zigbeeModel: ['3417931P6', '929003056201'],
         model: '3417931P6',
         vendor: 'Philips',
         description: 'Hue white ambiance Adore GU10 with Bluetooth (2 spots)',

package/devices/scanproducts.js

@@ -1,5 +1,5 @@
-const reporting = require('zigbee-herdsman-converters/lib/reporting');
-const extend = require('zigbee-herdsman-converters/lib/extend');
+const reporting = require('../lib/reporting');
+const extend = require('../lib/extend');
 
 module.exports = [
     {

package/devices/skydance.js

@@ -46,7 +46,7 @@ module.exports = [
         toZigbee: [tz.tuya_dimmer_state, tz.tuya_light_wz5],
         exposes: [
             exposes.light().withBrightness().setAccess('state', ea.STATE_SET).setAccess('brightness',
-                ea.STATE_SET).withColor('hs'),
+                ea.STATE_SET).withColor(['hs']),
         ],
     },
     {
@@ -61,7 +61,7 @@ module.exports = [
         toZigbee: [tz.tuya_dimmer_state, tz.tuya_light_wz5],
         exposes: [
             exposes.light().withBrightness().setAccess('state', ea.STATE_SET).setAccess('brightness',
-                ea.STATE_SET).withColor('hs'),
+                ea.STATE_SET).withColor(['hs']),
             exposes.numeric('white_brightness', ea.STATE_SET).withValueMin(0).withValueMax(254).withDescription(
                 'White brightness of this light'),
         ],
@@ -79,7 +79,7 @@ module.exports = [
         toZigbee: [tz.tuya_dimmer_state, tz.tuya_light_wz5],
         exposes: [
             exposes.light().withBrightness().setAccess('state', ea.STATE_SET).setAccess('brightness',
-                ea.STATE_SET).withColor('hs').withColorTemp([250, 454]).setAccess('color_temp',
+                ea.STATE_SET).withColor(['hs']).withColorTemp([250, 454]).setAccess('color_temp',
                 ea.STATE_SET),
             exposes.numeric('white_brightness', ea.STATE_SET).withValueMin(0).withValueMax(254).withDescription(
                 'White brightness of this light'),

package/devices/tuya.js

@@ -510,6 +510,7 @@ module.exports = [
             {modelID: 'TS0502B', manufacturerName: '_TZ3000_zw7wr5uo'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_pz9zmxjj'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3000_fzwhym79'},
+            {modelID: 'TS0502B', manufacturerName: '_TZ3210_rm0hthdo'},
         ],
         model: 'TS0502B',
         vendor: 'TuYa',
@@ -1678,7 +1679,7 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic']);
         },
         exposes: [exposes.binary('trigger', ea.STATE_SET, true, false).withDescription('Trigger the door movement'),
-            e.action(), exposes.binary('garage_door_contact', ea.STATE, true, false)],
+            e.action(['trigger']), exposes.binary('garage_door_contact', ea.STATE, true, false)],
     },
     {
         fingerprint: [{modelID: 'TS0201', manufacturerName: '_TZ3000_qaaysllp'}],

package/devices/xiaomi.js

@@ -1655,6 +1655,7 @@ module.exports = [
             const payload = reporting.payload('presentValue', 10, constants.repInterval.HOUR, 5);
             await endpoint.configureReporting('genAnalogInput', payload);
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.switch.b2nc01'],

package/lib/exposes.js

@@ -294,20 +294,22 @@ class Light extends Base {
 
     withColor(types) {
         assert(!this.endpoint, 'Cannot add feature after adding endpoint');
-        if (types.includes('xy')) {
-            const colorXY = new Composite('color_xy', 'color')
-                .withFeature(new Numeric('x', access.ALL))
-                .withFeature(new Numeric('y', access.ALL))
-                .withDescription('Color of this light in the CIE 1931 color space (x/y)');
-            this.features.push(colorXY);
-        }
-
-        if (types.includes('hs')) {
-            const colorHS = new Composite('color_hs', 'color')
-                .withFeature(new Numeric('hue', access.ALL))
-                .withFeature(new Numeric('saturation', access.ALL))
-                .withDescription('Color of this light expressed as hue/saturation');
-            this.features.push(colorHS);
+        for (const type of types) {
+            if (type === 'xy') {
+                const colorXY = new Composite('color_xy', 'color')
+                    .withFeature(new Numeric('x', access.ALL))
+                    .withFeature(new Numeric('y', access.ALL))
+                    .withDescription('Color of this light in the CIE 1931 color space (x/y)');
+                this.features.push(colorXY);
+            } else if (type === 'hs') {
+                const colorHS = new Composite('color_hs', 'color')
+                    .withFeature(new Numeric('hue', access.ALL))
+                    .withFeature(new Numeric('saturation', access.ALL))
+                    .withDescription('Color of this light expressed as hue/saturation');
+                this.features.push(colorHS);
+            } else {
+                assert(false, `Unsupported color type ${type}`);
+            }
         }
 
         return this;
@@ -547,10 +549,10 @@ module.exports = {
         keypad_lockout: () => new Enum('keypad_lockout', access.ALL, ['unlock', 'lock1', 'lock2']).withDescription('Enables/disables physical input on the device'),
         led_disabled_night: () => new Binary('led_disabled_night', access.ALL, true, false).withDescription('Enable/disable the LED at night'),
         light_brightness: () => new Light().withBrightness(),
-        light_brightness_color: () => new Light().withBrightness().withColor((['xy', 'hs'])),
+        light_brightness_color: (preferHS) => new Light().withBrightness().withColor((preferHS ? ['hs', 'xy'] : ['xy', 'hs'])),
         light_brightness_colorhs: () => new Light().withBrightness().withColor(['hs']),
         light_brightness_colortemp: (colorTempRange) => new Light().withBrightness().withColorTemp(colorTempRange).withColorTempStartup(colorTempRange),
-        light_brightness_colortemp_color: (colorTempRange) => new Light().withBrightness().withColorTemp(colorTempRange).withColorTempStartup(colorTempRange).withColor(['xy', 'hs']),
+        light_brightness_colortemp_color: (colorTempRange, preferHS) => new Light().withBrightness().withColorTemp(colorTempRange).withColorTempStartup(colorTempRange).withColor(preferHS ? ['hs', 'xy'] : ['xy', 'hs']),
         light_brightness_colortemp_colorhs: (colorTempRange) => new Light().withBrightness().withColorTemp(colorTempRange).withColorTempStartup(colorTempRange).withColor(['hs']),
         light_brightness_colortemp_colorxy: (colorTempRange) => new Light().withBrightness().withColorTemp(colorTempRange).withColorTempStartup(colorTempRange).withColor(['xy']),
         light_brightness_colorxy: () => new Light().withBrightness().withColor((['xy'])),

package/lib/extend.js

@@ -50,8 +50,8 @@ const extend = {
         return result;
     },
     light_onoff_brightness_color: (options={}) => {
-        options = {disableEffect: false, supportsHS: false, ...options};
-        const exposes = [(options.supportsHS ? e.light_brightness_color() : e.light_brightness_colorxy()),
+        options = {disableEffect: false, supportsHS: false, preferHS: 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 toZigbee = [tz.light_onoff_brightness, tz.light_color, tz.ignore_transition, tz.ignore_rate, tz.light_brightness_move,
@@ -66,8 +66,8 @@ const extend = {
         };
     },
     light_onoff_brightness_colortemp_color: (options={}) => {
-        options = {disableEffect: false, supportsHS: false, disableColorTempStartup: false, ...options};
-        const exposes = [(options.supportsHS ? e.light_brightness_colortemp_color(options.colorTempRange) :
+        options = {disableEffect: false, supportsHS: false, disableColorTempStartup: false, preferHS: 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 toZigbee = [

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.394",
+  "version": "14.0.395",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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