Skip to content

Commit

Permalink
Adding Test Scripts for Concentration Measurement Clusters (#27215)
Browse files Browse the repository at this point in the history 
* 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 <commits@restyled.io>
  • Loading branch information
@mhazley @restyled-commits @pull
2 people authored and pull[bot] committed Oct 16, 2023
1 parent ccf8730 commit 1403806
Show file tree
Hide file tree
Showing 29 changed files with 28,803 additions and 89 deletions.
84 changes: 76 additions & 8 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4366,9 +4366,14 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
readonly attribute nullable single measuredValue = 0;
readonly attribute nullable single minMeasuredValue = 1;
readonly attribute nullable single maxMeasuredValue = 2;
readonly attribute nullable single peakMeasuredValue = 3;
readonly attribute elapsed_s peakMeasuredValueWindow = 4;
readonly attribute nullable single averageMeasuredValue = 5;
readonly attribute elapsed_s averageMeasuredValueWindow = 6;
readonly attribute single uncertainty = 7;
readonly attribute MeasurementUnitEnum measurementUnit = 8;
readonly attribute MeasurementMediumEnum measurementMedium = 9;
readonly attribute LevelValueEnum levelValue = 10;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -4413,6 +4418,15 @@ server cluster OzoneConcentrationMeasurement = 1045 {
kAverageMeasurement = 0x20;
}

readonly attribute nullable single measuredValue = 0;
readonly attribute nullable single minMeasuredValue = 1;
readonly attribute nullable single maxMeasuredValue = 2;
readonly attribute nullable single peakMeasuredValue = 3;
readonly attribute elapsed_s peakMeasuredValueWindow = 4;
readonly attribute nullable single averageMeasuredValue = 5;
readonly attribute elapsed_s averageMeasuredValueWindow = 6;
readonly attribute single uncertainty = 7;
readonly attribute MeasurementUnitEnum measurementUnit = 8;
readonly attribute MeasurementMediumEnum measurementMedium = 9;
readonly attribute LevelValueEnum levelValue = 10;
readonly attribute command_id generatedCommandList[] = 65528;
Expand Down Expand Up @@ -4514,6 +4528,16 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
kAverageMeasurement = 0x20;
}

readonly attribute nullable single measuredValue = 0;
readonly attribute nullable single minMeasuredValue = 1;
readonly attribute nullable single maxMeasuredValue = 2;
readonly attribute nullable single peakMeasuredValue = 3;
readonly attribute elapsed_s peakMeasuredValueWindow = 4;
readonly attribute nullable single averageMeasuredValue = 5;
readonly attribute elapsed_s averageMeasuredValueWindow = 6;
readonly attribute single uncertainty = 7;
readonly attribute MeasurementUnitEnum measurementUnit = 8;
readonly attribute MeasurementMediumEnum measurementMedium = 9;
readonly attribute LevelValueEnum levelValue = 10;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down Expand Up @@ -4679,6 +4703,7 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
readonly attribute single uncertainty = 7;
readonly attribute MeasurementUnitEnum measurementUnit = 8;
readonly attribute MeasurementMediumEnum measurementMedium = 9;
readonly attribute LevelValueEnum levelValue = 10;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -4723,6 +4748,15 @@ server cluster RadonConcentrationMeasurement = 1071 {
kAverageMeasurement = 0x20;
}

readonly attribute nullable single measuredValue = 0;
readonly attribute nullable single minMeasuredValue = 1;
readonly attribute nullable single maxMeasuredValue = 2;
readonly attribute nullable single peakMeasuredValue = 3;
readonly attribute elapsed_s peakMeasuredValueWindow = 4;
readonly attribute nullable single averageMeasuredValue = 5;
readonly attribute elapsed_s averageMeasuredValueWindow = 6;
readonly attribute single uncertainty = 7;
readonly attribute MeasurementUnitEnum measurementUnit = 8;
readonly attribute MeasurementMediumEnum measurementMedium = 9;
readonly attribute LevelValueEnum levelValue = 10;
readonly attribute command_id generatedCommandList[] = 65528;
Expand Down Expand Up @@ -6617,25 +6651,39 @@ endpoint 1 {
ram attribute measuredValue default = 3;
ram attribute minMeasuredValue default = 1;
ram attribute maxMeasuredValue default = 150;
ram attribute peakMeasuredValue default = 3;
ram attribute peakMeasuredValueWindow default = 120;
ram attribute averageMeasuredValue default = 3;
ram attribute averageMeasuredValueWindow default = 120;
ram attribute uncertainty default = 1;
ram attribute measurementUnit default = 1;
ram attribute measurementMedium default = 0;
ram attribute levelValue default = 1;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 1;
ram attribute featureMap default = 63;
ram attribute clusterRevision default = 1;
}

server cluster OzoneConcentrationMeasurement {
ram attribute measuredValue default = 10;
ram attribute minMeasuredValue default = 3;
ram attribute maxMeasuredValue default = 300;
ram attribute peakMeasuredValue default = 50;
ram attribute peakMeasuredValueWindow default = 3600;
ram attribute averageMeasuredValue default = 20;
ram attribute averageMeasuredValueWindow default = 3600;
ram attribute uncertainty default = 0;
ram attribute measurementUnit default = 0;
ram attribute measurementMedium default = 0;
ram attribute levelValue default = 1;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 14;
ram attribute featureMap default = 63;
ram attribute clusterRevision default = 1;
}

Expand All @@ -6660,12 +6708,22 @@ endpoint 1 {
}

server cluster FormaldehydeConcentrationMeasurement {
ram attribute levelValue default = 3;
ram attribute measuredValue default = 10;
ram attribute minMeasuredValue default = 0;
ram attribute maxMeasuredValue default = 200;
ram attribute peakMeasuredValue default = 10;
ram attribute peakMeasuredValueWindow default = 7200;
ram attribute averageMeasuredValue default = 2;
ram attribute averageMeasuredValueWindow default = 7200;
ram attribute uncertainty default = 0;
ram attribute measurementUnit default = 3;
ram attribute measurementMedium default = 0;
ram attribute levelValue default = 2;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 2;
ram attribute featureMap default = 63;
ram attribute clusterRevision default = 1;
}

Expand All @@ -6690,7 +6748,7 @@ endpoint 1 {
}

server cluster Pm10ConcentrationMeasurement {
ram attribute measuredValue;
ram attribute measuredValue default = 7;
ram attribute minMeasuredValue default = 2;
ram attribute maxMeasuredValue default = 400;
ram attribute peakMeasuredValue default = 49;
Expand Down Expand Up @@ -6720,22 +6778,32 @@ endpoint 1 {
ram attribute uncertainty default = 1;
ram attribute measurementUnit default = 1;
ram attribute measurementMedium default = 0;
ram attribute levelValue default = 1;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 49;
ram attribute featureMap default = 63;
ram attribute clusterRevision default = 1;
}

server cluster RadonConcentrationMeasurement {
ram attribute measuredValue default = 10;
ram attribute minMeasuredValue default = 5;
ram attribute maxMeasuredValue default = 100;
ram attribute peakMeasuredValue default = 36;
ram attribute peakMeasuredValueWindow default = 3600;
ram attribute averageMeasuredValue default = 20;
ram attribute averageMeasuredValueWindow default = 3600;
ram attribute uncertainty default = 0;
ram attribute measurementUnit default = 0;
ram attribute measurementMedium default = 0;
ram attribute levelValue default = 4;
ram attribute levelValue default = 3;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 14;
ram attribute featureMap default = 63;
ram attribute clusterRevision default = 1;
}

Expand Down
Loading

0 comments on commit 1403806

Please sign in to comment.