Skip to content

Commit 1188396

Browse files
jonsmirlbzbarsky-apple
authored and
pull[bot]
committed
Consolidate all Matter Device definitions into single source file for zap (#11868)
* Consolidate all Matter Device definition into single source file for zap * define MatterBridgedDeviceBasicInformationPluginServerInitCallback() * Run scripts/tools/zap_regen_all.py to rebuild zzz_generated * Fix python style Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
1 parent ad0c1d0 commit 1188396

Some content is hidden

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

57 files changed

+5019
-3533
lines changed

‎src/app/util/util.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ void MatterWakeOnLanPluginServerInitCallback() {}
308308
void MatterOnOffSwitchConfigurationPluginServerInitCallback() {}
309309
void MatterPowerSourcePluginServerInitCallback() {}
310310
void MatterThermostatUserInterfaceConfigurationPluginServerInitCallback() {}
311+
void MatterBridgedDeviceBasicInformationPluginServerInitCallback() {}
311312

312313
// ****************************************
313314
// This function is called by the application when the stack goes down,

‎src/app/zap-templates/zcl/data-model/chip/ACL-cluster.xml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Copyright (c) 2021 Project CHIP Authors
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<configurator>
18+
<domain name="CHIP"/>
19+
20+
21+
<cluster>
22+
<domain>General</domain>
23+
<name>ACL</name>
24+
<code>0x001F</code>
25+
<define>ACL_CLUSTER</define>
26+
<client init="false" tick="false">true</client>
27+
<server init="false" tick="false">true</server>
28+
<description>The Access Control Cluster exposes a data model view of a Node’s Access Control List (ACL), which
29+
codifies the rules used to manage and enforce Access Control for the Node’s endpoints and their
30+
associated cluster instances. Access to this Access Control Cluster itself requires a special
31+
Administer privilege level, such that only Nodes granted such privilege (hereafter termed
32+
"Administrators") can manage the Access Control Cluster.</description>
33+
<!-- Base data types -->
34+
35+
<!-- Test Commands -->
36+
37+
</cluster>
38+
</configurator>

‎src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information-cluster.xml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Copyright (c) 2021 Project CHIP Authors
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<configurator>
18+
<domain name="CHIP" />
19+
20+
21+
<cluster>
22+
<domain>General</domain>
23+
<name>Bridged Device Basic Information</name>
24+
<code>0x0039</code>
25+
<define>BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER</define>
26+
<client init="false" tick="false">true</client>
27+
<server init="false" tick="false">true</server>
28+
<description>This Cluster serves two purposes towards a Node communicating with a Bridge:
29+
indicate that the functionality on the Endpoint where it is placed (and its Parts) is bridged from
30+
a non-CHIP technology, and
31+
provide a centralized collection of attributes that the Node MAY collect to aid in conveying
32+
information regarding the Bridged Device to a user, such as the vendor name, the model name,
33+
or user-assigned name.</description>
34+
<!-- Base data types -->
35+
36+
<!-- Test Commands -->
37+
38+
</cluster>
39+
</configurator>

‎src/app/zap-templates/zcl/data-model/chip/chip-devices.xml

-221
This file was deleted.

‎src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Copyright (c) 2021 Project CHIP Authors
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<configurator>
18+
<domain name="CHIP"/>
19+
20+
21+
<cluster>
22+
<domain>General</domain>
23+
<name>Localization Configuration</name>
24+
<code>0x002b</code>
25+
<define>LOCALIZATION_CONFIGURATION_CLUSTER</define>
26+
<client init="false" tick="false">true</client>
27+
<server init="false" tick="false">true</server>
28+
<description>Nodes should be expected to be deployed to any and all regions of the world. These global regions
29+
may have differing common languages, units of measurements, and numerical formatting
30+
standards. As such, Nodes that visually or audibly convey information need a mechanism by which
31+
they can be configured to use a user’s preferred language, units, etc</description>
32+
<!-- Base data types -->
33+
34+
<!-- Test Commands -->
35+
36+
</cluster>
37+
</configurator>

‎src/app/zap-templates/zcl/data-model/chip/localization-time-format-cluster.xml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Copyright (c) 2021 Project CHIP Authors
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<configurator>
18+
<domain name="CHIP" />
19+
20+
21+
<cluster>
22+
<domain>General</domain>
23+
<name>Localization Time Format</name>
24+
<code>0x002c</code>
25+
<define>LOCALIZATION_TIME_FORMAT_CLUSTER</define>
26+
<client init="false" tick="false">true</client>
27+
<server init="false" tick="false">true</server>
28+
<description>Nodes should be expected to be deployed to any and all regions of the world. These global regions
29+
may have differing preferences for how dates and times are conveyed. As such, Nodes that visually
30+
or audibly convey time information need a mechanism by which they can be configured to use a
31+
user’s preferred format.</description>
32+
<!-- Base data types -->
33+
34+
<!-- Test Commands -->
35+
36+
</cluster>
37+
</configurator>

0 commit comments

Comments
 (0)