Skip to content

Commit 8e2617e

Browse files
zaid-googlezaid-google
committed
XML changes cluster revision conformance
1 parent df65e20 commit 8e2617e

File tree

2 files changed

+77
-29
lines changed

2 files changed

+77
-29
lines changed

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

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
<!--
1818
XML generated by Alchemy; DO NOT EDIT.
1919
Source: src/service_device_management/BasicInformationCluster.adoc
20-
Parameters: zap attribute=improved-capabilities-tcr sdk-root=../connectedhomeip/ spec-root=../connectedhomeip-spec/ ../connectedhomeip-spec/src/data_model/Interaction-Model.adoc ../connectedhomeip-spec/src/service_device_management/BasicInformationCluster.adoc ../connectedhomeip-spec/src/service_device_management/DiagnosticsGeneral.adoc
21-
Git: 1.5-base-19-g551278a1a
20+
Parameters: zap attribute=cluster-rev-conformance sdk-root=../connectedhomeip/ spec-root=../connectedhomeip-spec/ ../connectedhomeip-spec/src/data_model/BridgedDeviceBasicInformationCluster.adoc ../connectedhomeip-spec/src/data_model/Data-Model.adoc ../connectedhomeip-spec/src/service_device_management/BasicInformationCluster.adoc
21+
Git: 0.9-fall2025-ncr-108-g24bc22cb5
2222
Alchemy: v1.5.55
2323
-->
2424
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
@@ -27,10 +27,6 @@ Alchemy: v1.5.55
2727
<cluster code="0x0028"/>
2828
<item fieldId="0" name="CaseSessionsPerFabric" type="int16u" writable="false" default="3" min="3"/>
2929
<item fieldId="1" name="SubscriptionsPerFabric" type="int16u" writable="false" default="3" min="3"/>
30-
<item fieldId="2" name="SimultaneousInvocationsSupported" type="int16u" optional="true" min="1"/>
31-
<item fieldId="3" name="SimultaneousWritesSupported" type="int16u" optional="true" min="1"/>
32-
<item fieldId="4" name="ReadPathsSupported" type="int16u" optional="true" min="9"/>
33-
<item fieldId="5" name="SubscribePathsSupported" type="int16u" optional="true" min="3"/>
3430
</struct>
3531

3632
<enum name="ProductFinishEnum" type="enum8">
@@ -84,15 +80,7 @@ Alchemy: v1.5.55
8480
which apply to the whole Node. Also allows setting user device information such as location.</description>
8581
<client init="false" tick="false">true</client>
8682
<server init="false" tick="false">true</server>
87-
<features>
88-
<feature bit="0" code="EXTM" name="ExtendedMinima" summary="Extended information is available in the CapabilityMinimaStruct.">
89-
<otherwiseConform>
90-
<provisionalConform/>
91-
<mandatoryConform/>
92-
</otherwiseConform>
93-
</feature>
94-
</features>
95-
<globalAttribute side="either" code="0xFFFD" value="6"/>
83+
<globalAttribute side="either" code="0xFFFD" value="5"/>
9684
<attribute side="server" code="0" name="DataModelRevision" define="DATA_MODEL_REVISION" type="int16u"/>
9785
<attribute side="server" code="1" name="VendorName" define="VENDOR_NAME" type="char_string" length="32"/>
9886
<attribute side="server" code="2" name="VendorID" define="VENDOR_ID" type="vendor_id"/>
@@ -130,17 +118,51 @@ Alchemy: v1.5.55
130118
<attribute side="server" code="17" name="Reachable" define="REACHABLE" type="boolean" default="1" optional="true">
131119
<optionalConform/>
132120
</attribute>
133-
<attribute side="server" code="18" name="UniqueID" define="UNIQUE_ID" type="char_string" length="32"/>
121+
<attribute side="server" code="18" name="UniqueID" define="UNIQUE_ID" type="char_string" length="32" optional="true">
122+
<otherwiseConform>
123+
<mandatoryConform>
124+
<greaterOrEqualTerm>
125+
<revision value="current"/>
126+
<revision value="4"/>
127+
</greaterOrEqualTerm>
128+
</mandatoryConform>
129+
<optionalConform/>
130+
</otherwiseConform>
131+
</attribute>
134132
<attribute side="server" code="19" name="CapabilityMinima" define="CAPABILITY_MINIMA" type="CapabilityMinimaStruct"/>
135133
<attribute side="server" code="20" name="ProductAppearance" define="PRODUCT_APPEARANCE" type="ProductAppearanceStruct" optional="true">
136-
<optionalConform/>
134+
<optionalConform>
135+
<greaterOrEqualTerm>
136+
<revision value="current"/>
137+
<revision value="2"/>
138+
</greaterOrEqualTerm>
139+
</optionalConform>
140+
</attribute>
141+
<attribute side="server" code="21" name="SpecificationVersion" define="SPECIFICATION_VERSION" type="int32u" default="0" optional="true">
142+
<mandatoryConform>
143+
<greaterOrEqualTerm>
144+
<revision value="current"/>
145+
<revision value="3"/>
146+
</greaterOrEqualTerm>
147+
</mandatoryConform>
148+
</attribute>
149+
<attribute side="server" code="22" name="MaxPathsPerInvoke" define="MAX_PATHS_PER_INVOKE" type="int16u" min="1" default="1" optional="true">
150+
<mandatoryConform>
151+
<greaterOrEqualTerm>
152+
<revision value="current"/>
153+
<revision value="3"/>
154+
</greaterOrEqualTerm>
155+
</mandatoryConform>
137156
</attribute>
138-
<attribute side="server" code="21" name="SpecificationVersion" define="SPECIFICATION_VERSION" type="int32u" default="0"/>
139-
<attribute side="server" code="22" name="MaxPathsPerInvoke" define="MAX_PATHS_PER_INVOKE" type="int16u" min="1" default="1"/>
140-
<attribute code="0x0018" side="server" name="ConfigurationVersion" define="CONFIGURATION_VERSION" type="int32u" min="1" default="1">
157+
<attribute code="0x0018" side="server" name="ConfigurationVersion" define="CONFIGURATION_VERSION" type="int32u" min="1" default="1" optional="true">
141158
<otherwiseConform>
142159
<provisionalConform/>
143-
<mandatoryConform/>
160+
<mandatoryConform>
161+
<greaterOrEqualTerm>
162+
<revision value="current"/>
163+
<revision value="5"/>
164+
</greaterOrEqualTerm>
165+
</mandatoryConform>
144166
</otherwiseConform>
145167
</attribute>
146168
<event side="server" code="0x00" name="StartUp" priority="critical">

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

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ limitations under the License.
1717
<!--
1818
XML generated by Alchemy; DO NOT EDIT.
1919
Source: src/data_model/BridgedDeviceBasicInformationCluster.adoc
20-
Parameters:
21-
Git: 0.7-summer-2025-ncr-23-g816a9defd
20+
Parameters: zap attribute=cluster-rev-conformance sdk-root=../connectedhomeip/ spec-root=../connectedhomeip-spec/ ../connectedhomeip-spec/src/data_model/BridgedDeviceBasicInformationCluster.adoc ../connectedhomeip-spec/src/data_model/Data-Model.adoc ../connectedhomeip-spec/src/service_device_management/BasicInformationCluster.adoc
21+
Git: 0.9-fall2025-ncr-108-g24bc22cb5
22+
Alchemy: v1.5.55
2223
-->
2324
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2425
<domain name="CHIP"/>
@@ -59,8 +60,8 @@ Git: 0.7-summer-2025-ncr-23-g816a9defd
5960

6061
<struct name="ProductAppearanceStruct">
6162
<cluster code="0x0039"/>
62-
<item fieldId="0" name="Finish" type="ProductFinishEnum" min="0x00" max="0x05"/>
63-
<item fieldId="1" name="PrimaryColor" type="ColorEnum" isNullable="true" min="0x00" max="0x14"/>
63+
<item fieldId="0" name="Finish" type="ProductFinishEnum" max="0x05"/>
64+
<item fieldId="1" name="PrimaryColor" type="ColorEnum" isNullable="true" max="0x14"/>
6465
</struct>
6566

6667
<cluster>
@@ -77,7 +78,12 @@ Git: 0.7-summer-2025-ncr-23-g816a9defd
7778
<globalAttribute side="either" code="0xFFFD" value="5"/>
7879
<features>
7980
<feature bit="20" code="BIS" name="BridgedICDSupport" summary="Support bridged ICDs.">
80-
<optionalConform/>
81+
<optionalConform>
82+
<greaterOrEqualTerm>
83+
<revision value="current"/>
84+
<revision value="4"/>
85+
</greaterOrEqualTerm>
86+
</optionalConform>
8187
</feature>
8288
</features>
8389
<attribute side="server" code="1" name="VendorName" define="VENDOR_NAME" type="char_string" length="32" optional="true">
@@ -124,14 +130,34 @@ Git: 0.7-summer-2025-ncr-23-g816a9defd
124130
<optionalConform/>
125131
</attribute>
126132
<attribute side="server" code="17" name="Reachable" define="REACHABLE" type="boolean" default="1"/>
127-
<attribute side="server" code="18" name="UniqueID" define="UNIQUE_ID" type="char_string" length="32"/>
133+
<attribute side="server" code="18" name="UniqueID" define="UNIQUE_ID" type="char_string" length="32" optional="true">
134+
<otherwiseConform>
135+
<mandatoryConform>
136+
<greaterOrEqualTerm>
137+
<revision value="current"/>
138+
<revision value="4"/>
139+
</greaterOrEqualTerm>
140+
</mandatoryConform>
141+
<optionalConform/>
142+
</otherwiseConform>
143+
</attribute>
128144
<attribute side="server" code="20" name="ProductAppearance" define="PRODUCT_APPEARANCE" type="ProductAppearanceStruct" optional="true">
129-
<optionalConform/>
145+
<optionalConform>
146+
<greaterOrEqualTerm>
147+
<revision value="current"/>
148+
<revision value="2"/>
149+
</greaterOrEqualTerm>
150+
</optionalConform>
130151
</attribute>
131152
<attribute code="0x0018" side="server" name="ConfigurationVersion" define="CONFIGURATION_VERSION" type="int32u" min="1" default="1" optional="true">
132153
<otherwiseConform>
133154
<provisionalConform/>
134-
<optionalConform/>
155+
<optionalConform>
156+
<greaterOrEqualTerm>
157+
<revision value="current"/>
158+
<revision value="5"/>
159+
</greaterOrEqualTerm>
160+
</optionalConform>
135161
</otherwiseConform>
136162
</attribute>
137163
<command source="client" code="0x80" name="KeepActive" optional="true">

0 commit comments

Comments
 (0)