Align naming in Mode Select cluster XML with the spec. (#24345)

* Align naming in Mode Select cluster XML with the spec. * Regenerate generated code.
project-chip · Aug 21, 2023 · 1037754 · 1037754
1 parent a78504e
commit 1037754
Show file tree

Hide file tree

Showing 24 changed files with 120 additions and 97 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -1777,13 +1777,13 @@ server cluster ModeSelect = 80 {
   }
 
   struct ModeOptionStruct {
-    char_string<32> label = 0;
+    char_string<64> label = 0;
     int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
+    SemanticTagStruct semanticTags[] = 2;
   }
 
-  struct SemanticTag {
-    enum16 mfgCode = 0;
+  struct SemanticTagStruct {
+    vendor_id mfgCode = 0;
     enum16 value = 1;
   }
 

diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
@@ -6,7 +6,7 @@ using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::ModeSelect;
 
 using ModeOptionStructType = Structs::ModeOptionStruct::Type;
-using SemanticTag          = Structs::SemanticTag::Type;
+using SemanticTag          = Structs::SemanticTagStruct::Type;
 template <typename T>
 using List               = app::DataModel::List<T>;
 using storage_value_type = const ModeOptionStructType;

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -1622,13 +1622,13 @@ server cluster ModeSelect = 80 {
   }
 
   struct ModeOptionStruct {
-    char_string<32> label = 0;
+    char_string<64> label = 0;
     int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
+    SemanticTagStruct semanticTags[] = 2;
   }
 
-  struct SemanticTag {
-    enum16 mfgCode = 0;
+  struct SemanticTagStruct {
+    vendor_id mfgCode = 0;
     enum16 value = 1;
   }
 

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -1536,13 +1536,13 @@ client cluster ModeSelect = 80 {
   }
 
   struct ModeOptionStruct {
-    char_string<32> label = 0;
+    char_string<64> label = 0;
     int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
+    SemanticTagStruct semanticTags[] = 2;
   }
 
-  struct SemanticTag {
-    enum16 mfgCode = 0;
+  struct SemanticTagStruct {
+    vendor_id mfgCode = 0;
     enum16 value = 1;
   }
 
@@ -1570,13 +1570,13 @@ server cluster ModeSelect = 80 {
   }
 
   struct ModeOptionStruct {
-    char_string<32> label = 0;
+    char_string<64> label = 0;
     int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
+    SemanticTagStruct semanticTags[] = 2;
   }
 
-  struct SemanticTag {
-    enum16 mfgCode = 0;
+  struct SemanticTagStruct {
+    vendor_id mfgCode = 0;
     enum16 value = 1;
   }
 

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -1513,13 +1513,13 @@ client cluster ModeSelect = 80 {
   }
 
   struct ModeOptionStruct {
-    char_string<32> label = 0;
+    char_string<64> label = 0;
     int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
+    SemanticTagStruct semanticTags[] = 2;
   }
 
-  struct SemanticTag {
-    enum16 mfgCode = 0;
+  struct SemanticTagStruct {
+    vendor_id mfgCode = 0;
     enum16 value = 1;
   }
 
@@ -1547,13 +1547,13 @@ server cluster ModeSelect = 80 {
   }
 
   struct ModeOptionStruct {
-    char_string<32> label = 0;
+    char_string<64> label = 0;
     int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
+    SemanticTagStruct semanticTags[] = 2;
   }
 
-  struct SemanticTag {
-    enum16 mfgCode = 0;
+  struct SemanticTagStruct {
+    vendor_id mfgCode = 0;
     enum16 value = 1;
   }
 

diff --git a/examples/placeholder/linux/static-supported-modes-manager.cpp b/examples/placeholder/linux/static-supported-modes-manager.cpp
@@ -6,7 +6,7 @@ using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::ModeSelect;
 
 using ModeOptionStructType = Structs::ModeOptionStruct::Type;
-using SemanticTag          = Structs::SemanticTag::Type;
+using SemanticTag          = Structs::SemanticTagStruct::Type;
 template <typename T>
 using List               = app::DataModel::List<T>;
 using storage_value_type = const ModeOptionStructType;

diff --git a/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml
@@ -17,17 +17,17 @@ limitations under the License.
 <configurator>
   <domain name="CHIP"/>
 
-  <struct name="SemanticTag">
+  <struct name="SemanticTagStruct">
     <cluster code="0x0050"/>
-    <item name="MfgCode" type="ENUM16"/>
+    <item name="MfgCode" type="vendor_id"/>
     <item name="Value" type="ENUM16" optional="false"/>
   </struct>
 
   <struct name="ModeOptionStruct">
     <cluster code="0x0050"/>
-    <item name="Label" type="CHAR_STRING" optional="false" length="32"/>
+    <item name="Label" type="CHAR_STRING" optional="false" length="64"/>
     <item name="Mode" type="INT8U" optional="false"/>
-    <item name="SemanticTags" type="SemanticTag" array="true" optional="false"/>
+    <item name="SemanticTags" type="SemanticTagStruct" array="true" optional="false"/>
   </struct>
 
   <cluster>

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -2022,13 +2022,13 @@ client cluster ModeSelect = 80 {
   }
 
   struct ModeOptionStruct {
-    char_string<32> label = 0;
+    char_string<64> label = 0;
     int8u mode = 1;
-    SemanticTag semanticTags[] = 2;
+    SemanticTagStruct semanticTags[] = 2;
   }
 
-  struct SemanticTag {
-    enum16 mfgCode = 0;
+  struct SemanticTagStruct {
+    vendor_id mfgCode = 0;
     enum16 value = 1;
   }
 

diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -4974,6 +4974,8 @@
               - ThreadMetricsStruct
           GeneralDiagnostics:
               - NetworkInterface
+          ModeSelect:
+              - SemanticTagStruct
       struct fields:
           UnitTesting:
               SimpleStruct:
@@ -5068,6 +5070,10 @@
                   - iPv4Addresses
                   - iPv6Addresses
                   - type
+          ModeSelect:
+              SemanticTagStruct:
+                  - mfgCode
+                  - value
       events:
           OTASoftwareUpdateRequestor:
               - StateTransition
@@ -5374,6 +5380,8 @@
               - ThreadMetrics
           GeneralDiagnostics:
               - NetworkInterfaceType
+          ModeSelect:
+              - SemanticTag
       struct fields:
           Descriptor:
               DeviceTypeStruct:
@@ -5521,6 +5529,8 @@
               ThreadMetricsStruct: ThreadMetrics
           GeneralDiagnostics:
               NetworkInterface: NetworkInterfaceType
+          ModeSelect:
+              SemanticTagStruct: SemanticTag
       struct fields:
           Descriptor:
               DeviceTypeStruct:

diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm