zigbee-herdsman-converters 15.0.54 → 15.0.56

package/converters/fromZigbee.js

@@ -408,6 +408,15 @@ const converters = {
             }
         },
     },
+    pm25: {
+        cluster: 'pm25Measurement',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data['measuredValue']) {
+                return {pm25: msg.data['measuredValue']};
+            }
+        },
+    },
     soil_moisture: {
         cluster: 'msSoilMoisture',
         type: ['attributeReport', 'readResponse'],
@@ -5926,15 +5935,6 @@ const converters = {
             };
         },
     },
-    heiman_pm25: {
-        cluster: 'heimanSpecificPM25Measurement',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            if (msg.data['measuredValue']) {
-                return {pm25: msg.data['measuredValue']};
-            }
-        },
-    },
     heiman_hcho: {
         cluster: 'heimanSpecificFormaldehydeMeasurement',
         type: ['attributeReport', 'readResponse'],

package/devices/develco.js

@@ -534,6 +534,26 @@ module.exports = [
             await reporting.batteryVoltage(endpoint38);
         },
     },
+    {
+        zigbeeModel: ['WISZB-138'],
+        model: 'WISZB-138',
+        vendor: 'Develco',
+        description: 'Window sensor',
+        fromZigbee: [fz.ias_contact_alarm_1, fz.battery, develco.fz.temperature],
+        toZigbee: [],
+        exposes: [e.contact(), e.battery(), e.battery_low(), e.temperature()],
+        meta: {battery: {voltageToPercentage: '3V_2500'}},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint35 = device.getEndpoint(35);
+            const endpoint38 = device.getEndpoint(38);
+            await reporting.bind(endpoint35, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.bind(endpoint38, coordinatorEndpoint, ['msTemperatureMeasurement']);
+            await reporting.batteryVoltage(endpoint35);
+            await reporting.temperature(endpoint38);
+
+            await develco.configure.read_sw_hw_version(device, logger);
+        },
+    },
     {
         zigbeeModel: ['MOSZB-130'],
         model: 'MOSZB-130',

package/devices/heiman.js

@@ -557,14 +557,14 @@ module.exports = [
         model: 'HS2AQ-EM',
         vendor: 'HEIMAN',
         description: 'Air quality monitor',
-        fromZigbee: [fz.battery, fz.temperature, fz.humidity, fz.heiman_pm25, fz.heiman_hcho, fz.heiman_air_quality],
+        fromZigbee: [fz.battery, fz.temperature, fz.humidity, fz.pm25, fz.heiman_hcho, fz.heiman_air_quality],
         toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const heiman = {
                 configureReporting: {
                     pm25MeasuredValue: async (endpoint, overrides) => {
                         const payload = reporting.payload('measuredValue', 0, constants.repInterval.HOUR, 1, overrides);
-                        await endpoint.configureReporting('heimanSpecificPM25Measurement', payload);
+                        await endpoint.configureReporting('pm25Measurement', payload);
                     },
                     formAldehydeMeasuredValue: async (endpoint, overrides) => {
                         const payload = reporting.payload('measuredValue', 0, constants.repInterval.HOUR, 1, overrides);
@@ -591,7 +591,7 @@ module.exports = [
 
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, [
-                'genPowerCfg', 'genTime', 'msTemperatureMeasurement', 'msRelativeHumidity', 'heimanSpecificPM25Measurement',
+                'genPowerCfg', 'genTime', 'msTemperatureMeasurement', 'msRelativeHumidity', 'pm25Measurement',
                 'heimanSpecificFormaldehydeMeasurement', 'heimanSpecificAirQuality']);
 
             await reporting.batteryPercentageRemaining(endpoint);

package/devices/ikea.js

@@ -1025,4 +1025,30 @@ module.exports = [
         description: 'PILSKOTT LED floor lamp',
         extend: tradfriExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['VINDSTYRKA'],
+        model: 'E2112',
+        vendor: 'IKEA',
+        description: 'Vindstyrka air quality and humidity sensor',
+        fromZigbee: [fz.temperature, fz.humidity, fz.pm25],
+        toZigbee: [],
+        exposes: [e.temperature(), e.humidity(), e.pm25()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const ep = device.getEndpoint(1);
+            await reporting.bind(ep, coordinatorEndpoint,
+                ['msTemperatureMeasurement', 'msRelativeHumidity', 'pm25Measurement']);
+            await ep.configureReporting('msTemperatureMeasurement', [{
+                attribute: 'measuredValue',
+                minimumReportInterval: 60, maximumReportInterval: 120,
+            }]);
+            await ep.configureReporting('msRelativeHumidity', [{
+                attribute: 'measuredValue',
+                minimumReportInterval: 60, maximumReportInterval: 120,
+            }]);
+            await ep.configureReporting('pm25Measurement', [{
+                attribute: 'measuredValueIkea',
+                minimumReportInterval: 60, maximumReportInterval: 120, reportableChange: 2,
+            }]);
+        },
+    },
 ];

package/devices/ledvance.js

@@ -35,6 +35,13 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness_colortemp(),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['Panel Light 2x2 TW'],
+        model: '74746',
+        vendor: 'LEDVANCE',
+        description: 'LEDVANCE 74746 Sylvania smart+ Zigbee dimmable edge-lit panel',
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [200, 370]}),
+    },
     {
         zigbeeModel: ['Panel TW 620 UGR19'],
         model: 'GPDRPLOP401100CE',

package/devices/lidl.js

@@ -152,7 +152,7 @@ const tzLocal = {
             const newState = {};
 
             // The color mode encodes whether the light is using its white LEDs or its color LEDs
-            let colorMode = meta.state.color_mode || ColorMode.ColorTemp;
+            let colorMode = meta.state.color_mode ?? ColorMode.ColorTemp;
 
             // Color mode switching is done by setting color temperature (switch to white LEDs) or setting color (switch
             // to color LEDs)
@@ -162,12 +162,9 @@ const tzLocal = {
             if (colorMode != meta.state.color_mode) {
                 newState.color_mode = colorMode;
 
-                // We need to send a command to switch from white LEDs to color LEDs. We don't need to send one to
-                // switch back because the color LEDs are automatically turned off by the moveToColorTemp and
-                // moveToLevel commands.
-                if (colorMode == ColorMode.HS) {
-                    await entity.command('lightingColorCtrl', 'tuyaRgbMode', {enable: 1}, {}, {disableDefaultResponse: true});
-                }
+                // To switch between white mode and color mode, we have to send a special command:
+                const rgbMode = (colorMode == ColorMode.HS);
+                await entity.command('lightingColorCtrl', 'tuyaRgbMode', {enable: rgbMode}, {}, {disableDefaultResponse: true});
             }
 
             // A transition time of 0 would be treated as about 1 second, probably some kind of fallback/default
@@ -195,9 +192,9 @@ const tzLocal = {
 
                     // Load current state or defaults
                     const newSettings = {
-                        brightness: meta.state.brightness || 254, //      full brightness
-                        hue: (meta.state.color || {}).h || 0, //          red
-                        saturation: (meta.state.color || {}).s || 100, // full saturation
+                        brightness: meta.state.brightness ?? 254, //      full brightness
+                        hue: (meta.state.color ?? {}).h ?? 0, //          red
+                        saturation: (meta.state.color ?? {}).s ?? 100, // full saturation
                     };
 
                     // Apply changes

package/devices/miboxer.js

@@ -36,7 +36,7 @@ module.exports = [
         model: 'FUT035Z',
         description: 'Dual white LED controller',
         vendor: 'Miboxer',
-        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
+        extend: tuya.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], disablePowerOnBehavior: true}),
     },
     {
         fingerprint: [{modelID: 'TS0504B', manufacturerName: '_TZ3210_ttkgurpb'}],

package/devices/tuya.js

@@ -117,6 +117,22 @@ const tzLocal = {
             }
         },
     },
+    TS0224: {
+        key: ['light', 'duration', 'volume'],
+        convertSet: async (entity, key, value, meta) => {
+            if (key === 'light') {
+                await entity.command('genOnOff', value.toLowerCase() === 'on' ? 'on' : 'off', {}, utils.getOptions(meta.mapped, entity));
+            } else if (key === 'duration') {
+                await entity.write('ssIasWd', {'maxDuration': value}, utils.getOptions(meta.mapped, entity));
+            } else if (key === 'volume') {
+                const lookup = {'mute': 0, 'low': 10, 'medium': 30, 'high': 50};
+                value = value.toLowerCase();
+                utils.validateValue(value, Object.keys(lookup));
+                await entity.write('ssIasWd', {0x0002: {value: lookup[value], type: 0x0a}}, utils.getOptions(meta.mapped, entity));
+            }
+            return {state: {[key]: value}};
+        },
+    },
     power_on_behavior: {
         key: ['power_on_behavior'],
         convertSet: async (entity, key, value, meta) => {
@@ -2115,6 +2131,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_cowvfni3'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_rddyvrci'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_nueqqe6k'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_bqcqqjpb'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_xaabybja'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_rmymn92d'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_3i3exuay'},
@@ -2133,6 +2150,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_5sbebbzs'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_udank5zs'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_zuz7f94z'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_nv6nxo0c'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_68nvbio9'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_3ylew7b4'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_llm0epxg'},
@@ -4114,4 +4132,46 @@ module.exports = [
             ],
         },
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_r32ctezx']),
+        model: 'TS0601_fan_switch',
+        vendor: 'TuYa',
+        description: 'Fan switch',
+        fromZigbee: [tuya.fz.datapoints],
+        toZigbee: [tuya.tz.datapoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [
+            tuya.exposes.switch(), e.power_on_behavior(['off', 'on']).withAccess(ea.STATE_SET),
+            tuya.exposes.countdown().withValueMin(0).withValueMax(43200).withUnit('s').withDescription('Max ON time in seconds'),
+            exposes.numeric('fan_speed', ea.STATE_SET).withValueMin(1).withValueMax(5).withValueStep(1)
+                .withDescription('Speed off the fan'),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [1, 'state', tuya.valueConverter.onOff],
+                [2, 'countdown', tuya.valueConverter.countdown],
+                [3, 'fan_speed', tuya.valueConverterBasic
+                    .lookup({'1': tuya.enum(0), '2': tuya.enum(1), '3': tuya.enum(2), '4': tuya.enum(3), '5': tuya.enum(4)})],
+                [11, 'power_on_behavior', tuya.valueConverterBasic.lookup({'off': tuya.enum(0), 'on': tuya.enum(1)})],
+            ],
+        },
+        whiteLabel: [
+            {vendor: 'Lerlink', model: 'T2-Z67/T2-W67'},
+        ],
+    },
+    {
+        zigbeeModel: ['TS0224'],
+        model: 'TS0224',
+        vendor: 'TuYa',
+        description: 'Smart light & sound siren',
+        fromZigbee: [],
+        toZigbee: [tz.warning, tzLocal.TS0224],
+        exposes: [e.warning(),
+            exposes.binary('light', ea.STATE_SET, 'ON', 'OFF').withDescription('Turn the light of the alarm ON/OFF'),
+            exposes.numeric('duration', ea.STATE_SET).withValueMin(60).withValueMax(3600).withValueStep(1).withUnit('s')
+                .withDescription('Duration of the alarm'),
+            exposes.enum('volume', ea.STATE_SET, ['mute', 'low', 'medium', 'high'])
+                .withDescription('Volume of the alarm'),
+        ],
+    },
 ];

package/devices/xiaomi.js

@@ -68,7 +68,7 @@ const fzLocal = {
         },
     },
     aqara_s1_pm25: {
-        cluster: 'heimanSpecificPM25Measurement',
+        cluster: 'pm25Measurement',
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
             if (msg.data['measuredValue']) {

package/lib/tuya.js

@@ -1615,7 +1615,7 @@ const tuyaTz = {
             'week_schedule_programming', 'online', 'holiday_mode_date', 'schedule', 'schedule_monday', 'schedule_tuesday',
             'schedule_wednesday', 'schedule_thursday', 'schedule_friday', 'schedule_saturday', 'schedule_sunday', 'clear_fault',
             'scale_protection', 'error', 'radar_scene', 'radar_sensitivity', 'tumble_alarm_time', 'tumble_switch', 'fall_sensitivity',
-            'min_temperature', 'max_temperature', 'window_detection', 'boost_heating', 'alarm_ringtone', 'alarm_time',
+            'min_temperature', 'max_temperature', 'window_detection', 'boost_heating', 'alarm_ringtone', 'alarm_time', 'fan_speed',
         ],
         convertSet: async (entity, key, value, meta) => {
             // A set converter is only called once; therefore we need to loop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.54",
+  "version": "15.0.56",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -34,11 +34,11 @@
   },
   "homepage": "https://github.com/Koenkk/zigbee-herdsman-converters",
   "dependencies": {
-    "axios": "^1.3.3",
+    "axios": "^1.3.4",
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^3.0.0",
-    "zigbee-herdsman": "^0.14.93"
+    "zigbee-herdsman": "^0.14.95"
   },
   "devDependencies": {
     "eslint": "*",