Skip to content

Commit c3f54ae

Browse files
Rebase on latest master
1 parent 085de6c commit c3f54ae

36 files changed

+5570
-168
lines changed

docs/zap_clusters.md

-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ Generally regenerate using one of:
131131
| 1296 | 0x510 | ContentAppObserver |
132132
| 1872 | 0x750 | EcosystemInformation |
133133
| 1873 | 0x751 | CommissionerControl |
134-
| 2820 | 0xB04 | ElectricalMeasurement |
135134
| 2822 | 0xB06 | MeterIdentification |
136135
| 4294048773 | 0xFFF1FC05 | UnitTesting |
137136
| 4294048774 | 0xFFF1FC06 | FaultInjection |

src/controller/data_model/controller-clusters.matter

-167
Original file line numberDiff line numberDiff line change
@@ -9493,173 +9493,6 @@ provisional cluster CommissionerControl = 1873 {
94939493
command access(invoke: manage) CommissionNode(CommissionNodeRequest): ReverseOpenCommissioningWindow = 1;
94949494
}
94959495

9496-
/** 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.. */
9497-
deprecated cluster ElectricalMeasurement = 2820 {
9498-
revision 3;
9499-
9500-
readonly attribute optional bitmap32 measurementType = 0;
9501-
readonly attribute optional int16s dcVoltage = 256;
9502-
readonly attribute optional int16s dcVoltageMin = 257;
9503-
readonly attribute optional int16s dcVoltageMax = 258;
9504-
readonly attribute optional int16s dcCurrent = 259;
9505-
readonly attribute optional int16s dcCurrentMin = 260;
9506-
readonly attribute optional int16s dcCurrentMax = 261;
9507-
readonly attribute optional int16s dcPower = 262;
9508-
readonly attribute optional int16s dcPowerMin = 263;
9509-
readonly attribute optional int16s dcPowerMax = 264;
9510-
readonly attribute optional int16u dcVoltageMultiplier = 512;
9511-
readonly attribute optional int16u dcVoltageDivisor = 513;
9512-
readonly attribute optional int16u dcCurrentMultiplier = 514;
9513-
readonly attribute optional int16u dcCurrentDivisor = 515;
9514-
readonly attribute optional int16u dcPowerMultiplier = 516;
9515-
readonly attribute optional int16u dcPowerDivisor = 517;
9516-
readonly attribute optional int16u acFrequency = 768;
9517-
readonly attribute optional int16u acFrequencyMin = 769;
9518-
readonly attribute optional int16u acFrequencyMax = 770;
9519-
readonly attribute optional int16u neutralCurrent = 771;
9520-
readonly attribute optional int32s totalActivePower = 772;
9521-
readonly attribute optional int32s totalReactivePower = 773;
9522-
readonly attribute optional int32u totalApparentPower = 774;
9523-
readonly attribute optional int16s measured1stHarmonicCurrent = 775;
9524-
readonly attribute optional int16s measured3rdHarmonicCurrent = 776;
9525-
readonly attribute optional int16s measured5thHarmonicCurrent = 777;
9526-
readonly attribute optional int16s measured7thHarmonicCurrent = 778;
9527-
readonly attribute optional int16s measured9thHarmonicCurrent = 779;
9528-
readonly attribute optional int16s measured11thHarmonicCurrent = 780;
9529-
readonly attribute optional int16s measuredPhase1stHarmonicCurrent = 781;
9530-
readonly attribute optional int16s measuredPhase3rdHarmonicCurrent = 782;
9531-
readonly attribute optional int16s measuredPhase5thHarmonicCurrent = 783;
9532-
readonly attribute optional int16s measuredPhase7thHarmonicCurrent = 784;
9533-
readonly attribute optional int16s measuredPhase9thHarmonicCurrent = 785;
9534-
readonly attribute optional int16s measuredPhase11thHarmonicCurrent = 786;
9535-
readonly attribute optional int16u acFrequencyMultiplier = 1024;
9536-
readonly attribute optional int16u acFrequencyDivisor = 1025;
9537-
readonly attribute optional int32u powerMultiplier = 1026;
9538-
readonly attribute optional int32u powerDivisor = 1027;
9539-
readonly attribute optional int8s harmonicCurrentMultiplier = 1028;
9540-
readonly attribute optional int8s phaseHarmonicCurrentMultiplier = 1029;
9541-
readonly attribute optional int16s instantaneousVoltage = 1280;
9542-
readonly attribute optional int16u instantaneousLineCurrent = 1281;
9543-
readonly attribute optional int16s instantaneousActiveCurrent = 1282;
9544-
readonly attribute optional int16s instantaneousReactiveCurrent = 1283;
9545-
readonly attribute optional int16s instantaneousPower = 1284;
9546-
readonly attribute optional int16u rmsVoltage = 1285;
9547-
readonly attribute optional int16u rmsVoltageMin = 1286;
9548-
readonly attribute optional int16u rmsVoltageMax = 1287;
9549-
readonly attribute optional int16u rmsCurrent = 1288;
9550-
readonly attribute optional int16u rmsCurrentMin = 1289;
9551-
readonly attribute optional int16u rmsCurrentMax = 1290;
9552-
readonly attribute optional int16s activePower = 1291;
9553-
readonly attribute optional int16s activePowerMin = 1292;
9554-
readonly attribute optional int16s activePowerMax = 1293;
9555-
readonly attribute optional int16s reactivePower = 1294;
9556-
readonly attribute optional int16u apparentPower = 1295;
9557-
readonly attribute optional int8s powerFactor = 1296;
9558-
attribute optional int16u averageRmsVoltageMeasurementPeriod = 1297;
9559-
attribute optional int16u averageRmsUnderVoltageCounter = 1299;
9560-
attribute optional int16u rmsExtremeOverVoltagePeriod = 1300;
9561-
attribute optional int16u rmsExtremeUnderVoltagePeriod = 1301;
9562-
attribute optional int16u rmsVoltageSagPeriod = 1302;
9563-
attribute optional int16u rmsVoltageSwellPeriod = 1303;
9564-
readonly attribute optional int16u acVoltageMultiplier = 1536;
9565-
readonly attribute optional int16u acVoltageDivisor = 1537;
9566-
readonly attribute optional int16u acCurrentMultiplier = 1538;
9567-
readonly attribute optional int16u acCurrentDivisor = 1539;
9568-
readonly attribute optional int16u acPowerMultiplier = 1540;
9569-
readonly attribute optional int16u acPowerDivisor = 1541;
9570-
attribute optional bitmap8 overloadAlarmsMask = 1792;
9571-
readonly attribute optional int16s voltageOverload = 1793;
9572-
readonly attribute optional int16s currentOverload = 1794;
9573-
attribute optional bitmap16 acOverloadAlarmsMask = 2048;
9574-
readonly attribute optional int16s acVoltageOverload = 2049;
9575-
readonly attribute optional int16s acCurrentOverload = 2050;
9576-
readonly attribute optional int16s acActivePowerOverload = 2051;
9577-
readonly attribute optional int16s acReactivePowerOverload = 2052;
9578-
readonly attribute optional int16s averageRmsOverVoltage = 2053;
9579-
readonly attribute optional int16s averageRmsUnderVoltage = 2054;
9580-
readonly attribute optional int16s rmsExtremeOverVoltage = 2055;
9581-
readonly attribute optional int16s rmsExtremeUnderVoltage = 2056;
9582-
readonly attribute optional int16s rmsVoltageSag = 2057;
9583-
readonly attribute optional int16s rmsVoltageSwell = 2058;
9584-
readonly attribute optional int16u lineCurrentPhaseB = 2305;
9585-
readonly attribute optional int16s activeCurrentPhaseB = 2306;
9586-
readonly attribute optional int16s reactiveCurrentPhaseB = 2307;
9587-
readonly attribute optional int16u rmsVoltagePhaseB = 2309;
9588-
readonly attribute optional int16u rmsVoltageMinPhaseB = 2310;
9589-
readonly attribute optional int16u rmsVoltageMaxPhaseB = 2311;
9590-
readonly attribute optional int16u rmsCurrentPhaseB = 2312;
9591-
readonly attribute optional int16u rmsCurrentMinPhaseB = 2313;
9592-
readonly attribute optional int16u rmsCurrentMaxPhaseB = 2314;
9593-
readonly attribute optional int16s activePowerPhaseB = 2315;
9594-
readonly attribute optional int16s activePowerMinPhaseB = 2316;
9595-
readonly attribute optional int16s activePowerMaxPhaseB = 2317;
9596-
readonly attribute optional int16s reactivePowerPhaseB = 2318;
9597-
readonly attribute optional int16u apparentPowerPhaseB = 2319;
9598-
readonly attribute optional int8s powerFactorPhaseB = 2320;
9599-
readonly attribute optional int16u averageRmsVoltageMeasurementPeriodPhaseB = 2321;
9600-
readonly attribute optional int16u averageRmsOverVoltageCounterPhaseB = 2322;
9601-
readonly attribute optional int16u averageRmsUnderVoltageCounterPhaseB = 2323;
9602-
readonly attribute optional int16u rmsExtremeOverVoltagePeriodPhaseB = 2324;
9603-
readonly attribute optional int16u rmsExtremeUnderVoltagePeriodPhaseB = 2325;
9604-
readonly attribute optional int16u rmsVoltageSagPeriodPhaseB = 2326;
9605-
readonly attribute optional int16u rmsVoltageSwellPeriodPhaseB = 2327;
9606-
readonly attribute optional int16u lineCurrentPhaseC = 2561;
9607-
readonly attribute optional int16s activeCurrentPhaseC = 2562;
9608-
readonly attribute optional int16s reactiveCurrentPhaseC = 2563;
9609-
readonly attribute optional int16u rmsVoltagePhaseC = 2565;
9610-
readonly attribute optional int16u rmsVoltageMinPhaseC = 2566;
9611-
readonly attribute optional int16u rmsVoltageMaxPhaseC = 2567;
9612-
readonly attribute optional int16u rmsCurrentPhaseC = 2568;
9613-
readonly attribute optional int16u rmsCurrentMinPhaseC = 2569;
9614-
readonly attribute optional int16u rmsCurrentMaxPhaseC = 2570;
9615-
readonly attribute optional int16s activePowerPhaseC = 2571;
9616-
readonly attribute optional int16s activePowerMinPhaseC = 2572;
9617-
readonly attribute optional int16s activePowerMaxPhaseC = 2573;
9618-
readonly attribute optional int16s reactivePowerPhaseC = 2574;
9619-
readonly attribute optional int16u apparentPowerPhaseC = 2575;
9620-
readonly attribute optional int8s powerFactorPhaseC = 2576;
9621-
readonly attribute optional int16u averageRmsVoltageMeasurementPeriodPhaseC = 2577;
9622-
readonly attribute optional int16u averageRmsOverVoltageCounterPhaseC = 2578;
9623-
readonly attribute optional int16u averageRmsUnderVoltageCounterPhaseC = 2579;
9624-
readonly attribute optional int16u rmsExtremeOverVoltagePeriodPhaseC = 2580;
9625-
readonly attribute optional int16u rmsExtremeUnderVoltagePeriodPhaseC = 2581;
9626-
readonly attribute optional int16u rmsVoltageSagPeriodPhaseC = 2582;
9627-
readonly attribute optional int16u rmsVoltageSwellPeriodPhaseC = 2583;
9628-
readonly attribute command_id generatedCommandList[] = 65528;
9629-
readonly attribute command_id acceptedCommandList[] = 65529;
9630-
readonly attribute event_id eventList[] = 65530;
9631-
readonly attribute attrib_id attributeList[] = 65531;
9632-
readonly attribute bitmap32 featureMap = 65532;
9633-
readonly attribute int16u clusterRevision = 65533;
9634-
9635-
response struct GetProfileInfoResponseCommand = 0 {
9636-
int8u profileCount = 0;
9637-
enum8 profileIntervalPeriod = 1;
9638-
int8u maxNumberOfIntervals = 2;
9639-
int16u listOfAttributes[] = 3;
9640-
}
9641-
9642-
response struct GetMeasurementProfileResponseCommand = 1 {
9643-
int32u startTime = 0;
9644-
enum8 status = 1;
9645-
enum8 profileIntervalPeriod = 2;
9646-
int8u numberOfIntervalsDelivered = 3;
9647-
int16u attributeId = 4;
9648-
int8u intervals[] = 5;
9649-
}
9650-
9651-
request struct GetMeasurementProfileCommandRequest {
9652-
int16u attributeId = 0;
9653-
int32u startTime = 1;
9654-
enum8 numberOfIntervals = 2;
9655-
}
9656-
9657-
/** A function which retrieves the power profiling information from the electrical measurement server. */
9658-
command GetProfileInfoCommand(): DefaultSuccess = 0;
9659-
/** A function which retrieves an electricity measurement profile from the electricity measurement server for a specific attribute Id requested. */
9660-
command GetMeasurementProfileCommand(GetMeasurementProfileCommandRequest): DefaultSuccess = 1;
9661-
}
9662-
96639496
/** Attributes for determining advanced information about utility metering device */
96649497
cluster MeterIdentification = 2822 {
96659498
revision 1;

0 commit comments

Comments
 (0)