zigbee-herdsman-converters 15.0.104 → 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'},

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, true);
             await reporting.activePower(endpoint);
+            await reporting.reactivePower(endpoint);
             await reporting.rmsCurrent(endpoint);
             await reporting.rmsVoltage(endpoint);
             await reporting.readMeteringMultiplierDivisor(endpoint);

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',

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/reporting.js

@@ -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.104",
+  "version": "15.0.105",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [