Regenerate generated files.

project-chip · Jan 3, 2023 · 539c9d9 · 539c9d9
1 parent 5dc1493
commit 539c9d9
Show file tree

Hide file tree

Showing 22 changed files with 81 additions and 48 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
@@ -258,7 +258,7 @@ server cluster OnOff = 6 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
+    OnOffEffectIdentifier effectIdentifier = 0;
     OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 

diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -154,7 +154,7 @@ server cluster OnOff = 6 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
+    OnOffEffectIdentifier effectIdentifier = 0;
     OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 

diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -150,7 +150,7 @@ server cluster OnOff = 6 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
+    OnOffEffectIdentifier effectIdentifier = 0;
     OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 

diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -154,7 +154,7 @@ server cluster OnOff = 6 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
+    OnOffEffectIdentifier effectIdentifier = 0;
     OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 

diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -150,7 +150,7 @@ server cluster OnOff = 6 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
+    OnOffEffectIdentifier effectIdentifier = 0;
     OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -247,7 +247,7 @@ client cluster OnOff = 6 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
+    OnOffEffectIdentifier effectIdentifier = 0;
     OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 
@@ -308,7 +308,7 @@ server cluster OnOff = 6 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
+    OnOffEffectIdentifier effectIdentifier = 0;
     OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -247,7 +247,7 @@ client cluster OnOff = 6 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
+    OnOffEffectIdentifier effectIdentifier = 0;
     OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 
@@ -308,7 +308,7 @@ server cluster OnOff = 6 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
+    OnOffEffectIdentifier effectIdentifier = 0;
     OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -270,7 +270,7 @@ client cluster OnOff = 6 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct OffWithEffectRequest {
-    OnOffEffectIdentifier effectId = 0;
+    OnOffEffectIdentifier effectIdentifier = 0;
     OnOffDelayedAllOffEffectVariant effectVariant = 1;
   }
 

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/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
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
@@ -4917,6 +4917,9 @@
               RegisterClientMonitoring:
                   - clientNodeId
                   - iCid
+          OnOff:
+              OffWithEffect:
+                  - effectIdentifier
       structs:
           OTASoftwareUpdateRequestor:
               - ProviderLocation
@@ -5153,6 +5156,10 @@
               - PirOccupiedToUnoccupiedDelay
               - PirUnoccupiedToOccupiedDelay
               - PirUnoccupiedToOccupiedThreshold
+      command fields:
+          OnOff:
+              OffWithEffect:
+                  - effectId
       structs:
           Descriptor:
               - DeviceType
@@ -5187,3 +5194,7 @@
           Switch:
               MultiPressComplete:
                   previousPosition: newPosition
+      command fields:
+          OnOff:
+              OffWithEffect:
+                  effectIdentifier: effectId
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
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
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h