zigbee-herdsman-converters 14.0.629 → 14.0.631

package/converters/fromZigbee.js

@@ -785,6 +785,20 @@ const converters = {
             }
         },
     },
+    on_off_force_multiendpoint: {
+        cluster: 'genOnOff',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            // This converted is need instead of `fz.on_off` when no meta: {multiEndpoint: true} can be defined for this device
+            // but it is needed for the `state`. E.g. when a switch has 3 channels (state_l1, state_l2, state_l3) but
+            // has combined power measurements (power, energy))
+            if (msg.data.hasOwnProperty('onOff')) {
+                const endpointName = model.hasOwnProperty('endpoint') ?
+                    utils.getKey(model.endpoint(meta.device), msg.endpoint.ID) : msg.endpoint.ID;
+                return {[`state_${endpointName}`]: msg.data['onOff'] === 1 ? 'ON' : 'OFF'};
+            }
+        },
+    },
     on_off_skip_duplicate_transaction: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],

package/devices/aurora_lighting.js

@@ -79,6 +79,13 @@ const batteryRotaryDimmer = (...endpointsIds) => ({
 });
 
 module.exports = [
+    {
+        zigbeeModel: ['TWBulb51AU'],
+        model: 'AU-A1GSZ9CX',
+        vendor: 'Aurora',
+        description: 'AOne GLS lamp 9w tunable dimmable 2200-5000K',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [200, 454]}),
+    },
     {
         zigbeeModel: ['RGBCXStrip50AU'],
         model: 'AU-A1ZBSCRGBCX',

package/devices/danfoss.js

@@ -37,7 +37,7 @@ module.exports = [
                 .withDescription('Thermostat Orientation. This is important for the PID in how it assesses temperature. ' +
                     '`false` Horizontal or `true` Vertical'),
             exposes.binary('viewing_direction', ea.ALL, true, false)
-                .withDescription('Viewing/Display Direction. `false` Horizontal or `true` Vertical'),
+                .withDescription('Viewing/display direction, `false` normal or `true` upside-down'),
             exposes.binary('heat_available', ea.ALL, true, false)
                 .withDescription('Not clear how this affects operation. However, it would appear that the device does not execute any ' +
                     'motor functions if this is set to false. This may be a means to conserve battery during periods that the heating ' +

package/devices/develco.js

@@ -290,16 +290,20 @@ module.exports = [
         model: 'MOSZB-140',
         vendor: 'Develco',
         description: 'Motion sensor',
-        fromZigbee: [fz.temperature, fz.illuminance, fz.ias_occupancy_alarm_1],
+        fromZigbee: [fz.temperature, fz.illuminance, fz.ias_occupancy_alarm_1, fz.battery],
         toZigbee: [],
-        exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.temperature(), e.illuminance_lux()],
+        exposes: [e.occupancy(), e.battery(), e.battery_low(), e.tamper(), e.temperature(), e.illuminance_lux()],
+        meta: {battery: {voltageToPercentage: '3V_2500'}},
         configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint1 = device.getEndpoint(38);
-            await reporting.bind(endpoint1, coordinatorEndpoint, ['msTemperatureMeasurement']);
-            await reporting.temperature(endpoint1);
-            const endpoint2 = device.getEndpoint(39);
-            await reporting.bind(endpoint2, coordinatorEndpoint, ['msIlluminanceMeasurement']);
-            await reporting.illuminance(endpoint2);
+            const endpoint1 = device.getEndpoint(35);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryVoltage(endpoint1, {min: constants.repInterval.HOUR, max: 43200, change: 100});
+            const endpoint2 = device.getEndpoint(38);
+            await reporting.bind(endpoint2, coordinatorEndpoint, ['msTemperatureMeasurement']);
+            await reporting.temperature(endpoint2);
+            const endpoint3 = device.getEndpoint(39);
+            await reporting.bind(endpoint3, coordinatorEndpoint, ['msIlluminanceMeasurement']);
+            await reporting.illuminance(endpoint3);
         },
     },
     {

package/devices/gledopto.js

@@ -2,6 +2,7 @@ const exposes = require('../lib/exposes');
 const globalStore = require('../lib/store');
 const ota = require('../lib/ota');
 const extend = require('../lib/extend');
+const reporting = require('../lib/reporting');
 const utils = require('../lib/utils');
 const tz = require('../converters/toZigbee');
 const e = exposes.presets;
@@ -600,6 +601,21 @@ module.exports = [
         description: 'Zigbee 10W Floodlight RGB+CCT (pro)',
         extend: gledoptoExtend.light_onoff_brightness_colortemp_color(),
     },
+    {
+        zigbeeModel: ['GL-C-004P'],
+        model: 'GL-C-004P',
+        vendor: 'Gledopto',
+        description: 'Zigbee LED Strip Light Kit',
+        extend: gledoptoExtend.light_onoff_brightness_colortemp({noConfigure: true, colorTempRange: [158, 495]}),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness_colortemp().configure(device, coordinatorEndpoint, logger);
+            const endpoint = device.getEndpoint(11);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'lightingColorCtrl']);
+            await reporting.onOff(endpoint);
+            await reporting.brightness(endpoint);
+            await reporting.colorTemperature(endpoint);
+        },
+    },
     {
         zigbeeModel: ['GL-FL-001P'],
         model: 'GL-FL-001P',

package/devices/immax.js

@@ -53,6 +53,13 @@ module.exports = [
         description: 'Neo SMART LED strip RGB + CCT, color, dimmable, Zigbee 3.0',
         extend: extend.light_onoff_brightness_colortemp_color(),
     },
+    {
+        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_pwauw3g2'}],
+        model: '07743L',
+        vendor: 'Immax',
+        description: 'Neo Smart LED E27 11W RGB + CCT, color, dimmable, Zigbee 3.0',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['Keyfob-ZB3.0'],
         model: '07046L',

package/devices/insta.js

@@ -83,7 +83,7 @@ module.exports = [
                 {ID: 242, profileID: 41440, deviceID: 97},
             ]},
         ],
-        zigbeeModel: ['57004000'],
+        zigbeeModel: ['NEXENTRO Pushbutton Interface', '57004000'],
         model: '57004000',
         vendor: 'Insta',
         description: 'Pushbutton Interface 2-gang 230V',

package/devices/lellki.js

@@ -133,14 +133,16 @@ module.exports = [
         description: 'Power cord 4 sockets EU (with power monitoring)',
         vendor: 'LELLKI',
         extend: extend.switch(),
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, fz.tuya_switch_power_outage_memory],
+        fromZigbee: [fz.on_off_force_multiendpoint, fz.electrical_measurement, fz.metering, fz.ignore_basic_report,
+            fz.tuya_switch_power_outage_memory],
         toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
-            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
-            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
+            for (const ep of [1, 2, 3]) {
+                await reporting.bind(device.getEndpoint(ep), coordinatorEndpoint, ['genOnOff']);
+                await reporting.onOff(device.getEndpoint(ep));
+            }
             endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {acCurrentDivisor: 1000, acCurrentMultiplier: 1});
             endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
             device.save();

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

@@ -14,6 +14,14 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 556]}),
         toZigbee: extend.light_onoff_brightness_colortemp_color().toZigbee.concat([tz.tint_scene]),
     },
+    {
+        zigbeeModel: ['Retro Bulb Gold XXL white+ambiance'],
+        model: '404065',
+        vendor: 'Müller Licht',
+        description: 'tint LED-Globe Retro Gold XXL E27',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 555]}),
+        toZigbee: extend.light_onoff_brightness_colortemp().toZigbee.concat([tz.tint_scene]),
+    },
     {
         zigbeeModel: ['ZBT-DIMLight-A4700001'],
         model: '404023',

package/devices/niko.js

@@ -131,6 +131,29 @@ module.exports = [
             exposes.binary('led_enable', ea.ALL, true, false).withDescription('Enable LED'),
         ],
     },
+    {
+        zigbeeModel: ['Smart plug Zigbee SE'],
+        model: '552-80698',
+        vendor: 'Niko',
+        description: 'Smart plug with side earthing pin',
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.power_on_behavior],
+        toZigbee: [tz.on_off, tz.power_on_behavior, tz.electrical_measurement_power, tz.currentsummdelivered],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.onOff(endpoint);
+            // only activePower seems to be support, although compliance document states otherwise
+            await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
+            await reporting.activePower(endpoint);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint, {min: 60, change: 1});
+        },
+        exposes: [
+            e.switch(), e.power().withAccess(ea.STATE_GET), e.energy().withAccess(ea.STATE_GET),
+            exposes.enum('power_on_behavior', ea.ALL, ['off', 'previous', 'on'])
+                .withDescription('Controls the behaviour when the device is powered on'),
+        ],
+    },
     {
         zigbeeModel: ['Smart plug Zigbee PE'],
         model: '552-80699',

package/devices/philips.js

@@ -2701,6 +2701,13 @@ module.exports = [
         description: 'Akari downlight',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['LCD005'],
+        model: '9290031345',
+        vendor: 'Philips',
+        description: 'Hue white and color ambiance 4" retrofit recessed downlight',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['LCD006'],
         model: '9290031346',

package/devices/rtx.js

@@ -1,6 +1,7 @@
 const fz = require('../converters/fromZigbee');
 const tz = require('../converters/toZigbee');
 const exposes = require('../lib/exposes');
+const tuya = require('../lib/tuya');
 const e = exposes.presets;
 const ea = exposes.access;
 
@@ -14,7 +15,8 @@ module.exports = [
         model: 'ZVG1',
         vendor: 'RTX',
         description: 'Zigbee smart water valve',
-        fromZigbee: [fz.ZVG1, fz.ignore_tuya_set_time, fz.ignore_basic_report],
+        onEvent: tuya.onEventSetLocalTime,
+        fromZigbee: [fz.ZVG1, fz.ignore_basic_report],
         toZigbee: [tz.tuya_switch_state, tz.ZVG1_weather_delay, tz.ZVG1_timer, tz.ZVG1_cycle_timer, tz.ZVG1_normal_schedule_timer],
         exposes: [e.switch().setAccess('state', ea.STATE_SET), e.battery(),
             exposes.enum('weather_delay', ea.STATE_SET, ['disabled', '24h', '48h', '72h']),

package/devices/shinasystem.js

@@ -59,7 +59,7 @@ const fzLocal = {
 
 const tzLocal = {
     CSM300_SETUP: {
-        key: ['rf_pairing_on', 'counting_freeze', 'tof_init', 'led_state', 'rf_state', 'transation', 'fast_in', 'fast_out'],
+        key: ['rf_pairing_on', 'counting_freeze', 'tof_init', 'led_state', 'rf_state', 'transaction', 'fast_in', 'fast_out'],
         convertSet: async (entity, key, value, meta) => {
             let payload = null;
             const endpoint = meta.device.endpoints.find((e) => e.supportsInputCluster('genAnalogInput'));
@@ -91,7 +91,7 @@ const tzLocal = {
                     payload = {'presentValue': 89};
                 }
                 break;
-            case 'transation':
+            case 'transaction':
                 if (value === '0ms') {
                     payload = {'presentValue': 90};
                 } else if (value === '200ms') {
@@ -216,8 +216,8 @@ module.exports = [
             exposes.enum('tof_init', ea.SET, ['initial']).withDescription('ToF sensor initial'),
             exposes.binary('led_state', ea.SET, 'enable', 'disable').withDescription('Indicate LED enable/disable, default : enable'),
             exposes.binary('rf_state', ea.SET, 'enable', 'disable').withDescription('RF function enable/disable, default : disable'),
-            exposes.enum('transation', ea.SET, ['0ms', '200ms', '400ms', '600ms', '800ms', '1,000ms'])
-                .withDescription('Transation interval, default : 400ms'),
+            exposes.enum('transaction', ea.SET, ['0ms', '200ms', '400ms', '600ms', '800ms', '1,000ms'])
+                .withDescription('Transaction interval, default : 400ms'),
             exposes.binary('fast_in', ea.SET, 'enable', 'disable')
                 .withDescription('Fast process enable/disable when people 0 to 1. default : enable'),
             exposes.binary('fast_out', ea.SET, 'enable', 'disable')

package/devices/siglis.js

@@ -41,18 +41,26 @@ const zifgredFromZigbeeButtonEvent = {
 };
 
 const coverAndLightToZigbee = {
-    key: ['state', 'brightness', 'brightness_percent', 'on_time'],
+    key: ['state', 'brightness', 'brightness_percent', 'on_time', 'position', 'tilt'],
     options: [exposes.options.transition()],
     convertSet: async (entity, key, value, meta) => {
-        const isCover = (typeof value === 'string' && ['open', 'close', 'stop'].includes(value.toLowerCase()));
+        const isCover = entity.ID === 0x0b || entity.ID === 0x0c;
         if (isCover) {
-            return tz.cover_state.convertSet(entity, key, value, meta);
+            if (key === 'state') {
+                return tz.cover_state.convertSet(entity, key, value, meta);
+            } else if (key === 'position' || key === 'tilt') {
+                return tz.cover_position_tilt.convertSet(entity, key, value, meta);
+            }
         } else {
-            return tz.light_onoff_brightness.convertSet(entity, key, value, meta);
+            if (key === 'state' || key === 'brightness' || key === 'brightness_percent' || key === 'on_time') {
+                return tz.light_onoff_brightness.convertSet(entity, key, value, meta);
+            }
         }
     },
     convertGet: async (entity, key, meta) => {
-        if (key === 'brightness') {
+        if (key === 'state' && (entity.ID === 0x0b || entity.ID === 0x0c)) {
+            await tz.cover_position_tilt.convertGet(entity, 'position', meta);
+        } else if (key === 'brightness') {
             await entity.read('genLevelCtrl', ['currentLevel']);
         } else if (key === 'state') {
             await tz.on_off.convertGet(entity, key, meta);
@@ -68,7 +76,7 @@ const buttonEventExposes = e.action([
 ]);
 
 function checkOption(device, options, key) {
-    if (options.hasOwnProperty(key)) {
+    if (options != null && options.hasOwnProperty(key)) {
         if (options[key] === 'true') {
             return true;
         } else if (options[key] === 'false') {
@@ -80,16 +88,22 @@ function checkOption(device, options, key) {
 }
 
 function checkMetaOption(device, key) {
-    const enabled = device.meta[key];
-    if (enabled === undefined) {
-        return false;
-    } else {
-        return !!enabled;
+    if (device != null) {
+        const enabled = device.meta[key];
+        if (enabled === undefined) {
+            return false;
+        } else {
+            return !!enabled;
+        }
     }
+
+    return false;
 }
 
 function setMetaOption(device, key, enabled) {
-    device.meta[key] = enabled;
+    if (device != null && key != null) {
+        device.meta[key] = enabled;
+    }
 }
 
 module.exports = [
@@ -114,21 +128,19 @@ module.exports = [
             expose.push(buttonEventExposes);
             expose.push(e.linkquality());
 
-            if (device != null && options != null) {
-                if (checkOption(device, options, 'front_surface_enabled')) {
-                    expose.push(e.light_brightness_colorxy().withEndpoint('l1'));
-                }
+            if (checkOption(device, options, 'front_surface_enabled')) {
+                expose.push(e.light_brightness_colorxy().withEndpoint('l1'));
+            }
 
-                if (checkOption(device, options, 'relay_enabled')) {
-                    expose.push(e.switch().withEndpoint('l2'));
-                }
+            if (checkOption(device, options, 'relay_enabled')) {
+                expose.push(e.switch().withEndpoint('l2'));
+            }
 
-                if (checkOption(device, options, 'dimmer_enabled')) {
-                    if (checkOption(device, options, 'dimmer_dimming_enabled')) {
-                        expose.push(e.light_brightness().withEndpoint('l3'));
-                    } else {
-                        expose.push(e.switch().withEndpoint('l3'));
-                    }
+            if (checkOption(device, options, 'dimmer_enabled')) {
+                if (checkOption(device, options, 'dimmer_dimming_enabled')) {
+                    expose.push(e.light_brightness().withEndpoint('l3'));
+                } else {
+                    expose.push(e.switch().withEndpoint('l3'));
                 }
             }
 
@@ -238,65 +250,63 @@ module.exports = [
             expose.push(buttonEventExposes);
             expose.push(e.linkquality());
 
-            if (device != null && options != null) {
-                if (checkOption(device, options, 'front_surface_enabled')) {
-                    expose.push(e.light_brightness_colorxy().withEndpoint('l1'));
-                }
+            if (checkOption(device, options, 'front_surface_enabled')) {
+                expose.push(e.light_brightness_colorxy().withEndpoint('l1'));
+            }
 
-                if (checkOption(device, options, 'dimmer_1_enabled')) {
-                    if (checkOption(device, options, 'dimmer_1_dimming_enabled')) {
-                        expose.push(e.light_brightness().withEndpoint('l2'));
-                    } else {
-                        expose.push(e.switch().withEndpoint('l2'));
-                    }
+            if (checkOption(device, options, 'dimmer_1_enabled')) {
+                if (checkOption(device, options, 'dimmer_1_dimming_enabled')) {
+                    expose.push(e.light_brightness().withEndpoint('l2'));
+                } else {
+                    expose.push(e.switch().withEndpoint('l2'));
                 }
+            }
 
-                if (checkOption(device, options, 'dimmer_2_enabled')) {
-                    if (checkOption(device, options, 'dimmer_2_dimming_enabled')) {
-                        expose.push(e.light_brightness().withEndpoint('l3'));
-                    } else {
-                        expose.push(e.switch().withEndpoint('l3'));
-                    }
+            if (checkOption(device, options, 'dimmer_2_enabled')) {
+                if (checkOption(device, options, 'dimmer_2_dimming_enabled')) {
+                    expose.push(e.light_brightness().withEndpoint('l3'));
+                } else {
+                    expose.push(e.switch().withEndpoint('l3'));
                 }
+            }
 
-                if (checkOption(device, options, 'dimmer_3_enabled')) {
-                    if (checkOption(device, options, 'dimmer_3_dimming_enabled')) {
-                        expose.push(e.light_brightness().withEndpoint('l4'));
-                    } else {
-                        expose.push(e.switch().withEndpoint('l4'));
-                    }
+            if (checkOption(device, options, 'dimmer_3_enabled')) {
+                if (checkOption(device, options, 'dimmer_3_dimming_enabled')) {
+                    expose.push(e.light_brightness().withEndpoint('l4'));
+                } else {
+                    expose.push(e.switch().withEndpoint('l4'));
                 }
+            }
 
-                if (checkOption(device, options, 'dimmer_4_enabled')) {
-                    if (checkOption(device, options, 'dimmer_4_dimming_enabled')) {
-                        expose.push(e.light_brightness().withEndpoint('l5'));
-                    } else {
-                        expose.push(e.switch().withEndpoint('l5'));
-                    }
+            if (checkOption(device, options, 'dimmer_4_enabled')) {
+                if (checkOption(device, options, 'dimmer_4_dimming_enabled')) {
+                    expose.push(e.light_brightness().withEndpoint('l5'));
+                } else {
+                    expose.push(e.switch().withEndpoint('l5'));
                 }
+            }
 
-                if (checkOption(device, options, 'cover_1_enabled')) {
-                    if (checkOption(device, options, 'cover_1_tilt_enabled')) {
-                        expose.push(exposes.cover()
-                            .setAccess('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
-                            .withPosition().withTilt().withEndpoint('l6'));
-                    } else {
-                        expose.push(exposes.cover()
-                            .setAccess('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
-                            .withPosition().withEndpoint('l6'));
-                    }
+            if (checkOption(device, options, 'cover_1_enabled')) {
+                if (checkOption(device, options, 'cover_1_tilt_enabled')) {
+                    expose.push(exposes.cover()
+                        .setAccess('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
+                        .withPosition().withTilt().withEndpoint('l6'));
+                } else {
+                    expose.push(exposes.cover()
+                        .setAccess('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
+                        .withPosition().withEndpoint('l6'));
                 }
+            }
 
-                if (checkOption(device, options, 'cover_2_enabled')) {
-                    if (checkOption(device, options, 'cover_2_tilt_enabled')) {
-                        expose.push(exposes.cover()
-                            .setAccess('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
-                            .withPosition().withTilt().withEndpoint('l7'));
-                    } else {
-                        expose.push(exposes.cover()
-                            .setAccess('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
-                            .withPosition().withEndpoint('l7'));
-                    }
+            if (checkOption(device, options, 'cover_2_enabled')) {
+                if (checkOption(device, options, 'cover_2_tilt_enabled')) {
+                    expose.push(exposes.cover()
+                        .setAccess('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
+                        .withPosition().withTilt().withEndpoint('l7'));
+                } else {
+                    expose.push(exposes.cover()
+                        .setAccess('state', exposes.access.STATE_SET | exposes.access.STATE_GET)
+                        .withPosition().withEndpoint('l7'));
                 }
             }
 
@@ -311,9 +321,6 @@ module.exports = [
             fz.power_on_behavior,
             fz.ignore_basic_report,
             fz.cover_position_tilt,
-            fz.command_cover_open,
-            fz.command_cover_close,
-            fz.command_cover_stop,
         ],
         toZigbee: [
             tz.light_color,
@@ -327,7 +334,6 @@ module.exports = [
             tz.light_hue_saturation_step,
             tz.light_color_options,
             tz.light_color_mode,
-            tz.cover_position_tilt,
             coverAndLightToZigbee,
         ],
         meta: {multiEndpoint: true},

package/devices/tuya.js

@@ -21,7 +21,7 @@ const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak',
     '_TZ3000_1h2x4akh', '_TZ3000_9vo5icau', '_TZ3000_cehuw1lw', '_TZ3000_ko6v90pg', '_TZ3000_f1bapcit', '_TZ3000_cjrngdr3',
     '_TZ3000_zloso4jk', '_TZ3000_r6buo8ba', '_TZ3000_iksasdbv', '_TZ3000_idrffznf', '_TZ3000_okaz9tjs', '_TZ3210_q7oryllx',
     '_TZ3000_ss98ec5d', '_TZ3000_gznh2xla', '_TZ3000_hdopuwv6', '_TZ3000_gvn91tmx', '_TZ3000_dksbtrzs', '_TZ3000_b28wrpvx',
-    '_TZ3000_aim0ztek', '_TZ3000_mlswgkc3', '_TZ3000_7dndcnnb'];
+    '_TZ3000_aim0ztek', '_TZ3000_mlswgkc3', '_TZ3000_7dndcnnb', '_TZ3000_waho4jtj'];
 
 const tzLocal = {
     SA12IZL_silence_siren: {
@@ -1044,6 +1044,22 @@ module.exports = [
             await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
         },
     },
+    {
+        fingerprint: [{modelID: 'TS0202', manufacturerName: '_TZ3040_msl6wxk9'}],
+        model: '40ZH-O',
+        vendor: 'TuYa',
+        description: 'Motion sensor',
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ignore_basic_report, fz.ZM35HQ_attr, fzLocal.ZM35HQ_battery],
+        toZigbee: [tz.ZM35HQ_attr],
+        exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.battery(),
+            exposes.enum('sensitivity', ea.ALL, ['low', 'medium', 'high']).withDescription('PIR sensor sensitivity'),
+            exposes.enum('keep_time', ea.ALL, [30, 60, 120]).withDescription('PIR keep time in seconds'),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+        },
+    },
     {
         fingerprint: [{modelID: 'TS0202', manufacturerName: '_TZ3000_mcxw5ehu'}],
         model: 'IH012-RT01',
@@ -1143,6 +1159,7 @@ module.exports = [
             {vendor: 'Earda', model: 'EDM-1ZBA-EU'},
             {vendor: 'Mercator Ikuü', model: 'SSWD01'},
             {vendor: 'Moes', model: 'ZS-USD'},
+            {vendor: 'Moes', model: 'EDM-1ZBB-EU'},
         ],
     },
     {
@@ -1368,6 +1385,7 @@ module.exports = [
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_ijsj2evj'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_pgq2qvyv'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_nvaik6gk'},
+            {modelID: 'TS0502B', manufacturerName: '_TZB210_rkgngb5o'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3000_armwcncd'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_2p6wbry3'},
             {modelID: 'TS0502B', manufacturerName: '_TZB210_nfzrlz29'},
@@ -1913,6 +1931,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_husqqvux'}, /* model: 'TSL-TRV-TV01ZG', vendor: 'Tesla Smart' */
             {modelID: 'TS0601', manufacturerName: '_TZE200_lllliz3p'}, /* model: 'TV02-Zigbee', vendor: 'TuYa' */
             {modelID: 'TS0601', manufacturerName: '_TZE200_mudxchsu'}, /* model: 'TV05-ZG curve', vendor: 'TuYa' */
+            {modelID: 'TS0601', manufacturerName: '_TZE200_7yoranx2'}, /* model: 'TV01-ZB', vendor: 'Moes' */
         ],
         model: 'TV02-Zigbee',
         vendor: 'TuYa',
@@ -3173,7 +3192,7 @@ module.exports = [
         exposes: [e.temperature(), e.humidity(), e.battery()],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_3towulqd'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_3towulqd'}, {modelID: 'TS0601', manufacturerName: '_TZE200_1ibpyhdc'}],
         model: 'ZG-204ZL',
         vendor: 'TuYa',
         description: 'Luminance motion sensor',

package/lib/reporting.js

@@ -86,6 +86,10 @@ module.exports = {
         const p = payload('currentLevel', 0, repInterval.HOUR, 1, overrides);
         await endpoint.configureReporting('genLevelCtrl', p);
     },
+    colorTemperature: async (endpoint, overrides) => {
+        const p = payload('colorTemperature', 0, repInterval.HOUR, 1, overrides);
+        await endpoint.configureReporting('lightingColorCtrl', p);
+    },
     occupancy: async (endpoint, overrides) => {
         const p = payload('occupancy', 0, repInterval.HOUR, 0, overrides);
         await endpoint.configureReporting('msOccupancySensing', p);

package/lib/tuya.js

@@ -125,12 +125,12 @@ function convertRawToCycleTimer(value) {
         timernr = value[1];
         timeractive = value[2];
         if (value[3] > 0) {
-            weekdays = (value[3] & 0x40 ? 'Mo' : '') +
-            (value[3] & 0x20 ? 'Tu' : '') +
-            (value[3] & 0x10 ? 'We' : '') +
-            (value[3] & 0x08 ? 'Th' : '') +
-            (value[3] & 0x04 ? 'Fr' : '') +
-            (value[3] & 0x02 ? 'Sa' : '') +
+            weekdays = (value[3] & 0x40 ? 'Sa' : '') +
+            (value[3] & 0x20 ? 'Fr' : '') +
+            (value[3] & 0x10 ? 'Th' : '') +
+            (value[3] & 0x08 ? 'We' : '') +
+            (value[3] & 0x04 ? 'Tu' : '') +
+            (value[3] & 0x02 ? 'Mo' : '') +
             (value[3] & 0x01 ? 'Su' : '');
         } else {
             weekdays = 'once';
@@ -165,12 +165,12 @@ function convertRawToTimer(value) {
         starttime = String(parseInt(minsincemidnight / 60)).padStart(2, '0') + ':' + String(minsincemidnight % 60).padStart(2, '0');
         duration = value[4] * 256 + value[5];
         if (value[6] > 0) {
-            weekdays = (value[6] & 0x40 ? 'Mo' : '') +
-            (value[6] & 0x20 ? 'Tu' : '') +
-            (value[6] & 0x10 ? 'We' : '') +
-            (value[6] & 0x08 ? 'Th' : '') +
-            (value[6] & 0x04 ? 'Fr' : '') +
-            (value[6] & 0x02 ? 'Sa' : '') +
+            weekdays = (value[6] & 0x40 ? 'Sa' : '') +
+            (value[6] & 0x20 ? 'Fr' : '') +
+            (value[6] & 0x10 ? 'Th' : '') +
+            (value[6] & 0x08 ? 'We' : '') +
+            (value[6] & 0x04 ? 'Tu' : '') +
+            (value[6] & 0x02 ? 'Mo' : '') +
             (value[6] & 0x01 ? 'Su' : '');
         } else {
             weekdays = 'once';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.629",
+  "version": "14.0.631",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -38,7 +38,7 @@
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^2.2.0",
-    "zigbee-herdsman": "^0.14.55"
+    "zigbee-herdsman": "^0.14.59"
   },
   "devDependencies": {
     "eslint": "*",