Skip to content

Commit

Permalink
Revert "Revert Generate Conformance Data with Alchemy" and Remove Att…
Browse files Browse the repository at this point in the history
…ribute Description (#36233)

* Revert "Revert "Generate Conformance Data with Alchemy (#36186)" (#36220)"

This reverts commit a4a911c.

* move attribute name

- move attribute name from description to name inside attribute tag
  • Loading branch information
ethanzhouyc authored and jmartinez-silabs committed Nov 21, 2024
1 parent c833c78 commit d0eeca1
Show file tree
Hide file tree
Showing 96 changed files with 897 additions and 1,785 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -109,42 +109,35 @@ limitations under the License.
and enforce Access Control for the Node's endpoints and their associated
cluster instances.</description>

<attribute side="server" code="0x0000" define="ACL" type="array" entryType="AccessControlEntryStruct" writable="true">
<description>ACL</description>
<attribute side="server" code="0x0000" name="ACL" define="ACL" type="array" entryType="AccessControlEntryStruct" writable="true">
<access op="read" privilege="administer"/>
<access op="write" privilege="administer"/>
<mandatoryConform/>
</attribute>

<attribute side="server" code="0x0001" define="EXTENSION" type="array" entryType="AccessControlExtensionStruct" writable="true" optional="true">
<description>Extension</description>
<attribute side="server" code="0x0001" name="Extension" define="EXTENSION" type="array" entryType="AccessControlExtensionStruct" writable="true" optional="true">
<access op="read" privilege="administer"/>
<access op="write" privilege="administer"/>
<mandatoryConform>
<feature name="EXTS"/>
</mandatoryConform>
</attribute>

<attribute side="server" code="0x0002" define="SUBJECTS_PER_ACCESS_CONTROL_ENTRY" type="int16u" min="4" default="4">
<description>SubjectsPerAccessControlEntry</description>
<attribute side="server" code="0x0002" name="SubjectsPerAccessControlEntry" define="SUBJECTS_PER_ACCESS_CONTROL_ENTRY" type="int16u" min="4" default="4">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0003" define="TARGETS_PER_ACCESS_CONTROL_ENTRY" type="int16u" min="3" default="3">
<description>TargetsPerAccessControlEntry</description>
<attribute side="server" code="0x0003" name="TargetsPerAccessControlEntry" define="TARGETS_PER_ACCESS_CONTROL_ENTRY" type="int16u" min="3" default="3">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0004" define="ACCESS_CONTROL_ENTRIES_PER_FABRIC" type="int16u" min="4" default="4">
<description>AccessControlEntriesPerFabric</description>
<attribute side="server" code="0x0004" name="AccessControlEntriesPerFabric" define="ACCESS_CONTROL_ENTRIES_PER_FABRIC" type="int16u" min="4" default="4">
<mandatoryConform/>
</attribute>
<attribute code="0x0005" side="server" define="COMMISSIONING_ARL" type="array" entryType="CommissioningAccessRestrictionEntryStruct" optional="true">
<description>CommissioningARL</description>
<attribute code="0x0005" side="server" name="CommissioningARL" define="COMMISSIONING_ARL" type="array" entryType="CommissioningAccessRestrictionEntryStruct" optional="true">
<mandatoryConform>
<feature name="MNGD"/>
</mandatoryConform>
</attribute>
<attribute code="0x0006" side="server" define="ARL" type="array" entryType="AccessRestrictionEntryStruct" optional="true">
<description>ARL</description>
<attribute code="0x0006" side="server" name="ARL" define="ARL" type="array" entryType="AccessRestrictionEntryStruct" optional="true">
<mandatoryConform>
<feature name="MNGD"/>
</mandatoryConform>
Expand Down
9 changes: 3 additions & 6 deletions src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,13 @@ limitations under the License.
<define>ACTIONS_CLUSTER</define>
<description>This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information.</description>

<attribute side="server" code="0x0000" define="ACTION_LIST" type="array" entryType="ActionStruct" length="256">
<description>ActionList</description>
<attribute side="server" code="0x0000" name="ActionList" define="ACTION_LIST" type="array" entryType="ActionStruct" length="256">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0001" define="ENDPOINT_LIST" type="array" entryType="EndpointListStruct" length="256">
<description>EndpointLists</description>
<attribute side="server" code="0x0001" name="EndpointLists" define="ENDPOINT_LIST" type="array" entryType="EndpointListStruct" length="256">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0002" define="SETUP_URL" type="LONG_CHAR_STRING" length="512" optional="true">
<description>SetupURL</description>
<attribute side="server" code="0x0002" name="SetupURL" define="SETUP_URL" type="LONG_CHAR_STRING" length="512" optional="true">
<optionalConform/>
</attribute>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,13 @@ limitations under the License.
<optionalConform/>
</feature>
</features>
<attribute side="server" code="0x0000" define="WINDOW_STATUS" type="CommissioningWindowStatusEnum">
<description>WindowStatus</description>
<attribute side="server" code="0x0000" name="WindowStatus" define="WINDOW_STATUS" type="CommissioningWindowStatusEnum">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0001" define="ADMIN_FABRIC_INDEX" type="fabric_idx" isNullable="true">
<description>AdminFabricIndex</description>
<attribute side="server" code="0x0001" name="AdminFabricIndex" define="ADMIN_FABRIC_INDEX" type="fabric_idx" isNullable="true">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0002" define="ADMIN_VENDOR_ID" type="vendor_id" isNullable="true">
<description>AdminVendorId</description>
<attribute side="server" code="0x0002" name="AdminVendorId" define="ADMIN_VENDOR_ID" type="vendor_id" isNullable="true">
<mandatoryConform/>
</attribute>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ limitations under the License.
</features>

<!-- Attributes -->
<attribute side="server" code="0x0000" define="AIR_QUALITY" type="AirQualityEnum" min="0" max="6" default="0">
<description>AirQuality</description>
<attribute side="server" code="0x0000" name="AirQuality" define="AIR_QUALITY" type="AirQualityEnum" min="0" max="6" default="0">
<mandatoryConform/>
</attribute>
</cluster>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,28 @@ limitations under the License.
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
<description>This cluster provides information about an application running on a TV or media player device which is represented as an endpoint.</description>
<attribute side="server" code="0x0000" define="APPLICATION_VENDOR_NAME" type="char_string" length="32" optional="true">
<description>VendorName</description>
<attribute side="server" code="0x0000" name="VendorName" define="APPLICATION_VENDOR_NAME" type="char_string" length="32" optional="true">
<optionalConform/>
</attribute>
<attribute side="server" code="0x0001" define="APPLICATION_VENDOR_ID" type="vendor_id" optional="true">
<description>VendorID</description>
<attribute side="server" code="0x0001" name="VendorID" define="APPLICATION_VENDOR_ID" type="vendor_id" optional="true">
<optionalConform/>
</attribute>
<attribute side="server" code="0x0002" define="APPLICATION_NAME" type="long_char_string" length="256">
<description>ApplicationName</description>
<attribute side="server" code="0x0002" name="ApplicationName" define="APPLICATION_NAME" type="long_char_string" length="256">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0003" define="APPLICATION_PRODUCT_ID" type="int16u" optional="true">
<description>ProductID</description>
<attribute side="server" code="0x0003" name="ProductID" define="APPLICATION_PRODUCT_ID" type="int16u" optional="true">
<optionalConform/>
</attribute>
<attribute side="server" code="0x0004" define="APPLICATION_APP" type="ApplicationStruct">
<description>Application</description>
<attribute side="server" code="0x0004" name="Application" define="APPLICATION_APP" type="ApplicationStruct">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0005" define="APPLICATION_STATUS" type="ApplicationStatusEnum" default="0x01" min="0x00" max="0xFF">
<description>Status</description>
<attribute side="server" code="0x0005" name="Status" define="APPLICATION_STATUS" type="ApplicationStatusEnum" default="0x01" min="0x00" max="0xFF">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0006" define="APPLICATION_VERSION" type="char_string" length="32">
<description>ApplicationVersion</description>
<attribute side="server" code="0x0006" name="ApplicationVersion" define="APPLICATION_VERSION" type="char_string" length="32">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0007" define="APPLICATION_ALLOWED_VENDOR_LIST" type="array" entryType="vendor_id" length="32">
<description>AllowedVendorList</description>
<attribute side="server" code="0x0007" name="AllowedVendorList" define="APPLICATION_ALLOWED_VENDOR_LIST" type="array" entryType="vendor_id" length="32">
<access op="read" role="administer"/>
<mandatoryConform/>
</attribute>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@ limitations under the License.
</feature>
</features>

<attribute side="server" code="0x0000" define="APPLICATION_LAUNCHER_LIST" type="array" entryType="int16u" reportable="true" optional="true">
<description>CatalogList</description>
<attribute side="server" code="0x0000" name="CatalogList" define="APPLICATION_LAUNCHER_LIST" type="array" entryType="int16u" reportable="true" optional="true">
<mandatoryConform>
<feature name="AP"/>
</mandatoryConform>
</attribute>
<attribute side="server" code="0x0001" define="APPLICATION_LAUNCHER_CURRENT_APP" type="ApplicationEPStruct" isNullable="true" optional="true">
<description>CurrentApp</description>
<attribute side="server" code="0x0001" name="CurrentApp" define="APPLICATION_LAUNCHER_CURRENT_APP" type="ApplicationEPStruct" isNullable="true" optional="true">
<optionalConform/>
</attribute>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@ limitations under the License.
</feature>
</features>

<attribute side="server" code="0x0000" define="AUDIO_OUTPUT_LIST" type="array" entryType="OutputInfoStruct" length="254">
<description>OutputList</description>
<attribute side="server" code="0x0000" name="OutputList" define="AUDIO_OUTPUT_LIST" type="array" entryType="OutputInfoStruct" length="254">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0001" define="AUDIO_OUTPUT_CURRENT_OUTPUT" type="int8u">
<description>CurrentOutput</description>
<attribute side="server" code="0x0001" name="CurrentOutput" define="AUDIO_OUTPUT_CURRENT_OUTPUT" type="int8u">
<mandatoryConform/>
</attribute>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,73 +41,59 @@ limitations under the License.
<globalAttribute side="either" code="0xFFFD" value="4"/>

<!-- Ballast Configuration Attribute Set -->
<attribute side="server" code="0x0000" define="PHYSICAL_MIN_LEVEL" type="int8u" min="0x01" max="0xFE" default="0x01">
<description>PhysicalMinLevel</description>
<attribute side="server" code="0x0000" name="PhysicalMinLevel" define="PHYSICAL_MIN_LEVEL" type="int8u" min="0x01" max="0xFE" default="0x01">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0001" define="PHYSICAL_MAX_LEVEL" type="int8u" min="0x01" max="0xFE" default="0xFE">
<description>PhysicalMaxLevel</description>
<attribute side="server" code="0x0001" name="PhysicalMaxLevel" define="PHYSICAL_MAX_LEVEL" type="int8u" min="0x01" max="0xFE" default="0xFE">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0002" define="BALLAST_STATUS" type="BallastStatusBitmap" min="0x00" max="0x03" default="0x00" optional="true">
<description>BallastStatus</description>
<attribute side="server" code="0x0002" name="BallastStatus" define="BALLAST_STATUS" type="BallastStatusBitmap" min="0x00" max="0x03" default="0x00" optional="true">
<optionalConform/>
</attribute>
<!-- Ballast Settings Attribute Set -->
<attribute side="server" code="0x0010" define="MIN_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0x01">
<description>MinLevel</description>
<attribute side="server" code="0x0010" name="MinLevel" define="MIN_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0x01">
<access op="write" privilege="manage"/>
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0011" define="MAX_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0xFE">
<description>MaxLevel</description>
<attribute side="server" code="0x0011" name="MaxLevel" define="MAX_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0xFE">
<access op="write" privilege="manage"/>
<mandatoryConform/>
</attribute>
<!-- PowerOnLevel and PowerOnFadeTime are deprecated -->
<attribute side="server" code="0x0014" define="INTRINSIC_BALLAST_FACTOR" type="int8u" writable="true" isNullable="true" optional="true">
<description>IntrinsicBallastFactor</description>
<attribute side="server" code="0x0014" name="IntrinsicBallastFactor" define="INTRINSIC_BALLAST_FACTOR" type="int8u" writable="true" isNullable="true" optional="true">
<access op="write" privilege="manage"/>
<optionalConform/>
</attribute>
<attribute side="server" code="0x0015" define="BALLAST_FACTOR_ADJUSTMENT" type="int8u" min="0x64" writable="true" isNullable="true" optional="true">
<description>BallastFactorAdjustment</description>
<attribute side="server" code="0x0015" name="BallastFactorAdjustment" define="BALLAST_FACTOR_ADJUSTMENT" type="int8u" min="0x64" writable="true" isNullable="true" optional="true">
<access op="write" privilege="manage"/>
<optionalConform/>
</attribute>
<!-- Lamp Information Attribute Set -->
<attribute side="server" code="0x0020" define="LAMP_QUANTITY" type="int8u">
<description>LampQuantity</description>
<attribute side="server" code="0x0020" name="LampQuantity" define="LAMP_QUANTITY" type="int8u">
<mandatoryConform/>
</attribute>
<!-- Lamp Settings Attribute Set -->
<attribute side="server" code="0x0030" define="LAMP_TYPE" type="char_string" length="16" writable="true" optional="true">
<description>LampType</description>
<attribute side="server" code="0x0030" name="LampType" define="LAMP_TYPE" type="char_string" length="16" writable="true" optional="true">
<access op="write" privilege="manage"/>
<optionalConform/>
</attribute>
<attribute side="server" code="0x0031" define="LAMP_MANUFACTURER" type="char_string" length="16" writable="true" optional="true">
<description>LampManufacturer</description>
<attribute side="server" code="0x0031" name="LampManufacturer" define="LAMP_MANUFACTURER" type="char_string" length="16" writable="true" optional="true">
<access op="write" privilege="manage"/>
<optionalConform/>
</attribute>
<attribute side="server" code="0x0032" define="LAMP_RATED_HOURS" type="int24u" writable="true" isNullable="true" optional="true">
<description>LampRatedHours</description>
<attribute side="server" code="0x0032" name="LampRatedHours" define="LAMP_RATED_HOURS" type="int24u" writable="true" isNullable="true" optional="true">
<access op="write" privilege="manage"/>
<optionalConform/>
</attribute>
<attribute side="server" code="0x0033" define="LAMP_BURN_HOURS" type="int24u" writable="true" default="0x000000" isNullable="true" optional="true">
<description>LampBurnHours</description>
<attribute side="server" code="0x0033" name="LampBurnHours" define="LAMP_BURN_HOURS" type="int24u" writable="true" default="0x000000" isNullable="true" optional="true">
<access op="write" privilege="manage"/>
<optionalConform/>
</attribute>
<attribute side="server" code="0x0034" define="LAMP_ALARM_MODE" type="LampAlarmModeBitmap" min="0x00" max="0x01" writable="true" default="0x00" optional="true">
<description>LampAlarmMode</description>
<attribute side="server" code="0x0034" name="LampAlarmMode" define="LAMP_ALARM_MODE" type="LampAlarmModeBitmap" min="0x00" max="0x01" writable="true" default="0x00" optional="true">
<access op="write" privilege="manage"/>
<optionalConform/>
</attribute>
<attribute side="server" code="0x0035" define="LAMP_BURN_HOURS_TRIP_POINT" type="int24u" writable="true" isNullable="true" optional="true">
<description>LampBurnHoursTripPoint</description>
<attribute side="server" code="0x0035" name="LampBurnHoursTripPoint" define="LAMP_BURN_HOURS_TRIP_POINT" type="int24u" writable="true" isNullable="true" optional="true">
<access op="write" privilege="manage"/>
<optionalConform/>
</attribute>
Expand Down
Loading

0 comments on commit d0eeca1

Please sign in to comment.