Revert "Remove Electrical Measurement cluster"

This reverts commit 47f5298.

Author: hasty

docs/clusters.md

@@ -122,6 +122,7 @@ Generally regenerate using one of:
 |       1294 |      0x50E | AccountLogin                                            |
 |       1295 |      0x50F | ContentControl                                          |
 |       1296 |      0x510 | ContentAppObserver                                      |
+|       2820 |      0xB04 | ElectricalMeasurement                                   |
 | 4294048773 | 0xFFF1FC05 | UnitTesting                                             |
 | 4294048774 | 0xFFF1FC06 | FaultInjection                                          |
 | 4294048800 | 0xFFF1FC20 | SampleMei                                               |

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

@@ -6377,6 +6377,173 @@ cluster LowPower = 1288 {
   command Sleep(): DefaultSuccess = 0;
 }
 
+/** Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster.. */
+deprecated cluster ElectricalMeasurement = 2820 {
+  revision 3;
+
+  readonly attribute optional bitmap32 measurementType = 0;
+  readonly attribute optional int16s dcVoltage = 256;
+  readonly attribute optional int16s dcVoltageMin = 257;
+  readonly attribute optional int16s dcVoltageMax = 258;
+  readonly attribute optional int16s dcCurrent = 259;
+  readonly attribute optional int16s dcCurrentMin = 260;
+  readonly attribute optional int16s dcCurrentMax = 261;
+  readonly attribute optional int16s dcPower = 262;
+  readonly attribute optional int16s dcPowerMin = 263;
+  readonly attribute optional int16s dcPowerMax = 264;
+  readonly attribute optional int16u dcVoltageMultiplier = 512;
+  readonly attribute optional int16u dcVoltageDivisor = 513;
+  readonly attribute optional int16u dcCurrentMultiplier = 514;
+  readonly attribute optional int16u dcCurrentDivisor = 515;
+  readonly attribute optional int16u dcPowerMultiplier = 516;
+  readonly attribute optional int16u dcPowerDivisor = 517;
+  readonly attribute optional int16u acFrequency = 768;
+  readonly attribute optional int16u acFrequencyMin = 769;
+  readonly attribute optional int16u acFrequencyMax = 770;
+  readonly attribute optional int16u neutralCurrent = 771;
+  readonly attribute optional int32s totalActivePower = 772;
+  readonly attribute optional int32s totalReactivePower = 773;
+  readonly attribute optional int32u totalApparentPower = 774;
+  readonly attribute optional int16s measured1stHarmonicCurrent = 775;
+  readonly attribute optional int16s measured3rdHarmonicCurrent = 776;
+  readonly attribute optional int16s measured5thHarmonicCurrent = 777;
+  readonly attribute optional int16s measured7thHarmonicCurrent = 778;
+  readonly attribute optional int16s measured9thHarmonicCurrent = 779;
+  readonly attribute optional int16s measured11thHarmonicCurrent = 780;
+  readonly attribute optional int16s measuredPhase1stHarmonicCurrent = 781;
+  readonly attribute optional int16s measuredPhase3rdHarmonicCurrent = 782;
+  readonly attribute optional int16s measuredPhase5thHarmonicCurrent = 783;
+  readonly attribute optional int16s measuredPhase7thHarmonicCurrent = 784;
+  readonly attribute optional int16s measuredPhase9thHarmonicCurrent = 785;
+  readonly attribute optional int16s measuredPhase11thHarmonicCurrent = 786;
+  readonly attribute optional int16u acFrequencyMultiplier = 1024;
+  readonly attribute optional int16u acFrequencyDivisor = 1025;
+  readonly attribute optional int32u powerMultiplier = 1026;
+  readonly attribute optional int32u powerDivisor = 1027;
+  readonly attribute optional int8s harmonicCurrentMultiplier = 1028;
+  readonly attribute optional int8s phaseHarmonicCurrentMultiplier = 1029;
+  readonly attribute optional int16s instantaneousVoltage = 1280;
+  readonly attribute optional int16u instantaneousLineCurrent = 1281;
+  readonly attribute optional int16s instantaneousActiveCurrent = 1282;
+  readonly attribute optional int16s instantaneousReactiveCurrent = 1283;
+  readonly attribute optional int16s instantaneousPower = 1284;
+  readonly attribute optional int16u rmsVoltage = 1285;
+  readonly attribute optional int16u rmsVoltageMin = 1286;
+  readonly attribute optional int16u rmsVoltageMax = 1287;
+  readonly attribute optional int16u rmsCurrent = 1288;
+  readonly attribute optional int16u rmsCurrentMin = 1289;
+  readonly attribute optional int16u rmsCurrentMax = 1290;
+  readonly attribute optional int16s activePower = 1291;
+  readonly attribute optional int16s activePowerMin = 1292;
+  readonly attribute optional int16s activePowerMax = 1293;
+  readonly attribute optional int16s reactivePower = 1294;
+  readonly attribute optional int16u apparentPower = 1295;
+  readonly attribute optional int8s powerFactor = 1296;
+  attribute optional int16u averageRmsVoltageMeasurementPeriod = 1297;
+  attribute optional int16u averageRmsUnderVoltageCounter = 1299;
+  attribute optional int16u rmsExtremeOverVoltagePeriod = 1300;
+  attribute optional int16u rmsExtremeUnderVoltagePeriod = 1301;
+  attribute optional int16u rmsVoltageSagPeriod = 1302;
+  attribute optional int16u rmsVoltageSwellPeriod = 1303;
+  readonly attribute optional int16u acVoltageMultiplier = 1536;
+  readonly attribute optional int16u acVoltageDivisor = 1537;
+  readonly attribute optional int16u acCurrentMultiplier = 1538;
+  readonly attribute optional int16u acCurrentDivisor = 1539;
+  readonly attribute optional int16u acPowerMultiplier = 1540;
+  readonly attribute optional int16u acPowerDivisor = 1541;
+  attribute optional bitmap8 overloadAlarmsMask = 1792;
+  readonly attribute optional int16s voltageOverload = 1793;
+  readonly attribute optional int16s currentOverload = 1794;
+  attribute optional bitmap16 acOverloadAlarmsMask = 2048;
+  readonly attribute optional int16s acVoltageOverload = 2049;
+  readonly attribute optional int16s acCurrentOverload = 2050;
+  readonly attribute optional int16s acActivePowerOverload = 2051;
+  readonly attribute optional int16s acReactivePowerOverload = 2052;
+  readonly attribute optional int16s averageRmsOverVoltage = 2053;
+  readonly attribute optional int16s averageRmsUnderVoltage = 2054;
+  readonly attribute optional int16s rmsExtremeOverVoltage = 2055;
+  readonly attribute optional int16s rmsExtremeUnderVoltage = 2056;
+  readonly attribute optional int16s rmsVoltageSag = 2057;
+  readonly attribute optional int16s rmsVoltageSwell = 2058;
+  readonly attribute optional int16u lineCurrentPhaseB = 2305;
+  readonly attribute optional int16s activeCurrentPhaseB = 2306;
+  readonly attribute optional int16s reactiveCurrentPhaseB = 2307;
+  readonly attribute optional int16u rmsVoltagePhaseB = 2309;
+  readonly attribute optional int16u rmsVoltageMinPhaseB = 2310;
+  readonly attribute optional int16u rmsVoltageMaxPhaseB = 2311;
+  readonly attribute optional int16u rmsCurrentPhaseB = 2312;
+  readonly attribute optional int16u rmsCurrentMinPhaseB = 2313;
+  readonly attribute optional int16u rmsCurrentMaxPhaseB = 2314;
+  readonly attribute optional int16s activePowerPhaseB = 2315;
+  readonly attribute optional int16s activePowerMinPhaseB = 2316;
+  readonly attribute optional int16s activePowerMaxPhaseB = 2317;
+  readonly attribute optional int16s reactivePowerPhaseB = 2318;
+  readonly attribute optional int16u apparentPowerPhaseB = 2319;
+  readonly attribute optional int8s powerFactorPhaseB = 2320;
+  readonly attribute optional int16u averageRmsVoltageMeasurementPeriodPhaseB = 2321;
+  readonly attribute optional int16u averageRmsOverVoltageCounterPhaseB = 2322;
+  readonly attribute optional int16u averageRmsUnderVoltageCounterPhaseB = 2323;
+  readonly attribute optional int16u rmsExtremeOverVoltagePeriodPhaseB = 2324;
+  readonly attribute optional int16u rmsExtremeUnderVoltagePeriodPhaseB = 2325;
+  readonly attribute optional int16u rmsVoltageSagPeriodPhaseB = 2326;
+  readonly attribute optional int16u rmsVoltageSwellPeriodPhaseB = 2327;
+  readonly attribute optional int16u lineCurrentPhaseC = 2561;
+  readonly attribute optional int16s activeCurrentPhaseC = 2562;
+  readonly attribute optional int16s reactiveCurrentPhaseC = 2563;
+  readonly attribute optional int16u rmsVoltagePhaseC = 2565;
+  readonly attribute optional int16u rmsVoltageMinPhaseC = 2566;
+  readonly attribute optional int16u rmsVoltageMaxPhaseC = 2567;
+  readonly attribute optional int16u rmsCurrentPhaseC = 2568;
+  readonly attribute optional int16u rmsCurrentMinPhaseC = 2569;
+  readonly attribute optional int16u rmsCurrentMaxPhaseC = 2570;
+  readonly attribute optional int16s activePowerPhaseC = 2571;
+  readonly attribute optional int16s activePowerMinPhaseC = 2572;
+  readonly attribute optional int16s activePowerMaxPhaseC = 2573;
+  readonly attribute optional int16s reactivePowerPhaseC = 2574;
+  readonly attribute optional int16u apparentPowerPhaseC = 2575;
+  readonly attribute optional int8s powerFactorPhaseC = 2576;
+  readonly attribute optional int16u averageRmsVoltageMeasurementPeriodPhaseC = 2577;
+  readonly attribute optional int16u averageRmsOverVoltageCounterPhaseC = 2578;
+  readonly attribute optional int16u averageRmsUnderVoltageCounterPhaseC = 2579;
+  readonly attribute optional int16u rmsExtremeOverVoltagePeriodPhaseC = 2580;
+  readonly attribute optional int16u rmsExtremeUnderVoltagePeriodPhaseC = 2581;
+  readonly attribute optional int16u rmsVoltageSagPeriodPhaseC = 2582;
+  readonly attribute optional int16u rmsVoltageSwellPeriodPhaseC = 2583;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  response struct GetProfileInfoResponseCommand = 0 {
+    int8u profileCount = 0;
+    enum8 profileIntervalPeriod = 1;
+    int8u maxNumberOfIntervals = 2;
+    int16u listOfAttributes[] = 3;
+  }
+
+  response struct GetMeasurementProfileResponseCommand = 1 {
+    int32u startTime = 0;
+    enum8 status = 1;
+    enum8 profileIntervalPeriod = 2;
+    int8u numberOfIntervalsDelivered = 3;
+    int16u attributeId = 4;
+    int8u intervals[] = 5;
+  }
+
+  request struct GetMeasurementProfileCommandRequest {
+    int16u attributeId = 0;
+    int32u startTime = 1;
+    enum8 numberOfIntervals = 2;
+  }
+
+  /** A function which retrieves the power profiling information from the electrical measurement server. */
+  command GetProfileInfoCommand(): DefaultSuccess = 0;
+  /** A function which retrieves an electricity measurement profile from the electricity measurement server for a specific attribute Id requested. */
+  command GetMeasurementProfileCommand(GetMeasurementProfileCommandRequest): DefaultSuccess = 1;
+}
+
 /** The Test Cluster is meant to validate the generated code */
 internal cluster UnitTesting = 4294048773 {
   revision 1; // NOTE: Default/not specifically set
@@ -8552,6 +8719,22 @@ endpoint 1 {
     handle command Sleep;
   }
 
+  server cluster ElectricalMeasurement {
+    ram      attribute measurementType default = 0x000000;
+    ram      attribute totalActivePower default = 0x000000;
+    ram      attribute rmsVoltage default = 0xffff;
+    ram      attribute rmsVoltageMin default = 0x8000;
+    ram      attribute rmsVoltageMax default = 0x8000;
+    ram      attribute rmsCurrent default = 0xffff;
+    ram      attribute rmsCurrentMin default = 0xffff;
+    ram      attribute rmsCurrentMax default = 0xffff;
+    ram      attribute activePower default = 0xffff;
+    ram      attribute activePowerMin default = 0xffff;
+    ram      attribute activePowerMax default = 0xffff;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
   server cluster UnitTesting {
     emits event TestEvent;
     emits event TestFabricScopedEvent;