zigbee-herdsman-converters 14.0.421 → 14.0.422

package/converters/fromZigbee.js

@@ -4141,6 +4141,25 @@ const converters = {
             }
         },
     },
+    tuya_CO: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataReport', 'commandDataResponse'],
+        options: [exposes.options.precision('co'), exposes.options.calibration('co')],
+        convert: (model, msg, publish, options, meta) => {
+            const dpValue = tuya.firstDpValue(msg, meta, 'tuya_CO');
+            const dp = dpValue.dp;
+            const value = tuya.getDataValue(dpValue);
+            switch (dp) {
+            case tuya.dataPoints.tuyaSabCO:
+                return {co: calibrateAndPrecisionRoundOptions(value / 100, options, 'co')};
+            case tuya.dataPoints.tuyaSabCOalarm:
+                return {carbon_monoxide: value ? 'OFF' : 'ON'};
+            default:
+                meta.logger.warn(`zigbee-herdsman-converters:TuyaSmartAirBox: Unrecognized DP #${
+                    dp} with data ${JSON.stringify(dpValue)}`);
+            }
+        },
+    },
     saswell_thermostat: {
         cluster: 'manuSpecificTuya',
         type: ['commandDataResponse', 'commandDataReport'],
@@ -4434,7 +4453,7 @@ const converters = {
             case tuya.dataPoints.ecoTemp:
                 return {eco_temperature: value};
             case tuya.dataPoints.valvePos:
-                return {position: value};
+                return {position: value, running_state: value ? 'heat' : 'idle'};
             case tuya.dataPoints.awayTemp:
                 return {away_preset_temperature: value};
             case tuya.dataPoints.awayDays:
@@ -8150,7 +8169,7 @@ const converters = {
                     1: 'on',
                     2: 'previous',
                 };
-                result.power_on_behaviour = lookup[value];
+                result.power_on_behavior = lookup[value];
             }
             if (dp === tuya.dataPoints.hochFaultCode) {
                 const lookup = {
@@ -8410,6 +8429,20 @@ const converters = {
             }
         },
     },
+    tm081: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataReport'],
+        convert: (model, msg, publish, options, meta) => {
+            const dpValue = tuya.firstDpValue(msg, meta, 'tm0801');
+            const dp = dpValue.dp;
+            const value = tuya.getDataValue(dpValue);
+            if (dp === 1) return {contact: value === true ? false : true};
+            if (dp === 2) return {battery: value};
+            else {
+                meta.logger.warn(`zigbee-herdsman-converters:TM081: NOT RECOGNIZED DP #${dp} with data ${JSON.stringify(dpValue)}`);
+            }
+        },
+    },
     // #endregion
 
     // #region Ignore converters (these message dont need parsing).

package/converters/toZigbee.js

@@ -7006,7 +7006,7 @@ const converters = {
         key: ['state',
             'child_lock',
             'countdown_timer',
-            'power_on_behaviour',
+            'power_on_behavior',
             'trip',
             'clear_device_data',
             /* TODO: Add the below keys when toZigbee converter work has been completed
@@ -7025,10 +7025,10 @@ const converters = {
             } else if (key === 'countdown_timer') {
                 await tuya.sendDataPointValue(entity, tuya.dataPoints.hochCountdownTimer, value);
                 return {state: {countdown_timer: value}};
-            } else if (key === 'power_on_behaviour') {
+            } else if (key === 'power_on_behavior') {
                 const lookup = {'off': 0, 'on': 1, 'previous': 2};
                 await tuya.sendDataPointEnum(entity, tuya.dataPoints.hochRelayStatus, lookup[value], 'sendData');
-                return {state: {power_on_behaviour: value}};
+                return {state: {power_on_behavior: value}};
             } else if (key === 'trip') {
                 if (value === 'clear') {
                     await tuya.sendDataPointBool(entity, tuya.dataPoints.hochLocking, true, 'sendData');

package/devices/adeo.js

@@ -71,6 +71,13 @@ module.exports = [
         description: 'ENKI Lexman E27 14W to 100W LED RGBW',
         extend: extend.light_onoff_brightness_colortemp_color(),
     },
+    {
+        zigbeeModel: ['ZBEK-2'],
+        model: 'IG-CDZOTAAG014RA-MAN',
+        vendor: 'ADEO',
+        description: 'ENKI Lexman E27 14W to 100W LED RGBW v2',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
+    },
     {
         zigbeeModel: ['LXEK-7'],
         model: '9CZA-A806ST-Q1Z',

package/devices/aurora_lighting.js

@@ -4,6 +4,21 @@ const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
+const utils = require('zigbee-herdsman-converters/lib/utils');
+const ea = exposes.access;
+
+const tzLocal = {
+    aOneBacklight: {
+        key: ['backlight_led'],
+        convertSet: async (entity, key, value, meta) => {
+            const state = value.toLowerCase();
+            utils.validateValue(state, ['toggle', 'off', 'on']);
+            const endpoint = meta.device.getEndpoint(3);
+            await endpoint.command('genOnOff', state, {});
+            return {state: {backlight_led: state.toUpperCase()}};
+        },
+    },
+};
 
 const batteryRotaryDimmer = (...endpointsIds) => ({
     fromZigbee: [fz.battery, fz.command_on, fz.command_off, fz.command_step, fz.command_step_color_temperature],
@@ -129,6 +144,9 @@ module.exports = [
         model: 'AU-A1ZB2WDM',
         vendor: 'Aurora Lighting',
         description: 'AOne 250W smart rotary dimmer module',
+        exposes: [...extend.light_onoff_brightness({noConfigure: true}).exposes,
+            exposes.binary('backlight_led', ea.STATE_SET, 'ON', 'OFF').withDescription('Enable or disable the blue backlight LED')],
+        toZigbee: [...extend.light_onoff_brightness({noConfigure: true}).toZigbee, tzLocal.aOneBacklight],
         extend: extend.light_onoff_brightness({noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);

package/devices/enbrighten.js

@@ -15,6 +15,18 @@ module.exports = [
             await reporting.onOff(endpoint);
         },
     },
+    {
+        zigbeeModel: ['43078'],
+        model: '43078',
+        vendor: 'Enbrighten',
+        description: 'Zigbee in-wall smart switch',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
     {
         zigbeeModel: ['43080'],
         model: '43080',

package/devices/ikea.js

@@ -285,6 +285,13 @@ module.exports = [
         description: 'TRADFRI LED bulb E27 1055 lumen, dimmable, white spectrum, opal white',
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
+    {
+        zigbeeModel: ['TRADFRIbulbE27WSglobeclear806lm'],
+        model: 'LED2004G8',
+        vendor: 'IKEA',
+        description: 'TRADFRI LED bulb E27 806 lumen, dimmable, white spectrum, clear',
+        extend: tradfriExtend.light_onoff_brightness_colortemp(),
+    },
     {
         zigbeeModel: ['TRADFRI bulb E27 opal 470lm', 'TRADFRI bulb E27 W opal 470lm', 'TRADFRIbulbT120E27WSopal470lm'],
         model: 'LED1937T5_E27',

package/devices/lds.js

@@ -0,0 +1,11 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['ZBT-RGBWLight-A0000'],
+        model: 'ZBT-RGBWLight-A0000',
+        vendor: 'LDS',
+        description: 'Ynoa smart LED E27',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555]}),
+    },
+];

package/devices/lixee.js

@@ -443,19 +443,21 @@ function getCurrentConfig(device, options, logger=console) {
         .filter((e) => e.linkyMode == linkyMode && (e.linkyPhase == linkyPhase || e.linkyPhase == linkyPhaseDef.all) && (linkyProduction || !e.onlyProducer));
 
     // Filter even more, based on our current tarif
-    let currentTarf;
+    let currentTarf = '';
 
-    try {
-        // Try to remove atributes which doesn't match current tarif
-        currentTarf = endpoint.clusters.liXeePrivate.attributes.currentTarif.replace(/\0/g, '');
-    } catch (error) {
-        currentTarf = '';
-        if (options && options.hasOwnProperty('tarif') && options['tarif'] != 'auto') {
-            currentTarf = Object.entries(tarifsDef).find(( [k, v] ) => (v.fname == options['tarif']))[1].currentTarf;
+    if (options && options.hasOwnProperty('tarif') && options['tarif'] != 'auto') {
+        currentTarf = Object.entries(tarifsDef).find(( [k, v] ) => (v.fname == options['tarif']))[1].currentTarf;
+    } else {
+        try {
+            const lixAtts = endpoint.clusters[clustersDef._0xFF66].attributes;
+            lixAtts.raiseIfEmpty;
+            currentTarf = fzLocal.lixee_private_fz.convert({}, {data: lixAtts}).current_tarif;
+        } catch (error) {
+            logger.warn(`Not able to detect the current tarif. Not filtering any expose...`);
         }
     }
 
-    // logger.debug(`zlinky config: ` + linkyMode + `, `+ linkyPhase + `, `+ linkyProduction.toString() +`, `+ currentTarf);
+    logger.debug(`zlinky config: ` + linkyMode + `, `+ linkyPhase + `, `+ linkyProduction.toString() +`, `+ currentTarf);
 
     switch (currentTarf) {
     case linkyMode == linkyModeDef.legacy && tarifsDef.histo_BASE.currentTarf:
@@ -481,7 +483,7 @@ function getCurrentConfig(device, options, logger=console) {
     return myExpose;
 }
 const definition = {
-    zigbeeModel: ['ZLinky_TIC'],
+    zigbeeModel: ['ZLinky_TIC', 'ZLinky_TIC\u0000'],
     model: 'ZLinky_TIC',
     vendor: 'LiXee',
     description: 'Lixee ZLinky',
@@ -525,13 +527,15 @@ const definition = {
             clustersDef._0xFF66, /* liXeePrivate */
         ]);
 
+        await endpoint.read('liXeePrivate', ['linkyMode', 'currentTarif'], {manufacturerCode: null});
+
         const configReportings = [];
         const suscribeNew = getCurrentConfig(device, options, logger).filter((e) => e.reportable);
 
         const unsuscribe = endpoint.configuredReportings
             .filter((e) => !suscribeNew.some((r) => e.cluster.name == r.cluster && e.attribute.name == r.att));
         // Unsuscribe reports that doesn't correspond with the current config
-        (await Promise.allSettled(unsuscribe.map((e) => endpoint.configureReporting(e.cluster.name, reporting.payload(e.attribute.name, e.minimumReportInterval, 65535, e.reportableChange)))))
+        (await Promise.allSettled(unsuscribe.map((e) => endpoint.configureReporting(e.cluster.name, reporting.payload(e.attribute.name, e.minimumReportInterval, 65535, e.reportableChange), {manufacturerCode: null}))))
             .filter((e) => e.status == 'rejected')
             .forEach((e) => {
                 throw e.reason;
@@ -550,7 +554,8 @@ const definition = {
             }
             configReportings.push(endpoint
                 .configureReporting(
-                    e.cluster, reporting.payload(params.att, params.min, params.max, params.change)),
+                    e.cluster, reporting.payload(params.att, params.min, params.max, params.change),
+                    {manufacturerCode: null}),
             );
         }
         (await Promise.allSettled(configReportings))
@@ -573,8 +578,7 @@ const definition = {
                     .filter((e) => !endpoint.configuredReportings.some((r) => r.cluster.name == e.cluster && r.attribute.name == e.att));
                 for (const e of currentExposes) {
                     await endpoint
-                        .read(e.cluster, [e.att])
-                        .catch((err) => { }); // TODO: Ignore reads error?
+                        .read(e.cluster, [e.att], {manufacturerCode: null});
                 }
             }, seconds * 1000);
             globalStore.putValue(device, 'interval', interval);

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

@@ -45,7 +45,7 @@ module.exports = [
     },
     {
         zigbeeModel: ['ZBT-ExtendedColor'],
-        model: '404000/404005/404012',
+        model: '404000/404005/404012/404019',
         vendor: 'Müller Licht',
         description: 'Tint LED bulb GU10/E14/E27 350/470/806 lumen, dimmable, color, opal white',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 556], supportsHS: true}),

package/devices/philips.js

@@ -2465,7 +2465,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['5309230P6', '5309231P6'],
+        zigbeeModel: ['5309230P6', '5309231P6', '929003045701_01', '929003045701_02'],
         model: '5309230P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner double spotlight',

package/devices/profalux.js

@@ -1,7 +1,7 @@
-const fz = require('zigbee-herdsman-converters/converters/fromZigbee');
-const tz = require('zigbee-herdsman-converters/converters/toZigbee');
-const exposes = require('zigbee-herdsman-converters/lib/exposes');
-const reporting = require('zigbee-herdsman-converters/lib/reporting');
+const fz = require('../converters/fromZigbee');
+const tz = require('../converters/toZigbee');
+const exposes = require('../lib/exposes');
+const reporting = require('../lib/reporting');
 const e = exposes.presets;
 const ea = exposes.access;
 

package/devices/slv.js

@@ -0,0 +1,20 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['1001248', 'ZBT-ColorTemperature-Panel'],
+        model: '1001248',
+        vendor: 'SLV',
+        description: 'VALETO CCT LED driver',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+    },
+    {
+        zigbeeModel: ['1002994'],
+        model: '1002994',
+        vendor: 'SLV',
+        description: 'VALETO remote (binds to device)',
+        fromZigbee: [],
+        toZigbee: [],
+        exposes: [],
+    },
+];

package/devices/tuya.js

@@ -98,6 +98,15 @@ module.exports = [
         toZigbee: [],
         exposes: [e.temperature(), e.humidity(), e.co2(), e.voc(), e.formaldehyd(), e.pm25()],
     },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_7bztmfm1'}],
+        model: 'TS0601_smart_CO_air_box',
+        vendor: 'TuYa',
+        description: 'Smart air box (carbon monoxide)',
+        fromZigbee: [fz.tuya_CO],
+        toZigbee: [],
+        exposes: [e.carbon_monoxide(), e.co()],
+    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_ggev5fsl'}],
         model: 'TS0601_gas_sensor',
@@ -962,7 +971,8 @@ module.exports = [
                     'to the desired temperature. If you want TRV to properly regulate the temperature you need to use mode `auto` ' +
                     'instead setting the desired temperature.')
                 .withLocalTemperatureCalibration(-9, 9, 1, ea.STATE_SET)
-                .withAwayMode().withPreset(['schedule', 'manual', 'boost', 'complex', 'comfort', 'eco']),
+                .withAwayMode().withPreset(['schedule', 'manual', 'boost', 'complex', 'comfort', 'eco'])
+                .withRunningState(['idle', 'heat'], ea.STATE),
             e.auto_lock(), e.away_mode(), e.away_preset_days(), e.boost_time(), e.comfort_temperature(), e.eco_temperature(), e.force(),
             e.max_temperature(), e.min_temperature(), e.away_preset_temperature(),
             exposes.composite('programming_mode').withDescription('Schedule MODE ⏱ - In this mode, ' +
@@ -1895,7 +1905,7 @@ module.exports = [
             exposes.text('alarm', ea.STATE),
             exposes.binary('trip', ea.STATE_SET, 'trip', 'clear'),
             exposes.binary('child_lock', ea.STATE_SET, 'ON', 'OFF'),
-            exposes.enum('power_on_behaviour', ea.STATE_SET, ['off', 'on', 'previous']),
+            exposes.enum('power_on_behavior', ea.STATE_SET, ['off', 'on', 'previous']),
             exposes.numeric('countdown_timer', ea.STATE_SET).withValueMin(0).withValueMax(86400).withUnit('s'),
             exposes.numeric('voltage', ea.STATE).withUnit('V'),
             exposes.numeric('voltage_rms', ea.STATE).withUnit('V'),
@@ -2006,4 +2016,13 @@ module.exports = [
         toZigbee: [],
         exposes: [e.illuminance_lux(), e.brightness_state()],
     },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_kltffuzl'}, {modelID: 'TS0601', manufacturerName: '_TZE200_fwoorn8y'}],
+        model: 'TM001-ZA/TM081',
+        vendor: 'TuYa',
+        description: 'Door and window sensor',
+        fromZigbee: [fz.tm081],
+        toZigbee: [],
+        exposes: [e.contact(), e.battery()],
+    },
 ];

package/lib/exposes.js

@@ -519,6 +519,7 @@ module.exports = {
         carbon_monoxide: () => new Binary('carbon_monoxide', access.STATE, true, false).withDescription('Indicates if CO (carbon monoxide) is detected'),
         child_lock: () => new Lock().withState('child_lock', 'LOCK', 'UNLOCK', 'Enables/disables physical input on the device', access.STATE_SET),
         co2: () => new Numeric('co2', access.STATE).withUnit('ppm').withDescription('The measured CO2 (carbon dioxide) value'),
+        co: () => new Numeric('co', access.STATE).withUnit('ppm').withDescription('The measured CO (carbon monoxide) value'),
         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)'),

package/lib/tuya.js

@@ -421,6 +421,9 @@ const dataPoints = {
     // tuya Smart Air House Keeper, Multifunctionale air quality detector.
     // CO2, Temp, Humidity, VOC and Formaldehyd same as Smart Air Box
     tuyaSahkMP25: 20,
+    // Tuya CO (carbon monoxide) smart air box
+    tuyaSabCOalarm: 1,
+    tuyaSabCO: 2,
     lidlTimer: 5,
     // Moes MS-105 Dimmer
     moes105DimmerState1: 1,

package/npm-shrinkwrap.json

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

package/package.json

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