Skip to content

Commit e01eb4e

Browse files
authored
Darwin: Promote Electrical Power Measurement out of Provisional to Introduced (#33316)
* Remove Darwin provisional markings for `ElectricalPowerMeasurement` (YAML step) * Remove Darwin provisional markings for `ElectricalPowerMeasurement` (codegen step) * `ElectricalPowerMeasurement`: add common structs/enums * `ElectricalPowerMeasurement`: add common structs/enums - codegen step * tidy whitespace
1 parent 16e220b commit e01eb4e

File tree

6 files changed

+285
-308
lines changed

6 files changed

+285
-308
lines changed

src/darwin/Framework/CHIP/templates/availability.yaml

+101-1
Original file line numberDiff line numberDiff line change
@@ -8515,6 +8515,7 @@
85158515
clusters:
85168516
- ActivatedCarbonFilterMonitoring
85178517
- AirQuality
8518+
- ElectricalPowerMeasurement
85188519
- HEPAFilterMonitoring
85198520
- SmokeCOAlarm
85208521
# Concentration Measurement clusters
@@ -8548,6 +8549,31 @@
85488549
- AttributeList
85498550
- FeatureMap
85508551
- ClusterRevision
8552+
ElectricalPowerMeasurement:
8553+
- PowerMode
8554+
- NumberOfMeasurementTypes
8555+
- Accuracy
8556+
- Ranges
8557+
- Voltage
8558+
- ActiveCurrent
8559+
- ReactiveCurrent
8560+
- ApparentCurrent
8561+
- ActivePower
8562+
- ReactivePower
8563+
- ApparentPower
8564+
- RMSVoltage
8565+
- RMSCurrent
8566+
- RMSPower
8567+
- Frequency
8568+
- HarmonicCurrents
8569+
- HarmonicPhases
8570+
- PowerFactor
8571+
- NeutralCurrent
8572+
- GeneratedCommandList
8573+
- AcceptedCommandList
8574+
- AttributeList
8575+
- FeatureMap
8576+
- ClusterRevision
85518577
FanControl:
85528578
- AirflowDirection
85538579
HEPAFilterMonitoring:
@@ -8769,18 +8795,56 @@
87698795
structs:
87708796
ActivatedCarbonFilterMonitoring:
87718797
- ReplacementProductStruct
8798+
ElectricalPowerMeasurement:
8799+
- HarmonicMeasurementStruct
8800+
- MeasurementRangeStruct
8801+
- MeasurementAccuracyRangeStruct
8802+
- MeasurementAccuracyStruct
87728803
HEPAFilterMonitoring:
87738804
- ReplacementProductStruct
87748805
struct fields:
87758806
ActivatedCarbonFilterMonitoring:
87768807
ReplacementProductStruct:
87778808
- productIdentifierType
87788809
- productIdentifierValue
8810+
ElectricalPowerMeasurement:
8811+
MeasurementRangeStruct:
8812+
- measurementType
8813+
- min
8814+
- max
8815+
- startTimestamp
8816+
- endTimestamp
8817+
- minTimestamp
8818+
- maxTimestamp
8819+
- startSystime
8820+
- endSystime
8821+
- minSystime
8822+
- maxSystime
8823+
HarmonicMeasurementStruct:
8824+
- order
8825+
- measurement
8826+
MeasurementAccuracyStruct:
8827+
- measurementType
8828+
- measured
8829+
- minMeasuredValue
8830+
- maxMeasuredValue
8831+
- accuracyRanges
8832+
MeasurementAccuracyRangeStruct:
8833+
- rangeMin
8834+
- rangeMax
8835+
- percentMax
8836+
- percentMin
8837+
- percentTypical
8838+
- fixedMax
8839+
- fixedMin
8840+
- fixedTypical
87798841
HEPAFilterMonitoring:
87808842
ReplacementProductStruct:
87818843
- productIdentifierType
87828844
- productIdentifierValue
87838845
events:
8846+
ElectricalPowerMeasurement:
8847+
- MeasurementPeriodRanges
87848848
SmokeCOAlarm:
87858849
- SmokeAlarm
87868850
- COAlarm
@@ -8794,6 +8858,9 @@
87948858
- InterconnectCOAlarm
87958859
- AllClear
87968860
event fields:
8861+
ElectricalPowerMeasurement:
8862+
MeasurementPeriodRanges:
8863+
- ranges
87978864
SmokeCOAlarm:
87988865
SmokeAlarm:
87998866
- alarmSeverityLevel
@@ -8812,6 +8879,9 @@
88128879
- ProductIdentifierTypeEnum
88138880
AirQuality:
88148881
- AirQualityEnum
8882+
ElectricalPowerMeasurement:
8883+
- PowerModeEnum
8884+
- MeasurementTypeEnum
88158885
FanControl:
88168886
- StepDirectionEnum
88178887
- AirflowDirectionEnum
@@ -8890,6 +8960,28 @@
88908960
- Poor
88918961
- VeryPoor
88928962
- ExtremelyPoor
8963+
ElectricalPowerMeasurement:
8964+
PowerModeEnum:
8965+
- Unknown
8966+
- DC
8967+
- AC
8968+
MeasurementTypeEnum:
8969+
- Unspecified
8970+
- Voltage
8971+
- ActiveCurrent
8972+
- ReactiveCurrent
8973+
- ApparentCurrent
8974+
- ActivePower
8975+
- ReactivePower
8976+
- ApparentPower
8977+
- RMSVoltage
8978+
- RMSCurrent
8979+
- RMSPower
8980+
- Frequency
8981+
- PowerFactor
8982+
- NeutralCurrent
8983+
- ElectricalEnergy
8984+
88938985
FanControl:
88948986
StepDirectionEnum:
88958987
- Increase
@@ -9146,6 +9238,8 @@
91469238
- Feature
91479239
AirQuality:
91489240
- Feature
9241+
ElectricalPowerMeasurement:
9242+
- Feature
91499243
HEPAFilterMonitoring:
91509244
- Feature
91519245
SmokeCOAlarm:
@@ -9182,6 +9276,13 @@
91829276
- Moderate
91839277
- VeryPoor
91849278
- ExtremelyPoor
9279+
ElectricalPowerMeasurement:
9280+
Feature:
9281+
- DirectCurrent
9282+
- AlternatingCurrent
9283+
- PolyphasePower
9284+
- Harmonics
9285+
- PowerQuality
91859286
HEPAFilterMonitoring:
91869287
Feature:
91879288
- Condition
@@ -9281,7 +9382,6 @@
92819382
- EnergyEVSEMode
92829383
- DeviceEnergyManagementMode
92839384
- Messages
9284-
- ElectricalPowerMeasurement
92859385
- PowerTopology
92869386
attributes:
92879387
DoorLock:

0 commit comments

Comments
 (0)