Skip to content

Commit 1403806

Browse files
mhazleyrestyled-commits
authored and
pull[bot]
committed
Adding Test Scripts for Concentration Measurement Clusters (#27215)
* Added carbon monoxide measurement test yaml * Added additional concentration measurement test scripts * Updating conc meas clusters in all clusters to support all PICS * Restyled by whitespace * Restyled by prettier-yaml * Fixed formatting on comments * Adding ci pics * Restyled by prettier-yaml * Updates to darwin TestCommandBridge to not always assume the constraint is an integer c/o bzbarsky-apple * Fixed error in TC_CMO_CONC_1_1 with extra && * Adding excludes tests for when the PICS are not switched on and regen tests * Fixed embarrassing typo in hasMasksSet * Restyled by whitespace * Restyled by prettier-yaml * Remove dot in the cluster name for the python chip yaml runner --------- Co-authored-by: Restyled.io <[email protected]>
1 parent ccf8730 commit 1403806

29 files changed

+28803
-89
lines changed

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

+76-8
Original file line numberDiff line numberDiff line change
@@ -4366,9 +4366,14 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
43664366
readonly attribute nullable single measuredValue = 0;
43674367
readonly attribute nullable single minMeasuredValue = 1;
43684368
readonly attribute nullable single maxMeasuredValue = 2;
4369+
readonly attribute nullable single peakMeasuredValue = 3;
4370+
readonly attribute elapsed_s peakMeasuredValueWindow = 4;
4371+
readonly attribute nullable single averageMeasuredValue = 5;
4372+
readonly attribute elapsed_s averageMeasuredValueWindow = 6;
43694373
readonly attribute single uncertainty = 7;
43704374
readonly attribute MeasurementUnitEnum measurementUnit = 8;
43714375
readonly attribute MeasurementMediumEnum measurementMedium = 9;
4376+
readonly attribute LevelValueEnum levelValue = 10;
43724377
readonly attribute command_id generatedCommandList[] = 65528;
43734378
readonly attribute command_id acceptedCommandList[] = 65529;
43744379
readonly attribute event_id eventList[] = 65530;
@@ -4413,6 +4418,15 @@ server cluster OzoneConcentrationMeasurement = 1045 {
44134418
kAverageMeasurement = 0x20;
44144419
}
44154420

4421+
readonly attribute nullable single measuredValue = 0;
4422+
readonly attribute nullable single minMeasuredValue = 1;
4423+
readonly attribute nullable single maxMeasuredValue = 2;
4424+
readonly attribute nullable single peakMeasuredValue = 3;
4425+
readonly attribute elapsed_s peakMeasuredValueWindow = 4;
4426+
readonly attribute nullable single averageMeasuredValue = 5;
4427+
readonly attribute elapsed_s averageMeasuredValueWindow = 6;
4428+
readonly attribute single uncertainty = 7;
4429+
readonly attribute MeasurementUnitEnum measurementUnit = 8;
44164430
readonly attribute MeasurementMediumEnum measurementMedium = 9;
44174431
readonly attribute LevelValueEnum levelValue = 10;
44184432
readonly attribute command_id generatedCommandList[] = 65528;
@@ -4514,6 +4528,16 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
45144528
kAverageMeasurement = 0x20;
45154529
}
45164530

4531+
readonly attribute nullable single measuredValue = 0;
4532+
readonly attribute nullable single minMeasuredValue = 1;
4533+
readonly attribute nullable single maxMeasuredValue = 2;
4534+
readonly attribute nullable single peakMeasuredValue = 3;
4535+
readonly attribute elapsed_s peakMeasuredValueWindow = 4;
4536+
readonly attribute nullable single averageMeasuredValue = 5;
4537+
readonly attribute elapsed_s averageMeasuredValueWindow = 6;
4538+
readonly attribute single uncertainty = 7;
4539+
readonly attribute MeasurementUnitEnum measurementUnit = 8;
4540+
readonly attribute MeasurementMediumEnum measurementMedium = 9;
45174541
readonly attribute LevelValueEnum levelValue = 10;
45184542
readonly attribute command_id generatedCommandList[] = 65528;
45194543
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -4679,6 +4703,7 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
46794703
readonly attribute single uncertainty = 7;
46804704
readonly attribute MeasurementUnitEnum measurementUnit = 8;
46814705
readonly attribute MeasurementMediumEnum measurementMedium = 9;
4706+
readonly attribute LevelValueEnum levelValue = 10;
46824707
readonly attribute command_id generatedCommandList[] = 65528;
46834708
readonly attribute command_id acceptedCommandList[] = 65529;
46844709
readonly attribute event_id eventList[] = 65530;
@@ -4723,6 +4748,15 @@ server cluster RadonConcentrationMeasurement = 1071 {
47234748
kAverageMeasurement = 0x20;
47244749
}
47254750

4751+
readonly attribute nullable single measuredValue = 0;
4752+
readonly attribute nullable single minMeasuredValue = 1;
4753+
readonly attribute nullable single maxMeasuredValue = 2;
4754+
readonly attribute nullable single peakMeasuredValue = 3;
4755+
readonly attribute elapsed_s peakMeasuredValueWindow = 4;
4756+
readonly attribute nullable single averageMeasuredValue = 5;
4757+
readonly attribute elapsed_s averageMeasuredValueWindow = 6;
4758+
readonly attribute single uncertainty = 7;
4759+
readonly attribute MeasurementUnitEnum measurementUnit = 8;
47264760
readonly attribute MeasurementMediumEnum measurementMedium = 9;
47274761
readonly attribute LevelValueEnum levelValue = 10;
47284762
readonly attribute command_id generatedCommandList[] = 65528;
@@ -6617,25 +6651,39 @@ endpoint 1 {
66176651
ram attribute measuredValue default = 3;
66186652
ram attribute minMeasuredValue default = 1;
66196653
ram attribute maxMeasuredValue default = 150;
6654+
ram attribute peakMeasuredValue default = 3;
6655+
ram attribute peakMeasuredValueWindow default = 120;
6656+
ram attribute averageMeasuredValue default = 3;
6657+
ram attribute averageMeasuredValueWindow default = 120;
66206658
ram attribute uncertainty default = 1;
66216659
ram attribute measurementUnit default = 1;
66226660
ram attribute measurementMedium default = 0;
6661+
ram attribute levelValue default = 1;
66236662
callback attribute generatedCommandList;
66246663
callback attribute acceptedCommandList;
66256664
callback attribute eventList;
66266665
callback attribute attributeList;
6627-
ram attribute featureMap default = 1;
6666+
ram attribute featureMap default = 63;
66286667
ram attribute clusterRevision default = 1;
66296668
}
66306669

66316670
server cluster OzoneConcentrationMeasurement {
6671+
ram attribute measuredValue default = 10;
6672+
ram attribute minMeasuredValue default = 3;
6673+
ram attribute maxMeasuredValue default = 300;
6674+
ram attribute peakMeasuredValue default = 50;
6675+
ram attribute peakMeasuredValueWindow default = 3600;
6676+
ram attribute averageMeasuredValue default = 20;
6677+
ram attribute averageMeasuredValueWindow default = 3600;
6678+
ram attribute uncertainty default = 0;
6679+
ram attribute measurementUnit default = 0;
66326680
ram attribute measurementMedium default = 0;
66336681
ram attribute levelValue default = 1;
66346682
callback attribute generatedCommandList;
66356683
callback attribute acceptedCommandList;
66366684
callback attribute eventList;
66376685
callback attribute attributeList;
6638-
ram attribute featureMap default = 14;
6686+
ram attribute featureMap default = 63;
66396687
ram attribute clusterRevision default = 1;
66406688
}
66416689

@@ -6660,12 +6708,22 @@ endpoint 1 {
66606708
}
66616709

66626710
server cluster FormaldehydeConcentrationMeasurement {
6663-
ram attribute levelValue default = 3;
6711+
ram attribute measuredValue default = 10;
6712+
ram attribute minMeasuredValue default = 0;
6713+
ram attribute maxMeasuredValue default = 200;
6714+
ram attribute peakMeasuredValue default = 10;
6715+
ram attribute peakMeasuredValueWindow default = 7200;
6716+
ram attribute averageMeasuredValue default = 2;
6717+
ram attribute averageMeasuredValueWindow default = 7200;
6718+
ram attribute uncertainty default = 0;
6719+
ram attribute measurementUnit default = 3;
6720+
ram attribute measurementMedium default = 0;
6721+
ram attribute levelValue default = 2;
66646722
callback attribute generatedCommandList;
66656723
callback attribute acceptedCommandList;
66666724
callback attribute eventList;
66676725
callback attribute attributeList;
6668-
ram attribute featureMap default = 2;
6726+
ram attribute featureMap default = 63;
66696727
ram attribute clusterRevision default = 1;
66706728
}
66716729

@@ -6690,7 +6748,7 @@ endpoint 1 {
66906748
}
66916749

66926750
server cluster Pm10ConcentrationMeasurement {
6693-
ram attribute measuredValue;
6751+
ram attribute measuredValue default = 7;
66946752
ram attribute minMeasuredValue default = 2;
66956753
ram attribute maxMeasuredValue default = 400;
66966754
ram attribute peakMeasuredValue default = 49;
@@ -6720,22 +6778,32 @@ endpoint 1 {
67206778
ram attribute uncertainty default = 1;
67216779
ram attribute measurementUnit default = 1;
67226780
ram attribute measurementMedium default = 0;
6781+
ram attribute levelValue default = 1;
67236782
callback attribute generatedCommandList;
67246783
callback attribute acceptedCommandList;
67256784
callback attribute eventList;
67266785
callback attribute attributeList;
6727-
ram attribute featureMap default = 49;
6786+
ram attribute featureMap default = 63;
67286787
ram attribute clusterRevision default = 1;
67296788
}
67306789

67316790
server cluster RadonConcentrationMeasurement {
6791+
ram attribute measuredValue default = 10;
6792+
ram attribute minMeasuredValue default = 5;
6793+
ram attribute maxMeasuredValue default = 100;
6794+
ram attribute peakMeasuredValue default = 36;
6795+
ram attribute peakMeasuredValueWindow default = 3600;
6796+
ram attribute averageMeasuredValue default = 20;
6797+
ram attribute averageMeasuredValueWindow default = 3600;
6798+
ram attribute uncertainty default = 0;
6799+
ram attribute measurementUnit default = 0;
67326800
ram attribute measurementMedium default = 0;
6733-
ram attribute levelValue default = 4;
6801+
ram attribute levelValue default = 3;
67346802
callback attribute generatedCommandList;
67356803
callback attribute acceptedCommandList;
67366804
callback attribute eventList;
67376805
callback attribute attributeList;
6738-
ram attribute featureMap default = 14;
6806+
ram attribute featureMap default = 63;
67396807
ram attribute clusterRevision default = 1;
67406808
}
67416809

0 commit comments

Comments
 (0)