fix: ShinaSystem: use metering cluster for power measurements (#8909)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Koen Kanters <[email protected]>

Author: 3 people

src/devices/shinasystem.ts

@@ -598,23 +598,23 @@ export const definitions: DefinitionWithExtend[] = [
         model: "PMM-300Z1",
         vendor: "ShinaSystem",
         description: "SiHAS energy monitor",
-        extend: [m.electricityMeter()],
+        extend: [m.electricityMeter({power: {cluster: "metering"}})],
     },
     {
         zigbeeModel: ["PMM-300Z2"],
         model: "PMM-300Z2",
         vendor: "ShinaSystem",
         ota: true,
         description: "SiHAS energy monitor",
-        extend: [m.electricityMeter({acFrequency: {multiplier: 1, divisor: 10}, powerFactor: true}), m.temperature()],
+        extend: [m.electricityMeter({power: {cluster: "metering"}, acFrequency: {multiplier: 1, divisor: 10}, powerFactor: true}), m.temperature()],
     },
     {
         zigbeeModel: ["PMM-300Z3"],
         model: "PMM-300Z3",
         vendor: "ShinaSystem",
         ota: true,
         description: "SiHAS 3phase energy monitor",
-        extend: [m.electricityMeter({acFrequency: {multiplier: 1, divisor: 10}, powerFactor: true}), m.temperature()],
+        extend: [m.electricityMeter({power: {cluster: "metering"}, acFrequency: {multiplier: 1, divisor: 10}, powerFactor: true}), m.temperature()],
     },
     {
         zigbeeModel: ["DLM-300Z"],

src/lib/modernExtend.ts

@@ -1678,7 +1678,7 @@ type MeterType = "electricity" | "gas"; // water, etc
 interface MeterArgs {
     type?: MeterType;
     cluster?: "both" | "metering" | "electrical";
-    power?: false | (MultiplierDivisor & Partial<ReportingConfigWithoutAttribute>);
+    power?: false | (MultiplierDivisor & Partial<ReportingConfigWithoutAttribute> & {cluster?: "metering" | "electrical"});
     energy?: false | (MultiplierDivisor & Partial<ReportingConfigWithoutAttribute>);
     status?: boolean;
     extendedStatus?: boolean;
@@ -1951,17 +1951,23 @@ function genericMeter(args?: MeterArgs) {
         if (args.energy !== false) exposes.push(e.energy().withAccess(ea.STATE_GET));
         if (args.producedEnergy !== false) exposes.push(e.produced_energy().withAccess(ea.STATE_GET));
         fromZigbee = [args.fzElectricalMeasurement ?? fz.electrical_measurement, args.fzMetering ?? fz.metering];
+        const useMeteringForPower = args.power !== false && args.power?.cluster === "metering";
         toZigbee = [
-            tz.electrical_measurement_power,
+            useMeteringForPower ? tz.metering_power : tz.electrical_measurement_power,
             tz.acvoltage,
             tz.accurrent,
             tz.currentsummdelivered,
             tz.currentsummreceived,
             tz.frequency,
             tz.powerfactor,
         ];
-        // biome-ignore lint/performance/noDelete: ignored using `--suppress`
-        delete configureLookup.seMetering.power;
+        if (useMeteringForPower) {
+            // biome-ignore lint/performance/noDelete: ignored using `--suppress`
+            delete configureLookup.haElectricalMeasurement.power;
+        } else {
+            // biome-ignore lint/performance/noDelete: ignored using `--suppress`
+            delete configureLookup.seMetering.power;
+        }
     } else if (args.cluster === "metering" && args.type === "electricity") {
         if (args.power !== false) exposes.push(e.power().withAccess(ea.STATE_GET));
         if (args.energy !== false) exposes.push(e.energy().withAccess(ea.STATE_GET));