Skip to content

Commit

Permalink
Consolidate all Matter Device definitions into single source file for…
Browse files Browse the repository at this point in the history
… 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 <[email protected]>
  • Loading branch information
2 people authored and pull[bot] committed Feb 17, 2023
1 parent 4ed54d0 commit 1122498
Show file tree
Hide file tree
Showing 57 changed files with 5,019 additions and 3,533 deletions.
1 change: 1 addition & 0 deletions src/app/util/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ void MatterWakeOnLanPluginServerInitCallback() {}
void MatterOnOffSwitchConfigurationPluginServerInitCallback() {}
void MatterPowerSourcePluginServerInitCallback() {}
void MatterThermostatUserInterfaceConfigurationPluginServerInitCallback() {}
void MatterBridgedDeviceBasicInformationPluginServerInitCallback() {}

// ****************************************
// This function is called by the application when the stack goes down,
Expand Down
38 changes: 38 additions & 0 deletions src/app/zap-templates/zcl/data-model/chip/ACL-cluster.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2021 Project CHIP Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configurator>
<domain name="CHIP"/>


<cluster>
<domain>General</domain>
<name>ACL</name>
<code>0x001F</code>
<define>ACL_CLUSTER</define>
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
<description>The Access Control Cluster exposes a data model view of a Node’s Access Control List (ACL), which
codifies the rules used to manage and enforce Access Control for the Node’s endpoints and their
associated cluster instances. Access to this Access Control Cluster itself requires a special
Administer privilege level, such that only Nodes granted such privilege (hereafter termed
"Administrators") can manage the Access Control Cluster.</description>
<!-- Base data types -->

<!-- Test Commands -->

</cluster>
</configurator>
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2021 Project CHIP Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configurator>
<domain name="CHIP" />


<cluster>
<domain>General</domain>
<name>Bridged Device Basic Information</name>
<code>0x0039</code>
<define>BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER</define>
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
<description>This Cluster serves two purposes towards a Node communicating with a Bridge:
indicate that the functionality on the Endpoint where it is placed (and its Parts) is bridged from
a non-CHIP technology, and
provide a centralized collection of attributes that the Node MAY collect to aid in conveying
information regarding the Bridged Device to a user, such as the vendor name, the model name,
or user-assigned name.</description>
<!-- Base data types -->

<!-- Test Commands -->

</cluster>
</configurator>
221 changes: 0 additions & 221 deletions src/app/zap-templates/zcl/data-model/chip/chip-devices.xml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2021 Project CHIP Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configurator>
<domain name="CHIP"/>


<cluster>
<domain>General</domain>
<name>Localization Configuration</name>
<code>0x002b</code>
<define>LOCALIZATION_CONFIGURATION_CLUSTER</define>
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
<description>Nodes should be expected to be deployed to any and all regions of the world. These global regions
may have differing common languages, units of measurements, and numerical formatting
standards. As such, Nodes that visually or audibly convey information need a mechanism by which
they can be configured to use a user’s preferred language, units, etc</description>
<!-- Base data types -->

<!-- Test Commands -->

</cluster>
</configurator>
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2021 Project CHIP Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configurator>
<domain name="CHIP" />


<cluster>
<domain>General</domain>
<name>Localization Time Format</name>
<code>0x002c</code>
<define>LOCALIZATION_TIME_FORMAT_CLUSTER</define>
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
<description>Nodes should be expected to be deployed to any and all regions of the world. These global regions
may have differing preferences for how dates and times are conveyed. As such, Nodes that visually
or audibly convey time information need a mechanism by which they can be configured to use a
user’s preferred format.</description>
<!-- Base data types -->

<!-- Test Commands -->

</cluster>
</configurator>
Loading

0 comments on commit 1122498

Please sign in to comment.