amend 2 (remove default, enum, a-g)

ethanzhouyc · Oct 16, 2024 · 65297b8 · 65297b8
1 parent 94f354d
commit 65297b8
Show file tree

Hide file tree

Showing 36 changed files with 201 additions and 308 deletions.
diff --git a/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml
@@ -178,11 +178,11 @@ limitations under the License.
       <arg name="Duration" type="int32u"/>
     </command>
 
-    <event side="server" code="0x00" priority="info" name="StateChanged">
-      <description>This event SHALL be generated when there is a change in the State of an ActionID during the execution of an action and the most recent command using that ActionID used an InvokeID data field.</description>
+    <event side="server" code="0x00" priority="info" name="StateChanged" optional="false">
+      <description>This event SHALL be generated when there is a change in the Status of an ActionID.</description>
       <field id="0" name="ActionID" type="int16u"/>
       <field id="1" name="InvokeID" type="int32u"/>
-      <field id="2" name="NewState" type="ActionStateEnum" min="0x00" max="0x03"/>
+      <field id="2" name="NewState" type="ActionStateEnum" />
       <mandatoryConform/>
     </event>
 

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
@@ -43,7 +43,7 @@ limitations under the License.
         <optionalConform/>
       </feature>
     </features>
-    <attribute side="server" code="0x0000" define="WINDOW_STATUS" type="CommissioningWindowStatusEnum" min="0x00" max="0x02">
+    <attribute side="server" code="0x0000" define="WINDOW_STATUS" type="CommissioningWindowStatusEnum">
       <description>WindowStatus</description>
       <mandatoryConform/>
     </attribute>

diff --git a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml
@@ -32,7 +32,7 @@ limitations under the License.
       <description>VendorID</description>
       <optionalConform/>
     </attribute>
-    <attribute side="server" code="0x0002" define="APPLICATION_NAME" type="char_string">
+    <attribute side="server" code="0x0002" define="APPLICATION_NAME" type="long_char_string" length="256">
       <description>ApplicationName</description>
       <mandatoryConform/>
     </attribute>
@@ -44,15 +44,15 @@ limitations under the License.
       <description>Application</description>
       <mandatoryConform/>
     </attribute>
-    <attribute side="server" code="0x0005" define="APPLICATION_STATUS" type="ApplicationStatusEnum" min="0x00" max="0x03">
+    <attribute side="server" code="0x0005" define="APPLICATION_STATUS" type="ApplicationStatusEnum" default="0x01" min="0x00" max="0xFF">
       <description>Status</description>
       <mandatoryConform/>
     </attribute>
     <attribute side="server" code="0x0006" define="APPLICATION_VERSION" type="char_string" length="32">
       <description>ApplicationVersion</description>
       <mandatoryConform/>
     </attribute>
-    <attribute side="server" code="0x0007" define="APPLICATION_ALLOWED_VENDOR_LIST" type="array" entryType="vendor_id">
+    <attribute side="server" code="0x0007" define="APPLICATION_ALLOWED_VENDOR_LIST" type="array" entryType="vendor_id" length="32">
       <description>AllowedVendorList</description>
       <access op="read" role="administer"/>
       <mandatoryConform/>

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
@@ -30,7 +30,7 @@ limitations under the License.
         <optionalConform/>
       </feature>
     </features>
-    <attribute side="server" code="0x0000" define="APPLICATION_LAUNCHER_LIST" type="array" entryType="int16u" optional="true">
+    <attribute side="server" code="0x0000" define="APPLICATION_LAUNCHER_LIST" type="array" entryType="int16u" reportable="true" optional="true">
       <description>CatalogList</description>
       <mandatoryConform>
         <feature name="AP"/>

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
@@ -30,7 +30,7 @@ limitations under the License.
         <optionalConform/>
       </feature>
     </features>
-    <attribute side="server" code="0x0000" define="AUDIO_OUTPUT_LIST" type="array" entryType="OutputInfoStruct">
+    <attribute side="server" code="0x0000" define="AUDIO_OUTPUT_LIST" type="array" entryType="OutputInfoStruct" length="254">
       <description>OutputList</description>
       <mandatoryConform/>
     </attribute>

diff --git a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml
@@ -65,7 +65,7 @@ limitations under the License.
       <mandatoryConform/>
     </attribute>
     <!-- PowerOnLevel and PowerOnFadeTime are deprecated -->
-    <attribute side="server" code="0x0014" define="INTRINSIC_BALLAST_FACTOR" type="int8u" writable="true" isNullable="true" optional="true" min="0" max="254">
+    <attribute side="server" code="0x0014" define="INTRINSIC_BALLAST_FACTOR" type="int8u" writable="true" isNullable="true" optional="true">
       <description>IntrinsicBallastFactor</description>
       <access op="write" privilege="manage"/>
       <optionalConform/>

diff --git a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
@@ -72,9 +72,8 @@ limitations under the License.
     <description>This cluster provides attributes and events for determining basic information about Nodes, which supports both
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location.</description>
-    <client init="false" tick="false">true</client>
-    <server init="false" tick="false">true</server>
-    <globalAttribute side="either" code="0xFFFD" value="4"/>
+    <globalAttribute side="either" code="0xFFFD" value="3"/>
+
     <attribute side="server" code="0" define="DATA_MODEL_REVISION" type="int16u">
       <description>DataModelRevision</description>
       <mandatoryConform/>
@@ -165,21 +164,18 @@ limitations under the License.
       <description>ProductAppearance</description>
       <optionalConform/>
     </attribute>
-    <attribute side="server" code="21" define="SPECIFICATION_VERSION" type="int32u" default="0">
+    <attribute side="server" code="21" define="SPECIFICATION_VERSION" type="int32u">
       <description>SpecificationVersion</description>
       <mandatoryConform/>
     </attribute>
-    <attribute side="server" code="22" define="MAX_PATHS_PER_INVOKE" type="int16u" min="1" default="1">
+    <attribute side="server" code="22" define="MAX_PATHS_PER_INVOKE" type="int16u">
       <description>MaxPathsPerInvoke</description>
       <mandatoryConform/>
     </attribute>
-    <attribute code="0x0017" side="server" define="DEVICE_LOCATION" type="LocationDescriptorStruct" isNullable="true" writable="true" optional="true">
-      <description>DeviceLocation</description>
-      <access op="write" privilege="administer"/>
-      <optionalConform/>
-    </attribute>
-    <event side="server" code="0x00" name="StartUp" priority="critical">
-      <description>The StartUp event SHALL be emitted by a Node as soon as reasonable after completing a boot or reboot process.</description>      <field id="0" name="SoftwareVersion" type="int32u"/>
+
+    <event side="server" code="0x00" name="StartUp" priority="critical" optional="false">
+      <description>The StartUp event SHALL be emitted by a Node as soon as reasonable after completing a boot or reboot process.</description>
+      <field id="0" name="SoftwareVersion" type="int32u"/>
       <mandatoryConform/>
     </event>
     <event side="server" code="0x01" name="ShutDown" priority="critical" optional="true">

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
@@ -75,7 +75,7 @@ limitations under the License.
         <feature name="SENSLVL"/>
       </optionalConform>
     </attribute>
-    <attribute side="server" code="0x0003" define="ALARMS_ACTIVE" type="AlarmModeBitmap" optional="true" default="0x00">
+    <attribute side="server" code="0x0003" define="ALARMS_ACTIVE" type="AlarmModeBitmap" optional="true">
       <description>AlarmsActive</description>
       <mandatoryConform>
         <orTerm>
@@ -84,7 +84,7 @@ limitations under the License.
         </orTerm>
       </mandatoryConform>
     </attribute>
-    <attribute side="server" code="0x0004" define="ALARMS_SUPPRESSED" type="AlarmModeBitmap" optional="true" default="0x00">
+    <attribute side="server" code="0x0004" define="ALARMS_SUPPRESSED" type="AlarmModeBitmap" optional="true">
       <description>AlarmsSuppressed</description>
       <mandatoryConform>
         <feature name="SPRS"/>
@@ -99,7 +99,7 @@ limitations under the License.
         </orTerm>
       </optionalConform>
     </attribute>
-    <attribute side="server" code="0x0006" define="ALARMS_SUPPORTED" type="AlarmModeBitmap" optional="true" default="0x00">
+    <attribute side="server" code="0x0006" define="ALARMS_SUPPORTED" type="AlarmModeBitmap" optional="true">
       <description>AlarmsSupported</description>
       <mandatoryConform>
         <orTerm>

diff --git a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml
@@ -77,104 +77,47 @@ limitations under the License.
           </feature>
         </features>
 
-        <attribute side="server" code="1"  define="VENDOR_NAME"               type="char_string"               length="32"                              optional="true">
-          <description>VendorName</description>
-          <optionalConform/>
-        </attribute>
-        <attribute side="server" code="2"  define="VENDOR_ID"                 type="vendor_id"                                                          optional="true">
-          <description>VendorID</description>
-          <optionalConform/>
-        </attribute>
-        <attribute side="server" code="3"  define="PRODUCT_NAME"              type="char_string"               length="32"                              optional="true">
-          <description>ProductName</description>
-          <optionalConform/>
-        </attribute>
+        <attribute side="server" code="1"  define="VENDOR_NAME"               type="char_string"               length="32"                              optional="true">VendorName</attribute>
+        <attribute side="server" code="2"  define="VENDOR_ID"                 type="vendor_id"                                                          optional="true">VendorID</attribute>
+        <attribute side="server" code="3"  define="PRODUCT_NAME"              type="char_string"               length="32"                              optional="true">ProductName</attribute>
         <attribute side="server" code="4"  define="PRODUCT_ID"                type="int16u"  optional="true">ProductID</attribute>
-        <attribute side="server" code="5"  define="NODE_LABEL"                type="char_string"               length="32"  default=""  writable="true" optional="true">
-          <description>NodeLabel</description>
-        </attribute>
-        <attribute side="server" code="7"  define="HARDWARE_VERSION"          type="int16u"                                 default="0"                 optional="true">
-          <description>HardwareVersion</description>
-          <optionalConform/>
-        </attribute>
-        <attribute side="server" code="8"  define="HARDWARE_VERSION_STRING"   type="char_string" minLength="1" length="64"                              optional="true">
-          <description>HardwareVersionString</description>
-          <optionalConform/>
-        </attribute>
-        <attribute side="server" code="9"  define="SOFTWARE_VERSION"          type="int32u"                                 default="0"                 optional="true">
-          <description>SoftwareVersion</description>
-          <optionalConform/>
-        </attribute>
-        <attribute side="server" code="10" define="SOFTWARE_VERSION_STRING"   type="char_string" minLength="1" length="64"                              optional="true">
-          <description>SoftwareVersionString</description>
-          <optionalConform/>
-        </attribute>
-        <attribute side="server" code="11" define="MANUFACTURING_DATE"        type="char_string" minLength="8" length="16"                              optional="true">
-          <description>ManufacturingDate</description>
-          <optionalConform/>
-        </attribute>
-        <attribute side="server" code="12" define="PART_NUMBER"               type="char_string"               length="32"                              optional="true">
-          <description>PartNumber</description>
-          <optionalConform/>
-        </attribute>
-        <attribute side="server" code="13" define="PRODUCT_URL"               type="long_char_string"          length="256"                             optional="true">
-          <description>ProductURL</description>
-          <optionalConform/>
-        </attribute>
-        <attribute side="server" code="14" define="PRODUCT_LABEL"             type="char_string"               length="64"                              optional="true">
-          <description>ProductLabel</description>
-          <optionalConform/>
-        </attribute>
-        <attribute side="server" code="15" define="SERIAL_NUMBER"             type="char_string"               length="32"                              optional="true">
-          <description>SerialNumber</description>
-          <optionalConform/>
-        </attribute>
-        <attribute side="server" code="17" define="REACHABLE"                 type="boolean"                                default="1"                 optional="false">
-          <description>Reachable</description>
-          <mandatoryConform/>
-        </attribute>
-        <attribute side="server" code="18" define="UNIQUE_ID"                 type="char_string"               length="32"                              optional="false">
-          <description>UniqueID</description>
-          <mandatoryConform/>
-        </attribute>
-        <attribute side="server" code="20" define="PRODUCT_APPEARANCE"        type="ProductAppearanceStruct"                                            optional="true">
-          <description>ProductAppearance</description>
-          <optionalConform/>
-        </attribute>
+        <attribute side="server" code="5"  define="NODE_LABEL"                type="char_string"               length="32"  default=""  writable="true" optional="true">NodeLabel</attribute>
+        <attribute side="server" code="7"  define="HARDWARE_VERSION"          type="int16u"                                 default="0"                 optional="true">HardwareVersion</attribute>
+        <attribute side="server" code="8"  define="HARDWARE_VERSION_STRING"   type="char_string" minLength="1" length="64"                              optional="true">HardwareVersionString</attribute>
+        <attribute side="server" code="9"  define="SOFTWARE_VERSION"          type="int32u"                                 default="0"                 optional="true">SoftwareVersion</attribute>
+        <attribute side="server" code="10" define="SOFTWARE_VERSION_STRING"   type="char_string" minLength="1" length="64"                              optional="true">SoftwareVersionString</attribute>
+        <attribute side="server" code="11" define="MANUFACTURING_DATE"        type="char_string" minLength="8" length="16"                              optional="true">ManufacturingDate</attribute>
+        <attribute side="server" code="12" define="PART_NUMBER"               type="char_string"               length="32"                              optional="true">PartNumber</attribute>
+        <attribute side="server" code="13" define="PRODUCT_URL"               type="long_char_string"          length="256"                             optional="true">ProductURL</attribute>
+        <attribute side="server" code="14" define="PRODUCT_LABEL"             type="char_string"               length="64"                              optional="true">ProductLabel</attribute>
+        <attribute side="server" code="15" define="SERIAL_NUMBER"             type="char_string"               length="32"                              optional="true">SerialNumber</attribute>
+        <attribute side="server" code="17" define="REACHABLE"                 type="boolean"                                default="1"                 optional="false">Reachable</attribute>
+        <attribute side="server" code="18" define="UNIQUE_ID"                 type="char_string"               length="32"                              optional="false">UniqueID</attribute>
+        <attribute side="server" code="20" define="PRODUCT_APPEARANCE"        type="ProductAppearanceStruct"                                            optional="true">ProductAppearance</attribute>
 
         <command source="client" code="0x80" name="KeepActive" optional="true">
           <description> The server SHALL attempt to keep the devices specified active for StayActiveDuration milliseconds when they are next active.</description>
           <arg id="0" name="StayActiveDuration" type="int32u"/>
           <arg id="1" name="TimeoutMs" type="int32u" min="30000" max="3600000"/>
-          <mandatoryConform>
-            <feature name="BIS"/>
-          </mandatoryConform>
         </command>
 
         <event side="server" code="0x00" name="StartUp" priority="critical" optional="true">
             <description>The StartUp event SHALL be emitted by a Node as soon as reasonable after completing a boot or reboot process.</description>
             <field id="0" name="SoftwareVersion" type="int32u"/>
-            <optionalConform/>
         </event>
         <event side="server" code="0x01" name="ShutDown" priority="critical" optional="true">
             <description>The ShutDown event SHOULD be emitted by a Node prior to any orderly shutdown sequence on a best-effort basis.</description>
-            <optionalConform/>
         </event>
         <event side="server" code="0x02" name="Leave" priority="info" optional="true">
             <description>The Leave event SHOULD be emitted by a Node prior to permanently leaving the Fabric.</description>
-            <optionalConform/>
         </event>
         <event side="server" code="0x03" name="ReachableChanged" priority="info">
             <description>This event SHALL be generated when there is a change in the Reachable attribute.</description>
             <field id="0" name="ReachableNewValue" type="boolean"/>
-            <mandatoryConform/>
         </event>
         <event side="server" code="0x80" name="ActiveChanged" priority="info" optional="true" apiMaturity="provisional">
             <description>This event (when supported) SHALL be generated the next time a bridged device becomes active after a KeepActive command is received.</description>
             <field id="0" name="PromisedActiveDuration" type="int32u"/>
-            <mandatoryConform>
-              <feature name="BIS"/>
-            </mandatoryConform>
         </event>
 
     </cluster>

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
@@ -40,7 +40,7 @@ limitations under the License.
         <optionalConform/>
       </feature>
     </features>
-    <attribute side="server" code="0x0000" define="CHANNEL_LIST" type="array" entryType="ChannelInfoStruct" optional="true">
+    <attribute side="server" code="0x0000" define="CHANNEL_LIST" type="array" entryType="ChannelInfoStruct" length="254" optional="true">
       <description>ChannelList</description>
       <mandatoryConform>
         <feature name="CL"/>

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
@@ -169,7 +169,7 @@ limitations under the License.
       <optionalConform/>
     </attribute>
     <!-- COMPENSATION_TEXT -->
-    <attribute side="server" code="0x0007" define="COLOR_CONTROL_COLOR_TEMPERATURE" type="int16u" max="0xFEFF" reportable="true" default="0x00FA" optional="true">
+    <attribute side="server" code="0x0007" define="COLOR_CONTROL_COLOR_TEMPERATURE" type="int16u" min="0x0001" max="0xFEFF" reportable="true" default="0x00FA" optional="true">
       <description>ColorTemperatureMireds</description>
       <mandatoryConform>
         <feature name="CT"/>
@@ -502,7 +502,7 @@ limitations under the License.
       <optionalConform/>
     </attribute>
     <!-- COLOR_POINT_B_INTENSITY -->
-    <attribute side="server" code="0x400D" define="COLOR_CONTROL_TEMPERATURE_LEVEL_MIN_MIREDS" type="int16u" max="0xFFFF" optional="true">
+    <attribute side="server" code="0x400D" define="COLOR_CONTROL_TEMPERATURE_LEVEL_MIN_MIREDS" type="int16u" optional="true">
       <description>CoupleColorTempToLevelMinMireds</description>
       <mandatoryConform>
         <orTerm>
@@ -671,7 +671,6 @@ limitations under the License.
         <feature name="CT"/>
       </mandatoryConform>
     </command>
-
   </cluster>
 
   <clusterExtension code="0x0300">