Skip to content

Commit 5528a58

Browse files
committed
1 parent 2eb7ba5 commit 5528a58

7 files changed

+106
-65
lines changed

src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2024 Project CHIP Authors
3+
Copyright (c) 2024-2025 Project CHIP Authors
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@ limitations under the License.
1616
-->
1717
<!--
1818
XML generated by Alchemy; DO NOT EDIT.
19-
Source: src\app_clusters\CameraAVSettingsUserLevelManagement.adoc
20-
Parameters:
21-
Git: 1.4-444-g6d595e737
19+
Source: src/app_clusters/CameraAVSettingsUserLevelManagement.adoc
20+
Parameters: in-progress
21+
Git: 0.7-summer-2025-1-ge4654a5ef
2222
-->
2323
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2424
<domain name="Cameras"/>
@@ -33,7 +33,7 @@ Git: 1.4-444-g6d595e737
3333
<cluster code="0x0552"/>
3434
<item fieldId="0" name="Pan" type="int16s" optional="true" default="0" min="-180" max="180"/>
3535
<item fieldId="1" name="Tilt" type="int16s" optional="true" default="0" min="-180" max="180"/>
36-
<item fieldId="2" name="Zoom" type="int8u" optional="true" default="1" min="1"/>
36+
<item fieldId="2" name="Zoom" type="int8u" optional="true" default="1" min="1" max="100"/>
3737
</struct>
3838

3939
<cluster apiMaturity="provisional">
@@ -128,9 +128,9 @@ Git: 1.4-444-g6d595e737
128128
</attribute>
129129
<command code="0x00" source="client" name="MPTZSetPosition" optional="true">
130130
<description>This command SHALL set the values for the pan, tilt, and zoom in the mechanical PTZ.</description>
131-
<arg id="0" name="Pan" type="int16s" optional="true"/>
132-
<arg id="1" name="Tilt" type="int16s" optional="true"/>
133-
<arg id="2" name="Zoom" type="int8u" optional="true" min="1" max="1"/>
131+
<arg id="0" name="Pan" type="int16s" optional="true" min="-180" max="180"/>
132+
<arg id="1" name="Tilt" type="int16s" optional="true" min="-180" max="180"/>
133+
<arg id="2" name="Zoom" type="int8u" optional="true" min="1" max="100"/>
134134
<mandatoryConform>
135135
<orTerm>
136136
<feature name="MPAN"/>

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2024 Project CHIP Authors
3+
Copyright (c) 2024-2025 Project CHIP Authors
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -18,18 +18,18 @@ limitations under the License.
1818
XML generated by Alchemy; DO NOT EDIT.
1919
Source: src/app_clusters/Chime.adoc
2020
Parameters: in-progress
21-
Git: 0.9-fall2024-301-g4e2f0c1c4
21+
Git: 0.7-summer-2025-1-ge4654a5ef
2222
-->
2323
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2424
<domain name="General"/>
2525
<struct name="ChimeSoundStruct" apiMaturity="provisional">
2626
<cluster code="0x0556"/>
2727
<item fieldId="0" name="ChimeID" type="int8u"/>
28-
<item fieldId="1" name="Name" type="char_string" length="48"/>
28+
<item fieldId="1" name="Name" type="char_string" length="48" minLength="1"/>
2929
</struct>
3030

3131
<cluster apiMaturity="provisional">
32-
<domain name="Cameras"/>
32+
<domain name="Cameras">Cameras</domain>
3333
<name>Chime</name>
3434
<code>0x0556</code>
3535
<define>CHIME_CLUSTER</define>
@@ -38,7 +38,7 @@ Git: 0.9-fall2024-301-g4e2f0c1c4
3838
<server init="false" tick="false">true</server>
3939
<globalAttribute code="0xFFFD" side="either" value="1"/>
4040
<attribute code="0x0000" side="server" define="INSTALLED_CHIME_SOUNDS" type="array" entryType="ChimeSoundStruct" length="255" minLength="1">InstalledChimeSounds</attribute>
41-
<attribute code="0x0001" side="server" define="ACTIVE_CHIME_SOUND_ID" type="int8u" min="0" max="255" default="0" writable="true">ActiveChimeID</attribute>
41+
<attribute code="0x0001" side="server" define="ACTIVE_CHIME_SOUND_ID" type="int8u" min="0" max="255" default="0" writable="true">SelectedChime</attribute>
4242
<attribute code="0x0002" side="server" define="ENABLED" type="boolean" default="1" writable="true">Enabled</attribute>
4343
<command code="0x00" source="client" name="PlayChimeSound" optional="false">
4444
<description/>

src/app/zap-templates/zcl/data-model/chip/global-enums.xml

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2024 Project CHIP Authors
3+
Copyright (c) 2024-2025 Project CHIP Authors
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -15,24 +15,29 @@ See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
1717
<!--
18+
XML generated by Alchemy; DO NOT EDIT.
19+
Source: src/app_clusters/energy_management.adoc src/app_clusters/meas_and_sense.adoc src/data_model/Data-Model.adoc src/service_device_management/DistributedComplianceLedger.adoc
20+
Parameters: in-progress
21+
Git: 0.7-summer-2025
22+
-->
23+
<!--
1824
TODO: Make these structures global rather than defining them for each cluster.
1925
This depends on the ability to define global structs via XML tags.
2026
see: https://github.com/project-chip/connectedhomeip/issues/29818
2127
-->
22-
<configurator>
28+
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2329
<domain name="CHIP"/>
24-
2530
<enum name="AtomicRequestTypeEnum" type="enum8">
2631
<item name="BeginWrite" value="0x00"/>
2732
<item name="CommitWrite" value="0x01"/>
2833
<item name="RollbackWrite" value="0x02"/>
2934
</enum>
3035

3136
<enum name="ThreeLevelAutoEnum" type="enum8">
32-
<item name="Low" value="0x00"/>
33-
<item name="Medium" value="0x01"/>
34-
<item name="High" value="0x02"/>
35-
<item name="Automatic" value="0x03"/>
37+
<item name="Auto" value="0x00"/>
38+
<item name="Low" value="0x01"/>
39+
<item name="Medium" value="0x02"/>
40+
<item name="High" value="0x03"/>
3641
</enum>
3742

3843
<enum name="StreamUsageEnum" type="enum8">
@@ -45,7 +50,6 @@ TODO: Make these structures global rather than defining them for each cluster.
4550
<item name="Analysis" value="0x02"/>
4651
<item name="LiveView" value="0x03"/>
4752
</enum>
48-
4953
<!--
5054
These are test global items (no cluster attached) for testing only.
5155
Their usage is defined for UnitTestCluster only.

src/app/zap-templates/zcl/data-model/chip/tls-certificate-management-cluster.xml

+45-35
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@ limitations under the License.
1818
XML generated by Alchemy; DO NOT EDIT.
1919
Source: src/tls/TLSCertificateManagement.adoc
2020
Parameters: in-progress
21-
Git: 1.4-534-g3214b3502
21+
Git: 0.7-summer-2025-308-g2f23be841
2222
-->
2323
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2424
<domain name="General"/>
25-
<struct name="TLSCertStruct" apiMaturity="provisional">
25+
<struct name="TLSCertStruct" apiMaturity="provisional" isFabricScoped="true">
2626
<cluster code="0x0801"/>
2727
<item fieldId="0" name="CAID" type="int16u"/>
28-
<item fieldId="1" name="Certificate" type="long_octet_string" length="3000"/>
28+
<item fieldId="1" name="Certificate" type="long_octet_string" length="3000" optional="true"/>
2929
</struct>
3030

31-
<struct name="TLSClientCertificateDetailStruct" apiMaturity="provisional">
31+
<struct name="TLSClientCertificateDetailStruct" apiMaturity="provisional" isFabricScoped="true">
3232
<cluster code="0x0801"/>
3333
<item fieldId="0" name="CCDID" type="int16u"/>
34-
<item fieldId="1" name="ClientCertificate" type="long_octet_string" length="3000"/>
35-
<item fieldId="2" name="IntermediateCertificates" array="true" type="octet_string"/>
34+
<item fieldId="1" name="ClientCertificate" type="long_octet_string" length="3000" optional="true"/>
35+
<item fieldId="2" name="IntermediateCertificates" array="true" type="octet_string" optional="true" length="10"/>
3636
</struct>
3737

3838
<cluster apiMaturity="provisional">
39-
<domain name="General"/>
39+
<domain name="General">General</domain>
4040
<name>TLS Certificate Management</name>
4141
<code>0x0801</code>
4242
<define>TLS_CERTIFICATE_MANAGEMENT_CLUSTER</define>
@@ -45,96 +45,106 @@ Git: 1.4-534-g3214b3502
4545
<client init="false" tick="false">true</client>
4646
<server init="false" tick="false">true</server>
4747
<globalAttribute code="0xFFFD" side="either" value="1"/>
48-
<attribute code="0x0000" side="server" define="MAX_ROOT_CERTIFICATES" type="int8u">MaxRootCertificates</attribute>
49-
<attribute code="0x0001" side="server" define="CURRENT_ROOT_CERTIFICATES" type="int8u">CurrentRootCertificates</attribute>
50-
<attribute code="0x0002" side="server" define="MAX_CLIENT_CERTIFICATES" type="int8u">MaxClientCertificates</attribute>
51-
<attribute code="0x0003" side="server" define="CURRENT_CLIENT_CERTIFICATES" type="int8u">CurrentClientCertificates</attribute>
52-
<command code="0x00" source="client" name="ProvisionRootCertificate" optional="false" response="ProvisionRootCertificateResponse">
53-
<description>This command SHALL provision the provided certificate for the passed in CAID.</description>
48+
<attribute code="0x0000" side="server" define="MAX_ROOT_CERTIFICATES" type="int8u" min="5" max="254" default="5">MaxRootCertificates</attribute>
49+
<attribute code="0x0001" side="server" define="PROVISIONED_ROOT_CERTIFICATES" type="array" entryType="TLSCertStruct">ProvisionedRootCertificates</attribute>
50+
<attribute code="0x0002" side="server" define="MAX_CLIENT_CERTIFICATES" type="int8u" min="5" max="254" default="5">MaxClientCertificates</attribute>
51+
<attribute code="0x0003" side="server" define="PROVISIONED_CLIENT_CERTIFICATES" type="array" entryType="TLSClientCertificateDetailStruct">ProvisionedClientCertificates</attribute>
52+
<command code="0x00" source="client" name="ProvisionRootCertificate" optional="false" response="ProvisionRootCertificateResponse" isFabricScoped="true">
53+
<description>This command SHALL provision a newly provided certificate, or rotate an existing one, based on the contents of the CAID field.</description>
5454
<access op="invoke" privilege="administer"/>
55+
<quality largeMessage="true"/>
5556
<arg id="0" name="Certificate" type="long_octet_string" length="3000"/>
5657
<arg id="1" name="CAID" type="int16u" isNullable="true"/>
5758
</command>
5859

5960
<command code="0x01" source="server" name="ProvisionRootCertificateResponse" optional="false" disableDefaultResponse="true">
6061
<description>This command SHALL be generated in response to a ProvisionRootCertificate command.</description>
62+
<quality largeMessage="true"/>
6163
<arg id="0" name="CAID" type="int16u"/>
6264
</command>
6365

64-
<command code="0x02" source="client" name="FindRootCertificate" optional="false" response="FindRootCertificateResponse">
65-
<description>This command SHALL return the TLSCertStruct for the passed in CAID.</description>
66+
<command code="0x02" source="client" name="FindRootCertificate" optional="false" response="FindRootCertificateResponse" isFabricScoped="true">
67+
<description>This command SHALL return the specified TLS root certificate, or all TLS provisioned root certificates, based on the contents of the CAID field.</description>
68+
<quality largeMessage="true"/>
6669
<arg id="0" name="CAID" type="int16u" isNullable="true"/>
6770
</command>
6871

6972
<command code="0x03" source="server" name="FindRootCertificateResponse" optional="false" disableDefaultResponse="true">
7073
<description>This command SHALL be generated in response to a FindRootCertificate command.</description>
71-
<arg id="0" name="CertificateDetails" array="true" type="TLSCertStruct"/>
74+
<quality largeMessage="true"/>
75+
<arg id="0" name="CertificateDetails" array="true" type="TLSCertStruct" minLength="1"/>
7276
</command>
7377

74-
<command code="0x04" source="client" name="LookupRootCertificate" optional="false" response="LookupRootCertificateResponse">
78+
<command code="0x04" source="client" name="LookupRootCertificate" optional="false" response="LookupRootCertificateResponse" isFabricScoped="true">
7579
<description>This command SHALL return the CAID for the passed in fingerprint.</description>
80+
<quality largeMessage="true"/>
7681
<arg id="0" name="Fingerprint" type="octet_string" length="64"/>
7782
</command>
7883

7984
<command code="0x05" source="server" name="LookupRootCertificateResponse" optional="false" disableDefaultResponse="true">
8085
<description>This command SHALL be generated in response to a LookupRootCertificate command.</description>
86+
<quality largeMessage="true"/>
8187
<arg id="0" name="CAID" type="int16u"/>
8288
</command>
8389

84-
<command code="0x06" source="client" name="RemoveRootCertificate" optional="false">
90+
<command code="0x06" source="client" name="RemoveRootCertificate" optional="false" isFabricScoped="true">
8591
<description>This command SHALL be generated to request the server removes the certificate provisioned to the provided Certificate Authority ID.</description>
8692
<access op="invoke" privilege="administer"/>
93+
<quality largeMessage="true"/>
8794
<arg id="0" name="CAID" type="int16u"/>
8895
</command>
8996

90-
<command code="0x07" source="client" name="TLSClientCSR" optional="false" response="TLSClientCSRResponse">
97+
<command code="0x07" source="client" name="TLSClientCSR" optional="false" response="TLSClientCSRResponse" isFabricScoped="true">
9198
<description>This command SHALL be generated to request the Node generates a Certificate Signing Request.</description>
9299
<access op="invoke" privilege="administer"/>
100+
<quality largeMessage="true"/>
93101
<arg id="1" name="Nonce" type="octet_string"/>
94102
</command>
95103

96104
<command code="0x08" source="server" name="TLSClientCSRResponse" optional="false" disableDefaultResponse="true">
97105
<description>This command SHALL be generated in response to a TLSClientCSR command.</description>
106+
<quality largeMessage="true"/>
98107
<arg id="0" name="CCDID" type="int16u"/>
99108
<arg id="1" name="CSR" type="octet_string"/>
100109
<arg id="2" name="Nonce" type="octet_string"/>
101110
</command>
102111

103-
<command code="0x09" source="client" name="ProvisionClientCertificate" optional="false" response="ProvisionClientCertificateResponse">
104-
<description>This command SHALL be generated to request the Node provisions the provided Client Certificate Details.</description>
112+
<command code="0x09" source="client" name="ProvisionClientCertificate" optional="false" isFabricScoped="true">
113+
<description>This command SHALL be generated to request the Node provisions newly provided Client Certificate Details, or rotate an existing client certificate.</description>
105114
<access op="invoke" privilege="administer"/>
115+
<quality largeMessage="true"/>
106116
<arg id="0" name="CCDID" type="int16u"/>
107117
<arg id="1" name="ClientCertificateDetails" type="TLSClientCertificateDetailStruct"/>
108118
</command>
109119

110-
<command code="0x0A" source="server" name="ProvisionClientCertificateResponse" optional="false" disableDefaultResponse="true">
111-
<description>This command SHALL be generated in response to a ProvisionClientCertificate command.</description>
112-
<arg id="0" name="CCDID" type="int16u"/>
113-
</command>
114-
115-
<command code="0x0B" source="client" name="FindClientCertificate" optional="false" response="FindClientCertificateResponse">
116-
<description>This command SHALL return the TLSClientCertificateDetailStruct for the passed in CCDID.</description>
117-
<arg id="0" name="CCDID" type="int16u"/>
120+
<command code="0x0A" source="client" name="FindClientCertificate" isFabricScoped="true" optional="false" response="FindClientCertificateResponse">
121+
<description>This command SHALL return the TLSClientCertificateDetailStruct for the passed in CCDID, or all TLS client certificates, based on the contents of the CCDID field.</description>
122+
<quality largeMessage="true"/>
123+
<arg id="0" name="CCDID" type="int16u" isNullable="true"/>
118124
</command>
119125

120-
<command code="0x0C" source="server" name="FindClientCertificateResponse" optional="false" disableDefaultResponse="true">
126+
<command code="0x0B" source="server" name="FindClientCertificateResponse" optional="false" disableDefaultResponse="true">
121127
<description>This command SHALL be generated in response to a FindClientCertificate command.</description>
122-
<arg id="0" name="CertificateDetails" array="true" type="TLSClientCertificateDetailStruct"/>
128+
<quality largeMessage="true"/>
129+
<arg id="0" name="CertificateDetails" array="true" type="TLSClientCertificateDetailStruct" minLength="1"/>
123130
</command>
124131

125-
<command code="0x0D" source="client" name="LookupClientCertificate" optional="false" response="LookupClientCertificateResponse">
132+
<command code="0x0C" source="client" name="LookupClientCertificate" isFabricScoped="true" optional="false" response="LookupClientCertificateResponse">
126133
<description>This command SHALL return the CCDID for the passed in Fingerprint.</description>
134+
<quality largeMessage="true"/>
127135
<arg id="0" name="Fingerprint" type="octet_string" length="64"/>
128136
</command>
129137

130-
<command code="0x0E" source="server" name="LookupClientCertificateResponse" optional="false" disableDefaultResponse="true">
138+
<command code="0x0D" source="server" name="LookupClientCertificateResponse" optional="false" disableDefaultResponse="true">
131139
<description>This command SHALL be generated in response to a LookupClientCertificate command.</description>
140+
<quality largeMessage="true"/>
132141
<arg id="0" name="CCDID" type="int16u"/>
133142
</command>
134143

135-
<command code="0x0F" source="client" name="RemoveClientCertificate" optional="false">
136-
<description>This command SHALL be generated to request the Node removes the certificate provisioned to the provided Client Certificate Details ID.</description>
144+
<command code="0x0E" source="client" name="RemoveClientCertificate" isFabricScoped="true" optional="false">
145+
<description>This command SHALL be used to request the Node removes all stored information for the provided CCDID.</description>
137146
<access op="invoke" privilege="administer"/>
147+
<quality largeMessage="true"/>
138148
<arg id="0" name="CCDID" type="int16u"/>
139149
</command>
140150

0 commit comments

Comments
 (0)