Replace OCTET_STRING with now supported CHAR_STRING

project-chip · Oct 23, 2021 · 9e50a6e · 9e50a6e
1 parent a32184c
commit 9e50a6e
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 34 deletions.
diff --git a/src/app/zap-templates/zcl/data-model/chip/bridged-actions-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/bridged-actions-cluster.xml
@@ -68,8 +68,7 @@ limitations under the License.
   <struct name="ActionStruct">
     <cluster code="0x0025"/>
     <item name="ActionID"          type="INT16U"/>
-    <!-- TODO: Change Name to CHAR_STRING once it is supported #6112 -->
-    <item name="Name"              type="OCTET_STRING" length="32"/>
+    <item name="Name"              type="CHAR_STRING" length="32"/>
     <item name="Type"              type="ActionTypeEnum"/>
     <item name="EndpointListID"    type="INT16U"/>
     <item name="SupportedCommands" type="INT16U"/>
@@ -79,8 +78,7 @@ limitations under the License.
   <struct name="EndpointListStruct">
     <cluster code="0x0025"/>
     <item name="EndpointListID" type="INT16U"/>
-    <!-- TODO: Change Name to CHAR_STRING once it is supported #6112 -->
-    <item name="Name"           type="OCTET_STRING" length="32"/>
+    <item name="Name"           type="CHAR_STRING" length="32"/>
     <item name="Type"           type="EndpointListTypeEnum"/>
     <!-- TODO: Change Endpoints to INT16U array once it is supported -->
     <item name="Endpoints"      type="OCTET_STRING" length="256"/>

diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
diff --git a/src/controller/python/chip/clusters/CHIPClusters.cpp b/src/controller/python/chip/clusters/CHIPClusters.cpp
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
@@ -4177,7 +4177,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                         ClusterObjectFieldDescriptor(
                             Label="ActionID", Tag=0, Type=uint),
                         ClusterObjectFieldDescriptor(
-                            Label="Name", Tag=1, Type=bytes),
+                            Label="Name", Tag=1, Type=str),
                         ClusterObjectFieldDescriptor(
                             Label="Type", Tag=2, Type=BridgedActions.Enums.ActionTypeEnum),
                         ClusterObjectFieldDescriptor(
@@ -4189,7 +4189,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     ])
 
             ActionID: 'uint' = None
-            Name: 'bytes' = None
+            Name: 'str' = None
             Type: 'BridgedActions.Enums.ActionTypeEnum' = None
             EndpointListID: 'uint' = None
             SupportedCommands: 'uint' = None
@@ -4204,15 +4204,15 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                         ClusterObjectFieldDescriptor(
                             Label="EndpointListID", Tag=0, Type=uint),
                         ClusterObjectFieldDescriptor(
-                            Label="Name", Tag=1, Type=bytes),
+                            Label="Name", Tag=1, Type=str),
                         ClusterObjectFieldDescriptor(
                             Label="Type", Tag=2, Type=BridgedActions.Enums.EndpointListTypeEnum),
                         ClusterObjectFieldDescriptor(
                             Label="Endpoints", Tag=3, Type=bytes),
                     ])
 
             EndpointListID: 'uint' = None
-            Name: 'bytes' = None
+            Name: 'str' = None
             Type: 'BridgedActions.Enums.EndpointListTypeEnum' = None
             Endpoints: 'bytes' = None
 

diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm
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/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h