zigbee-herdsman-converters 14.0.369 → 14.0.373

package/converters/fromZigbee.js

@@ -1164,7 +1164,8 @@ const converters = {
 
             if (options.simulated_brightness) {
                 globalStore.putValue(msg.endpoint, 'simulated_brightness_brightness', msg.data.level);
-                payload.brightness = msg.data.level;
+                const property = postfixWithEndpointName('brightness', msg, model);
+                payload[property] = msg.data.level;
             }
 
             return payload;
@@ -1195,7 +1196,8 @@ const converters = {
                         brightness += delta;
                         brightness = numberWithinRange(brightness, 0, 255);
                         globalStore.putValue(msg.endpoint, 'simulated_brightness_brightness', brightness);
-                        publish({brightness});
+                        const property = postfixWithEndpointName('brightness', msg, model);
+                        publish({[property]: brightness});
                     }, intervalOpts);
 
                     globalStore.putValue(msg.endpoint, 'simulated_brightness_timer', timer);
@@ -1225,7 +1227,8 @@ const converters = {
                 brightness += delta;
                 brightness = numberWithinRange(brightness, 0, 255);
                 globalStore.putValue(msg.endpoint, 'simulated_brightness_brightness', brightness);
-                payload.brightness = brightness;
+                const property = postfixWithEndpointName('brightness', msg, model);
+                payload[property] = brightness;
             }
 
             return payload;
@@ -2574,6 +2577,28 @@ const converters = {
             }
         },
     },
+    wls100z_water_leak: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataResponse', 'commandDataReport'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            for (const dpValue of msg.data.dpValues) {
+                const value = tuya.getDataValue(dpValue);
+                switch (dpValue.dp) {
+                case tuya.dataPoints.wlsWaterLeak:
+                    result.water_leak = value < 1;
+                    break;
+                case tuya.dataPoints.wlsBatteryPercentage:
+                    result.battery = value;
+                    break;
+                default:
+                    meta.logger.warn(`zigbee-herdsman-converters:wls100z_water_leak:` +
+                        `NOT RECOGNIZED DP #${dpValue.dp} with data ${JSON.stringify(dpValue)}`);
+                }
+            }
+            return result;
+        },
+    },
     livolo_switch_state: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],
@@ -4679,17 +4704,21 @@ const converters = {
     },
     tuya_smoke: {
         cluster: 'manuSpecificTuya',
-        type: ['commandDataResponse'],
+        type: ['commandDataResponse', 'commandDataReport'],
         convert: (model, msg, publish, options, meta) => {
-            const dpValue = tuya.firstDpValue(msg, meta, 'tuya_smoke');
-            const dp = dpValue.dp;
-            const value = tuya.getDataValue(dpValue);
-            switch (dp) {
-            case tuya.dataPoints.state:
-                return {smoke: value === 0};
-            default:
-                meta.logger.warn(`zigbee-herdsman-converters:tuya_smoke: Unrecognized DP #${ dp} with data ${JSON.stringify(dpValue)}`);
+            const result = {};
+            for (const dpValue of msg.data.dpValues) {
+                const dp = dpValue.dp;
+                const value = tuya.getDataValue(dpValue);
+                switch (dp) {
+                case tuya.dataPoints.state:
+                    result.smoke = value === 0;
+                    break;
+                default:
+                    meta.logger.warn(`zigbee-herdsman-converters:tuya_smoke: Unrecognized DP #${ dp} with data ${JSON.stringify(dpValue)}`);
+                }
             }
+            return result;
         },
     },
     tuya_woox_smoke: {
@@ -4988,7 +5017,8 @@ const converters = {
     aqara_opple: {
         cluster: 'aqaraOpple',
         type: ['attributeReport', 'readResponse'],
-        options: [exposes.options.precision('temperature'), exposes.options.calibration('temperature')],
+        options: [exposes.options.precision('temperature'), exposes.options.calibration('temperature'),
+            exposes.options.precision('illuminance'), exposes.options.calibration('illuminance', 'percentual')],
         convert: (model, msg, publish, options, meta) => {
             const payload = {};
             if (msg.data.hasOwnProperty('247')) {
@@ -5113,6 +5143,8 @@ const converters = {
                         if (['QBKG19LM', 'QBKG20LM', 'QBKG39LM', 'QBKG41LM', 'QBCZ15LM'].includes(model.model)) {
                             const mapping = model.model === 'QBCZ15LM' ? 'usb' : 'right';
                             payload[`state_${mapping}`] = value === 1 ? 'ON' : 'OFF';
+                        } else if (['RTCGQ12LM'].includes(model.model)) {
+                            payload.illuminance = calibrateAndPrecisionRoundOptions(value, options, 'illuminance');
                         }
                     } else if (index === 149) {
                         payload.energy = precisionRound(value, 2); // 0x95
@@ -5128,7 +5160,7 @@ const converters = {
             if (msg.data.hasOwnProperty('0')) payload.detection_period = msg.data['0'];
             if (msg.data.hasOwnProperty('4')) payload.mode_switch = {4: 'anti_flicker_mode', 1: 'quick_mode'}[msg.data['4']];
             if (msg.data.hasOwnProperty('10')) payload.switch_type = {1: 'toggle', 2: 'momentary'}[msg.data['10']];
-            if (msg.data.hasOwnProperty('258')) payload.detection_interval = msg.data['258'];
+            if (msg.data.hasOwnProperty('258')) payload.occupancy_timeout = msg.data['258'];
             if (msg.data.hasOwnProperty('268')) payload.motion_sensitivity = {1: 'low', 2: 'medium', 3: 'high'}[msg.data['268']];
             if (msg.data.hasOwnProperty('512')) {
                 if (['ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM'].includes(model.model)) {
@@ -5281,6 +5313,65 @@ const converters = {
             return payload;
         },
     },
+    RTCGQ12LM_occupancy_illuminance: {
+        cluster: 'aqaraOpple',
+        type: ['attributeReport', 'readResponse'],
+        options: [exposes.options.precision('illuminance'), exposes.options.calibration('illuminance', 'percentual')],
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data.hasOwnProperty('illuminance')) {
+                // The occupancy sensor only sends a message when motion detected.
+                // Therefore we need to publish the no_motion detected by ourselves.
+                const timeout = meta && meta.state && meta.state.hasOwnProperty('occupancy_timeout') ? meta.state.occupancy_timeout : 60;
+
+                // Stop existing timers because motion is detected and set a new one.
+                globalStore.getValue(msg.endpoint, 'timers', []).forEach((t) => clearTimeout(t));
+                globalStore.putValue(msg.endpoint, 'timers', []);
+
+                if (timeout !== 0) {
+                    const timer = setTimeout(() => {
+                        publish({occupancy: false});
+                    }, timeout * 1000);
+
+                    globalStore.getValue(msg.endpoint, 'timers').push(timer);
+                }
+
+                const illuminance = msg.data['illuminance'] - 65536;
+                return {occupancy: true, illuminance: calibrateAndPrecisionRoundOptions(illuminance, options, 'illuminance')};
+            }
+        },
+    },
+    RTCGQ13LM_occupancy: {
+        // This is for occupancy sensor that only send a message when motion detected,
+        // but do not send a motion stop.
+        // Therefore we need to publish the no_motion detected by ourselves.
+        cluster: 'msOccupancySensing',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data.occupancy !== 1) {
+                // In case of 0 no occupancy is reported.
+                // https://github.com/Koenkk/zigbee2mqtt/issues/467
+                return;
+            }
+
+            // The occupancy sensor only sends a message when motion detected.
+            // Therefore we need to publish the no_motion detected by ourselves.
+            const timeout = meta && meta.state && meta.state.hasOwnProperty('occupancy_timeout') ? meta.state.occupancy_timeout : 60;
+
+            // Stop existing timers because motion is detected and set a new one.
+            globalStore.getValue(msg.endpoint, 'timers', []).forEach((t) => clearTimeout(t));
+            globalStore.putValue(msg.endpoint, 'timers', []);
+
+            if (timeout !== 0) {
+                const timer = setTimeout(() => {
+                    publish({occupancy: false});
+                }, timeout * 1000);
+
+                globalStore.getValue(msg.endpoint, 'timers').push(timer);
+            }
+
+            return {occupancy: true};
+        },
+    },
     xiaomi_WXKG01LM_action: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],
@@ -5943,7 +6034,13 @@ const converters = {
     ZMCSW032D_cover_position: {
         cluster: 'closuresWindowCovering',
         type: ['attributeReport', 'readResponse'],
-        options: [exposes.options.invert_cover()],
+        options: [
+            exposes.options.invert_cover(),
+            exposes.numeric('time_close')
+                .withDescription(`Set the full closing time of the roller shutter (e.g. set it to 20) (value is in s).`),
+            exposes.numeric('time_open')
+                .withDescription(`Set the full opening time of the roller shutter (e.g. set it to 21) (value is in s).`),
+        ],
         convert: (model, msg, publish, options, meta) => {
             const result = {};
             const timeCoverSetMiddle = 60;
@@ -7437,6 +7534,25 @@ const converters = {
             }
         },
     },
+    tuya_smart_vibration_sensor: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandGetData', 'commandDataResponse', 'raw'],
+        convert: (model, msg, publish, options, meta) => {
+            const dp = msg.data.dp;
+            const value = tuya.getDataValue(msg.data.datatype, msg.data.data);
+            switch (dp) {
+            case tuya.dataPoints.state:
+                return {contact: Boolean(value)};
+            case tuya.dataPoints.thitBatteryPercentage:
+                return {battery: value};
+            case tuya.dataPoints.tuyaVibration:
+                return {vibration: Boolean(value)};
+            default:
+                meta.logger.warn(`zigbee-herdsman-converters:tuya_smart_vibration_sensor: NOT RECOGNIZED ` +
+                    `DP #${dp} with data ${JSON.stringify(msg.data)}`);
+            }
+        },
+    },
     moes_thermostat_tv: {
         cluster: 'manuSpecificTuya',
         type: ['commandDataResponse', 'commandDataReport', 'raw'],
@@ -7527,7 +7643,11 @@ const converters = {
         cluster: 'genAnalogInput',
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
-            return {people: msg.data.presentValue};
+            const lookup = {'0': 'idle', '1': 'in', '2': 'out'};
+            const value = precisionRound(parseFloat(msg.data['presentValue']), 1);
+            let result = null;
+            result = {people: precisionRound(msg.data.presentValue, 0), status: lookup[value*10%10]};
+            return result;
         },
     },
     sihas_action: {
@@ -7712,6 +7832,40 @@ const converters = {
             };
         },
     },
+    tuya_light_wz5: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataResponse', 'commandDataReport'],
+        convert: (model, msg, publish, options, meta) => {
+            const separateWhite = (model.meta && model.meta.separateWhite);
+            const result = {};
+            // eslint-disable-next-line no-unused-vars
+            for (const [i, dpValue] of msg.data.dpValues.entries()) {
+                const dp = dpValue.dp;
+                const value = tuya.getDataValue(dpValue);
+                if (dp === tuya.dataPoints.state) {
+                    result.state = value ? 'ON': 'OFF';
+                } else if (dp === tuya.dataPoints.silvercrestSetBrightness) {
+                    const brightness = mapNumberRange(value, 0, 1000, 0, 255);
+                    if (separateWhite) {
+                        result.white_brightness = brightness;
+                    } else {
+                        result.brightness = brightness;
+                    }
+                } else if (dp === tuya.dataPoints.silvercrestSetColor) {
+                    const h = parseInt(value.substring(0, 4), 16);
+                    const s = parseInt(value.substring(4, 8), 16);
+                    const b = parseInt(value.substring(8, 12), 16);
+                    result.color_mode = 'hs';
+                    result.color = {hue: h, saturation: mapNumberRange(s, 0, 1000, 0, 100)};
+                    result.brightness = mapNumberRange(b, 0, 1000, 0, 255);
+                } else if (dp === tuya.dataPoints.silvercrestSetColorTemp) {
+                    const [colorTempMin, colorTempMax] = [250, 454];
+                    result.color_temp = mapNumberRange(value, 0, 1000, colorTempMax, colorTempMin);
+                }
+            }
+            return result;
+        },
+    },
     // #endregion
 
     // #region Ignore converters (these message dont need parsing).
@@ -7865,6 +8019,11 @@ const converters = {
         type: ['commandMcuSyncTime'],
         convert: (model, msg, publish, options, meta) => null,
     },
+    ignore_tuya_raw: {
+        cluster: 'manuSpecificTuya',
+        type: ['raw'],
+        convert: (model, msg, publish, options, meta) => null,
+    },
     // #endregion
 };
 

package/converters/toZigbee.js

@@ -1915,6 +1915,8 @@ const converters = {
                     }
                 }
             }
+
+            return {state: {hue_power_on_behavior: value}};
         },
     },
     hue_power_on_error: {
@@ -2076,12 +2078,12 @@ const converters = {
             await entity.read('aqaraOpple', [0x0000], manufacturerOptions.xiaomi);
         },
     },
-    RTCGQ13LM_detection_interval: {
-        key: ['detection_interval'],
+    aqara_occupancy_timeout: {
+        key: ['occupancy_timeout'],
         convertSet: async (entity, key, value, meta) => {
             value *= 1;
             await entity.write('aqaraOpple', {0x0102: {value: [value], type: 0x20}}, manufacturerOptions.xiaomi);
-            return {state: {detection_interval: value}};
+            return {state: {occupancy_timeout: value}};
         },
         convertGet: async (entity, key, meta) => {
             await entity.read('aqaraOpple', [0x0102], manufacturerOptions.xiaomi);
@@ -6404,6 +6406,133 @@ const converters = {
             return {state: {click_mode: value}};
         },
     },
+    tuya_light_wz5: {
+        key: ['color', 'color_temp', 'brightness', 'white_brightness'],
+        convertSet: async (entity, key, value, meta) => {
+            const separateWhite = (meta.mapped.meta && meta.mapped.meta.separateWhite);
+            if (key == 'white_brightness' || (!separateWhite && (key == 'brightness'))) {
+                // upscale to 1000
+                let newValue;
+                if (value >= 0 && value <= 255) {
+                    newValue = utils.mapNumberRange(value, 0, 255, 0, 1000);
+                } else {
+                    throw new Error('Dimmer brightness is out of range 0..255');
+                }
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white);
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.dimmerLevel, newValue);
+
+                return {state: {white_brightness: value}};
+            } else if (key == 'color_temp') {
+                const [colorTempMin, colorTempMax] = [250, 454];
+                const preset = {
+                    'warmest': colorTempMax,
+                    'warm': 454,
+                    'neutral': 370,
+                    'cool': 250,
+                    'coolest': colorTempMin,
+                };
+                if (typeof value === 'string' && isNaN(value)) {
+                    const presetName = value.toLowerCase();
+                    if (presetName in preset) {
+                        value = preset[presetName];
+                    } else {
+                        throw new Error(`Unknown preset '${value}'`);
+                    }
+                } else {
+                    value = light.clampColorTemp(Number(value), colorTempMin, colorTempMax, meta.logger);
+                }
+                const data = utils.mapNumberRange(value, colorTempMax, colorTempMin, 0, 1000);
+
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white);
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.silvercrestSetColorTemp, data);
+
+                return {state: {color_temp: value}};
+            } else if (key == 'color' || (separateWhite && (key == 'brightness'))) {
+                const newState = {};
+                if (key == 'brightness') {
+                    newState.brightness = value;
+                } else if (key == 'color') {
+                    newState.color = value;
+                    newState.color_mode = 'hs';
+                }
+
+                const make4sizedString = (v) => {
+                    if (v.length >= 4) {
+                        return v;
+                    } else if (v.length === 3) {
+                        return '0' + v;
+                    } else if (v.length === 2) {
+                        return '00' + v;
+                    } else if (v.length === 1) {
+                        return '000' + v;
+                    } else {
+                        return '0000';
+                    }
+                };
+
+                const fillInHSB = (h, s, b, state) => {
+                    // Define default values. Device expects leading zero in string.
+                    const hsb = {
+                        h: '0168', // 360
+                        s: '03e8', // 1000
+                        b: '03e8', // 1000
+                    };
+
+                    if (h) {
+                        // The device expects 0-359
+                        if (h >= 360) {
+                            h = 359;
+                        }
+                        hsb.h = make4sizedString(h.toString(16));
+                    } else if (state.color && state.color.hue) {
+                        hsb.h = make4sizedString(state.color.hue.toString(16));
+                    }
+
+                    // Device expects 0-1000, saturation normally is 0-100 so we expect that from the user
+                    // The device expects a round number, otherwise everything breaks
+                    if (s) {
+                        hsb.s = make4sizedString(utils.mapNumberRange(s, 0, 100, 0, 1000).toString(16));
+                    } else if (state.color && state.color.saturation) {
+                        hsb.s = make4sizedString(utils.mapNumberRange(state.color.saturation, 0, 100, 0, 1000).toString(16));
+                    }
+
+                    // Scale 0-255 to 0-1000 what the device expects.
+                    if (b) {
+                        hsb.b = make4sizedString(utils.mapNumberRange(b, 0, 255, 0, 1000).toString(16));
+                    } else if (state.brightness) {
+                        hsb.b = make4sizedString(utils.mapNumberRange(state.brightness, 0, 255, 0, 1000).toString(16));
+                    }
+
+                    return hsb;
+                };
+
+                const hsb = fillInHSB(
+                    value.h || value.hue || null,
+                    value.s || value.saturation || null,
+                    value.b || value.brightness || (key == 'brightness') ? value : null,
+                    meta.state,
+                );
+
+
+                let data = [];
+                data = data.concat(tuya.convertStringToHexArray(hsb.h));
+                data = data.concat(tuya.convertStringToHexArray(hsb.s));
+                data = data.concat(tuya.convertStringToHexArray(hsb.b));
+
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.color);
+                await tuya.sendDataPointStringBuffer(entity, tuya.dataPoints.silvercrestSetColor, data);
+
+                if (separateWhite && meta.state.white_brightness != undefined) {
+                    // restore white state
+                    const newValue = utils.mapNumberRange(meta.state.white_brightness, 0, 255, 0, 1000);
+                    await tuya.sendDataPointEnum(entity, tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white);
+                    await tuya.sendDataPointValue(entity, tuya.dataPoints.dimmerLevel, newValue);
+                }
+
+                return {state: newState};
+            }
+        },
+    },
     // #endregion
 
     // #region Ignore converters

package/devices/aldi.js

@@ -12,14 +12,6 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true}),
         meta: {applyRedFix: true},
     },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_kohbva1f'}],
-        model: 'L122CB63H11A9.0W',
-        vendor: 'Aldi',
-        description: 'LIGHTWAY smart home LED-lamp - bulb',
-        extend: extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true}),
-        meta: {applyRedFix: true},
-    },
     {
         fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_iivsrikg'}],
         model: 'L122AA63H11A6.5W',

package/devices/awox.js

@@ -10,6 +10,11 @@ module.exports = [
     },
     {
         fingerprint: [
+            {type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
+                {ID: 1, profileID: 260, deviceID: 269, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10], outputClusters: [6]},
+                {ID: 3, profileID: 4751, deviceID: 269, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
+                {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
+            ]},
             {type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
                 {ID: 1, profileID: 260, deviceID: 258, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096], outputClusters: [6, 25]},
                 {ID: 3, profileID: 49152, deviceID: 258, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},

package/devices/bticino.js

@@ -14,7 +14,11 @@ module.exports = [
         description: 'Light switch with neutral',
         fromZigbee: [fz.identify, fz.on_off, fz.K4003C_binary_input],
         toZigbee: [tz.on_off, tz.legrand_settingAlwaysEnableLed, tz.legrand_settingEnableLedIfOn, tz.legrand_identify],
-        exposes: [e.switch(), e.action(['identify', 'on', 'off'])],
+        exposes: [
+            e.switch(), e.action(['identify', 'on', 'off']),
+            exposes.binary('permanent_led', ea.STATE_SET, 'ON', 'OFF').withDescription('Enable or disable the permanent blue LED'),
+            exposes.binary('led_when_on', ea.STATE_SET, 'ON', 'OFF').withDescription('Enables the LED when the light is on'),
+        ],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genIdentify', 'genOnOff', 'genBinaryInput']);
@@ -26,7 +30,12 @@ module.exports = [
         vendor: 'BTicino',
         description: 'Dimmer switch with neutral',
         extend: extend.light_onoff_brightness({noConfigure: true}),
-        exposes: [e.light_brightness()],
+        exposes: [
+            e.light_brightness(),
+            exposes.binary('dimmer_enabled', ea.STATE_SET, 'ON', 'OFF').withDescription('Allow the device to change brightness'),
+            exposes.binary('permanent_led', ea.STATE_SET, 'ON', 'OFF').withDescription('Enable or disable the permanent blue LED'),
+            exposes.binary('led_when_on', ea.STATE_SET, 'ON', 'OFF').withDescription('Enables the LED when the light is on'),
+        ],
         fromZigbee: [fz.brightness, fz.identify, fz.on_off],
         toZigbee: [tz.light_onoff_brightness, tz.legrand_settingAlwaysEnableLed, tz.legrand_settingEnableLedIfOn,
             tz.legrand_settingEnableDimmer, tz.legrand_identify],

package/devices/centralite.js

@@ -196,12 +196,15 @@ module.exports = [
             tz.thermostat_occupied_heating_setpoint, tz.thermostat_occupied_cooling_setpoint,
             tz.thermostat_setpoint_raise_lower, tz.thermostat_remote_sensing,
             tz.thermostat_control_sequence_of_operation, tz.thermostat_system_mode,
-            tz.thermostat_relay_status_log, tz.fan_mode, tz.thermostat_running_state],
-        exposes: [e.battery(), exposes.climate().withSetpoint('occupied_heating_setpoint', 10, 30, 1).withLocalTemperature()
-            .withSystemMode(['off', 'heat', 'cool', 'emergency_heating'])
-            .withRunningState(['idle', 'heat', 'cool', 'fan_only']).withFanMode(['auto', 'on'])
-            .withSetpoint('occupied_cooling_setpoint', 10, 30, 1)
-            .withLocalTemperatureCalibration(-30, 30, 0.1)],
+            tz.thermostat_relay_status_log, tz.fan_mode, tz.thermostat_running_state, tz.thermostat_temperature_setpoint_hold],
+        exposes: [e.battery(),
+            exposes.binary('temperature_setpoint_hold', ea.ALL, true, false)
+                .withDescription('Prevent changes. `false` = run normally. `true` = prevent from making changes.'),
+            exposes.climate().withSetpoint('occupied_heating_setpoint', 10, 30, 1).withLocalTemperature()
+                .withSystemMode(['off', 'heat', 'cool', 'emergency_heating'])
+                .withRunningState(['idle', 'heat', 'cool', 'fan_only']).withFanMode(['auto', 'on'])
+                .withSetpoint('occupied_cooling_setpoint', 10, 30, 1)
+                .withLocalTemperatureCalibration(-30, 30, 0.1)],
         meta: {battery: {voltageToPercentage: '3V_1500_2800'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -210,6 +213,7 @@ module.exports = [
             await reporting.thermostatRunningState(endpoint);
             await reporting.thermostatTemperature(endpoint);
             await reporting.fanMode(endpoint);
+            await reporting.thermostatTemperatureSetpointHold(endpoint);
         },
     },
     {

package/devices/ecodim.js

@@ -121,4 +121,11 @@ module.exports = [
         toZigbee: [],
         meta: {multiEndpoint: true, battery: {dontDividePercentage: true}},
     },
+    {
+        fingerprint: [{modelID: 'TS0501B', manufacturerName: '_TZ3210_yluvwhjc'}],
+        model: 'ED-10042',
+        vendor: 'EcoDim',
+        description: 'Zigbee LED filament light dimmable E27, globe G125, flame 2200K',
+        extend: extend.light_onoff_brightness(),
+    },
 ];

package/devices/innr.js

@@ -79,6 +79,14 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555], supportsHS: true}),
         meta: {enhancedHue: false, applyRedFix: true, turnsOffAtBrightness1: true},
     },
+    {
+        zigbeeModel: ['RB 251 C'],
+        model: 'RB 251 C',
+        vendor: 'Innr',
+        description: 'E14 bulb RGBW',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555], supportsHS: true}),
+        meta: {enhancedHue: false, applyRedFix: true, turnsOffAtBrightness1: true},
+    },
     {
         zigbeeModel: ['RB 265'],
         model: 'RB 265',

package/devices/iris.js

@@ -74,7 +74,7 @@ module.exports = [
         exposes: [e.contact(), e.battery_low(), e.tamper(), e.temperature(), e.battery()],
     },
     {
-        zigbeeModel: ['3450-L'],
+        zigbeeModel: ['3450-L', '3450-L2'],
         model: '3450-L',
         vendor: 'Iris',
         description: 'Smart fob',

package/devices/konke.js

@@ -73,4 +73,13 @@ module.exports = [
         toZigbee: [],
         exposes: [e.water_leak(), e.battery_low(), e.tamper()],
     },
+    {
+        fingerprint: [{modelID: 'TS0222', manufacturerName: '_TYZB01_fi5yftwv'}],
+        model: 'KK-ES-J01W',
+        vendor: 'Konke',
+        description: 'Room temperature, relative humidity and illuminance sensor',
+        fromZigbee: [fz.battery, fz.illuminance, fz.humidity, fz.temperature],
+        toZigbee: [],
+        exposes: [e.battery(), e.illuminance(), e.illuminance_lux().withUnit('lx'), e.humidity(), e.temperature()],
+    },
 ];

package/devices/nodon.js

@@ -16,6 +16,8 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'closuresWindowCovering']);
+            await reporting.currentPositionLiftPercentage(endpoint);
+            await reporting.currentPositionTiltPercentage(endpoint);
         },
         exposes: [e.cover_position()],
     },

package/devices/nous.js

@@ -7,6 +7,15 @@ const e = exposes.presets;
 const ea = exposes.access;
 
 module.exports = [
+    {
+        fingerprint: [{modelID: 'TS0201', manufacturerName: '_TZ3000_lbtpiody'}],
+        model: 'E5',
+        vendor: 'Nous',
+        description: 'Temperature & humidity',
+        fromZigbee: [fz.temperature, fz.humidity, fz.battery],
+        toZigbee: [],
+        exposes: [e.temperature(), e.humidity(), e.battery()],
+    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_nnrfa68v'}],
         model: 'E6',

package/devices/osram.js

@@ -178,11 +178,11 @@ module.exports = [
         ota: ota.ledvance,
     },
     {
-        zigbeeModel: ['Surface Light TW'],
+        zigbeeModel: ['Surface Light TW', 'ZLO-CeilingTW-OS'],
         model: 'AB401130055',
         vendor: 'OSRAM',
         description: 'LIGHTIFY Surface Light LED Tunable White',
-        extend: extend.ledvance.light_onoff_brightness_colortemp(),
+        extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
         ota: ota.ledvance,
     },
     {

package/devices/owon.js

@@ -106,15 +106,14 @@ module.exports = [
         zigbeeModel: ['THS317-ET'],
         model: 'THS317-ET',
         vendor: 'OWON',
-        description: 'Temperature and humidity sensor',
-        fromZigbee: [fz.temperature, fz.humidity, fz.battery],
+        description: 'Temperature sensor',
+        fromZigbee: [fz.temperature, fz.battery],
         toZigbee: [],
-        exposes: [e.battery(), e.temperature(), e.humidity()],
+        exposes: [e.battery(), e.temperature()],
         configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(2);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement', 'msRelativeHumidity', 'genPowerCfg']);
+            const endpoint = device.getEndpoint(3);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement', 'genPowerCfg']);
             await reporting.temperature(endpoint);
-            await reporting.humidity(endpoint);
             await reporting.batteryVoltage(endpoint);
             await reporting.batteryPercentageRemaining(endpoint);
             device.powerSource = 'Battery';

package/devices/philips.js

@@ -29,6 +29,24 @@ const hueExtend = {
 };
 
 module.exports = [
+    {
+        zigbeeModel: ['929003047501'],
+        model: '929003047501',
+        vendor: 'Philips',
+        description: 'Centura recessed spotlight',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        ota: ota.zigbeeOTA,
+    },
+    {
+        zigbeeModel: ['915005996401'],
+        model: '915005996401',
+        vendor: 'Philips',
+        description: 'Hue white ambiance ceiling light Enrave S with Bluetooth',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['929003054001'],
         model: '929003054001',
@@ -2315,7 +2333,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['5309331P6'],
+        zigbeeModel: ['5309331P6', '5309330P6'],
         model: '5309331P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner triple spotlight',
@@ -2324,7 +2342,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['5309230P6'],
+        zigbeeModel: ['5309230P6', '5309231P6'],
         model: '5309230P6',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner double spotlight',
@@ -2369,7 +2387,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['5309030P9'],
+        zigbeeModel: ['5309030P9', '5309031P9', '5309030P6', '5309031P6'],
         model: '5309030P9',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner single spotlight',

package/devices/schneider_electric.js

@@ -610,4 +610,24 @@ module.exports = [
             await reporting.readMeteringMultiplierDivisor(endpoint);
         },
     },
+    {
+        zigbeeModel: ['LK/OUTLET/1'],
+        model: '545D6115',
+        vendor: 'Schneider Electric',
+        description: 'LK FUGA wiser wireless socket outlet',
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.EKO09738_metering, fz.power_on_behavior],
+        toZigbee: [tz.on_off, tz.power_on_behavior],
+        exposes: [e.switch(), e.power(), e.energy(), e.current(), e.voltage(),
+            exposes.enum('power_on_behavior', ea.ALL, ['off', 'previous', 'on'])
+                .withDescription('Controls the behaviour when the device is powered on')],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(6);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.onOff(endpoint);
+            // Unit supports acVoltage and acCurrent, but only acCurrent divisor/multiplier can be read
+            await endpoint.read('haElectricalMeasurement', ['acCurrentDivisor', 'acCurrentMultiplier']);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint, {min: 60, change: 1});
+        },
+    },
 ];

package/devices/shinasystem.js

@@ -24,6 +24,7 @@ module.exports = [
             await endpoint.configureReporting('genAnalogInput', payload);
         },
         exposes: [e.battery(), e.battery_voltage(),
+            exposes.enum('status', ea.STATE, ['idle', 'in', 'out']).withDescription('Currently status'),
             exposes.numeric('people', ea.ALL).withValueMin(0).withValueMax(50).withDescription('People count')],
     },
     {

package/devices/skydance.js

@@ -0,0 +1,74 @@
+const exposes = require('../lib/exposes');
+const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
+const tz = require('../converters/toZigbee');
+const ea = exposes.access;
+
+module.exports = [
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_6qoazbre'}],
+        model: 'WZ5_dim',
+        vendor: 'Skydance',
+        description: 'Zigbee & RF 5 in 1 LED controller (DIM mode)',
+        fromZigbee: [fz.tuya_light_wz5],
+        toZigbee: [tz.tuya_dimmer_state, tz.tuya_light_wz5],
+        exposes: [
+            exposes.light().withBrightness().setAccess('state',
+                ea.STATE_SET).setAccess('brightness', ea.STATE_SET),
+        ],
+    },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_gz3n0tzf'}],
+        model: 'WZ5_cct',
+        vendor: 'Skydance',
+        description: 'Zigbee & RF 5 in 1 LED controller (CCT mode)',
+        fromZigbee: [fz.tuya_light_wz5],
+        toZigbee: [tz.tuya_dimmer_state, tz.tuya_light_wz5],
+        exposes: [
+            exposes.light().withBrightness().setAccess('state',
+                ea.STATE_SET).setAccess('brightness', ea.STATE_SET).withColorTemp([250, 454]).setAccess('color_temp', ea.STATE_SET),
+        ],
+    },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_9hghastn'}],
+        model: 'WZ5_rgb',
+        vendor: 'Skydance',
+        description: 'Zigbee & RF 5 in 1 LED controller (RGB mode)',
+        fromZigbee: [fz.tuya_light_wz5],
+        toZigbee: [tz.tuya_dimmer_state, tz.tuya_light_wz5],
+        exposes: [
+            exposes.light().withBrightness().setAccess('state', ea.STATE_SET).setAccess('brightness',
+                ea.STATE_SET).withColor('hs'),
+        ],
+    },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_3thxjahu'}],
+        model: 'WZ5_rgbw',
+        vendor: 'Skydance',
+        description: 'Zigbee & RF 5 in 1 LED controller (RGBW mode)',
+        fromZigbee: [fz.tuya_light_wz5],
+        toZigbee: [tz.tuya_dimmer_state, tz.tuya_light_wz5],
+        exposes: [
+            exposes.light().withBrightness().setAccess('state', ea.STATE_SET).setAccess('brightness',
+                ea.STATE_SET).withColor('hs'),
+            exposes.numeric('white_brightness', ea.STATE_SET).withValueMin(0).withValueMax(254).withDescription(
+                'White brightness of this light'),
+        ],
+        meta: {separateWhite: true},
+    },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_mde0utnv'}],
+        model: 'WZ5_rgbcct',
+        vendor: 'Skydance',
+        description: 'Zigbee & RF 5 in 1 LED controller (RGB+CCT mode)',
+        fromZigbee: [fz.tuya_light_wz5],
+        toZigbee: [tz.tuya_dimmer_state, tz.tuya_light_wz5],
+        exposes: [
+            exposes.light().withBrightness().setAccess('state', ea.STATE_SET).setAccess('brightness',
+                ea.STATE_SET).withColor('hs').withColorTemp([250, 454]).setAccess('color_temp',
+                ea.STATE_SET),
+            exposes.numeric('white_brightness', ea.STATE_SET).withValueMin(0).withValueMax(254).withDescription(
+                'White brightness of this light'),
+        ],
+        meta: {separateWhite: true},
+    },
+];

package/devices/sunricher.js

@@ -6,6 +6,22 @@ const extend = require('../lib/extend');
 const e = exposes.presets;
 
 module.exports = [
+    {
+        zigbeeModel: ['ON/OFF(2CH)'],
+        model: 'UP-SA-9127D',
+        vendor: 'Sunricher',
+        description: 'LED-trading 2 channel AC switch',
+        extend: extend.switch(),
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2')],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+        },
+    },
     {
         zigbeeModel: ['HK-ZD-CCT-A'],
         model: 'HK-ZD-CCT-A',

package/devices/tuya.js

@@ -12,7 +12,7 @@ const utils = require('../lib/utils');
 
 const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak', '_TZ3000_ew3ldmgx', '_TZ3000_gjnozsaz',
     '_TZ3000_jvzvulen', '_TZ3000_mraovvmm', '_TZ3000_nfnmi125', '_TZ3000_ps3dmato', '_TZ3000_w0qqde0g', '_TZ3000_u5u4cakc',
-    '_TZ3000_rdtixbnu', '_TZ3000_typdpbpg', '_TZ3000_v1pdxuqq'];
+    '_TZ3000_rdtixbnu', '_TZ3000_typdpbpg', '_TZ3000_v1pdxuqq', '_TZ3000_bfn1w0mm'];
 
 const tzLocal = {
     TS0504B_color: {
@@ -158,6 +158,7 @@ module.exports = [
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_589kq4ul'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_1mtktxdk'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_remypqqm'},
+            {modelID: 'TS0505B', manufacturerName: '_TZ3000_kohbva1f'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_0rn9qhnu'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_bicjqpg4'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_cmaky9gq'},
@@ -166,7 +167,10 @@ module.exports = [
         vendor: 'TuYa',
         description: 'Zigbee RGB+CCT light',
         whiteLabel: [{vendor: 'Mercator Ikuü', model: 'SMD4106W-RGB-ZB'},
-            {vendor: 'TuYa', model: 'A5C-21F7-01'}, {vendor: 'Mercator Ikuü', model: 'S9E27LED9W-RGB-Z'}],
+            {vendor: 'TuYa', model: 'A5C-21F7-01'}, {vendor: 'Mercator Ikuü', model: 'S9E27LED9W-RGB-Z'},
+            {vendor: 'Aldi', model: 'L122CB63H11A9.0W', description: 'LIGHTWAY smart home LED-lamp - bulb'},
+            {vendor: 'Lidl', model: '14153706L', description: 'Livarno smart LED ceiling light'},
+        ],
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         meta: {applyRedFix: true, enhancedHue: false},
     },
@@ -660,6 +664,20 @@ module.exports = [
         toZigbee: [],
         whiteLabel: [{vendor: 'Neo', model: 'NAS-WS02B0'}],
     },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_jthf7vb6'}],
+        model: 'WLS-100z',
+        vendor: 'TuYa',
+        description: 'Water leak sensor',
+        fromZigbee: [fz.ignore_basic_report, fz.ignore_tuya_raw, fz.wls100z_water_leak],
+        toZigbee: [],
+        onEvent: tuya.onEventSetTime,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic']);
+        },
+        exposes: [e.battery(), e.water_leak()],
+    },
     {
         zigbeeModel: ['TS0001'],
         model: 'TS0001',
@@ -1151,7 +1169,8 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_byzdayie'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_fsb6zw01'}],
+            {modelID: 'TS0601', manufacturerName: '_TZE200_fsb6zw01'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_ewxhg6o9'}],
         model: 'TS0601_din',
         vendor: 'TuYa',
         description: 'Zigbee smart energy meter DDS238-2 Zigbee',
@@ -1677,7 +1696,9 @@ module.exports = [
         ],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_vrfecyku'}],
+        fingerprint: [
+            {modelID: 'TS0601', manufacturerName: '_TZE200_vrfecyku'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_lu01t0zl'}],
         model: 'MIR-HE200-TY',
         vendor: 'TuYa',
         description: 'Human presence sensor',
@@ -1805,4 +1826,13 @@ module.exports = [
         toZigbee: [],
         exposes: [e.action(['toggle', 'brightness_step_up', 'brightness_step_down'])],
     },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_kzm5w4iz'}],
+        model: 'TS0601_vibration_sensor',
+        vendor: 'TuYa',
+        description: 'Smart vibration sensor',
+        fromZigbee: [fz.tuya_smart_vibration_sensor],
+        toZigbee: [],
+        exposes: [e.contact(), e.battery(), e.vibration()],
+    },
 ];

package/devices/xiaomi.js

@@ -89,6 +89,22 @@ module.exports = [
             e.power_outage_memory().withAccess(ea.STATE_SET)]),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['lumi.light.acn003'],
+        model: 'ZNXDD01LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara ceiling light L1-350',
+        extend: xiaomiExtend.light_onoff_brightness_colortemp({disableEffect: true, colorTempRange: [153, 370]}),
+        ota: ota.zigbeeOTA,
+    },
+    {
+        zigbeeModel: ['lumi.light.cwac02'],
+        model: 'ZNLDP13LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara T1 smart LED bulb',
+        extend: xiaomiExtend.light_onoff_brightness_colortemp({disableEffect: true, colorTempRange: [153, 370]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['lumi.light.cwopcn01'],
         model: 'XDD11LM',
@@ -670,6 +686,11 @@ module.exports = [
             exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled'])
                 .withDescription('Decoupled mode'),
         ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.type = 'Router';
+            device.powerSource = 'Mains (single phase)';
+            device.save();
+        },
     },
     {
         zigbeeModel: ['lumi.switch.b2nacn02'],
@@ -852,19 +873,17 @@ module.exports = [
         zigbeeModel: ['lumi.motion.agl02'],
         model: 'RTCGQ12LM',
         vendor: 'Xiaomi',
-        description: 'Aqara T1 human body movement and illuminance sensor (illuminance not supported for now)',
-        fromZigbee: [fz.occupancy, fz.occupancy_timeout, fz.battery],
-        toZigbee: [tz.occupancy_timeout],
-        exposes: [e.occupancy(), e.battery(),
-            exposes.numeric('occupancy_timeout', exposes.access.ALL).withValueMin(0).withValueMax(65535).withUnit('s')
-                .withDescription('Time in seconds till occupancy goes to false')],
+        description: 'Aqara T1 human body movement and illuminance sensor',
+        fromZigbee: [fz.RTCGQ12LM_occupancy_illuminance, fz.aqara_opple, fz.battery],
+        toZigbee: [tz.aqara_occupancy_timeout],
+        exposes: [e.occupancy(), e.illuminance().withUnit('lx').withDescription('Measured illuminance in lux'),
+            exposes.numeric('occupancy_timeout', ea.ALL).withValueMin(2).withValueMax(65535).withUnit('s')
+                .withDescription('Time in seconds till occupancy goes to false'), e.battery()],
         meta: {battery: {voltageToPercentage: '3V_2100'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'msOccupancySensing']);
-            await reporting.occupancy(endpoint);
-            await reporting.batteryVoltage(endpoint);
-            await endpoint.read('msOccupancySensing', ['pirOToUDelay']);
+            await endpoint.read('genPowerCfg', ['batteryVoltage']);
+            await endpoint.read('aqaraOpple', [0x0102], {manufacturerCode: 0x115f});
         },
     },
     {
@@ -872,15 +891,15 @@ module.exports = [
         model: 'RTCGQ13LM',
         vendor: 'Xiaomi',
         description: 'Aqara high precision motion sensor',
-        fromZigbee: [fz.occupancy_with_timeout, fz.aqara_opple, fz.battery],
-        toZigbee: [tz.RTCGQ13LM_detection_interval, tz.RTCGQ13LM_motion_sensitivity],
-        exposes: [e.occupancy(), e.battery(),
-            exposes.enum('motion_sensitivity', exposes.access.ALL, ['low', 'medium', 'high']),
-            exposes.numeric('detection_interval', exposes.access.ALL).withValueMin(2).withValueMax(180).withUnit('s')
-                .withDescription('Time interval for detecting actions')],
+        fromZigbee: [fz.RTCGQ13LM_occupancy, fz.aqara_opple, fz.battery],
+        toZigbee: [tz.aqara_occupancy_timeout, tz.RTCGQ13LM_motion_sensitivity],
+        exposes: [e.occupancy(), exposes.enum('motion_sensitivity', ea.ALL, ['low', 'medium', 'high']),
+            exposes.numeric('occupancy_timeout', ea.ALL).withValueMin(2).withValueMax(65535).withUnit('s')
+                .withDescription('Time in seconds till occupancy goes to false'), e.battery()],
         meta: {battery: {voltageToPercentage: '3V_2100'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
+            await endpoint.read('genPowerCfg', ['batteryVoltage']);
             await endpoint.read('aqaraOpple', [0x0102], {manufacturerCode: 0x115f});
             await endpoint.read('aqaraOpple', [0x010c], {manufacturerCode: 0x115f});
         },

package/devices/zemismart.js

@@ -9,14 +9,18 @@ const tuya = require('../lib/tuya');
 const fzLocal = {
     ZMRM02: {
         cluster: 'manuSpecificTuya',
-        type: ['commandGetData', 'commandSetDataResponse'],
+        type: ['commandGetData', 'commandSetDataResponse', 'commandDataResponse'],
         convert: (model, msg, publish, options, meta) => {
             const dpValue = tuya.firstDpValue(msg, meta, 'ZMRM02');
-            const button = dpValue.dp;
-            const actionValue = tuya.getDataValue(dpValue);
-            const lookup = {0: 'single', 1: 'double', 2: 'hold'};
-            const action = lookup[actionValue];
-            return {action: `button_${button}_${action}`};
+            if (dpValue.dp === 10) {
+                return {battery: tuya.getDataValue(dpValue)};
+            } else {
+                const button = dpValue.dp;
+                const actionValue = tuya.getDataValue(dpValue);
+                const lookup = {0: 'single', 1: 'double', 2: 'hold'};
+                const action = lookup[actionValue];
+                return {action: `button_${button}_${action}`};
+            }
         },
     },
 };
@@ -90,7 +94,7 @@ module.exports = [
         fromZigbee: [fzLocal.ZMRM02],
         toZigbee: [],
         onEvent: tuya.onEventSetTime,
-        exposes: [e.action([
+        exposes: [e.battery(), e.action([
             'button_1_hold', 'button_1_single', 'button_1_double',
             'button_2_hold', 'button_2_single', 'button_2_double',
             'button_3_hold', 'button_3_single', 'button_3_double',

package/lib/exposes.js

@@ -527,7 +527,7 @@ module.exports = {
         current: () => new Numeric('current', access.STATE).withUnit('A').withDescription('Instantaneous measured electrical current'),
         current_phase_b: () => new Numeric('current_phase_b', access.STATE).withUnit('A').withDescription('Instantaneous measured electrical current on phase B'),
         current_phase_c: () => new Numeric('current_phase_c', access.STATE).withUnit('A').withDescription('Instantaneous measured electrical current on phase C'),
-        deadzone_temperature: () => new Numeric('deadzone_temperature', access.STATE_SET).withUnit('°C').withDescription('The delta between local_temperature and current_heating_setpoint to trigger Heat').withValueMin(0.1).withValueMax(5),
+        deadzone_temperature: () => new Numeric('deadzone_temperature', access.STATE_SET).withUnit('°C').withDescription('The delta between local_temperature and current_heating_setpoint to trigger Heat').withValueMin(0).withValueMax(5).withValueStep(1),
         device_temperature: () => new Numeric('device_temperature', access.STATE).withUnit('°C').withDescription('Temperature of the device'),
         eco2: () => new Numeric('eco2', access.STATE).withUnit('ppm').withDescription('Measured eCO2 value'),
         eco_mode: () => new Binary('eco_mode', access.STATE_SET, 'ON', 'OFF').withDescription('ECO mode (energy saving mode)'),

package/lib/ota/zigbeeOTA.js

@@ -2,17 +2,56 @@ const url = 'https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/index.js
 const assert = require('assert');
 const common = require('./common');
 const axios = common.getAxios();
+const fs = require('fs');
+const URI = require('uri-js');
+
+let overrideFileName = null;
 
 /**
  * Helper functions
  */
 
+
+function isValidUrl(url) {
+    let parsed;
+    try {
+        parsed = URI.parse(url);
+    } catch (_) {
+        return false;
+    }
+    return parsed.scheme === 'http' || parsed.scheme === 'https';
+}
+
+async function getFile(urlOrName) {
+    if (isValidUrl(urlOrName)) {
+        return (await axios.get(urlOrName)).data;
+    }
+
+    return JSON.parse(fs.readFileSync(urlOrName));
+}
+
+async function getIndex(logger) {
+    const index = (await axios.get(url)).data;
+
+    logger.debug(`ZigbeeOTA: downloaded main index`);
+
+    if (overrideFileName) {
+        logger.debug(`ZigbeeOTA: Loading override index ${overrideFileName}`);
+        const localIndex = await getFile(overrideFileName);
+
+        // Resulting index will have overriden items first
+        return localIndex.concat(index);
+    }
+
+    return index;
+}
+
 async function getImageMeta(current, logger, device) {
     const modelId = device.modelID;
     const imageType = current.imageType;
     const manufacturerCode = current.manufacturerCode;
     const manufacturerName = device.manufacturerName;
-    const images = (await axios.get(url)).data;
+    const images = await getIndex(logger);
 
     // NOTE: Officially an image can be determined with a combination of manufacturerCode and imageType.
     // However Gledopto pro products use the same imageType (0) for every device while the image is different.
@@ -46,4 +85,7 @@ module.exports = {
     getImageMeta,
     isUpdateAvailable,
     updateToLatest,
+    useIndexOverride: (indexFileName) => {
+        overrideFileName = indexFileName;
+    },
 };

package/lib/tuya.js

@@ -86,6 +86,9 @@ async function onEventMeasurementPoll(type, data, device, options) {
             try {
                 await endpoint.read('haElectricalMeasurement', ['rmsVoltage', 'rmsCurrent', 'activePower']);
                 await endpoint.read('seMetering', ['currentSummDelivered']);
+                if (device.manufacturerName === '_TZ3000_u5u4cakc') {
+                    await endpoint.read('genOnOff', ['onOff']);
+                }
             } catch (error) {/* Do nothing*/}
         }, seconds*1000);
         globalStore.putValue(device, 'interval', interval);
@@ -381,6 +384,7 @@ const dataPoints = {
     // Silvercrest
     silvercrestChangeMode: 2,
     silvercrestSetBrightness: 3,
+    silvercrestSetColorTemp: 4,
     silvercrestSetColor: 5,
     silvercrestSetEffect: 6,
     // Fantem
@@ -521,12 +525,16 @@ const dataPoints = {
     nousMinTemp: 11,
     nousTempAlarm: 14,
     nousTempSensitivity: 19,
-
     // TUYA / HUMIDITY/ILLUMINANCE/TEMPERATURE SENSOR
     thitBatteryPercentage: 3,
     thitIlluminanceLux: 7,
     thitHumidity: 9,
     thitTemperature: 8,
+    // TUYA SMART VIBRATION SENSOR
+    tuyaVibration: 10,
+    // TUYA WLS-100z Water Leak Sensor
+    wlsWaterLeak: 1,
+    wlsBatteryPercentage: 4,
 };
 
 const thermostatWeekFormat = {

package/npm-shrinkwrap.json

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

package/package.json

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