zigbee-herdsman-converters 14.0.692 → 14.0.693

package/converters/fromZigbee.js

@@ -383,9 +383,11 @@ const converters = {
     device_temperature: {
         cluster: 'genDeviceTempCfg',
         type: ['attributeReport', 'readResponse'],
+        options: [exposes.options.calibration('device_temperature')],
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.hasOwnProperty('currentTemperature')) {
-                return {device_temperature: parseInt(msg.data['currentTemperature'])};
+                const value = parseInt(msg.data['currentTemperature']);
+                return {device_temperature: calibrateAndPrecisionRoundOptions(value, options, 'device_temperature')};
             }
         },
     },
@@ -648,7 +650,7 @@ const converters = {
             const result = converters.metering.convert(model, msg, publish, options, meta);
             // Filter incorrect 0 energy values reported by the device:
             // https://github.com/Koenkk/zigbee2mqtt/issues/7852
-            if (result.energy === 0) {
+            if (result && result.energy === 0) {
                 delete result.energy;
             }
             return result;
@@ -680,6 +682,17 @@ const converters = {
          */
         cluster: 'seMetering',
         type: ['attributeReport', 'readResponse'],
+        options: (definition) => {
+            const result = [];
+            if (definition.exposes.find((e) => e.name === 'power')) {
+                result.push(exposes.options.precision('power'), exposes.options.calibration('power', 'percentual'));
+            }
+            if (definition.exposes.find((e) => e.name === 'energy')) {
+                result.push(exposes.options.precision('energy'), exposes.options.calibration('energy', 'percentual'));
+            }
+            return result;
+        },
+
         convert: (model, msg, publish, options, meta) => {
             if (utils.hasAlreadyProcessedMessage(msg, model)) return;
             const payload = {};
@@ -692,7 +705,7 @@ const converters = {
                 if (factor != null) {
                     power = (power * factor) * 1000; // kWh to Watt
                 }
-                payload.power = precisionRound(power, 2);
+                payload.power = calibrateAndPrecisionRoundOptions(power, options, 'power');
             }
 
             if (factor != null && (msg.data.hasOwnProperty('currentSummDelivered') ||
@@ -708,7 +721,7 @@ const converters = {
                     const value = (parseInt(data[0]) << 32) + parseInt(data[1]);
                     energy -= value * factor;
                 }
-                payload.energy = precisionRound(energy, 2);
+                payload.energy = calibrateAndPrecisionRoundOptions(energy, options, 'energy');
             }
 
             return payload;
@@ -735,8 +748,11 @@ const converters = {
          */
         cluster: 'haElectricalMeasurement',
         type: ['attributeReport', 'readResponse'],
-        options: [exposes.options.calibration('power', 'percentual'), exposes.options.calibration('current', 'percentual'),
-            exposes.options.calibration('voltage', 'percentual')],
+        options: [
+            exposes.options.calibration('power', 'percentual'), exposes.options.precision('power'),
+            exposes.options.calibration('current', 'percentual'), exposes.options.precision('current'),
+            exposes.options.calibration('voltage', 'percentual'), exposes.options.precision('voltage'),
+        ],
         convert: (model, msg, publish, options, meta) => {
             if (utils.hasAlreadyProcessedMessage(msg, model)) return;
             const getFactor = (key) => {
@@ -5322,47 +5338,23 @@ const converters = {
     xiaomi_power: {
         cluster: 'genAnalogInput',
         type: ['attributeReport', 'readResponse'],
+        options: [exposes.options.calibration('power', 'percentual'), exposes.options.precision('power')],
         convert: (model, msg, publish, options, meta) => {
-            return {power: precisionRound(msg.data['presentValue'], 2)};
+            return {power: calibrateAndPrecisionRoundOptions(msg.data['presentValue'], options, 'power')};
         },
     },
     xiaomi_basic: {
         cluster: 'genBasic',
         type: ['attributeReport', 'readResponse'],
-        options: (definition) => {
-            const result = [];
-            if (definition.exposes.find((e) => e.name === 'temperature')) {
-                result.push(exposes.options.precision('temperature'), exposes.options.calibration('temperature'));
-            }
-            if (definition.exposes.find((e) => e.name === 'device_temperature')) {
-                result.push(exposes.options.calibration('device_temperature'));
-            }
-            if (definition.exposes.find((e) => e.name === 'illuminance')) {
-                result.push(exposes.options.calibration('illuminance', 'percentual'));
-            }
-            if (definition.exposes.find((e) => e.name === 'illuminance_lux')) {
-                result.push(exposes.options.calibration('illuminance_lux', 'percentual'));
-            }
-            return result;
-        },
+        options: xiaomi.numericAttributes2Options,
         convert: (model, msg, publish, options, meta) => {
-            const payload = xiaomi.numericAttributes2Payload(msg, meta, model, options, msg.data);
-            return payload;
+            return xiaomi.numericAttributes2Payload(msg, meta, model, options, msg.data);
         },
     },
     xiaomi_basic_raw: {
         cluster: 'genBasic',
         type: ['raw'],
-        options: (definition) => {
-            const result = [];
-            if (definition.exposes.find((e) => e.name === 'temperature')) {
-                result.push(exposes.options.precision('temperature'), exposes.options.calibration('temperature'));
-            }
-            if (definition.exposes.find((e) => e.name === 'device_temperature')) {
-                result.push(exposes.options.calibration('device_temperature'));
-            }
-            return result;
-        },
+        options: xiaomi.numericAttributes2Options,
         convert: (model, msg, publish, options, meta) => {
             let payload = {};
             if (Buffer.isBuffer(msg.data)) {
@@ -5375,22 +5367,9 @@ const converters = {
     aqara_opple: {
         cluster: 'aqaraOpple',
         type: ['attributeReport', 'readResponse'],
-        options: (definition) => {
-            const result = [];
-            if (definition.exposes.find((e) => e.name === 'temperature')) {
-                result.push(exposes.options.precision('temperature'), exposes.options.calibration('temperature'));
-            }
-            if (definition.exposes.find((e) => e.name === 'device_temperature')) {
-                result.push(exposes.options.calibration('device_temperature'));
-            }
-            if (definition.exposes.find((e) => e.name === 'illuminance')) {
-                result.push(exposes.options.calibration('illuminance', 'percentual'));
-            }
-            return result;
-        },
+        options: xiaomi.numericAttributes2Options,
         convert: (model, msg, publish, options, meta) => {
-            const payload = xiaomi.numericAttributes2Payload(msg, meta, model, options, msg.data);
-            return payload;
+            return xiaomi.numericAttributes2Payload(msg, meta, model, options, msg.data);
         },
     },
     xiaomi_on_off_action: {

package/converters/toZigbee.js

@@ -2588,6 +2588,18 @@ const converters = {
             }
         },
     },
+    xiaomi_curtain_battery_voltage: {
+        key: ['voltage'],
+        convertGet: async (entity, key, meta) => {
+            switch (meta.mapped.model) {
+            case 'ZNCLBL01LM':
+                await entity.read('aqaraOpple', [0x040B], manufacturerOptions.xiaomi);
+                break;
+            default:
+                throw new Error(`xiaomi_curtain_battery_voltage - unsupported model: ${meta.mapped.model}`);
+            }
+        },
+    },
     xiaomi_curtain_acn002_charging_status: {
         key: ['charging_status'],
         convertGet: async (entity, key, meta) => {
@@ -6513,10 +6525,12 @@ const converters = {
             }
         },
     },
-    ZNCLBL01LM_battery_voltage: {
-        key: ['voltage'],
-        convertGet: async (entity, key, meta) => {
-            await entity.read('aqaraOpple', [0x040B], manufacturerOptions.xiaomi);
+    ZNCLBL01LM_hooks_lock: {
+        key: ['hooks_lock'],
+        convertSet: async (entity, key, value, meta) => {
+            const lookup = {'UNLOCK': 0, 'LOCK': 1};
+            await entity.write('aqaraOpple', {0x0427: {value: lookup[value], type: 0x20}}, manufacturerOptions.xiaomi);
+            return {state: {[key]: value}};
         },
     },
     ZNCLBL01LM_hooks_state: {
@@ -6525,6 +6539,32 @@ const converters = {
             await entity.read('aqaraOpple', [0x0428], manufacturerOptions.xiaomi);
         },
     },
+    ZNCLBL01LM_hand_open: {
+        key: ['hand_open'],
+        convertSet: async (entity, key, value, meta) => {
+            await entity.write('aqaraOpple', {0x0401: {value: !value, type: 0x10}}, manufacturerOptions.xiaomi);
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('aqaraOpple', [0x0401], manufacturerOptions.xiaomi);
+        },
+    },
+    ZNCLBL01LM_limits_calibration: {
+        key: ['limits_calibration'],
+        convertSet: async (entity, key, value, meta) => {
+            switch (value) {
+            case 'start':
+                await entity.write('aqaraOpple', {0x0407: {value: 0x01, type: 0x20}}, manufacturerOptions.xiaomi);
+                break;
+            case 'end':
+                await entity.write('aqaraOpple', {0x0407: {value: 0x02, type: 0x20}}, manufacturerOptions.xiaomi);
+                break;
+            case 'reset':
+                await entity.write('aqaraOpple', {0x0407: {value: 0x00, type: 0x20}}, manufacturerOptions.xiaomi);
+                // also? await entity.write('aqaraOpple', {0x0402: {value: 0x00, type: 0x10}}, manufacturerOptions.xiaomi);
+                break;
+            }
+        },
+    },
     wiser_vact_calibrate_valve: {
         key: ['calibrate_valve'],
         convertSet: async (entity, key, value, meta) => {

package/devices/namron.js

@@ -5,6 +5,7 @@ const tz = require('../converters/toZigbee');
 const constants = require('../lib/constants');
 const reporting = require('../lib/reporting');
 const globalStore = require('../lib/store');
+const ota = require('../lib/ota');
 const utils = require('../lib/utils');
 const extend = require('../lib/extend');
 const ea = exposes.access;
@@ -159,6 +160,7 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(endpoint);
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['1402755'],
@@ -190,6 +192,7 @@ module.exports = [
         endpoint: (device) => {
             return {l1: 1, l2: 2, l3: 3, l4: 4};
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['4512721'],
@@ -207,6 +210,7 @@ module.exports = [
         endpoint: (device) => {
             return {l1: 1, l2: 2, l3: 3, l4: 4};
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['4512701'],
@@ -231,7 +235,7 @@ module.exports = [
         zigbeeModel: ['4512719'],
         model: '4512719',
         vendor: 'Namron',
-        description: 'Zigbee 2 channel switch K4 white',
+        description: 'Zigbee 2 channel switch K4 (white)',
         fromZigbee: [fz.command_on, fz.command_off, fz.battery, fz.command_move, fz.command_stop],
         meta: {multiEndpoint: true},
         exposes: [e.battery(), e.action(['on_l1', 'off_l1', 'brightness_move_up_l1', 'brightness_move_down_l1', 'brightness_stop_l1',
@@ -240,6 +244,7 @@ module.exports = [
         endpoint: (device) => {
             return {l1: 1, l2: 2};
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['4512726'],
@@ -259,12 +264,13 @@ module.exports = [
             await reporting.batteryPercentageRemaining(endpoint);
             await reporting.batteryVoltage(endpoint);
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['4512729'],
         model: '4512729',
         vendor: 'Namron',
-        description: 'Zigbee 2 channel switch K4 white',
+        description: 'Zigbee 2 channel switch K4 (black)',
         fromZigbee: [fz.command_on, fz.command_off, fz.battery, fz.command_move, fz.command_stop],
         meta: {multiEndpoint: true},
         exposes: [e.battery(), e.action(['on_l1', 'off_l1', 'brightness_move_up_l1', 'brightness_move_down_l1', 'brightness_stop_l1',
@@ -273,6 +279,7 @@ module.exports = [
         endpoint: (device) => {
             return {l1: 1, l2: 2};
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['4512706'],
@@ -589,6 +596,7 @@ module.exports = [
             await endpoint.read('hvacThermostat', [0x1008, 0x1009, 0x100A, 0x100B], options);
             await endpoint.read('hvacThermostat', [0x2001, 0x2002], options);
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['4512735'],

package/devices/philips.js

@@ -769,7 +769,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
-        zigbeeModel: ['LCG002'],
+        zigbeeModel: ['LCG002', '929003047701'],
         model: '929001953101',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance GU10',
@@ -2013,11 +2013,7 @@ module.exports = [
             exposes.numeric('occupancy_timeout', ea.ALL).withUnit('second').withValueMin(0).withValueMax(65535)],
         toZigbee: [tz.occupancy_timeout, tz.hue_motion_sensitivity, tz.hue_motion_led_indication],
         endpoint: (device) => {
-            return {
-                'default': 2, // default
-                'ep1': 1,
-                'ep2': 2, // e.g. for write to msOccupancySensing
-            };
+            return {'default': 2, 'ep1': 1, 'ep2': 2};
         },
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(2);
@@ -2046,11 +2042,7 @@ module.exports = [
             exposes.numeric('occupancy_timeout', ea.ALL).withUnit('second').withValueMin(0).withValueMax(65535)],
         toZigbee: [tz.occupancy_timeout, tz.hue_motion_sensitivity, tz.hue_motion_led_indication],
         endpoint: (device) => {
-            return {
-                'default': 2, // default
-                'ep1': 1,
-                'ep2': 2, // e.g. for write to msOccupancySensing
-            };
+            return {'default': 2, 'ep1': 1, 'ep2': 2};
         },
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(2);
@@ -2078,13 +2070,6 @@ module.exports = [
             exposes.binary('led_indication', ea.ALL, true, false).withDescription('Blink green LED on motion detection'),
             exposes.numeric('occupancy_timeout', ea.ALL).withUnit('second').withValueMin(0).withValueMax(65535)],
         toZigbee: [tz.occupancy_timeout, tz.hue_motion_sensitivity, tz.hue_motion_led_indication],
-        endpoint: (device) => {
-            return {
-                'default': 2, // default
-                'ep1': 1,
-                'ep2': 2, // e.g. for write to msOccupancySensing
-            };
-        },
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(2);
             const binds = ['genPowerCfg', 'msIlluminanceMeasurement', 'msTemperatureMeasurement', 'msOccupancySensing'];
@@ -2111,13 +2096,6 @@ module.exports = [
             exposes.binary('led_indication', ea.ALL, true, false).withDescription('Blink green LED on motion detection'),
             exposes.numeric('occupancy_timeout', ea.ALL).withUnit('second').withValueMin(0).withValueMax(65535)],
         toZigbee: [tz.occupancy_timeout, tz.hue_motion_sensitivity, tz.hue_motion_led_indication],
-        endpoint: (device) => {
-            return {
-                'default': 2, // default
-                'ep1': 1,
-                'ep2': 2, // e.g. for write to msOccupancySensing
-            };
-        },
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(2);
             const binds = ['genPowerCfg', 'msIlluminanceMeasurement', 'msTemperatureMeasurement', 'msOccupancySensing'];
@@ -3011,6 +2989,13 @@ module.exports = [
         description: 'Hue Gradient Signe floor lamp (white)',
         extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['915005987301'],
+        model: '915005987301',
+        vendor: 'Philips',
+        description: 'Hue Gradient Signe table lamp (white)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['929003526301'],
         model: '929003526301',
@@ -3032,4 +3017,11 @@ module.exports = [
         description: 'Hue white ambiance Pillar spotlight with Bluetooth (black)',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['8719514288232'],
+        model: '929002469216',
+        vendor: 'Philips',
+        description: 'Hue white E27 1100lm with Bluetooth',
+        extend: hueExtend.light_onoff_brightness(),
+    },
 ];

package/devices/sinope.js

@@ -1017,4 +1017,26 @@ module.exports = [
             } catch (error) {/* Do Nothing */}
         },
     },
+    {
+        zigbeeModel: ['RM3500ZB'],
+        model: 'RM3500ZB',
+        vendor: 'Sinopé',
+        description: 'Calypso smart water heater controller',
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ias_water_leak_alarm_1, fz.temperature],
+        toZigbee: [tz.on_off],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.water_leak(), e.temperature()],
+        configure: async (device, coordinatorEndpoint) => {
+            const endpoint = device.getEndpoint(1);
+            const binds = ['genOnOff', 'haElectricalMeasurement', 'seMetering', 'Temperature'];
+            await reporting.bind(endpoint, coordinatorEndpoint, binds);
+            await reporting.onOff(endpoint);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.activePower(endpoint);
+            await reporting.rmsCurrent(endpoint);
+            await reporting.rmsVoltage(endpoint);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint);
+            await reporting.temperature(endpoint, {min: 60, max: 3600, change: 1});
+        },
+    },
 ];

package/devices/third_reality.js

@@ -102,17 +102,12 @@ module.exports = [
         model: '3RSP019BZ',
         vendor: 'Third Reality',
         description: 'Zigbee / BLE smart plug',
-        fromZigbee: [fz.on_off, fz.electrical_measurement],
-        toZigbee: [tz.on_off],
+        extend: extend.switch(),
         ota: ota.zigbeeOTA,
-        exposes: [e.switch(), e.power(), e.current(), e.voltage()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(endpoint);
-            await reporting.activePower(endpoint);
-            await reporting.rmsCurrent(endpoint);
-            await reporting.rmsVoltage(endpoint);
         },
     },
     {
@@ -158,4 +153,21 @@ module.exports = [
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['3RSP02028BZ'],
+        model: '3RSP02028BZ',
+        vendor: 'Third Reality',
+        description: 'Zigbee / BLE smart plug with power',
+        fromZigbee: [fz.on_off, fz.electrical_measurement],
+        toZigbee: [tz.on_off],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement']);
+            await reporting.onOff(endpoint);
+            await reporting.activePower(endpoint);
+            await reporting.rmsCurrent(endpoint);
+            await reporting.rmsVoltage(endpoint);
+        },
+    },
 ];

package/devices/tuya.js

@@ -989,7 +989,8 @@ module.exports = [
             {vendor: 'Zemismart', model: 'LXZB-ZB-09A', description: 'Zemismart LED Surface Mounted Downlight 9W RGBW'},
             {vendor: 'Feconn', model: 'FE-GU10-5W', description: 'Zigbee GU10 5W smart bulb'},
         ],
-        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], disableColorTempStartup: true}),
+        extend: extend.light_onoff_brightness_colortemp_color(
+            {colorTempRange: [153, 500], disableColorTempStartup: true, disablePowerOnBehavior: true}),
         meta: {applyRedFix: true, enhancedHue: false},
     },
     {
@@ -998,7 +999,7 @@ module.exports = [
         vendor: 'TuYa',
         description: 'Zigbee RGB light',
         whiteLabel: [{vendor: 'BTF-Lighting', model: 'C03Z'}],
-        extend: extend.light_onoff_brightness_color(),
+        extend: extend.light_onoff_brightness_color({disablePowerOnBehavior: true}),
         // Requires red fix: https://github.com/Koenkk/zigbee2mqtt/issues/5962#issue-796462106
         meta: {applyRedFix: true, enhancedHue: false},
     },
@@ -1007,7 +1008,7 @@ module.exports = [
         model: 'TS0504B',
         vendor: 'TuYa',
         description: 'Zigbee RGBW light',
-        extend: extend.light_onoff_brightness_color(),
+        extend: extend.light_onoff_brightness_color({disablePowerOnBehavior: true}),
         toZigbee: utils.replaceInArray(extend.light_onoff_brightness_color().toZigbee, [tz.light_color], [tzLocal.TS0504B_color]),
         meta: {applyRedFix: true},
     },
@@ -1016,14 +1017,14 @@ module.exports = [
         model: 'TS0501A',
         description: 'Zigbee light',
         vendor: 'TuYa',
-        extend: extend.light_onoff_brightness(),
+        extend: extend.light_onoff_brightness({disablePowerOnBehavior: true}),
     },
     {
         zigbeeModel: ['TS0501B'],
         model: 'TS0501B',
         description: 'Zigbee light',
         vendor: 'TuYa',
-        extend: extend.light_onoff_brightness(),
+        extend: extend.light_onoff_brightness({disablePowerOnBehavior: true}),
     },
     {
         fingerprint: tuya.fingerprint('TS0202', ['_TZ3210_cwamkvua']),
@@ -1558,7 +1559,7 @@ module.exports = [
         model: 'TS0503A',
         vendor: 'TuYa',
         description: 'Led strip controller',
-        extend: extend.light_onoff_brightness_color(),
+        extend: extend.light_onoff_brightness_color({disablePowerOnBehavior: true}),
         meta: {applyRedFix: true},
     },
     {
@@ -1575,7 +1576,7 @@ module.exports = [
         model: 'TS0502A',
         vendor: 'TuYa',
         description: 'Light controller',
-        extend: extend.light_onoff_brightness_colortemp(),
+        extend: extend.light_onoff_brightness_colortemp({disablePowerOnBehavior: true}),
     },
     {
         zigbeeModel: ['TS0502B'],
@@ -1586,14 +1587,14 @@ module.exports = [
             {vendor: 'Mercator Ikuü', model: 'SMI7040', description: 'Ford Batten Light'},
             {vendor: 'Mercator Ikuü', model: 'SMD9300', description: 'Donovan Panel Light'},
         ],
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], disablePowerOnBehavior: true}),
     },
     {
         zigbeeModel: ['TS0504A'],
         model: 'TS0504A',
         vendor: 'TuYa',
         description: 'RGBW LED controller',
-        extend: extend.light_onoff_brightness_colortemp_color(),
+        extend: extend.light_onoff_brightness_colortemp_color({disablePowerOnBehavior: true}),
     },
     {
         fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_sosdczdl'}],
@@ -1609,7 +1610,7 @@ module.exports = [
         model: 'TS0505A',
         vendor: 'TuYa',
         description: 'RGB+CCT light controller',
-        extend: extend.light_onoff_brightness_colortemp_color(),
+        extend: extend.light_onoff_brightness_colortemp_color({disablePowerOnBehavior: true}),
     },
     {
         fingerprint: [{manufacturerName: '_TZ2000_a476raq2'}],
@@ -3657,7 +3658,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS110E', manufacturerName: '_TZ3210_zxbtub8r'}],
+        fingerprint: tuya.fingerprint('TS110E', ['_TZ3210_zxbtub8r', '_TZ3210_k1msuvg6']),
         model: 'TS110E_1gang_1',
         vendor: 'TuYa',
         description: '1 channel dimmer',

package/devices/xiaomi.js

@@ -1939,22 +1939,38 @@ module.exports = [
         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),
+        fromZigbee: [
+            fz.battery,
+            fz.xiaomi_curtain_position_tilt,
+            fz.aqara_opple,
+            fz.power_source,
+        ],
+        toZigbee: [
+            tz.xiaomi_curtain_position_state,
+            tz.xiaomi_curtain_battery_voltage,
+            tz.ZNCLBL01LM_hooks_lock,
+            tz.ZNCLBL01LM_hooks_state,
+            tz.ZNCLBL01LM_hand_open,
+            tz.ZNCLBL01LM_limits_calibration,
+            tz.power_source,
+            tz.battery_percentage_remaining,
+        ],
+        exposes: [
+            e.cover_position().setAccess('state', ea.ALL),
+            exposes.binary('hand_open', ea.ALL, true, false).withDescription('Pulling curtains by hand starts the motor'),
+            exposes.enum('limits_calibration', ea.SET, ['start', 'end', 'reset']).withDescription('Calibrate the position limits'),
+            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', 'pause'])
-                .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.enum('motor_state', ea.STATE, ['stopped', 'opening', 'closing', 'pause']).withDescription('Motor state'),
+            exposes.binary('running', ea.STATE, true, false).withDescription('Whether the motor is moving or not'),
+            exposes.enum('hooks_lock', ea.STATE_SET, ['LOCK', 'UNLOCK']).withDescription('Lock the curtain driver hooks'),
+            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')],
+            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']);

package/lib/utils.js

@@ -77,10 +77,11 @@ function hasAlreadyProcessedMessage(msg, model, ID=null, key=null) {
 
 const calibrateAndPrecisionRoundOptionsDefaultPrecision = {
     temperature: 2, humidity: 2, pressure: 1, pm25: 0, power: 2, current: 2, current_phase_b: 2, current_phase_c: 2,
-    voltage: 2, voltage_phase_b: 2, voltage_phase_c: 2, power_phase_b: 2, power_phase_c: 2,
+    voltage: 2, voltage_phase_b: 2, voltage_phase_c: 2, power_phase_b: 2, power_phase_c: 2, energy: 2,
 };
 function calibrateAndPrecisionRoundOptionsIsPercentual(type) {
-    return type.startsWith('current') || type.startsWith('voltage') || type.startsWith('power') || type.startsWith('illuminance');
+    return type.startsWith('current') || type.startsWith('energy') || type.startsWith('voltage') || type.startsWith('power') ||
+        type.startsWith('illuminance');
 }
 function calibrateAndPrecisionRoundOptions(number, options, type) {
     // Calibrate

package/lib/xiaomi.js

@@ -3,11 +3,14 @@
 const {
     batteryVoltageToPercentage,
     calibrateAndPrecisionRoundOptions,
+    calibrateAndPrecisionRoundOptionsIsPercentual,
     postfixWithEndpointName,
     precisionRound,
     getKey,
 } = require('./utils');
 
+const exposes = require('../lib/exposes');
+
 const buffer2DataObject = (meta, model, buffer) => {
     const dataObject = {};
 
@@ -337,27 +340,27 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             }
             break;
         case '149':
-            payload.energy = precisionRound(value, 2); // 0x95
+            payload.energy = calibrateAndPrecisionRoundOptions(value, options, 'energy'); // 0x95
             // Consumption is deprecated
             payload.consumption = payload.energy;
             break;
         case '150':
             if (!['JTYJ-GD-01LM/BW'].includes(model.model)) {
-                payload.voltage = precisionRound(value * 0.1, 1); // 0x96
+                payload.voltage = calibrateAndPrecisionRoundOptions(value * 0.1, options, 'voltage'); // 0x96
             }
             break;
         case '151':
             if (['LLKZMK11LM'].includes(model.model)) {
-                payload.current = precisionRound(value, 4);
+                payload.current = calibrateAndPrecisionRoundOptions(value, options, 'current');
             } else {
-                payload.current = precisionRound(value * 0.001, 4);
+                payload.current = calibrateAndPrecisionRoundOptions(value * 0.001, options, 'current');
             }
             break;
         case '152':
             if (['DJT11LM'].includes(model.model)) {
                 // We don't know what implies for this device, it contains values like 30, 50,... that don't seem to change
             } else {
-                payload.power = precisionRound(value, 2); // 0x98
+                payload.power = calibrateAndPrecisionRoundOptions(value, options, 'power'); // 0x98
             }
             break;
         case '154':
@@ -545,10 +548,15 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             payload.button_switch_mode = value === 1 ? 'relay_and_usb' : 'relay';
             break;
         case '1025':
-            payload.options = {...payload.options, // next values update only when curtain finished initial setup and knows current position
-                reverse_direction: value[2] == '\u0001',
-                hand_open: value[5] == '\u0000',
-            };
+            if (['ZNCLBL01LM'].includes(model.model)) {
+                payload.hand_open = !value;
+            } else {
+                // next values update only when curtain finished initial setup and knows current position
+                payload.options = {...payload.options,
+                    reverse_direction: value[2] == '\u0001',
+                    hand_open: value[5] == '\u0000',
+                };
+            }
             break;
         case '1028':
             payload = {...payload,
@@ -597,9 +605,15 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
                     {1: 'manual_open', 2: 'manual_close'})[value];
             }
             break;
+        case '1063':
+            if (['ZNCLBL01LM'].includes(model.model)) {
+                payload.hooks_lock = {0: 'UNLOCK', 1: 'LOCK'}[value];
+            }
+            break;
         case '1064':
             if (['ZNCLBL01LM'].includes(model.model)) {
                 payload.hooks_state = {0: 'unlocked', 1: 'locked', 2: 'locking', 3: 'unlocking'}[value];
+                payload.hooks_lock = {0: 'UNLOCK', 1: 'LOCK', 2: 'UNLOCK', 3: 'LOCK'}[value];
             }
             break;
         case '1289':
@@ -650,8 +664,29 @@ const VOCKQJK11LMDisplayUnit = {
     'ppb_fahrenheit': 0x11, // ppb, °F
 };
 
+const numericAttributes2Options = (definition) => {
+    const supported = ['temperature', 'device_temperature', 'illuminance', 'illuminance_lux',
+        'pressure', 'power', 'current', 'voltage', 'energy', 'power'];
+    const precisionSupported = ['temperature', 'humidity', 'pressure', 'power', 'current', 'voltage', 'energy', 'power'];
+    const result = [];
+    for (const expose of definition.exposes) {
+        // only eletrical measurement voltage is supported, not battery
+        const isBatteryVoltage = expose.name === 'voltage' && definition.meta && definition.meta.battery;
+        if (supported.includes(expose.name) && !isBatteryVoltage) {
+            const type = calibrateAndPrecisionRoundOptionsIsPercentual(expose.name) ? 'percentual' : 'absolute';
+            result.push(exposes.options.calibration(expose.name, type));
+            if (precisionSupported.includes(expose.name)) {
+                result.push(exposes.options.precision(expose.name));
+            }
+        }
+    }
+
+    return result;
+};
+
 module.exports = {
     buffer2DataObject,
     numericAttributes2Payload,
+    numericAttributes2Options,
     VOCKQJK11LMDisplayUnit,
 };

package/package.json

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