zigbee-herdsman-converters 14.0.448 → 14.0.451

package/converters/fromZigbee.js

@@ -4176,15 +4176,24 @@ const converters = {
                 return {temperature: calibrateAndPrecisionRoundOptions(value / 10, options, 'temperature')};
             case tuya.dataPoints.tuyaSabHumidity:
                 return {humidity: calibrateAndPrecisionRoundOptions(value / 10, options, 'humidity')};
+                // DP22: Smart Air Box: Formaldehyd, Smart Air Housekeeper: co2
+            case tuya.dataPoints.tuyaSabFormaldehyd:
+                if (meta.device.manufacturerName === '_TZE200_dwcarsat') {
+                    return {co2: calibrateAndPrecisionRoundOptions(value, options, 'co2')};
+                } else {
+                    return {formaldehyd: calibrateAndPrecisionRoundOptions(value, options, 'formaldehyd')};
+                }
+                // DP2: Smart Air Box: co2, Smart Air Housekeeper: MP25
             case tuya.dataPoints.tuyaSabCO2:
-                return {co2: calibrateAndPrecisionRoundOptions(value, options, 'co2')};
+                if (meta.device.manufacturerName === '_TZE200_dwcarsat') {
+                    return {pm25: calibrateAndPrecisionRoundOptions(value, options, 'pm25')};
+                } else {
+                    return {co2: calibrateAndPrecisionRoundOptions(value, options, 'co2')};
+                }
             case tuya.dataPoints.tuyaSabVOC:
                 return {voc: calibrateAndPrecisionRoundOptions(value, options, 'voc')};
-            case tuya.dataPoints.tuyaSabFormaldehyd:
-                // Not sure which unit this is, supposedly mg/m³, but the value seems way too high.
+            case tuya.dataPoints.tuyaSahkCH2O:
                 return {formaldehyd: calibrateAndPrecisionRoundOptions(value, options, 'formaldehyd')};
-            case tuya.dataPoints.tuyaSahkMP25:
-                return {pm25: calibrateAndPrecisionRoundOptions(value, options, 'pm25')};
             default:
                 meta.logger.warn(`zigbee-herdsman-converters:TuyaSmartAirBox: Unrecognized DP #${
                     dp} with data ${JSON.stringify(dpValue)}`);
@@ -4437,8 +4446,9 @@ const converters = {
             const dpValue = tuya.firstDpValue(msg, meta, 'tuya_thermostat');
             const dp = dpValue.dp;
             const value = tuya.getDataValue(dpValue);
-
             switch (dp) {
+            case tuya.dataPoints.windowOpen:
+                return {window_open: value};
             case tuya.dataPoints.windowDetection:
                 return {
                     window_detection: value[0] ? 'ON' : 'OFF',

package/converters/toZigbee.js

@@ -2116,7 +2116,7 @@ const converters = {
                 'WS-EUK01', 'WS-EUK02', 'WS-EUK03', 'WS-EUK04', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM',
                 'QBKG31LM', 'QBKG34LM', 'QBKG38LM', 'QBKG39LM', 'QBKG40LM', 'QBKG41LM', 'ZNDDMK11LM'].includes(meta.mapped.model)) {
                 await entity.write('aqaraOpple', {0x0201: {value: value ? 1 : 0, type: 0x10}}, manufacturerOptions.xiaomi);
-            } else if (['ZNCZ02LM', 'QBCZ11LM'].includes(meta.mapped.model)) {
+            } else if (['ZNCZ02LM', 'QBCZ11LM', 'LLKZMK11LM'].includes(meta.mapped.model)) {
                 const payload = value ?
                     [[0xaa, 0x80, 0x05, 0xd1, 0x47, 0x07, 0x01, 0x10, 0x01], [0xaa, 0x80, 0x03, 0xd3, 0x07, 0x08, 0x01]] :
                     [[0xaa, 0x80, 0x05, 0xd1, 0x47, 0x09, 0x01, 0x10, 0x00], [0xaa, 0x80, 0x03, 0xd3, 0x07, 0x0a, 0x01]];

package/devices/iluminize.js

@@ -185,4 +185,14 @@ module.exports = [
         description: 'Zigbee 3.0 LED-controller 1x 8A',
         extend: extend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['ZGRC-TEUR-001'],
+        model: '511.544',
+        vendor: 'Iluminize',
+        description: 'Zigbee 3.0 wall dimmer RGBW 4 zone',
+        fromZigbee: [fz.command_move_to_color, fz.command_move_hue, fz.command_on, fz.command_off, fz.command_move],
+        toZigbee: [],
+        exposes: [e.action(['recall_*', 'on', 'off', 'color_move', 'color_temperature_move',
+            'hue_move', 'brightness_step_down', 'brightness_step_up', 'brightness_move_down', 'brightness_move_up', 'brightness_stop'])],
+    },
 ];

package/devices/ledvance.js

@@ -55,6 +55,22 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness_colortemp_color(),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['PAR16S RGBW'],
+        model: 'AC33906',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ spot GU10 multicolor RGBW',
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
+        ota: ota.ledvance,
+    },
+    {
+        zigbeeModel: ['PAR16S TW'],
+        model: 'AC33905',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ spot GU10 tunable white',
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
+        ota: ota.ledvance,
+    },
     {
         zigbeeModel: ['B40 TW Z3'],
         model: '4058075208414',
@@ -63,6 +79,14 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['P40S TW'],
+        model: 'AC33903',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ classic P 40 E14 tunable white',
+        extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+        ota: ota.ledvance,
+    },
     {
         zigbeeModel: ['FLEX RGBW Z3'],
         model: '4058075208339',

package/devices/lixee.js

@@ -509,6 +509,14 @@ function getCurrentConfig(device, options, logger=console) {
         break;
     }
 
+    // Filter exposed attributes with user whitelist
+    if (options && options.hasOwnProperty('tic_command_whitelist')) {
+        const tic_commands_str = options['tic_command_whitelist'].toUpperCase();
+        if (tic_commands_str !== 'ALL') {
+            const tic_commands = tic_commands_str.split(',').map((a) => a.trim());
+            myExpose = myExpose.filter((a) => tic_commands.includes(a.exposes.name));
+        }
+    }
 
     return myExpose;
 }
@@ -547,6 +555,7 @@ const definition = {
             .withDescription(`Overrides the automatic current tarif. This option will exclude unnecesary attributes. Open a issue to support more of them. Default: auto`),
         exposes.options.precision(`kWh`),
         exposes.numeric(`measurement_poll_chunk`, ea.SET).withValueMin(1).withDescription(`During the poll, request multiple exposes to the Zlinky at once for reducing Zigbee network overload. Too much request at once could exceed device limit. Requieres Z2M restart. Default: 1`),
+        exposes.text(`tic_command_whitelist`, ea.SET).withDescription(`List of TIC commands to be exposed (separated by comma). Reconfigure device after change. Default: all`),
     ],
     configure: async (device, coordinatorEndpoint, logger, options) => {
         const endpoint = device.getEndpoint(1);
@@ -621,7 +630,11 @@ const definition = {
                             // Split array by chunks
                             for (i = 0, j = targ.length; i < j; i += measurement_poll_chunk) {
                                 await endpoint
-                                    .read(cluster, targ.slice(i, i + measurement_poll_chunk), {manufacturerCode: null});
+                                    .read(cluster, targ.slice(i, i + measurement_poll_chunk), {manufacturerCode: null})
+                                    .catch((e) => {
+                                        // https://github.com/Koenkk/zigbee2mqtt/issues/11674
+                                        console.warn(`Failed to read zigbee attributes: ${e}`);
+                                    });
                             }
                         }
                     }

package/devices/philips.js

@@ -2508,7 +2508,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['5309331P6', '5309330P6', '929003046301_03'],
+        zigbeeModel: ['5309331P6', '5309330P6', '929003046301_03', '929003046301_02'],
         model: '5309331P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner triple spotlight',
@@ -2776,7 +2776,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['915005997501'],
+        zigbeeModel: ['915005997501', '915005997401'],
         model: '915005997501',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance ceiling lamp Infuse large',
@@ -2810,4 +2810,13 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['LTO005', '929002980901'],
+        model: '929002980901',
+        vendor: 'Philips',
+        description: 'Hue white ambiance G40 E26 filament globe with Bluetooth',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [222, 454]}),
+        ota: ota.zigbeeOTA,
+    },
 ];

package/devices/third_reality.js

@@ -20,9 +20,10 @@ module.exports = [
         model: '3RSS008Z',
         vendor: 'Third Reality',
         description: 'RealitySwitch Plus',
-        fromZigbee: [fz.on_off],
+        fromZigbee: [fz.on_off, fz.battery],
         toZigbee: [tz.on_off, tz.ignore_transition],
-        exposes: [e.switch()],
+        meta: {battery: {voltageToPercentage: '3V_2100'}},
+        exposes: [e.switch(), e.battery(), e.battery_voltage()],
     },
     {
         zigbeeModel: ['3RSS007Z'],

package/devices/tuya.js

@@ -143,7 +143,8 @@ module.exports = [
         description: 'Smart air house keeper',
         fromZigbee: [fz.tuya_air_quality],
         toZigbee: [],
-        exposes: [e.temperature(), e.humidity(), e.co2(), e.voc(), e.formaldehyd(), e.pm25()],
+        exposes: [e.temperature(), e.humidity(), e.co2(), e.voc(), e.formaldehyd().withUnit('ppm'),
+            e.pm25().withValueMin(0).withValueMax(999).withValueStep(1)],
     },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_7bztmfm1'}],
@@ -235,7 +236,8 @@ module.exports = [
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_k1pe6ibm'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_bfwvfyx1'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_leyz4rju'},
-            {modelID: 'TS0505B', manufacturerName: '_TZ3210_jd3z4yig'}],
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_jd3z4yig'},
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_dgdjiw1c'}],
         model: 'TS0505B',
         vendor: 'TuYa',
         description: 'Zigbee RGB+CCT light',
@@ -999,6 +1001,8 @@ module.exports = [
         toZigbee: [tz.tuya_cover_control, tz.tuya_cover_options],
         exposes: [
             e.cover_position().setAccess('position', ea.STATE_SET),
+            exposes.binary('running', ea.STATE, true, false)
+                .withDescription('Whether the motor is moving or not'),
             exposes.composite('options', 'options')
                 .withFeature(exposes.numeric('motor_speed', ea.STATE_SET)
                     .withValueMin(0)
@@ -1036,7 +1040,9 @@ module.exports = [
             tz.tuya_thermostat_window_detect, tz.tuya_thermostat_schedule, tz.tuya_thermostat_week, tz.tuya_thermostat_away_preset,
             tz.tuya_thermostat_schedule_programming_mode],
         exposes: [
-            e.child_lock(), e.window_detection(), e.battery_low(), e.valve_detection(), e.position(),
+            e.child_lock(), e.window_detection(),
+            exposes.binary('window_open', ea.STATE).withDescription('Window open?'),
+            e.battery_low(), e.valve_detection(), e.position(),
             exposes.climate().withSetpoint('current_heating_setpoint', 5, 35, 0.5, ea.STATE_SET)
                 .withLocalTemperature(ea.STATE).withSystemMode(['heat', 'auto', 'off'], ea.STATE_SET,
                     'Mode of this device, in the `heat` mode the TS0601 will remain continuously heating, i.e. it does not regulate ' +

package/devices/xiaomi.js

@@ -914,7 +914,7 @@ module.exports = [
         fromZigbee: [fz.aqara_opple],
         toZigbee: [tz.RTCZCGQ11LM_presence, tz.RTCZCGQ11LM_monitoring_mode, tz.RTCZCGQ11LM_approach_distance,
             tz.aqara_motion_sensitivity, tz.RTCZCGQ11LM_reset_nopresence_status],
-        exposes: [e.presence().withAccess(ea.STATE_GET),
+        exposes: [e.presence().withAccess(ea.STATE_GET), e.power_outage_count(), e.temperature(),
             exposes.enum('presence_event', ea.STATE, ['enter', 'leave', 'left_enter', 'right_leave', 'right_enter', 'left_leave',
                 'approach', 'away']).withDescription('Presence events: "enter", "leave", "left_enter", "right_leave", ' +
                 '"right_enter", "left_leave", "approach", "away"'),
@@ -925,8 +925,7 @@ module.exports = [
             exposes.enum('motion_sensitivity', ea.ALL, ['low', 'medium', 'high']).withDescription('Different sensitivities ' +
                 'means different static human body recognition rate and response speed of occupied'),
             exposes.enum('reset_nopresence_status', ea.SET, ['Reset']).withDescription('Reset the status of no presence'),
-            exposes.numeric('power_outage_count', ea.STATE).withDescription('Number of power outages (since last pairing)'),
-            e.temperature()],
+        ],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.read('aqaraOpple', [0x010c], {manufacturerCode: 0x115f});
@@ -1173,7 +1172,7 @@ module.exports = [
         fromZigbee: [fz.aqara_opple],
         toZigbee: [tz.JTBZ01AQA_gas, tz.JTBZ01AQA_gas_density, tz.JTBZ01AQA_gas_sensitivity, tz.JTBZ01AQA_selftest,
             tz.JTBZ01AQA_mute_buzzer, tz.JTBZ01AQA_mute, tz.JTBZ01AQA_linkage_alarm, tz.JTBZ01AQA_state, tz.aqara_power_outage_count],
-        exposes: [e.gas().withAccess(ea.STATE_GET),
+        exposes: [e.gas().withAccess(ea.STATE_GET), e.power_outage_count().withAccess(ea.STATE_GET),
             exposes.numeric('gas_density', ea.STATE_GET).withUnit('%LEL').withDescription('Value of gas concentration'),
             exposes.enum('gas_sensitivity', ea.ALL, ['10%LEL', '15%LEL']).withDescription('Gas concentration value at which ' +
                 'an alarm is triggered ("10%LEL" is more sensitive than "15%LEL")'),
@@ -1187,7 +1186,7 @@ module.exports = [
                 'is detected, other detectors with this option enabled will also sound the alarm buzzer'),
             exposes.binary('state', ea.STATE_GET, 'preparation', 'work').withDescription('"Preparation" or "work" ' +
                 '(measurement of the gas concentration value and triggering of an alarm are only performed in the "work" state)'),
-            exposes.numeric('power_outage_count', ea.STATE_GET).withDescription('Number of power outages (since last pairing)')],
+        ],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.read('aqaraOpple', [0x013a], {manufacturerCode: 0x115f});
@@ -1239,7 +1238,9 @@ module.exports = [
         vendor: 'Xiaomi',
         fromZigbee: [fz.xiaomi_curtain_position, fz.cover_position_tilt, fz.xiaomi_curtain_options],
         toZigbee: [tz.xiaomi_curtain_position_state, tz.xiaomi_curtain_options],
-        exposes: [e.cover_position().setAccess('state', ea.ALL)],
+        exposes: [e.cover_position().setAccess('state', ea.ALL),
+            exposes.binary('running', ea.STATE, true, false)
+                .withDescription('Whether the motor is moving or not')],
         ota: ota.zigbeeOTA,
     },
     {
@@ -1249,7 +1250,9 @@ module.exports = [
         vendor: 'Xiaomi',
         fromZigbee: [fz.xiaomi_curtain_position, fz.cover_position_tilt, fz.xiaomi_curtain_options],
         toZigbee: [tz.xiaomi_curtain_position_state, tz.xiaomi_curtain_options],
-        exposes: [e.cover_position().setAccess('state', ea.ALL)],
+        exposes: [e.cover_position().setAccess('state', ea.ALL),
+            exposes.binary('running', ea.STATE, true, false)
+                .withDescription('Whether the motor is moving or not')],
         ota: ota.zigbeeOTA,
     },
     {
@@ -1266,7 +1269,9 @@ module.exports = [
                 await device.endpoints[0].read('genAnalogOutput', ['presentValue']);
             }
         },
-        exposes: [e.cover_position().setAccess('state', ea.ALL), e.battery()],
+        exposes: [e.cover_position().setAccess('state', ea.ALL), e.battery(),
+            exposes.binary('running', ea.STATE, true, false)
+                .withDescription('Whether the motor is moving or not')],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.endpoints[0];
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
@@ -1286,7 +1291,7 @@ module.exports = [
             exposes.enum('motor_state', ea.STATE, ['declining', 'rising', 'pause', 'blocked'])
                 .withDescription('The current state of the motor.'),
             exposes.binary('running', ea.STATE, true, false)
-                .withDescription('Whether the motor is moving or not.')],
+                .withDescription('Whether the motor is moving or not')],
         configure: async (device, coordinatorEndpoint, logger) => {
             device.powerSource = 'Battery';
             device.save();
@@ -1300,14 +1305,16 @@ module.exports = [
         description: 'Aqara wireless relay controller',
         fromZigbee: [fz.xiaomi_switch_basic, fz.xiaomi_power, fz.ignore_multistate_report, fz.on_off, fz.xiaomi_basic_raw],
         meta: {multiEndpoint: true},
-        toZigbee: [tz.on_off, tz.LLKZMK11LM_interlock, tz.xiaomi_power],
+        toZigbee: [tz.on_off, tz.LLKZMK11LM_interlock, tz.xiaomi_power, tz.xiaomi_switch_power_outage_memory],
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2};
         },
-        exposes: [e.power().withAccess(ea.STATE_GET), e.energy(), e.temperature(), e.voltage().withAccess(ea.STATE), e.current(),
-            e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'),
+        exposes: [e.power().withAccess(ea.STATE_GET), e.energy(), e.temperature(), e.voltage(), e.current(),
+            e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'), e.power_outage_count(false),
+            e.power_outage_memory(),
             exposes.binary('interlock', ea.STATE_SET, true, false)
-                .withDescription('Enabling prevents both relais being on at the same time')],
+                .withDescription('Enabling prevents both relais being on at the same time'),
+        ],
         ota: ota.zigbeeOTA,
     },
     {
@@ -1481,8 +1488,9 @@ module.exports = [
         // Ignore energy metering reports, rely on aqara_opple: https://github.com/Koenkk/zigbee2mqtt/issues/10709
         fromZigbee: [fz.on_off, fz.device_temperature, fz.aqara_opple, fz.ignore_metering, fz.ignore_electrical_measurement,
             fz.xiaomi_power],
-        exposes: [e.switch(), e.energy(), e.power(), e.device_temperature(), e.power_outage_memory(), e.switch_type(),
-            e.voltage(), e.temperature(), e.current()],
+        exposes: [e.switch(), e.energy(), e.power(), e.device_temperature(), e.power_outage_memory(), e.power_outage_count(),
+            e.switch_type(), e.voltage(), e.temperature(), e.current(),
+        ],
         toZigbee: [tz.xiaomi_switch_type, tz.on_off, tz.xiaomi_switch_power_outage_memory, tz.xiaomi_led_disabled_night],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);

package/lib/exposes.js

@@ -582,6 +582,7 @@ module.exports = {
         position: () => new Numeric('position', access.STATE).withUnit('%').withDescription('Position'),
         power: () => new Numeric('power', access.STATE).withUnit('W').withDescription('Instantaneous measured power'),
         power_on_behavior: () => new Enum('power_on_behavior', access.ALL, ['off', 'previous', 'on']).withDescription('Controls the behavior when the device is powered on'),
+        power_outage_count: (resetsWhenPairing = true) => new Numeric('power_outage_count', access.STATE).withDescription('Number of power outages' + (resetsWhenPairing ? ' (since last pairing)' : '')),
         power_outage_memory: () => new Binary('power_outage_memory', access.ALL, true, false).withDescription('Enable/disable the power outage memory, this recovers the on/off mode after power failure'),
         presence: () => new Binary('presence', access.STATE, true, false).withDescription('Indicates whether the device detected presence'),
         pressure: () => new Numeric('pressure', access.STATE).withUnit('hPa').withDescription('The measured atmospheric pressure'),

package/lib/tuya.js

@@ -258,6 +258,7 @@ const dataPoints = {
     scheduleWorkday: 112,
     scheduleHoliday: 113,
     awayTemp: 114,
+    windowOpen: 115,
     autoLock: 116,
     awayDays: 117,
     // Manufacturer specific
@@ -420,7 +421,9 @@ const dataPoints = {
     tuyaSabFormaldehyd: 22,
     // tuya Smart Air House Keeper, Multifunctionale air quality detector.
     // CO2, Temp, Humidity, VOC and Formaldehyd same as Smart Air Box
-    tuyaSahkMP25: 20,
+    tuyaSahkMP25: 2,
+    tuyaSahkCO2: 22,
+    tuyaSahkFormaldehyd: 20,
     // Tuya CO (carbon monoxide) smart air box
     tuyaSabCOalarm: 1,
     tuyaSabCO: 2,

package/lib/xiaomi.js

@@ -129,7 +129,11 @@ const buffer2DataObject = (meta, model, buffer) => {
         }
     }
 
-    if (meta.logger) meta.logger.debug(`${model.zigbeeModel}: Processed buffer into data ${JSON.stringify(dataObject)}`);
+    if (meta.logger) {
+        meta.logger.debug(`${model.zigbeeModel}: Processed buffer into data ${JSON.stringify(dataObject,
+            (key, value) => typeof value === 'bigint' ? value.toString() : value)}`);
+    }
+
 
     return dataObject;
 };
@@ -160,7 +164,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             payload.mode_switch = {4: 'anti_flicker_mode', 1: 'quick_mode'}[value];
             break;
         case '5':
-            if (['JT-BZ-01AQ/A', 'RTCZCGQ11LM'].includes(model.model)) {
+            if (['Mains (single phase)', 'DC Source'].includes(meta.device.powerSource)) {
                 payload.power_outage_count = value;
             }
             break;