Skip to content

Commit 4322a88

Browse files
brdandubrdandu
authored
Updating the existing xml with features per cluster and features per device type (#32930)
* Updating the existing xml with features per cluster and features per device type JIRA: ZAPP-1346 * Removing bitmap name=feature in favor of features which can be used to populate the bitmap JIRA: ZAPP-1346 * Minor cleanup JIRA: ZAPP-1346 * Updating the zap to be used JIRA: ZAPP-1346 * Updating the xml correctly for features JIRA: ZAPP-1346 * Minor cleanup JIRA: ZAPP-1346 * Cleanup to sync bitmap feature and features JIRA: ZAPP-1346 * Cleanup to sync bitmap feature and features JIRA: ZAPP-1346 * Cleanup to sync bitmap feature and features JIRA: ZAPP-1346 * Cleanup to sync bitmap feature and features JIRA: ZAPP-1346
1 parent 9966940 commit 4322a88

File tree

72 files changed

+1508
-434
lines changed

Some content is hidden

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

72 files changed

+1508
-434
lines changed

‎scripts/setup/zap.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"mac-amd64",
99
"windows-amd64"
1010
],
11-
"tags": ["version:2@v2024.03.14-nightly.1"]
11+
"tags": ["version:2@v2024.04.15-nightly.1"]
1212
},
1313
{
1414
"_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
1515
"path": "fuchsia/third_party/zap/mac-amd64",
1616
"platforms": ["mac-arm64"],
17-
"tags": ["version:2@v2024.03.14-nightly.1"]
17+
"tags": ["version:2@v2024.04.15-nightly.1"]
1818
}
1919
]
2020
}

‎scripts/setup/zap.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2024.03.14-nightly
1+
v2024.04.15-nightly

‎scripts/tools/zap/zap_execution.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
2424
# files may need updating for versions
2525
#
26-
MIN_ZAP_VERSION = '2024.3.14'
26+
MIN_ZAP_VERSION = '2024.4.15'
2727

2828

2929
class ZapTool:

‎src/app/zap-templates/app-templates.json

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"name": "CHIP Application templates",
33
"version": "chip-v1",
4+
"requiredFeatureLevel": 102,
5+
"category": "matter",
46
"helpers": [
57
"partials/helper.js",
68
"common/ListHelper.js",

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ limitations under the License.
3838
<define>ADMINISTRATOR_COMMISSIONING_CLUSTER</define>
3939
<description>Commands to trigger a Node to allow a new Administrator to commission it.</description>
4040

41+
<features>
42+
<feature bit="0" code="BC" name="Basic" summary="Node supports Basic Commissioning Method.">
43+
<optionalConform/>
44+
</feature>
45+
</features>
4146
<attribute side="server" code="0x0000" define="WINDOW_STATUS" type="CommissioningWindowStatusEnum" writable="false" optional="false">WindowStatus</attribute>
4247
<attribute side="server" code="0x0001" define="ADMIN_FABRIC_INDEX" type="fabric_idx" writable="false" isNullable="true" optional="false">AdminFabricIndex</attribute>
4348
<attribute side="server" code="0x0002" define="ADMIN_VENDOR_ID" type="vendor_id" writable="false" isNullable="true" optional="false">AdminVendorId</attribute>
@@ -64,9 +69,4 @@ limitations under the License.
6469
</command>
6570

6671
</cluster>
67-
68-
<bitmap name="Feature" type="bitmap32">
69-
<cluster code="0x003c" />
70-
<field name="Basic" mask="0x01" />
71-
</bitmap>
7272
</configurator>

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

+15-9
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,25 @@ limitations under the License.
2525
<client tick="false" init="false">true</client>
2626
<server tick="false" init="false">true</server>
2727

28+
<features>
29+
<feature bit="0" code="FAIR" name="Fair" summary="Cluster supports the Fair air quality level">
30+
<optionalConform/>
31+
</feature>
32+
<feature bit="1" code="MOD" name="Moderate" summary="Cluster supports the Moderate air quality level">
33+
<optionalConform/>
34+
</feature>
35+
<feature bit="2" code="VPOOR" name="VeryPoor" summary="Cluster supports the Very poor air quality level">
36+
<optionalConform/>
37+
</feature>
38+
<feature bit="3" code="XPOOR" name="ExtremelyPoor" summary="Cluster supports the Extremely poor air quality level">
39+
<optionalConform/>
40+
</feature>
41+
</features>
42+
2843
<!-- Attributes -->
2944
<attribute side="server" code="0x0000" define="AIR_QUALITY" type="AirQualityEnum" min="0" max="6" writable="false" isNullable="false" default="0" optional="false">AirQuality</attribute>
3045
</cluster>
3146

32-
<!-- Feature Map -->
33-
<bitmap name="Feature" type="bitmap32">
34-
<cluster code="0x005B" />
35-
<field name="Fair" mask="0x01" />
36-
<field name="Moderate" mask="0x02" />
37-
<field name="VeryPoor" mask="0x04" />
38-
<field name="ExtremelyPoor" mask="0x08" />
39-
</bitmap>
40-
4147
<!-- Cluster Data Types -->
4248
<enum name="AirQualityEnum" type="enum8">
4349
<cluster code="0x005B" />

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ limitations under the License.
2525
<server init="false" tick="false">true</server>
2626
<description>This cluster provides an interface for launching content on a media player device such as a TV or Speaker.</description>
2727

28+
<features>
29+
<feature bit="0" code="AP" name="ApplicationPlatform" summary="Support for attributes and commands required for endpoint to support launching any application within the supported application catalogs">
30+
<optionalConform/>
31+
</feature>
32+
</features>
33+
2834
<attribute side="server" code="0x0000" define="APPLICATION_LAUNCHER_LIST" type="array" entryType="int16u" reportable="true" writable="false" optional="true">CatalogList</attribute>
2935
<attribute side="server" code="0x0001" define="APPLICATION_LAUNCHER_CURRENT_APP" type="ApplicationEPStruct" isNullable="true" writable="false" optional="true">CurrentApp</attribute>
3036

@@ -75,9 +81,4 @@ limitations under the License.
7581
<item name="AppNotAvailable" value="0x01"/>
7682
<item name="SystemBusy" value="0x02"/>
7783
</enum>
78-
79-
<bitmap name="Feature" type="bitmap32">
80-
<cluster code="0x050c"/>
81-
<field name="ApplicationPlatform" mask="0x1"/>
82-
</bitmap>
8384
</configurator>

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ limitations under the License.
2424
<client init="false" tick="false">true</client>
2525
<server init="false" tick="false">true</server>
2626
<description>This cluster provides an interface for controlling the Output on a media device such as a TV.</description>
27+
28+
<features>
29+
<feature bit="0" code="NU" name="NameUpdates" summary="Supports updates to output names">
30+
<optionalConform/>
31+
</feature>
32+
</features>
33+
2734
<attribute side="server" code="0x0000" define="AUDIO_OUTPUT_LIST" type="array" entryType="OutputInfoStruct" length="254" writable="false" optional="false">OutputList</attribute>
2835
<attribute side="server" code="0x0001" define="AUDIO_OUTPUT_CURRENT_OUTPUT" type="int8u" default="0x00" min="0x00" max="0xFF" writable="false" optional="false">CurrentOutput</attribute>
2936

@@ -58,9 +65,4 @@ limitations under the License.
5865
<item name="Other" value="0x05"/>
5966
</enum>
6067

61-
<bitmap name="Feature" type="bitmap32">
62-
<cluster code="0x050b"/>
63-
<field name="NameUpdates" mask="0x1"/>
64-
</bitmap>
65-
6668
</configurator>

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

+20-8
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@ limitations under the License.
1717
<configurator>
1818
<domain name="CHIP"/>
1919

20-
<bitmap name="Feature" type="bitmap32">
21-
<cluster code="0x0080"/>
22-
<field name="Visual" mask="0x1"/>
23-
<field name="Audible" mask="0x2"/>
24-
<field name="AlarmSuppress" mask="0x4"/>
25-
<field name="SensitivityLevel" mask="0x8"/>
26-
</bitmap>
27-
2820
<bitmap name="AlarmModeBitmap" type="bitmap8">
2921
<cluster code="0x0080"/>
3022
<field name="Visual" mask="0x1"/>
@@ -46,6 +38,26 @@ limitations under the License.
4638
<description>This cluster is used to configure a boolean sensor.</description>
4739
<globalAttribute side="either" code="0xFFFD" value="1"/>
4840

41+
<features>
42+
<feature bit="0" code="VIS" name="Visual" summary="Supports visual alarms">
43+
<optionalConform/>
44+
</feature>
45+
<feature bit="1" code="AUD" name="Audible" summary="Supports audible alarms">
46+
<optionalConform/>
47+
</feature>
48+
<feature bit="2" code="SPRS" name="AlarmSuppress" summary="Supports ability to suppress or acknowledge alarms">
49+
<optionalConform>
50+
<orTerm>
51+
<feature name="VIS"/>
52+
<feature name="AUD"/>
53+
</orTerm>
54+
</optionalConform>
55+
</feature>
56+
<feature bit="3" code="SENSLVL" name="SensitivityLevel" summary="Supports ability to set sensor sensitivity">
57+
<optionalConform/>
58+
</feature>
59+
</features>
60+
4961
<attribute side="server" code="0x0000" define="CURRENT_SENSITIVITY_LEVEL" type="int8u" isNullable="false" writable="true" optional="true">CurrentSensitivityLevel</attribute>
5062
<attribute side="server" code="0x0001" define="SUPPORTED_SENSITIVITY_LEVELS" type="int8u" isNullable="false" min="2" max="10" writable="false" optional="true">SupportedSensitivityLevels</attribute>
5163
<attribute side="server" code="0x0002" define="DEFAULT_SENSITIVITY_LEVEL" type="int8u" isNullable="false" writable="false" optional="true">DefaultSensitivityLevel</attribute>

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

+16-8
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,22 @@ limitations under the License.
2525
<server init="false" tick="false">true</server>
2626
<globalAttribute side="either" code="0xFFFD" value="2"/> <!-- Revision -->
2727
<description>This cluster provides an interface for controlling the current Channel on a device.</description>
28+
29+
<features>
30+
<feature bit="0" code="CL" name="ChannelList" summary="Provides list of available channels.">
31+
<optionalConform/>
32+
</feature>
33+
<feature bit="1" code="LI" name="LineupInfo" summary="Provides lineup info, which is a reference to an external source of lineup information.">
34+
<optionalConform/>
35+
</feature>
36+
<feature bit="2" code="EG" name="ElectronicGuide" summary="Provides electronic program guide information.">
37+
<optionalConform/>
38+
</feature>
39+
<feature bit="3" code="RP" name="RecordProgram" summary="Provides ability to record program.">
40+
<optionalConform/>
41+
</feature>
42+
</features>
43+
2844
<attribute side="server" code="0x0000" define="CHANNEL_LIST" type="array" entryType="ChannelInfoStruct" length="254" writable="false" optional="true">ChannelList</attribute>
2945
<attribute side="server" code="0x0001" define="CHANNEL_LINEUP" type="LineupInfoStruct" default="0x0" isNullable="true" writable="false" optional="true">Lineup</attribute>
3046
<attribute side="server" code="0x0002" define="CHANNEL_CURRENT_CHANNEL" type="ChannelInfoStruct" default="0x0" isNullable="true" writable="false" optional="true">CurrentChannel</attribute>
@@ -192,12 +208,4 @@ limitations under the License.
192208
<field name="Recorded" mask="0x4"/>
193209
</bitmap>
194210

195-
<bitmap name="Feature" type="bitmap32">
196-
<cluster code="0x0504"/>
197-
<field name="ChannelList" mask="0x1"/>
198-
<field name="LineupInfo" mask="0x2"/>
199-
<field name="ElectronicGuide" mask="0x4"/>
200-
<field name="RecordProgram" mask="0x8"/>
201-
</bitmap>
202-
203211
</configurator>

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

+19-8
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,7 @@ See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
1717
<configurator>
18-
<bitmap name="Feature" type="bitmap32">
19-
<cluster code="0x0300" />
20-
<field name="HueAndSaturation" mask="0x01" />
21-
<field name="EnhancedHue" mask="0x02" />
22-
<field name="ColorLoop" mask="0x04" />
23-
<field name="XY" mask="0x08" />
24-
<field name="ColorTemperature" mask="0x10" />
25-
</bitmap>
18+
2619

2720
<enum name="HueDirection" type="enum8">
2821
<cluster code="0x0300"/>
@@ -107,6 +100,24 @@ limitations under the License.
107100

108101
<globalAttribute side="either" code="0xFFFD" value="6"/>
109102

103+
<features>
104+
<feature bit="0" code="HS" name="Hue And Saturation" summary="Supports color specification via hue/saturation.">
105+
<optionalConform/>
106+
</feature>
107+
<feature bit="1" code="EHUE" name="Enhanced Hue" summary="Enhanced hue is supported.">
108+
<optionalConform/>
109+
</feature>
110+
<feature bit="2" code="CL" name="Color loop" summary="Color loop is supported.">
111+
<optionalConform/>
112+
</feature>
113+
<feature bit="3" code="XY" name="XY" summary="Supports color specification via XY.">
114+
<optionalConform/>
115+
</feature>
116+
<feature bit="4" code="CT" name="Color temperature" summary="Supports specification of color temperature.">
117+
<optionalConform/>
118+
</feature>
119+
</features>
120+
110121
<attribute side="server" code="0x0000" define="COLOR_CONTROL_CURRENT_HUE" type="int8u" min="0x00" max="0xFE" writable="false" reportable="true" default="0x00" optional="true">CurrentHue</attribute>
111122
<!-- CURRENT_HUE -->
112123
<attribute side="server" code="0x0001" define="COLOR_CONTROL_CURRENT_SATURATION" type="int8u" min="0x00" max="0xFE" writable="false" reportable="true" default="0x00" optional="true">CurrentSaturation</attribute>

0 commit comments

Comments
 (0)