Update xml (#9912)

* update xml --update xml with array for struct item --update InterfaceType for NetworkInterfaceType struct * run codegen
project-chip · Sep 24, 2021 · 327a471 · 327a471
1 parent 2d3af17
commit 327a471
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 49 deletions.
diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
@@ -134,6 +134,6 @@ limitations under the License.
     <cluster code="0x050a"/>
     <item name="Type" type="ContentLaunchParameterEnum"/>
     <item name="Value" type="CHAR_STRING"/>
-    <item name="ExternalIDList" type="ARRAY" entryType="ContentLaunchAdditionalInfo" length="254"/>
+    <item name="ExternalIDList" type="ContentLaunchAdditionalInfo" array="true" length="254"/>
   </struct>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
@@ -74,7 +74,7 @@ limitations under the License.
     <item name="OffPremiseServicesReachableIPv6" type="BOOLEAN"/>
     <!-- TODO: HWADR not supported yet -->
     <item name="HardwareAddress" type="OCTET_STRING" length="8"/>
-    <item name="Type" type="ENUM8"/>
+    <item name="Type" type="InterfaceType"/>
   </struct>
   <cluster>
     <domain>General</domain>

diff --git a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
@@ -16,7 +16,6 @@ limitations under the License.
 -->
 <configurator>
   <domain name="CHIP"/>
-
   <struct name="TestListStructOctet">
     <cluster code="0x050F"/>
     <item name="fabricIndex" type="INT64U"/>
@@ -33,40 +32,36 @@ limitations under the License.
 
   <struct name="SimpleStruct">
     <cluster code="0x050F"/>
-    <item name="a" type="UINT8U" optional="false"/>
+    <item name="a" type="INT8U" optional="false"/>
     <item name="b" type="BOOLEAN" optional="false"/>
-    <item name="c" define="SIMPLE_ENUM" type="ENUM8" optional="false"/>
+    <item name="c" type="SimpleEnum" optional="false"/>
     <item name="d" type="OCTET_STRING" optional="false"/>
     <item name="e" type="CHAR_STRING" optional="false"/>
   </struct>
 
   <struct name="NestedStruct">
     <cluster code="0x050F"/>
-    <item name="a" type="UINT8U" optional="false"/>
+    <item name="a" type="INT8U" optional="false"/>
     <item name="b" type="BOOLEAN" optional="false"/>
-    <!--
     <item name="c" type="SimpleStruct" optional="false"/>
-    -->
   </struct>
 
   <struct name="NestedStructList">
     <cluster code="0x050F"/>
-    <item name="a" type="UINT8U" optional="false"/>
+    <item name="a" type="INT8U" optional="false"/>
     <item name="b" type="BOOLEAN" optional="false"/>
-     <!--
     <item name="c" type="SimpleStruct" optional="false"/>
-     -->
     <item name="d" type="SimpleStruct" array="true" optional="false"/>
-    <item name="e" type="UINT32U" array="true" optional="false"/>
+    <item name="e" type="INT32U" array="true" optional="false"/>
     <item name="f" type="OCTET_STRING" array="true" optional="false"/>
-    <item name="g" type="UINT8U" array="true" optional="false"/>
+    <item name="g" type="INT8U" array="true" optional="false"/>
   </struct>
 
   <struct name="DoubleNestedStructList">
     <cluster code="0x050F"/>
     <item name="a" type="NestedStructList" array="true" optional="false"/>
   </struct>
-   
+
   <cluster>
     <domain>CHIP</domain>
     <name>Test Cluster</name>

diff --git a/zzz_generated/all-clusters-app/zap-generated/attribute-size.cpp b/zzz_generated/all-clusters-app/zap-generated/attribute-size.cpp
diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h
diff --git a/zzz_generated/bridge-app/zap-generated/attribute-size.cpp b/zzz_generated/bridge-app/zap-generated/attribute-size.cpp
diff --git a/zzz_generated/lighting-app/zap-generated/attribute-size.cpp b/zzz_generated/lighting-app/zap-generated/attribute-size.cpp
diff --git a/zzz_generated/lock-app/zap-generated/attribute-size.cpp b/zzz_generated/lock-app/zap-generated/attribute-size.cpp
diff --git a/zzz_generated/pump-app/zap-generated/attribute-size.cpp b/zzz_generated/pump-app/zap-generated/attribute-size.cpp
diff --git a/zzz_generated/pump-controller-app/zap-generated/attribute-size.cpp b/zzz_generated/pump-controller-app/zap-generated/attribute-size.cpp
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/attribute-size.cpp b/zzz_generated/temperature-measurement-app/zap-generated/attribute-size.cpp
diff --git a/zzz_generated/thermostat/zap-generated/attribute-size.cpp b/zzz_generated/thermostat/zap-generated/attribute-size.cpp
diff --git a/zzz_generated/tv-app/zap-generated/attribute-size.cpp b/zzz_generated/tv-app/zap-generated/attribute-size.cpp
diff --git a/zzz_generated/tv-casting-app/zap-generated/attribute-size.cpp b/zzz_generated/tv-casting-app/zap-generated/attribute-size.cpp
diff --git a/zzz_generated/window-app/zap-generated/attribute-size.cpp b/zzz_generated/window-app/zap-generated/attribute-size.cpp