Skip to content

Commit 142e162

Browse files
dmitrymaslovdsrdmitrymaslovdsr
authored
Merge branch 'project-chip:master' into metering-identification-cluster-test-scripts
2 parents ad505ef + b205837 commit 142e162

File tree

61 files changed

+10973
-357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+10973
-357
lines changed

‎credentials/generate_revocation_set.py

+597-213
Large diffs are not rendered by default.

‎docs/examples/closure.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## Closure
2+
3+
```{toctree}
4+
:glob:
5+
:maxdepth: 1
6+
7+
closure-app/**/README
8+
```

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1916,7 +1916,7 @@ cluster Thermostat = 513 {
19161916

19171917
/** An interface for controlling a fan in a heating/cooling system. */
19181918
cluster FanControl = 514 {
1919-
revision 4;
1919+
revision 5;
19201920

19211921
enum AirflowDirectionEnum : enum8 {
19221922
kForward = 0;
@@ -1992,7 +1992,7 @@ cluster FanControl = 514 {
19921992
optional boolean lowestOff = 2;
19931993
}
19941994

1995-
/** The Step command speeds up or slows down the fan, in steps. */
1995+
/** This command speeds up or slows down the fan, in steps, without a client having to know the fan speed. */
19961996
command Step(StepRequest): DefaultSuccess = 0;
19971997
}
19981998

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5779,7 +5779,7 @@ cluster Thermostat = 513 {
57795779

57805780
/** An interface for controlling a fan in a heating/cooling system. */
57815781
cluster FanControl = 514 {
5782-
revision 4;
5782+
revision 5;
57835783

57845784
enum AirflowDirectionEnum : enum8 {
57855785
kForward = 0;
@@ -5855,7 +5855,7 @@ cluster FanControl = 514 {
58555855
optional boolean lowestOff = 2;
58565856
}
58575857

5858-
/** The Step command speeds up or slows down the fan, in steps. */
5858+
/** This command speeds up or slows down the fan, in steps, without a client having to know the fan speed. */
58595859
command Step(StepRequest): DefaultSuccess = 0;
58605860
}
58615861

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4191,7 +4191,7 @@ cluster Thermostat = 513 {
41914191

41924192
/** An interface for controlling a fan in a heating/cooling system. */
41934193
cluster FanControl = 514 {
4194-
revision 4;
4194+
revision 5;
41954195

41964196
enum AirflowDirectionEnum : enum8 {
41974197
kForward = 0;
@@ -4267,7 +4267,7 @@ cluster FanControl = 514 {
42674267
optional boolean lowestOff = 2;
42684268
}
42694269

4270-
/** The Step command speeds up or slows down the fan, in steps. */
4270+
/** This command speeds up or slows down the fan, in steps, without a client having to know the fan speed. */
42714271
command Step(StepRequest): DefaultSuccess = 0;
42724272
}
42734273

‎examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1659,7 +1659,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 {
16591659

16601660
/** An interface for controlling a fan in a heating/cooling system. */
16611661
cluster FanControl = 514 {
1662-
revision 4;
1662+
revision 5;
16631663

16641664
enum AirflowDirectionEnum : enum8 {
16651665
kForward = 0;
@@ -1735,7 +1735,7 @@ cluster FanControl = 514 {
17351735
optional boolean lowestOff = 2;
17361736
}
17371737

1738-
/** The Step command speeds up or slows down the fan, in steps. */
1738+
/** This command speeds up or slows down the fan, in steps, without a client having to know the fan speed. */
17391739
command Step(StepRequest): DefaultSuccess = 0;
17401740
}
17411741

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1839,7 +1839,7 @@ cluster Thermostat = 513 {
18391839

18401840
/** An interface for controlling a fan in a heating/cooling system. */
18411841
cluster FanControl = 514 {
1842-
revision 4;
1842+
revision 5;
18431843

18441844
enum AirflowDirectionEnum : enum8 {
18451845
kForward = 0;
@@ -1915,7 +1915,7 @@ cluster FanControl = 514 {
19151915
optional boolean lowestOff = 2;
19161916
}
19171917

1918-
/** The Step command speeds up or slows down the fan, in steps. */
1918+
/** This command speeds up or slows down the fan, in steps, without a client having to know the fan speed. */
19191919
command Step(StepRequest): DefaultSuccess = 0;
19201920
}
19211921

‎examples/chef/devices/rootnode_fan_7N2TobIlOX.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1562,7 +1562,7 @@ cluster FixedLabel = 64 {
15621562

15631563
/** An interface for controlling a fan in a heating/cooling system. */
15641564
cluster FanControl = 514 {
1565-
revision 4;
1565+
revision 5;
15661566

15671567
enum AirflowDirectionEnum : enum8 {
15681568
kForward = 0;
@@ -1638,7 +1638,7 @@ cluster FanControl = 514 {
16381638
optional boolean lowestOff = 2;
16391639
}
16401640

1641-
/** The Step command speeds up or slows down the fan, in steps. */
1641+
/** This command speeds up or slows down the fan, in steps, without a client having to know the fan speed. */
16421642
command Step(StepRequest): DefaultSuccess = 0;
16431643
}
16441644

‎examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -2135,7 +2135,7 @@ cluster Thermostat = 513 {
21352135

21362136
/** An interface for controlling a fan in a heating/cooling system. */
21372137
cluster FanControl = 514 {
2138-
revision 4;
2138+
revision 5;
21392139

21402140
enum AirflowDirectionEnum : enum8 {
21412141
kForward = 0;
@@ -2211,7 +2211,7 @@ cluster FanControl = 514 {
22112211
optional boolean lowestOff = 2;
22122212
}
22132213

2214-
/** The Step command speeds up or slows down the fan, in steps. */
2214+
/** This command speeds up or slows down the fan, in steps, without a client having to know the fan speed. */
22152215
command Step(StepRequest): DefaultSuccess = 0;
22162216
}
22172217

‎examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1779,7 +1779,7 @@ cluster Thermostat = 513 {
17791779

17801780
/** An interface for controlling a fan in a heating/cooling system. */
17811781
cluster FanControl = 514 {
1782-
revision 4;
1782+
revision 5;
17831783

17841784
enum AirflowDirectionEnum : enum8 {
17851785
kForward = 0;
@@ -1855,7 +1855,7 @@ cluster FanControl = 514 {
18551855
optional boolean lowestOff = 2;
18561856
}
18571857

1858-
/** The Step command speeds up or slows down the fan, in steps. */
1858+
/** This command speeds up or slows down the fan, in steps, without a client having to know the fan speed. */
18591859
command Step(StepRequest): DefaultSuccess = 0;
18601860
}
18611861

‎examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1999,7 +1999,7 @@ cluster Thermostat = 513 {
19991999

20002000
/** An interface for controlling a fan in a heating/cooling system. */
20012001
cluster FanControl = 514 {
2002-
revision 4;
2002+
revision 5;
20032003

20042004
enum AirflowDirectionEnum : enum8 {
20052005
kForward = 0;
@@ -2075,7 +2075,7 @@ cluster FanControl = 514 {
20752075
optional boolean lowestOff = 2;
20762076
}
20772077

2078-
/** The Step command speeds up or slows down the fan, in steps. */
2078+
/** This command speeds up or slows down the fan, in steps, without a client having to know the fan speed. */
20792079
command Step(StepRequest): DefaultSuccess = 0;
20802080
}
20812081

‎examples/closure-app/closure-common/BUILD.gn

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Copyright (c) 2025 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import("//build_overrides/chip.gni")
16+
import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
17+
import("${chip_root}/src/app/chip_data_model.gni")
18+
19+
config("config") {
20+
include_dirs = [ "common/include" ]
21+
}
22+
23+
chip_data_model("closure-common") {
24+
zap_file = "closure-app.zap"
25+
is_server = true
26+
}

0 commit comments

Comments
 (0)