zigbee-herdsman-converters 20.15.0 → 20.16.1

package/lib/modernExtend.d.ts

@@ -21,7 +21,7 @@ type ReportingConfigAttribute = string | number | {
 type ReportingConfig = {
     min: ReportingConfigTime;
     max: ReportingConfigTime;
-    change: number | [number, number];
+    change: number;
     attribute: ReportingConfigAttribute;
 };
 export type ReportingConfigWithoutAttribute = Omit<ReportingConfig, 'attribute'>;
@@ -171,9 +171,14 @@ export interface ElectricityMeterArgs {
     power?: false | MultiplierDivisor;
     voltage?: false | MultiplierDivisor;
     energy?: false | MultiplierDivisor;
+    producedEnergy?: false | true | MultiplierDivisor;
+    acFrequency?: false | true | MultiplierDivisor;
     threePhase?: boolean;
     configureReporting?: boolean;
+    powerFactor?: boolean;
     endpointNames?: string[];
+    fzMetering?: Fz.Converter;
+    fzElectricalMeasurement?: Fz.Converter;
 }
 export declare function electricityMeter(args?: ElectricityMeterArgs): ModernExtend;
 export declare function ota(definition?: DefinitionOta): ModernExtend;

package/lib/modernExtend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modernExtend.d.ts","sourceRoot":"","sources":["../src/lib/modernExtend.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"modernExtend.d.ts","sourceRoot":"","sources":["../src/lib/modernExtend.ts"],"names":[],"mappings":"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"}

package/lib/modernExtend.js

@@ -1297,12 +1297,32 @@ function iasWarning(args) {
     return { toZigbee, exposes, isModernExtend: true };
 }
 function electricityMeter(args) {
-    args = { cluster: 'both', configureReporting: true, threePhase: false, ...args };
-    if (args.cluster === 'metering' &&
-        (0, utils_1.isObject)(args.power) &&
-        (0, utils_1.isObject)(args.energy) &&
-        (args.power?.divisor !== args.energy?.divisor || args.power?.multiplier !== args.energy?.multiplier)) {
-        throw new Error(`When cluster is metering, power and energy divisor/multiplier should be equal`);
+    args = { cluster: 'both', configureReporting: true, threePhase: false, producedEnergy: false, acFrequency: false, powerFactor: false, ...args };
+    if (args.cluster !== 'electrical') {
+        const divisors = new Set([
+            args.cluster === 'metering' && (0, utils_1.isObject)(args.power) ? args.power?.divisor : false,
+            (0, utils_1.isObject)(args.energy) ? args.energy?.divisor : false,
+            (0, utils_1.isObject)(args.producedEnergy) ? args.producedEnergy?.divisor : false,
+        ]);
+        divisors.delete(false);
+        const multipliers = new Set([
+            args.cluster === 'metering' && (0, utils_1.isObject)(args.power) ? args.power?.multiplier : false,
+            (0, utils_1.isObject)(args.energy) ? args.energy?.multiplier : false,
+            (0, utils_1.isObject)(args.producedEnergy) ? args.producedEnergy?.multiplier : false,
+        ]);
+        multipliers.delete(false);
+        if (multipliers.size > 1 || divisors.size > 1) {
+            throw new Error(`When cluster is metering, power and energy divisor/multiplier should be equal, got divisors=${Array.from(divisors).join(', ')}, multipliers=${Array.from(multipliers).join(', ')}`);
+        }
+    }
+    if (args.cluster === 'electrical' && args.producedEnergy) {
+        throw new Error(`Produced energy is not supported with cluster 'electrical', use 'both' or 'metering'`);
+    }
+    if (args.cluster === 'metering' && args.acFrequency) {
+        throw new Error(`AC frequency is not supported with cluster 'metering', use 'both' or 'electrical'`);
+    }
+    if (args.cluster === 'metering' && args.powerFactor) {
+        throw new Error(`Power factor is not supported with cluster 'metering', use 'both' or 'electrical'`);
     }
     let exposes = [];
     let fromZigbee;
@@ -1315,6 +1335,14 @@ function electricityMeter(args) {
             power_phase_c: { attribute: 'activePowerPhC', divisor: 'acPowerDivisor', multiplier: 'acPowerMultiplier', forced: args.power, change: 5 },
             // Report change with every 0.05A change
             current: { attribute: 'rmsCurrent', divisor: 'acCurrentDivisor', multiplier: 'acCurrentMultiplier', forced: args.current, change: 0.05 },
+            // Report change every 1 Hz
+            ac_frequency: {
+                attribute: 'acFrequency',
+                divisor: 'acFrequencyDivisor',
+                multiplier: 'acFrequencyMultiplier',
+                forced: (0, utils_1.isObject)(args.acFrequency) ? args.acFrequency : false,
+                change: 1,
+            },
             current_phase_b: {
                 attribute: 'rmsCurrentPhB',
                 divisor: 'acCurrentDivisor',
@@ -1329,6 +1357,10 @@ function electricityMeter(args) {
                 forced: args.current,
                 change: 0.05,
             },
+            power_factor: {
+                attribute: 'powerFactor',
+                change: 10,
+            },
             // Report change with every 5V change
             voltage: { attribute: 'rmsVoltage', divisor: 'acVoltageDivisor', multiplier: 'acVoltageMultiplier', forced: args.voltage, change: 5 },
             voltage_phase_b: {
@@ -1351,7 +1383,13 @@ function electricityMeter(args) {
             power: { attribute: 'instantaneousDemand', divisor: 'divisor', multiplier: 'multiplier', forced: args.power, change: 5 },
             // Report change with every 0.1kWh change
             energy: { attribute: 'currentSummDelivered', divisor: 'divisor', multiplier: 'multiplier', forced: args.energy, change: 0.1 },
-            // produced_energy: {attribute: 'currentSummReceived', divisor: 'divisor', multiplier: 'multiplier', forced: args.energy, change: 0.1},
+            produced_energy: {
+                attribute: 'currentSummReceived',
+                divisor: 'divisor',
+                multiplier: 'multiplier',
+                forced: (0, utils_1.isObject)(args.producedEnergy) ? args.producedEnergy : false,
+                change: 0.1,
+            },
         },
     };
     if (args.power === false) {
@@ -1373,6 +1411,15 @@ function electricityMeter(args) {
     if (args.energy === false) {
         delete configureLookup.seMetering.energy;
     }
+    if (args.producedEnergy === false) {
+        delete configureLookup.seMetering.produced_energy;
+    }
+    if (args.powerFactor === false) {
+        delete configureLookup.haElectricalMeasurement.power_factor;
+    }
+    if (args.acFrequency === false) {
+        delete configureLookup.haElectricalMeasurement.ac_frequency;
+    }
     if (args.threePhase === false) {
         delete configureLookup.haElectricalMeasurement.power_phase_b;
         delete configureLookup.haElectricalMeasurement.power_phase_c;
@@ -1386,12 +1433,26 @@ function electricityMeter(args) {
             exposes.push(exposes_1.presets.power().withAccess(exposes_1.access.STATE_GET));
         if (args.voltage !== false)
             exposes.push(exposes_1.presets.voltage().withAccess(exposes_1.access.STATE_GET));
+        if (args.acFrequency !== false)
+            exposes.push(exposes_1.presets.ac_frequency().withAccess(exposes_1.access.STATE_GET));
+        if (args.powerFactor !== false)
+            exposes.push(exposes_1.presets.power_factor().withAccess(exposes_1.access.STATE_GET));
         if (args.current !== false)
             exposes.push(exposes_1.presets.current().withAccess(exposes_1.access.STATE_GET));
         if (args.energy !== false)
             exposes.push(exposes_1.presets.energy().withAccess(exposes_1.access.STATE_GET));
-        fromZigbee = [fromZigbee_1.default.electrical_measurement, fromZigbee_1.default.metering];
-        toZigbee = [toZigbee_1.default.electrical_measurement_power, toZigbee_1.default.acvoltage, toZigbee_1.default.accurrent, toZigbee_1.default.currentsummdelivered];
+        if (args.producedEnergy !== false)
+            exposes.push(exposes_1.presets.produced_energy().withAccess(exposes_1.access.STATE_GET));
+        fromZigbee = [args.fzElectricalMeasurement ?? fromZigbee_1.default.electrical_measurement, args.fzMetering ?? fromZigbee_1.default.metering];
+        toZigbee = [
+            toZigbee_1.default.electrical_measurement_power,
+            toZigbee_1.default.acvoltage,
+            toZigbee_1.default.accurrent,
+            toZigbee_1.default.currentsummdelivered,
+            toZigbee_1.default.currentsummreceived,
+            toZigbee_1.default.frequency,
+            toZigbee_1.default.powerfactor,
+        ];
         delete configureLookup.seMetering.power;
     }
     else if (args.cluster === 'metering') {
@@ -1399,8 +1460,10 @@ function electricityMeter(args) {
             exposes.push(exposes_1.presets.power().withAccess(exposes_1.access.STATE_GET));
         if (args.energy !== false)
             exposes.push(exposes_1.presets.energy().withAccess(exposes_1.access.STATE_GET));
-        fromZigbee = [fromZigbee_1.default.metering];
-        toZigbee = [toZigbee_1.default.metering_power, toZigbee_1.default.currentsummdelivered];
+        if (args.producedEnergy !== false)
+            exposes.push(exposes_1.presets.produced_energy().withAccess(exposes_1.access.STATE_GET));
+        fromZigbee = [args.fzMetering ?? fromZigbee_1.default.metering];
+        toZigbee = [toZigbee_1.default.metering_power, toZigbee_1.default.currentsummdelivered, toZigbee_1.default.currentsummreceived];
         delete configureLookup.haElectricalMeasurement;
     }
     else if (args.cluster === 'electrical') {
@@ -1410,8 +1473,12 @@ function electricityMeter(args) {
             exposes.push(exposes_1.presets.voltage().withAccess(exposes_1.access.STATE_GET));
         if (args.current !== false)
             exposes.push(exposes_1.presets.current().withAccess(exposes_1.access.STATE_GET));
-        fromZigbee = [fromZigbee_1.default.electrical_measurement];
-        toZigbee = [toZigbee_1.default.electrical_measurement_power, toZigbee_1.default.acvoltage, toZigbee_1.default.accurrent];
+        if (args.acFrequency !== false)
+            exposes.push(exposes_1.presets.ac_frequency().withAccess(exposes_1.access.STATE_GET));
+        if (args.powerFactor !== false)
+            exposes.push(exposes_1.presets.power_factor().withAccess(exposes_1.access.STATE_GET));
+        fromZigbee = [args.fzElectricalMeasurement ?? fromZigbee_1.default.electrical_measurement];
+        toZigbee = [toZigbee_1.default.electrical_measurement_power, toZigbee_1.default.acvoltage, toZigbee_1.default.accurrent, toZigbee_1.default.frequency, toZigbee_1.default.powerfactor];
         delete configureLookup.seMetering;
     }
     if (args.threePhase === true) {
@@ -1429,25 +1496,26 @@ function electricityMeter(args) {
                     for (const endpoint of getEndpointsWithCluster(device, cluster, 'input')) {
                         const items = [];
                         for (const property of Object.values(properties)) {
-                            // In case multiplier or divisor was provided, use that instead of reading from device.
-                            if (property.forced) {
-                                endpoint.saveClusterAttributeKeyValue(cluster, {
-                                    [property.divisor]: property.forced.divisor ?? 1,
-                                    [property.multiplier]: property.forced.multiplier ?? 1,
-                                });
-                                endpoint.save();
-                            }
-                            else {
-                                await endpoint.read(cluster, [property.divisor, property.multiplier]);
+                            let change = property.change;
+                            // Check if this property has a divisor and multiplier, e.g. AC frequency doesn't.
+                            if ('divisor' in property) {
+                                // In case multiplier or divisor was provided, use that instead of reading from device.
+                                if (property.forced) {
+                                    endpoint.saveClusterAttributeKeyValue(cluster, {
+                                        [property.divisor]: property.forced.divisor ?? 1,
+                                        [property.multiplier]: property.forced.multiplier ?? 1,
+                                    });
+                                    endpoint.save();
+                                }
+                                else {
+                                    await endpoint.read(cluster, [property.divisor, property.multiplier]);
+                                }
+                                const divisor = endpoint.getClusterAttributeValue(cluster, property.divisor);
+                                (0, utils_1.assertNumber)(divisor, property.divisor);
+                                const multiplier = endpoint.getClusterAttributeValue(cluster, property.multiplier);
+                                (0, utils_1.assertNumber)(multiplier, property.multiplier);
+                                change = property.change * (divisor / multiplier);
                             }
-                            const divisor = endpoint.getClusterAttributeValue(cluster, property.divisor);
-                            (0, utils_1.assertNumber)(divisor, property.divisor);
-                            const multiplier = endpoint.getClusterAttributeValue(cluster, property.multiplier);
-                            (0, utils_1.assertNumber)(multiplier, property.multiplier);
-                            let change = property.change * (divisor / multiplier);
-                            // currentSummDelivered data type is uint48, so reportableChange also is uint48
-                            if (property.attribute === 'currentSummDelivered')
-                                change = [0, change];
                             items.push({ attribute: property.attribute, min: '10_SECONDS', max: 'MAX', change });
                         }
                         if (items.length) {