Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into update_mode_select_xml_following_spec_pr_7151
Browse files Browse the repository at this point in the history
hicklin authored Jun 16, 2023
2 parents e62a80c + 561d7e1 commit f55e993
Showing 85 changed files with 30,084 additions and 1,462 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -80,4 +80,3 @@ examples/thermostat/ameba/build
# https://github.com/espressif/idf-component-manager#using-with-a-project
examples/*/esp32/managed_components
examples/*/esp32/dependencies.lock
examples/all-clusters-app/all-clusters-common/all-clusters-app.zap.old
Original file line number Diff line number Diff line change
@@ -4344,9 +4344,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;
@@ -4391,6 +4396,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;
@@ -4492,6 +4506,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;
@@ -4657,6 +4681,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;
@@ -4701,6 +4726,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;
@@ -6595,25 +6629,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;
}

@@ -6638,12 +6686,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;
}

@@ -6668,7 +6726,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;
@@ -6698,22 +6756,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;
}

Loading

0 comments on commit f55e993

Please sign in to comment.