Update OffWithEffect arguments to be of type int8u per spec (#25132)

* Update OffWithEffect arguments to be of type int8u per spec * Update generated code
project-chip · Feb 16, 2024 · f788d01 · f788d01
1 parent c75205f
commit f788d01
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 31 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
@@ -322,7 +322,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {

diff --git a/examples/all-clusters-app/ameba/main/include/OnOffCommands.h b/examples/all-clusters-app/ameba/main/include/OnOffCommands.h
@@ -125,7 +125,7 @@ void ProcessOnOffUnicastBindingCommand(BindingCommandData * data, const EmberBin
 
     case Clusters::OnOff::Commands::OffWithEffect::Id:
         offwitheffectCommand.effectIdentifier = static_cast<Clusters::OnOff::OnOffEffectIdentifier>(data->args[0]);
-        offwitheffectCommand.effectVariant    = static_cast<Clusters::OnOff::OnOffDelayedAllOffEffectVariant>(data->args[1]);
+        offwitheffectCommand.effectVariant    = static_cast<uint8_t>(data->args[1]);
         Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
                                          offwitheffectCommand, onSuccess, onFailure);
         break;
@@ -172,7 +172,7 @@ void ProcessOnOffGroupBindingCommand(BindingCommandData * data, const EmberBindi
 
     case Clusters::OnOff::Commands::OffWithEffect::Id:
         offwitheffectCommand.effectIdentifier = static_cast<Clusters::OnOff::OnOffEffectIdentifier>(data->args[0]);
-        offwitheffectCommand.effectVariant    = static_cast<Clusters::OnOff::OnOffDelayedAllOffEffectVariant>(data->args[1]);
+        offwitheffectCommand.effectVariant    = static_cast<uint8_t>(data->args[1]);
         Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, offwitheffectCommand);
         break;
 

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 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {

diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -159,7 +159,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {

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 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {

diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter
@@ -159,7 +159,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {

diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter
@@ -159,7 +159,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {

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
@@ -159,7 +159,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -269,7 +269,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -330,7 +330,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -269,7 +269,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {
@@ -330,7 +330,7 @@ server cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {

diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp
@@ -394,7 +394,7 @@ bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const a
             if (effect != nullptr && effect->mOffWithEffectTrigger != nullptr)
             {
                 effect->mEffectIdentifier = effectId;
-                effect->mEffectVariant    = to_underlying(effectVariant);
+                effect->mEffectVariant    = effectVariant;
 
                 effect->mOffWithEffectTrigger(effect);
             }

diff --git a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml
@@ -80,7 +80,7 @@ limitations under the License.
     <command source="client" code="0x40" name="OffWithEffect" optional="true">
       <description>The OffWithEffect command allows devices to be turned off using enhanced ways of fading.</description>
       <arg name="EffectIdentifier" type="OnOffEffectIdentifier"/>
-      <arg name="EffectVariant" type="OnOffDelayedAllOffEffectVariant"/>
+      <arg name="EffectVariant" type="int8u"/>
     </command>
 
     <command source="client" code="0x41" name="OnWithRecallGlobalScene" optional="true">

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -280,7 +280,7 @@ client cluster OnOff = 6 {
 
   request struct OffWithEffectRequest {
     OnOffEffectIdentifier effectIdentifier = 0;
-    OnOffDelayedAllOffEffectVariant effectVariant = 1;
+    int8u effectVariant = 1;
   }
 
   request struct OnWithTimedOffRequest {

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/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/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/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h