zigbee-herdsman-converters 14.0.545 → 14.0.548

package/converters/fromZigbee.js

@@ -1667,6 +1667,34 @@ const converters = {
             return result;
         },
     },
+    power_source: {
+        cluster: 'genBasic',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const payload = {};
+            if (msg.data.hasOwnProperty('powerSource')) {
+                const value = msg.data['powerSource'];
+                const lookup = {
+                    0: 'unknown',
+                    1: 'mains_single_phase',
+                    2: 'mains_three_phase',
+                    3: 'battery',
+                    4: 'dc_source',
+                    5: 'emergency_mains_constantly_powered',
+                    6: 'emergency_mains_and_transfer_switch',
+                };
+                payload.power_source = lookup[value];
+
+                if (['R7051'].includes(model.model)) {
+                    payload.ac_connected = value === 2;
+                } else if (['ZNCLBL01LM'].includes(model.model)) {
+                    payload.charging = value === 4;
+                }
+            }
+
+            return payload;
+        },
+    },
     // #endregion
 
     // #region Non-generic converters
@@ -2261,8 +2289,14 @@ const converters = {
             case tuya.dataPoints.coverArrived: { // Arrived at position
                 const invert = tuya.isCoverInverted(meta.device.manufacturerName) ? !options.invert_cover : options.invert_cover;
                 const position = invert ? 100 - (value & 0xFF) : (value & 0xFF);
-                let running = position == 0 || position == 100;
-                if (dp === tuya.dataPoints.coverArrived) running = false;
+                const running = dp !== tuya.dataPoints.coverArrived;
+
+                // Not all covers report coverArrived, so set running to false if device doesn't report position for a few seconds
+                clearTimeout(globalStore.getValue(msg.endpoint, 'running_timer'));
+                if (running) {
+                    const timer = setTimeout(() => publish({running: false}), 3 * 1000);
+                    globalStore.putValue(msg.endpoint, 'running_timer', timer);
+                }
 
                 if (position > 0 && position <= 100) {
                     return {running, position, state: 'OPEN'};
@@ -2743,16 +2777,6 @@ const converters = {
             return result;
         },
     },
-    ts0219_power_source: {
-        cluster: 'genBasic',
-        type: 'attributeReport',
-        convert: (model, msg, publish, options, meta) => {
-            const powerSource = msg.data.powerSource;
-            return {
-                ac_connected: powerSource === 2 ? true : false,
-            };
-        },
-    },
     tuya_cover_options: {
         cluster: 'closuresWindowCovering',
         type: ['attributeReport', 'readResponse'],
@@ -3967,7 +3991,7 @@ const converters = {
                 return {deadzone_temperature: value};
             case tuya.dataPoints.moesLocalTemp:
                 temperature = value & 1<<15 ? value - (1<<16) + 1 : value;
-                if (meta.device.manufacturerName !== '_TZE200_ye5jkfsb') {
+                if (!['_TZE200_ztvwu4nk', '_TZE200_ye5jkfsb'].includes(meta.device.manufacturerName)) {
                     // https://github.com/Koenkk/zigbee2mqtt/issues/11980
                     temperature = temperature / 10;
                 }
@@ -5631,8 +5655,9 @@ const converters = {
             }
 
             let buttonLookup = null;
-            if (['WXKG02LM_rev2', 'WXKG07LM', 'WXKG15LM', 'WXKG17LM',
-                'WRS-R02'].includes(model.model)) buttonLookup = {1: 'left', 2: 'right', 3: 'both'};
+            if (['WXKG02LM_rev2', 'WXKG07LM', 'WXKG15LM', 'WXKG17LM'].includes(model.model)) {
+                buttonLookup = {1: 'left', 2: 'right', 3: 'both'};
+            }
             if (['QBKG12LM', 'QBKG24LM'].includes(model.model)) buttonLookup = {5: 'left', 6: 'right', 7: 'both'};
             if (['QBKG39LM', 'QBKG41LM', 'WS-EUK02', 'WS-EUK04', 'QBKG20LM', 'QBKG31LM'].includes(model.model)) {
                 buttonLookup = {41: 'left', 42: 'right', 51: 'both'};
@@ -5941,7 +5966,10 @@ const converters = {
             const invert = model.meta && model.meta.coverInverted ? !options.invert_cover : options.invert_cover;
             if (msg.data.hasOwnProperty('currentPositionLiftPercentage') && msg.data['currentPositionLiftPercentage'] <= 100) {
                 const value = msg.data['currentPositionLiftPercentage'];
-                result[postfixWithEndpointName('position', msg, model)] = invert ? 100 - value : value;
+                const position = invert ? 100 - value : value;
+                const state = invert ? (position > 0 ? 'CLOSE' : 'OPEN') : (position > 0 ? 'OPEN' : 'CLOSE');
+                result[postfixWithEndpointName('position', msg, model)] = position;
+                result[postfixWithEndpointName('state', msg, model)] = state;
             }
             if (msg.data.hasOwnProperty('currentPositionTiltPercentage') && msg.data['currentPositionTiltPercentage'] <= 100) {
                 const value = msg.data['currentPositionTiltPercentage'];
@@ -7447,23 +7475,6 @@ const converters = {
             }
         },
     },
-    woox_R7060: {
-        cluster: 'manuSpecificTuya',
-        type: ['commandActiveStatusReport'],
-        convert: (model, msg, publish, options, meta) => {
-            const dpValue = tuya.firstDpValue(msg, meta, 'woox_R7060');
-            const dp = dpValue.dp;
-            const value = tuya.getDataValue(dpValue);
-
-            switch (dp) {
-            case tuya.dataPoints.wooxSwitch:
-                return {state: value === 2 ? 'OFF' : 'ON'};
-            default:
-                meta.logger.warn(`zigbee-herdsman-converters:WooxR7060: Unrecognized DP #${
-                    dp} with data ${JSON.stringify(dpValue)}`);
-            }
-        },
-    },
     idlock: {
         cluster: 'closuresDoorLock',
         type: ['attributeReport', 'readResponse'],

package/converters/toZigbee.js

@@ -91,6 +91,12 @@ const converters = {
             entity.commandResponse('ssIasAce', 'panelStatusChanged', payload);
         },
     },
+    battery_percentage_remaining: {
+        key: ['battery'],
+        convertGet: async (entity, key, meta) => {
+            await entity.read('genPowerCfg', ['batteryPercentageRemaining']);
+        },
+    },
     power_on_behavior: {
         key: ['power_on_behavior'],
         convertSet: async (entity, key, value, meta) => {
@@ -853,6 +859,7 @@ const converters = {
                 state = meta.message.state = brightness === 0 ? 'off' : 'on';
             }
 
+            let publishBrightness = brightness !== undefined;
             const targetState = state === 'toggle' ? (meta.state.state === 'ON' ? 'off' : 'on') : state;
             if (targetState === 'off') {
                 // Simulate 'Off' with transition via 'MoveToLevelWithOnOff', otherwise just use 'Off'.
@@ -890,6 +897,8 @@ const converters = {
                     } catch (e) {
                         // OnLevel not supported
                     }
+                    // Published state might have gotten clobbered by reporting.
+                    publishBrightness = true;
                 }
             }
 
@@ -921,7 +930,7 @@ const converters = {
             );
 
             const result = {state: {}, readAfterWriteTime: transition.time * 100};
-            if (brightness !== 0) {
+            if (publishBrightness) {
                 result.state.brightness = Number(brightness);
             }
             if (state !== null) {
@@ -2477,7 +2486,7 @@ const converters = {
                     await entity.command('closuresWindowCovering', 'stop', {}, utils.getOptions(meta.mapped, entity));
                 }
 
-                if (!['ZNCLDJ11LM', 'ZNJLBL01LM'].includes(meta.mapped.model)) {
+                if (!['ZNCLDJ11LM', 'ZNJLBL01LM', 'ZNCLBL01LM'].includes(meta.mapped.model)) {
                     // The code below is originally added for ZNCLDJ11LM (Koenkk/zigbee2mqtt#4585).
                     // However, in Koenkk/zigbee-herdsman-converters#4039 it was replaced by reading
                     // directly from currentPositionLiftPercentage, so that device is excluded.
@@ -2490,6 +2499,8 @@ const converters = {
                     // Xiaomi curtain does not send position update on stop, request this.
                     await entity.read('genAnalogOutput', [0x0055]);
                 }
+
+                return {state: {state: 'STOP'}};
             } else {
                 const lookup = {'open': 100, 'close': 0, 'on': 100, 'off': 0};
 
@@ -2497,12 +2508,21 @@ const converters = {
                 value = lookup.hasOwnProperty(value) ? lookup[value] : value;
                 value = meta.options.invert_cover ? 100 - value : value;
 
-                const payload = {0x0055: {value, type: 0x39}};
-                await entity.write('genAnalogOutput', payload);
+                if (['ZNCLBL01LM'].includes(meta.mapped.model)) {
+                    await entity.command('closuresWindowCovering', 'goToLiftPercentage', {percentageliftvalue: value},
+                        utils.getOptions(meta.mapped, entity));
+                } else {
+                    const payload = {0x0055: {value, type: 0x39}};
+                    await entity.write('genAnalogOutput', payload);
+                }
             }
         },
         convertGet: async (entity, key, meta) => {
-            await entity.read('genAnalogOutput', [0x0055]);
+            if (['ZNCLBL01LM'].includes(meta.mapped.model)) {
+                await entity.read('closuresWindowCovering', ['currentPositionLiftPercentage']);
+            } else {
+                await entity.read('genAnalogOutput', [0x0055]);
+            }
         },
     },
     xiaomi_curtain_acn002_charging_status: {
@@ -5310,6 +5330,12 @@ const converters = {
             }
         },
     },
+    power_source: {
+        key: ['power_source', 'charging'],
+        convertGet: async (entity, key, meta) => {
+            await entity.read('genBasic', ['powerSource']);
+        },
+    },
     ts0201_temperature_humidity_alarm: {
         key: ['alarm_humidity_max', 'alarm_humidity_min', 'alarm_temperature_max', 'alarm_temperature_min'],
         convertSet: async (entity, key, value, meta) => {
@@ -6532,6 +6558,18 @@ const converters = {
             }
         },
     },
+    ZNCLBL01LM_battery_voltage: {
+        key: ['voltage'],
+        convertGet: async (entity, key, meta) => {
+            await entity.read('aqaraOpple', [0x040B], manufacturerOptions.xiaomi);
+        },
+    },
+    ZNCLBL01LM_hooks_state: {
+        key: ['hooks_state'],
+        convertGet: async (entity, key, meta) => {
+            await entity.read('aqaraOpple', [0x0428], manufacturerOptions.xiaomi);
+        },
+    },
     wiser_vact_calibrate_valve: {
         key: ['calibrate_valve'],
         convertSet: async (entity, key, value, meta) => {

package/devices/alecto.js

@@ -5,6 +5,59 @@ const tuya = require('../lib/tuya');
 const e = exposes.presets;
 const ea = exposes.access;
 
+const fzLocal = {
+    tuya_alecto_smoke: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataResponse', 'commandDataReport'],
+        convert: (model, msg, publish, options, meta) => {
+            const dpValue = tuya.firstDpValue(msg, meta, 'tuya_alecto_smoke');
+            const dp = dpValue.dp;
+            const value = tuya.getDataValue(dpValue);
+            switch (dp) {
+            case tuya.dataPoints.alectoSmokeState:
+                return {smoke_state: {0: 'alarm', 1: 'normal'}[value]};
+            case tuya.dataPoints.alectoSmokeValue:
+                return {smoke_value: value};
+            case tuya.dataPoints.alectoSelfChecking:
+                return {self_checking: value};
+            case tuya.dataPoints.alectoCheckingResult:
+                return {checking_result: {0: 'checking', 1: 'check_success', 2: 'check_failure', 3: 'others'}[value]};
+            case tuya.dataPoints.alectoSmokeTest:
+                return {smoke_test: value};
+            case tuya.dataPoints.alectoLifecycle:
+                return {lifecycle: value};
+            case tuya.dataPoints.alectoBatteryPercentage:
+                return {battery: value};
+            case tuya.dataPoints.alectoBatteryState:
+                return {battery_state: {0: 'low', 1: 'middle', 2: 'high'}[value]};
+            case tuya.dataPoints.alectoSilence:
+                return {silence: value};
+            default:
+                meta.logger.warn(`zigbee-herdsman-converters:tuya_alecto_smoke: Unrecognized ` +
+                    `DP #${ dp} with data ${JSON.stringiy(msg.data)}`);
+            }
+        },
+    },
+};
+
+const tzLocal = {
+    tuya_alecto_smoke: {
+        key: ['self_checking', 'silence'],
+        convertSet: async (entity, key, value, meta) => {
+            switch (key) {
+            case 'self_checking':
+                await tuya.sendDataPointBool(entity, tuya.dataPoints.alectoSelfChecking, value);
+                break;
+            case 'silence':
+                await tuya.sendDataPointBool(entity, tuya.dataPoints.alectoSilence, value);
+                break;
+            default: // Unknown key
+                throw new Error(`zigbee-herdsman-converters:tuya_alecto_smoke: Unhandled key ${key}`);
+            }
+        },
+    },
+};
+
 module.exports = [
     {
         fingerprint: [
@@ -23,4 +76,21 @@ module.exports = [
             .withSetpoint('current_heating_setpoint', 5, 30, 0.5, ea.STATE_SET).withLocalTemperature(ea.STATE)
             .withSystemMode(['off', 'auto', 'heat'], ea.STATE_SET)],
     },
+    {
+        fingerprint: [{modelID: 'tbrwrfv\u0000', manufacturerName: '_TYST11_qtbrwrfv'}],
+        model: 'SMART-SMOKE10',
+        vendor: 'Alecto',
+        description: 'Smoke detector',
+        fromZigbee: [fzLocal.tuya_alecto_smoke],
+        toZigbee: [tzLocal.tuya_alecto_smoke],
+        meta: {},
+        exposes: [exposes.text('smoke_state', ea.STATE, ['alarm', 'normal']),
+            exposes.text('battery_state', ea.STATE, ['low', 'middle', 'high']),
+            exposes.text('checking_result', ea.STATE, ['checking', 'check_success', 'check_failure', 'others']),
+            exposes.numeric('smoke_value', ea.STATE),
+            exposes.numeric('battery', ea.STATE),
+            exposes.binary('lifecycle', ea.STATE, true, false),
+            exposes.binary('self_checking', ea.STATE_SET, true, false),
+            exposes.binary('silence', ea.STATE_SET, true, false)],
+    },
 ];

package/devices/connecte.js

@@ -24,13 +24,13 @@ module.exports = [
                 .withDescription('On/off state of the switch'),
             e.child_lock(),
             e.window_detection(),
+            e.away_mode(),
             exposes.climate()
                 .withSetpoint('current_heating_setpoint', 5, 35, 1, ea.STATE_SET)
                 .withLocalTemperature(ea.STATE)
                 .withLocalTemperatureCalibration(-9, 9, 1, ea.STATE_SET)
                 .withSystemMode(['heat', 'auto'], ea.STATE_SET)
                 .withRunningState(['idle', 'heat'], ea.STATE)
-                .withAwayMode()
                 .withSensor(['internal', 'external', 'both']),
             exposes.numeric('external_temperature', ea.STATE)
                 .withUnit('°C')

package/devices/develco.js

@@ -234,13 +234,17 @@ module.exports = [
         model: 'WISZB-120',
         vendor: 'Develco',
         description: 'Window sensor',
-        fromZigbee: [fz.ias_contact_alarm_1, fz.temperature],
+        fromZigbee: [fz.ias_contact_alarm_1, fz.battery, fz.temperature],
         toZigbee: [],
-        exposes: [e.contact(), e.battery_low(), e.tamper(), e.temperature()],
+        exposes: [e.contact(), e.battery(), e.battery_low(), e.tamper(), e.temperature()],
+        meta: {battery: {voltageToPercentage: '3V_2500'}},
         configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(38);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement']);
-            await reporting.temperature(endpoint);
+            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);
         },
     },
     {

package/devices/ikea.js

@@ -292,10 +292,10 @@ module.exports = [
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['TRADFRIbulbE27WSglobeopal1055lm', 'TRADFRIbulbE26WSglobeopal1100lm'],
+        zigbeeModel: ['TRADFRIbulbE27WSglobeopal1055lm', 'TRADFRIbulbE26WSglobeopal1100lm', 'TRADFRIbulbE26WSglobeopal1160lm'],
         model: 'LED2003G10',
         vendor: 'IKEA',
-        description: 'TRADFRI LED bulb E26/27 1100/1055 lumen, dimmable, white spectrum, opal white',
+        description: 'TRADFRI LED bulb E26/27 1100/1055/1160 lumen, dimmable, white spectrum, opal white',
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
     {

package/devices/immax.js

@@ -97,10 +97,10 @@ module.exports = [
                 weeklyScheduleFirstDayDpId: tuya.dataPoints.schedule,
             },
         },
-        exposes: [e.battery_low(), e.child_lock(), exposes.climate()
+        exposes: [e.battery_low(), e.child_lock(), e.away_mode(), exposes.climate()
             .withSetpoint('current_heating_setpoint', 5, 35, 0.5, ea.STATE_SET)
             .withLocalTemperature(ea.STATE).withSystemMode(['off', 'heat', 'auto'], ea.STATE_SET)
-            .withRunningState(['idle', 'heat'], ea.STATE).withAwayMode()],
+            .withRunningState(['idle', 'heat'], ea.STATE)],
     },
     {
         zigbeeModel: ['Bulb-RGB+CCT-ZB3.0'],

package/devices/ledvance.js

@@ -143,4 +143,12 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['CLA60 TW Value'],
+        model: 'AC23684',
+        vendor: 'LEDVANCE',
+        description: 'Classic E26 tunable white 9w 800 lumen',
+        extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+        ota: ota.ledvance,
+    },
 ];

package/devices/niko.js

@@ -234,4 +234,18 @@ module.exports = [
             await reporting.brightness(endpoint);
         },
     },
+    {
+        zigbeeModel: ['Connectable motor control,3A'],
+        model: '552-72301',
+        vendor: 'Niko',
+        description: 'Connectable motor control',
+        fromZigbee: [fz.cover_position_tilt, fz.battery],
+        toZigbee: [tz.cover_state, tz.cover_position_tilt],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['closuresWindowCovering']);
+            await reporting.currentPositionLiftPercentage(endpoint);
+        },
+        exposes: [e.cover_position()],
+    },
 ];

package/devices/philips.js

@@ -1655,7 +1655,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue Iris (generation 2, white)',
         meta: {turnsOffAtBrightness1: true},
-        extend: hueExtend.light_onoff_brightness_color(),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -2596,6 +2596,24 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['5047231P6'],
+        model: '5047231P6',
+        vendor: 'Philips',
+        description: 'Hue White ambiance Buckram double spotlight',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        ota: ota.zigbeeOTA,
+    },
+    {
+        zigbeeModel: ['5047331P6'],
+        model: '5047331P6',
+        vendor: 'Philips',
+        description: 'Hue White ambiance Buckram triple spotlight',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['5047130P9'],
         model: '5047130P9',

package/devices/saswell.js

@@ -42,13 +42,12 @@ module.exports = [
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic']);
         },
-        exposes: [e.battery_low(), e.window_detection(), e.child_lock(),
+        exposes: [e.battery_low(), e.window_detection(), e.child_lock(), e.away_mode(),
             exposes.binary('heating', ea.STATE, 'ON', 'OFF').withDescription('Device valve is open or closed (heating or not)'),
             exposes.climate()
                 .withSetpoint('current_heating_setpoint', 5, 30, 0.5, ea.STATE_SET).withLocalTemperature(ea.STATE)
                 .withSystemMode(['off', 'heat', 'auto'], ea.STATE_SET)
                 // Range is -6 - 6 and step 1: https://github.com/Koenkk/zigbee2mqtt/issues/11777
-                .withLocalTemperatureCalibration(-6, 6, 1, ea.STATE_SET)
-                .withAwayMode()],
+                .withLocalTemperatureCalibration(-6, 6, 1, ea.STATE_SET)],
     },
 ];

package/devices/tuya.js

@@ -466,7 +466,8 @@ module.exports = [
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_qxenlrin'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_iwbaamgh'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_klv2wul0'},
-            {modelID: 'TS0505B', manufacturerName: '_TZ3210_rcggc0ys'}],
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_rcggc0ys'},
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_s6zec0of'}],
         model: 'TS0505B',
         vendor: 'TuYa',
         description: 'Zigbee RGB+CCT light',
@@ -1359,7 +1360,7 @@ 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'])
+                .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(),
@@ -1439,10 +1440,9 @@ module.exports = [
                 weeklyScheduleFirstDayDpId: tuya.dataPoints.schedule,
             },
         },
-        exposes: [e.child_lock(), exposes.climate().withSetpoint('current_heating_setpoint', 5, 35, 0.5, ea.STATE_SET)
+        exposes: [e.child_lock(), e.away_mode(), exposes.climate().withSetpoint('current_heating_setpoint', 5, 35, 0.5, ea.STATE_SET)
             .withLocalTemperature(ea.STATE)
-            .withSystemMode(['off', 'heat', 'auto'], ea.STATE_SET).withRunningState(['idle', 'heat'], ea.STATE)
-            .withAwayMode()],
+            .withSystemMode(['off', 'heat', 'auto'], ea.STATE_SET).withRunningState(['idle', 'heat'], ea.STATE)],
     },
     {
         fingerprint: [{modelID: 'dpplnsn\u0000', manufacturerName: '_TYST11_2dpplnsn'},
@@ -1463,9 +1463,9 @@ module.exports = [
             },
         },
         exposes: [
-            e.battery_low(), e.child_lock(), exposes.climate()
+            e.battery_low(), e.child_lock(), e.away_mode(), exposes.climate()
                 .withSetpoint('current_heating_setpoint', 5, 35, 0.5, ea.STATE_SET)
-                .withLocalTemperature(ea.STATE).withAwayMode()
+                .withLocalTemperature(ea.STATE)
                 .withSystemMode(['off', 'heat', 'auto'], ea.STATE_SET).withRunningState(['idle', 'heat'], ea.STATE),
         ],
     },
@@ -2100,7 +2100,8 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS0210', manufacturerName: '_TYZB01_3zv6oleo'},
-            {modelID: 'TS0210', manufacturerName: '_TYZB01_j9xxahcl'}],
+            {modelID: 'TS0210', manufacturerName: '_TYZB01_j9xxahcl'},
+            {modelID: 'TS0210', manufacturerName: '_TYZB01_kulduhbj'}],
         model: 'TS0210',
         vendor: 'TuYa',
         description: 'Vibration sensor',
@@ -2117,6 +2118,7 @@ module.exports = [
             fz.tuya_relay_din_led_indicator],
         toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory, tz.tuya_relay_din_led_indicator],
         whiteLabel: [{vendor: 'MatSee Plus', model: 'ATMS1602Z'}],
+        ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);

package/devices/woox.js

@@ -52,6 +52,25 @@ const fzLocal = {
             return result;
         },
     },
+    woox_R7060: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandActiveStatusReport'],
+        convert: (model, msg, publish, options, meta) => {
+            const dpValue = tuya.firstDpValue(msg, meta, 'woox_R7060');
+            const dp = dpValue.dp;
+            const value = tuya.getDataValue(dpValue);
+
+            switch (dp) {
+            case tuya.dataPoints.wooxSwitch:
+                return {state: value === 2 ? 'OFF' : 'ON'};
+            case 101:
+                return {battery: value};
+            default:
+                meta.logger.warn(`zigbee-herdsman-converters:WooxR7060: Unrecognized DP #${
+                    dp} with data ${JSON.stringify(dpValue)}`);
+            }
+        },
+    },
 };
 
 const tzLocal = {
@@ -82,10 +101,10 @@ module.exports = [
         model: 'R7060',
         vendor: 'Woox',
         description: 'Smart garden irrigation control',
-        fromZigbee: [fz.on_off, fz.ignore_tuya_set_time, fz.ignore_basic_report, fz.woox_R7060, fz.battery],
+        fromZigbee: [fz.on_off, fz.ignore_tuya_set_time, fz.ignore_basic_report, fzLocal.woox_R7060],
         toZigbee: [tz.on_off],
         onEvent: tuya.onEventSetTime,
-        exposes: [e.switch(), e.battery(), e.battery_voltage()],
+        exposes: [e.switch(), e.battery()],
         meta: {disableDefaultResponse: true},
     },
     {
@@ -138,7 +157,7 @@ module.exports = [
         model: 'R7051',
         vendor: 'Woox',
         description: 'Smart siren',
-        fromZigbee: [fz.battery, fz.ts0216_siren, fz.ias_alarm_only_alarm_1, fz.ts0219_power_source],
+        fromZigbee: [fz.battery, fz.ts0216_siren, fz.ias_alarm_only_alarm_1, fz.power_source],
         toZigbee: [tz.warning, tz.ts0216_volume],
         exposes: [e.battery(), e.battery_voltage(), e.warning(), exposes.binary('alarm', ea.STATE, true, false),
             exposes.binary('ac_connected', ea.STATE, true, false).withDescription('Is the device plugged in'),

package/devices/xiaomi.js

@@ -466,7 +466,7 @@ module.exports = [
             fz.legacy.QBKG04LM_QBKG11LM_click, fz.xiaomi_basic, fz.xiaomi_operation_mode_basic,
             fz.legacy.QBKG11LM_click, fz.ignore_multistate_report, fz.xiaomi_power],
         exposes: [
-            e.switch(), e.power().withAccess(ea.STATE_GET), e.device_temperature(),
+            e.switch(), e.power().withAccess(ea.STATE_GET), e.device_temperature(), e.energy(),
             e.action(['single', 'double', 'release', 'hold']),
             exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled'])
                 .withDescription('Decoupled mode'),
@@ -522,7 +522,7 @@ module.exports = [
         exposes: [
             e.switch().withEndpoint('left'),
             e.switch().withEndpoint('right'),
-            e.device_temperature(),
+            e.device_temperature(), e.energy(),
             e.power().withAccess(ea.STATE_GET),
             e.action(['single_left', 'single_right', 'single_both', 'double_left', 'double_right', 'double_both',
                 'hold_left', 'hold_right', 'hold_both', 'release_left', 'release_right', 'release_both']),
@@ -929,11 +929,15 @@ module.exports = [
         toZigbee: [tz.aqara_detection_interval, tz.aqara_motion_sensitivity, tz.RTCGQ14LM_trigger_indicator],
         exposes: [e.occupancy(), e.illuminance_lux().withProperty('illuminance'),
             e.illuminance().withUnit('lx').withDescription('Measured illuminance in lux'),
-            exposes.enum('motion_sensitivity', ea.ALL, ['low', 'medium', 'high']),
+            exposes.enum('motion_sensitivity', ea.ALL, ['low', 'medium', 'high'])
+                .withDescription('. Press pairing button right before changing this otherwise it will fail.'),
             exposes.numeric('detection_interval', ea.ALL).withValueMin(2).withValueMax(65535).withUnit('s')
-                .withDescription('Time interval for detecting actions'),
+                .withDescription('Time interval for detecting actions. ' +
+                    'Press pairing button right before changing this otherwise it will fail.'),
             exposes.binary('trigger_indicator', ea.ALL, true, false).withDescription('When this option is enabled then ' +
-                'blue LED will blink once when motion is detected'), e.device_temperature(), e.battery(), e.battery_voltage()],
+                'blue LED will blink once when motion is detected. ' +
+                'Press pairing button right before changing this otherwise it will fail.'),
+            e.device_temperature(), e.battery(), e.battery_voltage()],
         meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -1320,9 +1324,10 @@ module.exports = [
     },
     {
         zigbeeModel: ['lumi.curtain.aq2'],
-        model: 'SRSC-M01',
+        model: 'ZNGZDJ11LM',
         description: 'Aqara roller shade motor',
         vendor: 'Xiaomi',
+        whiteLabel: [{vendor: 'Xiaomi', model: 'SRSC-M01'}],
         fromZigbee: [fz.xiaomi_basic, fz.xiaomi_curtain_position, fz.xiaomi_curtain_position_tilt],
         toZigbee: [tz.xiaomi_curtain_position_state, tz.xiaomi_curtain_options],
         exposes: [e.cover_position().setAccess('state', ea.ALL),
@@ -1356,6 +1361,7 @@ module.exports = [
         model: 'ZNJLBL01LM',
         description: 'Aqara roller shade companion E1',
         vendor: 'Xiaomi',
+        whiteLabel: [{vendor: 'Xiaomi', model: 'RSD-M01'}],
         fromZigbee: [fz.xiaomi_curtain_position, fz.xiaomi_curtain_acn002_status, fz.ignore_basic_report, fz.aqara_opple],
         toZigbee: [tz.xiaomi_curtain_position_state, tz.xiaomi_curtain_acn002_battery, tz.xiaomi_curtain_acn002_charging_status],
         onEvent: async (type, data, device) => {
@@ -1381,6 +1387,39 @@ module.exports = [
         },
         ota: ota.zigbeeOTA,
     },
+    {
+        // 'lumi.curtain.acn003' - CN version (ZNCLBL01LM), 'lumi.curtain.agl001' - global version (CM-M01)
+        zigbeeModel: ['lumi.curtain.acn003', 'lumi.curtain.agl001'],
+        model: 'ZNCLBL01LM',
+        vendor: 'Xiaomi',
+        whiteLabel: [{vendor: 'Xiaomi', model: 'CM-M01'}],
+        description: 'Aqara curtain driver E1',
+        fromZigbee: [fz.battery, fz.xiaomi_curtain_position_tilt, fz.aqara_opple, fz.power_source],
+        toZigbee: [tz.xiaomi_curtain_position_state, tz.ZNCLBL01LM_battery_voltage, tz.ZNCLBL01LM_hooks_state,
+            tz.power_source, tz.battery_percentage_remaining],
+        exposes: [e.cover_position().setAccess('state', ea.ALL), e.battery().withAccess(ea.STATE_GET),
+            e.battery_voltage().withAccess(ea.STATE_GET),
+            e.device_temperature(),
+            e.action(['manual_open', 'manual_close']),
+            exposes.enum('motor_state', ea.STATE, ['stopped', 'opening', 'closing'])
+                .withDescription('Motor state'),
+            exposes.binary('running', ea.STATE, true, false)
+                .withDescription('Whether the motor is moving or not'),
+            exposes.enum('hooks_state', ea.STATE_GET, ['unlocked', 'locked', 'locking', 'unlocking'])
+                .withDescription('Hooks state'),
+            exposes.numeric('target_position', ea.STATE).withUnit('%').withDescription('Target position'),
+            exposes.enum('power_source', ea.STATE_GET, ['battery', 'dc_source']).withDescription('The current power source'),
+            exposes.binary('charging', ea.STATE_GET, true, false).withDescription('The current charging state')],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genPowerCfg', ['batteryPercentageRemaining']);
+            await endpoint.read('aqaraOpple', [0x040B], {manufacturerCode: 0x115f});
+            await endpoint.read('aqaraOpple', [0x0428], {manufacturerCode: 0x115f});
+            await endpoint.read('genBasic', ['powerSource']);
+            await endpoint.read('closuresWindowCovering', ['currentPositionLiftPercentage']);
+        },
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['lumi.relay.c2acn01'],
         model: 'LLKZMK11LM',
@@ -1688,9 +1727,9 @@ module.exports = [
     },
     {
         zigbeeModel: ['lumi.remote.b28ac1'],
-        model: 'WRS-R02',
+        model: 'WXKG15LM',
         vendor: 'Xiaomi',
-        whiteLabel: [{vendor: 'Xiaomi', model: 'WXKG15LM'}],
+        whiteLabel: [{vendor: 'Xiaomi', model: 'WRS-R02'}],
         description: 'Aqara wireless remote switch H1 (double rocker)',
         fromZigbee: [fz.battery, fz.xiaomi_multistate_action, fz.aqara_opple, fz.command_toggle],
         toZigbee: [tz.xiaomi_switch_click_mode, tz.aqara_opple_operation_mode],

package/devices/yale.js

@@ -125,7 +125,7 @@ module.exports = [
         extend: lockExtend(),
     },
     {
-        zigbeeModel: ['c700000202'],
+        zigbeeModel: ['c700000202', '06ffff2029'],
         model: 'YDF40',
         vendor: 'Yale',
         description: 'Real living lock / Intelligent biometric digital lock',

package/lib/exposes.js

@@ -427,12 +427,6 @@ class Climate extends Base {
         return this;
     }
 
-    withAwayMode() {
-        assert(!this.endpoint, 'Cannot add feature after adding endpoint');
-        this.features.push(new Binary('away_mode', access.STATE_SET, 'ON', 'OFF').withDescription('Away mode'));
-        return this;
-    }
-
     withPiHeatingDemand(access=a.STATE) {
         assert(!this.endpoint, 'Cannot add feature after adding endpoint');
         this.features.push(new Numeric('pi_heating_demand', access).withValueMin(0).withValueMax(100).withUnit('%').withDescription('Position of the valve (= demanded heat) where 0% is fully closed and 100% is fully open'));

package/lib/tuya.js

@@ -695,6 +695,16 @@ const dataPoints = {
     lmsSensitivity: 9,
     lmsKeepTime: 10,
     lmsIlluminance: 12,
+    // Alecto SMART-SMOKE10
+    alectoSmokeState: 1,
+    alectoSmokeValue: 2,
+    alectoSelfChecking: 8,
+    alectoCheckingResult: 9,
+    alectoSmokeTest: 11,
+    alectoLifecycle: 12,
+    alectoBatteryState: 14,
+    alectoBatteryPercentage: 15,
+    alectoSilence: 16,
 };
 
 const thermostatWeekFormat = {

package/lib/xiaomi.js

@@ -204,7 +204,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
                 payload[`state_${mapping}`] = value === 1 ? 'ON' : 'OFF';
             } else if (['WXKG14LM', 'WXKG16LM', 'WXKG17LM'].includes(model.model)) {
                 payload.click_mode = {1: 'fast', 2: 'multi'}[value];
-            } else if (['WXCJKG11LM', 'WXCJKG12LM', 'WXCJKG13LM', 'ZNMS12LM', 'RTCGQ14LM'].includes(model.model)) {
+            } else if (['WXCJKG11LM', 'WXCJKG12LM', 'WXCJKG13LM', 'ZNMS12LM', 'RTCGQ14LM', 'ZNCLBL01LM'].includes(model.model)) {
                 // We don't know what the value means for these devices.
                 // https://github.com/Koenkk/zigbee2mqtt/issues/11126
                 // https://github.com/Koenkk/zigbee2mqtt/issues/12279
@@ -265,6 +265,9 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
                 }
             } else if (['ZNJLBL01LM', 'ZNCLDJ12LM'].includes(model.model)) {
                 payload.battery = value;
+            } else if (['ZNCLBL01LM'].includes(model.model)) {
+                const battery = value / 2;
+                payload.battery = precisionRound(battery, 2);
             } else if (['RTCZCGQ11LM'].includes(model.model)) {
                 payload.presence = {0: false, 1: true, 255: null}[value];
             }
@@ -308,6 +311,10 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
         case '107':
             if (['RTCGQ14LM'].includes(model.model)) {
                 payload.trigger_indicator = value === 1;
+            } else if (['ZNCLBL01LM'].includes(model.model)) {
+                const position = options.invert_cover ? 100 - value : value;
+                payload.position = position;
+                payload.state = options.invert_cover ? (position > 0 ? 'CLOSE' : 'OPEN') : (position > 0 ? 'OPEN' : 'CLOSE');
             }
             break;
         case '149':
@@ -521,6 +528,41 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
                 payload.battery = value;
             }
             break;
+        case '1035':
+            if (['ZNCLBL01LM'].includes(model.model)) {
+                payload.voltage = value;
+            }
+            break;
+        case '1055':
+            if (['ZNCLBL01LM'].includes(model.model)) {
+                payload.target_position = options.invert_cover ? 100 - value : value;
+            }
+            break;
+        case '1056':
+            if (['ZNCLBL01LM'].includes(model.model)) {
+                // This is the "target_state" attribute, which takes the following values: 0: 'OPEN', 1: 'CLOSE', 2: 'STOP'.
+                // It is not used because the values 0 and 1 are not always reported.
+                // https://github.com/Koenkk/zigbee-herdsman-converters/pull/4307
+            }
+            break;
+        case '1057':
+            if (['ZNCLBL01LM'].includes(model.model)) {
+                payload.motor_state = (options.invert_cover ? {0: 'opening', 1: 'closing', 2: 'stopped'} :
+                    {0: 'closing', 1: 'opening', 2: 'stopped'})[value];
+                payload.running = value < 2 ? true : false;
+            }
+            break;
+        case '1061':
+            if (['ZNCLBL01LM'].includes(model.model)) {
+                payload.action = (options.invert_cover ? {1: 'manual_close', 2: 'manual_open'} :
+                    {1: 'manual_open', 2: 'manual_close'})[value];
+            }
+            break;
+        case '1064':
+            if (['ZNCLBL01LM'].includes(model.model)) {
+                payload.hooks_state = {0: 'unlocked', 1: 'locked', 2: 'locking', 3: 'unlocking'}[value];
+            }
+            break;
         case '1289':
             payload.dimmer_mode = {3: 'rgbw', 1: 'dual_ct'}[value];
             break;

package/package.json

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