zigbee-herdsman-converters 15.0.103 → 15.0.105

package/converters/fromZigbee.js

@@ -778,6 +778,7 @@ const converters = {
                 {key: 'activePowerPhB', name: 'power_phase_b', factor: 'acPower'},
                 {key: 'activePowerPhC', name: 'power_phase_c', factor: 'acPower'},
                 {key: 'apparentPower', name: 'power_apparent', factor: 'acPower'},
+                {key: 'reactivePower', name: 'power_reactive', factor: 'acPower'},
                 {key: 'rmsCurrent', name: 'current', factor: 'acCurrent'},
                 {key: 'rmsCurrentPhB', name: 'current_phase_b', factor: 'acCurrent'},
                 {key: 'rmsCurrentPhC', name: 'current_phase_c', factor: 'acCurrent'},
@@ -5379,7 +5380,7 @@ const converters = {
             if (['QBKG39LM', 'QBKG41LM', 'WS-EUK02', 'WS-EUK04', 'QBKG20LM', 'QBKG28LM', 'QBKG31LM'].includes(model.model)) {
                 buttonLookup = {41: 'left', 42: 'right', 51: 'both'};
             }
-            if (['QBKG25LM', 'QBKG26LM', 'QBKG29LM', 'QBKG34LM', 'ZNQBKG31LM'].includes(model.model)) {
+            if (['QBKG25LM', 'QBKG26LM', 'QBKG29LM', 'QBKG34LM', 'ZNQBKG31LM', 'ZNQBKG26LM'].includes(model.model)) {
                 buttonLookup = {
                     41: 'left', 42: 'center', 43: 'right',
                     51: 'left_center', 52: 'left_right', 53: 'center_right',

package/converters/toZigbee.js

@@ -1654,6 +1654,12 @@ const converters = {
             await entity.read('haElectricalMeasurement', ['acFrequency']);
         },
     },
+    electrical_measurement_power_reactive: {
+        key: ['power_reactive'],
+        convertGet: async (entity, key, meta) => {
+            await entity.read('haElectricalMeasurement', ['reactivePower']);
+        },
+    },
     powerfactor: {
         key: ['power_factor'],
         convertGet: async (entity, key, meta) => {

package/devices/develco.js

@@ -292,13 +292,14 @@ module.exports = [
         description: 'Power plug',
         fromZigbee: [fz.on_off, develco.fz.electrical_measurement, develco.fz.metering],
         toZigbee: [tz.on_off],
-        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.ac_frequency()],
+        exposes: [e.switch(), e.power(), e.power_reactive(), e.current(), e.voltage(), e.energy(), e.ac_frequency()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(2);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
             await reporting.onOff(endpoint);
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint, true);
             await reporting.activePower(endpoint);
+            await reporting.reactivePower(endpoint);
             await reporting.rmsCurrent(endpoint);
             await reporting.rmsVoltage(endpoint);
             await reporting.readMeteringMultiplierDivisor(endpoint);

package/devices/profalux.js

@@ -20,6 +20,7 @@ module.exports = [
         zigbeeModel: [
             'MOT-C1Z06C\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000',
             'MOT-C1Z10F\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000',
+            'MOT-C1Z06F\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000',
         ],
         fingerprint: [{manufId: 4368, endpoints: [{ID: 1, profileID: 260, deviceID: 512,
             inputClusters: [0, 3, 4, 5, 6, 8, 10, 21, 256, 64544, 64545], outputClusters: [3, 64544]}]}],

package/devices/shinasystem.js

@@ -522,6 +522,7 @@ module.exports = [
         zigbeeModel: ['SBM300ZB4'],
         model: 'SBM300ZB4',
         vendor: 'ShinaSystem',
+        ota: ota.zigbeeOTA,
         description: 'SiHAS remote control 4 button',
         fromZigbee: [fz.sihas_action, fz.battery],
         toZigbee: [],
@@ -541,6 +542,7 @@ module.exports = [
         zigbeeModel: ['SBM300ZC1'],
         model: 'SBM300ZC1',
         vendor: 'ShinaSystem',
+        ota: ota.zigbeeOTA,
         description: 'SiHAS remote control',
         meta: {battery: {voltageToPercentage: '3V_2100'}},
         fromZigbee: [fz.battery, fz.sihas_action],
@@ -556,6 +558,7 @@ module.exports = [
         zigbeeModel: ['SBM300ZC2'],
         model: 'SBM300ZC2',
         vendor: 'ShinaSystem',
+        ota: ota.zigbeeOTA,
         description: 'SiHAS remote control 2 button',
         fromZigbee: [fz.sihas_action, fz.battery],
         toZigbee: [],
@@ -572,6 +575,7 @@ module.exports = [
         zigbeeModel: ['SBM300ZC3'],
         model: 'SBM300ZC3',
         vendor: 'ShinaSystem',
+        ota: ota.zigbeeOTA,
         description: 'SiHAS remote control 3 button',
         fromZigbee: [fz.sihas_action, fz.battery],
         toZigbee: [],
@@ -590,6 +594,7 @@ module.exports = [
         zigbeeModel: ['SBM300ZC4'],
         model: 'SBM300ZC4',
         vendor: 'ShinaSystem',
+        ota: ota.zigbeeOTA,
         description: 'SiHAS remote control 4 button',
         fromZigbee: [fz.sihas_action, fz.battery],
         toZigbee: [],
@@ -747,7 +752,6 @@ module.exports = [
         zigbeeModel: ['ISM300Z3'],
         model: 'ISM300Z3',
         vendor: 'ShinaSystem',
-        ota: ota.zigbeeOTA,
         description: 'SiHAS IOT smart inner switch 3 gang',
         fromZigbee: [fzLocal.ISM300Z3_on_off],
         toZigbee: [tzLocal.ISM300Z3_on_off, tzLocal.ISM300Z3_rf_pairing],

package/devices/skydance.js

@@ -11,7 +11,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_6qoazbre'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_fcooykb4'},
         ],
-        model: 'WZ5_dim',
+        model: 'WZ5_dim_1',
         vendor: 'Skydance',
         description: 'Zigbee & RF 5 in 1 LED controller (DIM mode)',
         fromZigbee: [fz.tuya_light_wz5],

package/devices/tuya.js

@@ -899,15 +899,18 @@ const fzLocal = {
         convert: (model, msg, publish, options, meta) => {
             const result = fz.electrical_measurement.convert(model, msg, publish, options, meta);
 
-            // Skip the first reported 0 values as this may be a false measurement
+            // Wait 5 seconds before reporting a 0 value as this could be an invalid measurement.
             // https://github.com/Koenkk/zigbee2mqtt/issues/16709#issuecomment-1509599046
             if (['_TZ3000_gvn91tmx', '_TZ3000_amdymr7l'].includes(meta.device.manufacturerName)) {
                 for (const key of ['power', 'current', 'voltage']) {
-                    const value = result[key];
-                    if (value === 0 && globalStore.getValue(msg.endpoint, key) !== 0) {
-                        delete result[key];
+                    if (key in result) {
+                        const value = result[key];
+                        clearTimeout(globalStore.getValue(msg.endpoint, key));
+                        if (value === 0) {
+                            globalStore.putValue(msg.endpoint, key, setTimeout(() => publish({[key]: value}), 5 * 1000));
+                            delete result[key];
+                        }
                     }
-                    globalStore.putValue(msg.endpoint, key, value);
                 }
             }
             return result;
@@ -1287,6 +1290,7 @@ module.exports = [
             tuya.whitelabel('Lidl', 'HG08008', 'Livarno Home LED ceiling light', ['_TZ3210_p9ao60da']),
             tuya.whitelabel('Lidl', 'HG08007', 'Livarno Home outdoor LED band', ['_TZ3210_zbabx9wh']),
             tuya.whitelabel('Lidl', '399629_2110', 'Livarno Lux Ceiling Panel RGB+CCT', ['_TZ3210_c0s1xloa']),
+            tuya.whitelabel('Skydance', 'WZ5_dim_2', 'Zigbee & RF 5 in 1 LED controller (DIM mode)', ['_TZB210_3zfp8mki']),
         ],
         extend: tuya.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -1923,6 +1927,7 @@ module.exports = [
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_kyfqmmyl'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_2hf7x9n3'},
+            {modelID: 'TS0601', manufacturerName: '_TZE204_atpwqgml'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_bynnczcb'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_atpwqgml'}],
         model: 'TS0601_switch_3_gang',
@@ -2523,7 +2528,6 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_3ylew7b4'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_llm0epxg'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_n1aauwb4'},
-            {modelID: 'TS0601', manufacturerName: '_TZE204_sxm7l9xa'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_xu4a5rhj'},
             {modelID: 'TS0601', manufacturerName: '_TZE204_r0jdjrvi'},
         ],

package/devices/xiaomi.js

@@ -3246,4 +3246,38 @@ module.exports = [
         },
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['lumi.switch.acn031'],
+        model: 'ZNQBKG26LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara smart wall switch H1M (with neutral, triple rocker)',
+        fromZigbee: [fz.on_off, fz.xiaomi_multistate_action, fz.aqara_opple, fz.xiaomi_power],
+        toZigbee: [tz.on_off, tz.xiaomi_switch_operation_mode_opple, tz.aqara_switch_mode_switch,
+            tz.xiaomi_flip_indicator_light],
+        endpoint: (device) => {
+            return {'left': 1, 'center': 2, 'right': 3};
+        },
+        meta: {multiEndpoint: true},
+        exposes: [
+            e.switch().withEndpoint('left'), e.switch().withEndpoint('center'), e.switch().withEndpoint('right'),
+            exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled'])
+                .withDescription('Decoupled mode for left button')
+                .withEndpoint('left'),
+            exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled'])
+                .withDescription('Decoupled mode for center button')
+                .withEndpoint('center'),
+            exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled'])
+                .withDescription('Decoupled mode for right button')
+                .withEndpoint('right'),
+            e.action(['single_left', 'double_left', 'single_center', 'double_center', 'single_right', 'double_right',
+                'single_left_center', 'double_left_center', 'single_left_right', 'double_left_right',
+                'single_center_right', 'double_center_right', 'single_all', 'double_all']),
+            e.device_temperature(), e.flip_indicator_light(),
+        ],
+        onEvent: preventReset,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await device.getEndpoint(1).write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
+        },
+        ota: ota.zigbeeOTA,
+    },
 ];

package/lib/exposes.js

@@ -626,6 +626,7 @@ module.exports = {
         power_on_behavior: (values=['off', 'previous', 'on']) => new Enum('power_on_behavior', access.ALL, values).withDescription('Controls the behavior when the device is powered on after power loss'),
         power_outage_count: (resetsWhenPairing = true) => new Numeric('power_outage_count', access.STATE).withDescription('Number of power outages' + (resetsWhenPairing ? ' (since last pairing)' : '')),
         power_outage_memory: () => new Binary('power_outage_memory', access.ALL, true, false).withDescription('Enable/disable the power outage memory, this recovers the on/off mode after power failure'),
+        power_reactive: () => new Numeric('power_reactive', access.STATE).withUnit('VAR').withDescription('Instantaneous measured reactive power'),
         presence: () => new Binary('presence', access.STATE, true, false).withDescription('Indicates whether the device detected presence'),
         pressure: () => new Numeric('pressure', access.STATE).withUnit('hPa').withDescription('The measured atmospheric pressure'),
         programming_operation_mode: () => new Enum('programming_operation_mode', access.ALL, ['setpoint', 'schedule', 'schedule_with_preheat', 'eco']).withDescription('Controls how programming affects the thermostat. Possible values: setpoint (only use specified setpoint), schedule (follow programmed setpoint schedule), schedule_with_preheat (follow programmed setpoint schedule with pre-heating). Changing this value does not clear programmed schedules.'),

package/lib/philips.js

@@ -52,7 +52,7 @@ const knownEffects = {
 
 const extend = {
     light_onoff_brightness: (options={}) => {
-        options = {disableHueEffects: true, ...options};
+        options = {disableHueEffects: false, ...options};
         if (!options.disableHueEffects) options.disableEffect = true;
         const result = extendDontUse.light_onoff_brightness(options);
         result['ota'] = ota.zigbeeOTA;

package/lib/reporting.js

@@ -25,7 +25,7 @@ async function readEletricalMeasurementMultiplierDivisors(endpoint, readFrequenc
     // Split into three chunks, some devices fail to respond when reading too much attributes at once.
     await endpoint.read('haElectricalMeasurement', ['acVoltageMultiplier', 'acVoltageDivisor', 'acCurrentMultiplier']);
     await endpoint.read('haElectricalMeasurement', ['acCurrentDivisor', 'acPowerMultiplier', 'acPowerDivisor']);
-    // Only read frequency multiplier/devisor when enabled as not all devices support this.
+    // Only read frequency multiplier/divisor when enabled as not all devices support this.
     if (readFrequencyAttrs) {
         await endpoint.read('haElectricalMeasurement', ['acFrequencyDivisor', 'acFrequencyMultiplier']);
     }
@@ -203,6 +203,10 @@ module.exports = {
         const p = payload('activePower', 5, repInterval.HOUR, 1, overrides);
         await endpoint.configureReporting('haElectricalMeasurement', p);
     },
+    reactivePower: async (endpoint, overrides) => {
+        const p = payload('reactivePower', 5, repInterval.HOUR, 1, overrides);
+        await endpoint.configureReporting('haElectricalMeasurement', p);
+    },
     apparentPower: async (endpoint, overrides) => {
         const p = payload('apparentPower', 5, repInterval.HOUR, 1, overrides);
         await endpoint.configureReporting('haElectricalMeasurement', p);

package/package.json

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