Skip to content

Commit f633bc9

Browse files
gmarcosbgmarcosb
committed
1 parent 0c1a606 commit f633bc9

12 files changed

+218
-145
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
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/camera-av-stream-management-cluster.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
XML generated by Alchemy; DO NOT EDIT.
1919
Source: src/app_clusters/CameraAVStreamManagement.adoc
2020
Parameters: in-progress
21-
Git: 1.4-526-g306635762
21+
Git: 0.7-summer-2025
2222
-->
2323
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2424
<domain name="Cameras"/>
@@ -127,7 +127,7 @@ Git: 1.4-526-g306635762
127127
<item fieldId="6" name="MaxResolution" type="VideoResolutionStruct"/>
128128
<item fieldId="7" name="MinBitRate" type="int32u" min="1"/>
129129
<item fieldId="8" name="MaxBitRate" type="int32u" min="1"/>
130-
<item fieldId="9" name="MinFragmentLen" type="int16u" default="4000" max="65500"/>
130+
<item fieldId="9" name="MinFragmentLen" type="int16u" default="4000"/>
131131
<item fieldId="10" name="MaxFragmentLen" type="int16u" default="4000" max="65500"/>
132132
<item fieldId="11" name="WatermarkEnabled" type="boolean" optional="true" default="0"/>
133133
<item fieldId="12" name="OSDEnabled" type="boolean" optional="true" default="0"/>
@@ -490,7 +490,7 @@ Git: 1.4-526-g306635762
490490
<arg id="6" name="MaxResolution" type="VideoResolutionStruct"/>
491491
<arg id="7" name="MinBitRate" type="int32u" min="1"/>
492492
<arg id="8" name="MaxBitRate" type="int32u" min="1"/>
493-
<arg id="9" name="MinFragmentLen" type="int16u" default="4000" max="65500"/>
493+
<arg id="9" name="MinFragmentLen" type="int16u" default="4000"/>
494494
<arg id="10" name="MaxFragmentLen" type="int16u" default="4000" max="65500"/>
495495
<arg id="11" name="WatermarkEnabled" type="boolean" optional="true" default="0"/>
496496
<arg id="12" name="OSDEnabled" type="boolean" optional="true" default="0"/>
@@ -601,7 +601,7 @@ Git: 1.4-526-g306635762
601601
<field id="6" name="MaxResolution" type="VideoResolutionStruct" optional="true"/>
602602
<field id="7" name="MinBitRate" type="int32u" optional="true" min="1"/>
603603
<field id="8" name="MaxBitRate" type="int32u" optional="true" min="1"/>
604-
<field id="9" name="MinFragmentLen" type="int16u" optional="true" max="65500"/>
604+
<field id="9" name="MinFragmentLen" type="int16u" optional="true"/>
605605
<field id="10" name="MaxFragmentLen" type="int16u" optional="true" max="65500"/>
606606
<description>This event SHALL be generated when there is a modification in the corresponding video stream.</description>
607607
<mandatoryConform>

‎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-dirty
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.

0 commit comments

Comments
 (0)