Updating the existing xml with features per cluster and features per …

…device type (project-chip#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
sharadb-amazon · Apr 18, 2024 · 4322a88 · 4322a88
1 parent 9966940
commit 4322a88
Show file tree

Hide file tree

Showing 72 changed files with 1,508 additions and 434 deletions.
diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json
@@ -8,13 +8,13 @@
  "mac-amd64",
  "windows-amd64"
  ],
- "tags": ["version:2@v2024.03.14-nightly.1"]
+ "tags": ["version:2@v2024.04.15-nightly.1"]
  },
  {
  "_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
  "path": "fuchsia/third_party/zap/mac-amd64",
  "platforms": ["mac-arm64"],
- "tags": ["version:2@v2024.03.14-nightly.1"]
+ "tags": ["version:2@v2024.04.15-nightly.1"]
  }
  ]
 }
diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version
@@ -1 +1 @@
-v2024.03.14-nightly
+v2024.04.15-nightly
diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py
@@ -23,7 +23,7 @@
 # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
 # files may need updating for versions
 #
-MIN_ZAP_VERSION = '2024.3.14'
+MIN_ZAP_VERSION = '2024.4.15'
 
 
 class ZapTool:

diff --git a/src/app/zap-templates/app-templates.json b/src/app/zap-templates/app-templates.json
@@ -1,6 +1,8 @@
 {
  "name": "CHIP Application templates",
  "version": "chip-v1",
+ "requiredFeatureLevel": 102,
+ "category": "matter",
  "helpers": [
  "partials/helper.js",
  "common/ListHelper.js",

diff --git a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml
@@ -38,6 +38,11 @@ limitations under the License.
  <define>ADMINISTRATOR_COMMISSIONING_CLUSTER</define>
  <description>Commands to trigger a Node to allow a new Administrator to commission it.</description>
 
+ <features>
+ <feature bit="0" code="BC" name="Basic" summary="Node supports Basic Commissioning Method.">
+ <optionalConform/>
+ </feature>
+ </features>
  <attribute side="server" code="0x0000" define="WINDOW_STATUS" type="CommissioningWindowStatusEnum" writable="false" optional="false">WindowStatus</attribute>
  <attribute side="server" code="0x0001" define="ADMIN_FABRIC_INDEX" type="fabric_idx" writable="false" isNullable="true" optional="false">AdminFabricIndex</attribute>
  <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.
  </command>
 
  </cluster>
-
- <bitmap name="Feature" type="bitmap32">
- <cluster code="0x003c" />
- <field name="Basic" mask="0x01" />
- </bitmap>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml
@@ -25,19 +25,25 @@ limitations under the License.
  <client tick="false" init="false">true</client>
  <server tick="false" init="false">true</server>
 
+ <features>
+ <feature bit="0" code="FAIR" name="Fair" summary="Cluster supports the Fair air quality level">
+ <optionalConform/>
+ </feature>
+ <feature bit="1" code="MOD" name="Moderate" summary="Cluster supports the Moderate air quality level">
+ <optionalConform/>
+ </feature>
+ <feature bit="2" code="VPOOR" name="VeryPoor" summary="Cluster supports the Very poor air quality level">
+ <optionalConform/>
+ </feature>
+ <feature bit="3" code="XPOOR" name="ExtremelyPoor" summary="Cluster supports the Extremely poor air quality level">
+ <optionalConform/>
+ </feature>
+ </features>
+
  <!-- Attributes -->
  <attribute side="server" code="0x0000" define="AIR_QUALITY" type="AirQualityEnum" min="0" max="6" writable="false" isNullable="false" default="0" optional="false">AirQuality</attribute>
  </cluster>
 
- <!-- Feature Map -->
- <bitmap name="Feature" type="bitmap32">
- <cluster code="0x005B" />
- <field name="Fair" mask="0x01" />
- <field name="Moderate" mask="0x02" />
- <field name="VeryPoor" mask="0x04" />
- <field name="ExtremelyPoor" mask="0x08" />
- </bitmap>
-
  <!-- Cluster Data Types -->
  <enum name="AirQualityEnum" type="enum8">
  <cluster code="0x005B" />

diff --git a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml
@@ -25,6 +25,12 @@ limitations under the License.
  <server init="false" tick="false">true</server>
  <description>This cluster provides an interface for launching content on a media player device such as a TV or Speaker.</description>
 
+ <features>
+ <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">
+ <optionalConform/>
+ </feature>
+ </features>
+
  <attribute side="server" code="0x0000" define="APPLICATION_LAUNCHER_LIST" type="array" entryType="int16u" reportable="true" writable="false" optional="true">CatalogList</attribute>
  <attribute side="server" code="0x0001" define="APPLICATION_LAUNCHER_CURRENT_APP" type="ApplicationEPStruct" isNullable="true" writable="false" optional="true">CurrentApp</attribute>
 
@@ -75,9 +81,4 @@ limitations under the License.
  <item name="AppNotAvailable" value="0x01"/>
  <item name="SystemBusy" value="0x02"/>
  </enum>
-
- <bitmap name="Feature" type="bitmap32">
- <cluster code="0x050c"/>
- <field name="ApplicationPlatform" mask="0x1"/>
- </bitmap>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml
@@ -24,6 +24,13 @@ limitations under the License.
  <client init="false" tick="false">true</client>
  <server init="false" tick="false">true</server>
  <description>This cluster provides an interface for controlling the Output on a media device such as a TV.</description>
+
+ <features>
+ <feature bit="0" code="NU" name="NameUpdates" summary="Supports updates to output names">
+ <optionalConform/>
+ </feature>
+ </features>
+
  <attribute side="server" code="0x0000" define="AUDIO_OUTPUT_LIST" type="array" entryType="OutputInfoStruct" length="254" writable="false" optional="false">OutputList</attribute>
  <attribute side="server" code="0x0001" define="AUDIO_OUTPUT_CURRENT_OUTPUT" type="int8u" default="0x00" min="0x00" max="0xFF" writable="false" optional="false">CurrentOutput</attribute>
 
@@ -58,9 +65,4 @@ limitations under the License.
  <item name="Other" value="0x05"/>
  </enum>
 
- <bitmap name="Feature" type="bitmap32">
- <cluster code="0x050b"/>
- <field name="NameUpdates" mask="0x1"/>
- </bitmap>
-
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml
@@ -17,14 +17,6 @@ limitations under the License.
 <configurator>
  <domain name="CHIP"/>
 
- <bitmap name="Feature" type="bitmap32">
- <cluster code="0x0080"/>
- <field name="Visual" mask="0x1"/>
- <field name="Audible" mask="0x2"/>
- <field name="AlarmSuppress" mask="0x4"/>
- <field name="SensitivityLevel" mask="0x8"/>
- </bitmap>
-
  <bitmap name="AlarmModeBitmap" type="bitmap8">
  <cluster code="0x0080"/>
  <field name="Visual" mask="0x1"/>
@@ -46,6 +38,26 @@ limitations under the License.
  <description>This cluster is used to configure a boolean sensor.</description>
  <globalAttribute side="either" code="0xFFFD" value="1"/>
 
+ <features>
+ <feature bit="0" code="VIS" name="Visual" summary="Supports visual alarms">
+ <optionalConform/>
+ </feature>
+ <feature bit="1" code="AUD" name="Audible" summary="Supports audible alarms">
+ <optionalConform/>
+ </feature>
+ <feature bit="2" code="SPRS" name="AlarmSuppress" summary="Supports ability to suppress or acknowledge alarms">
+ <optionalConform>
+ <orTerm>
+ <feature name="VIS"/>
+ <feature name="AUD"/>
+ </orTerm>
+ </optionalConform>
+ </feature>
+ <feature bit="3" code="SENSLVL" name="SensitivityLevel" summary="Supports ability to set sensor sensitivity">
+ <optionalConform/>
+ </feature>
+ </features>
+
  <attribute side="server" code="0x0000" define="CURRENT_SENSITIVITY_LEVEL" type="int8u" isNullable="false" writable="true" optional="true">CurrentSensitivityLevel</attribute>
  <attribute side="server" code="0x0001" define="SUPPORTED_SENSITIVITY_LEVELS" type="int8u" isNullable="false" min="2" max="10" writable="false" optional="true">SupportedSensitivityLevels</attribute>
  <attribute side="server" code="0x0002" define="DEFAULT_SENSITIVITY_LEVEL" type="int8u" isNullable="false" writable="false" optional="true">DefaultSensitivityLevel</attribute>

diff --git a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml
@@ -25,6 +25,22 @@ limitations under the License.
  <server init="false" tick="false">true</server>
  <globalAttribute side="either" code="0xFFFD" value="2"/> <!-- Revision -->
  <description>This cluster provides an interface for controlling the current Channel on a device.</description>
+
+ <features>
+ <feature bit="0" code="CL" name="ChannelList" summary="Provides list of available channels.">
+ <optionalConform/>
+ </feature>
+ <feature bit="1" code="LI" name="LineupInfo" summary="Provides lineup info, which is a reference to an external source of lineup information.">
+ <optionalConform/>
+ </feature>
+ <feature bit="2" code="EG" name="ElectronicGuide" summary="Provides electronic program guide information.">
+ <optionalConform/>
+ </feature>
+ <feature bit="3" code="RP" name="RecordProgram" summary="Provides ability to record program.">
+ <optionalConform/>
+ </feature>
+ </features>
+
  <attribute side="server" code="0x0000" define="CHANNEL_LIST" type="array" entryType="ChannelInfoStruct" length="254" writable="false" optional="true">ChannelList</attribute>
  <attribute side="server" code="0x0001" define="CHANNEL_LINEUP" type="LineupInfoStruct" default="0x0" isNullable="true" writable="false" optional="true">Lineup</attribute>
  <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.
  <field name="Recorded" mask="0x4"/>
  </bitmap>
 
- <bitmap name="Feature" type="bitmap32">
- <cluster code="0x0504"/>
- <field name="ChannelList" mask="0x1"/>
- <field name="LineupInfo" mask="0x2"/>
- <field name="ElectronicGuide" mask="0x4"/>
- <field name="RecordProgram" mask="0x8"/>
- </bitmap>
-
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml
@@ -15,14 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <configurator>
- <bitmap name="Feature" type="bitmap32">
- <cluster code="0x0300" />
- <field name="HueAndSaturation" mask="0x01" />
- <field name="EnhancedHue" mask="0x02" />
- <field name="ColorLoop" mask="0x04" />
- <field name="XY" mask="0x08" />
- <field name="ColorTemperature" mask="0x10" />
- </bitmap>
+
 
  <enum name="HueDirection" type="enum8">
  <cluster code="0x0300"/>
@@ -107,6 +100,24 @@ limitations under the License.
 
  <globalAttribute side="either" code="0xFFFD" value="6"/>
 
+ <features>
+ <feature bit="0" code="HS" name="Hue And Saturation" summary="Supports color specification via hue/saturation.">
+ <optionalConform/>
+ </feature>
+ <feature bit="1" code="EHUE" name="Enhanced Hue" summary="Enhanced hue is supported.">
+ <optionalConform/>
+ </feature>
+ <feature bit="2" code="CL" name="Color loop" summary="Color loop is supported.">
+ <optionalConform/>
+ </feature>
+ <feature bit="3" code="XY" name="XY" summary="Supports color specification via XY.">
+ <optionalConform/>
+ </feature>
+ <feature bit="4" code="CT" name="Color temperature" summary="Supports specification of color temperature.">
+ <optionalConform/>
+ </feature>
+ </features>
+
  <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>
  <!-- CURRENT_HUE -->
  <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>