From dac72d34de116b8aec9252c63c54c9e3da31696c Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Tue, 31 Oct 2023 16:51:30 -0400
Subject: [PATCH] Fix ZAP CI. (#30138)

More PRs landed that have merge conflicts with each other.
---
 .../MTRAttributeTLVValueDecoder.mm            | 10 +++
 .../zap-generated/cluster/Commands.h          | 62 +++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index fe63b938dd74d2..f6594bfd3a1e5a 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -6463,6 +6463,7 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
 {
     using namespace Clusters::MicrowaveOvenControl;
     switch (aAttributeId) {
+#if MTR_ENABLE_PROVISIONAL
     case Attributes::CookTime::Id: {
         using TypeInfo = Attributes::CookTime::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6474,6 +6475,8 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
     case Attributes::PowerSetting::Id: {
         using TypeInfo = Attributes::PowerSetting::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6485,6 +6488,8 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinPower::Id: {
         using TypeInfo = Attributes::MinPower::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6496,6 +6501,8 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxPower::Id: {
         using TypeInfo = Attributes::MaxPower::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6507,6 +6514,8 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
     case Attributes::PowerStep::Id: {
         using TypeInfo = Attributes::PowerStep::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6518,6 +6527,7 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
+#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 1e434271064beb..8886f8061f74eb 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -62530,6 +62530,7 @@ class SubscribeAttributeDishwasherAlarmClusterRevision : public SubscribeAttribu
 
 #endif // MTR_ENABLE_PROVISIONAL
 #endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
 | Cluster MicrowaveOvenControl                                        | 0x005F |
 |------------------------------------------------------------------------------|
@@ -62553,6 +62554,7 @@ class SubscribeAttributeDishwasherAlarmClusterRevision : public SubscribeAttribu
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
+#if MTR_ENABLE_PROVISIONAL
 /*
  * Command SetCookingParameters
  */
@@ -62616,6 +62618,8 @@ class MicrowaveOvenControlSetCookingParameters : public ClusterCommand {
     chip::app::Clusters::MicrowaveOvenControl::Commands::SetCookingParameters::Type mRequest;
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
 /*
  * Command AddMoreTime
  */
@@ -62663,6 +62667,10 @@ class MicrowaveOvenControlAddMoreTime : public ClusterCommand {
     chip::app::Clusters::MicrowaveOvenControl::Commands::AddMoreTime::Type mRequest;
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute CookTime
  */
@@ -62745,6 +62753,9 @@ class SubscribeAttributeMicrowaveOvenControlCookTime : public SubscribeAttribute
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute PowerSetting
  */
@@ -62827,6 +62838,9 @@ class SubscribeAttributeMicrowaveOvenControlPowerSetting : public SubscribeAttri
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute MinPower
  */
@@ -62909,6 +62923,9 @@ class SubscribeAttributeMicrowaveOvenControlMinPower : public SubscribeAttribute
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute MaxPower
  */
@@ -62991,6 +63008,9 @@ class SubscribeAttributeMicrowaveOvenControlMaxPower : public SubscribeAttribute
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute PowerStep
  */
@@ -63073,6 +63093,9 @@ class SubscribeAttributeMicrowaveOvenControlPowerStep : public SubscribeAttribut
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute GeneratedCommandList
  */
@@ -63155,6 +63178,9 @@ class SubscribeAttributeMicrowaveOvenControlGeneratedCommandList : public Subscr
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute AcceptedCommandList
  */
@@ -63237,6 +63263,7 @@ class SubscribeAttributeMicrowaveOvenControlAcceptedCommandList : public Subscri
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 
 /*
@@ -63322,6 +63349,7 @@ class SubscribeAttributeMicrowaveOvenControlEventList : public SubscribeAttribut
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
 
 /*
  * Attribute AttributeList
@@ -63405,6 +63433,9 @@ class SubscribeAttributeMicrowaveOvenControlAttributeList : public SubscribeAttr
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute FeatureMap
  */
@@ -63487,6 +63518,9 @@ class SubscribeAttributeMicrowaveOvenControlFeatureMap : public SubscribeAttribu
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute ClusterRevision
  */
@@ -63569,6 +63603,8 @@ class SubscribeAttributeMicrowaveOvenControlClusterRevision : public SubscribeAt
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
 | Cluster OperationalState                                            | 0x0060 |
@@ -157294,44 +157330,70 @@ void registerClusterDishwasherAlarm(Commands & commands)
 }
 void registerClusterMicrowaveOvenControl(Commands & commands)
 {
+#if MTR_ENABLE_PROVISIONAL
     using namespace chip::app::Clusters::MicrowaveOvenControl;
 
     const char * clusterName = "MicrowaveOvenControl";
 
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
+#if MTR_ENABLE_PROVISIONAL
         make_unique<MicrowaveOvenControlSetCookingParameters>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<MicrowaveOvenControlAddMoreTime>(), //
+#endif // MTR_ENABLE_PROVISIONAL
         make_unique<ReadAttribute>(Id), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadMicrowaveOvenControlCookTime>(), //
         make_unique<SubscribeAttributeMicrowaveOvenControlCookTime>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadMicrowaveOvenControlPowerSetting>(), //
         make_unique<SubscribeAttributeMicrowaveOvenControlPowerSetting>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadMicrowaveOvenControlMinPower>(), //
         make_unique<SubscribeAttributeMicrowaveOvenControlMinPower>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadMicrowaveOvenControlMaxPower>(), //
         make_unique<SubscribeAttributeMicrowaveOvenControlMaxPower>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadMicrowaveOvenControlPowerStep>(), //
         make_unique<SubscribeAttributeMicrowaveOvenControlPowerStep>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadMicrowaveOvenControlGeneratedCommandList>(), //
         make_unique<SubscribeAttributeMicrowaveOvenControlGeneratedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadMicrowaveOvenControlAcceptedCommandList>(), //
         make_unique<SubscribeAttributeMicrowaveOvenControlAcceptedCommandList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
         make_unique<ReadMicrowaveOvenControlEventList>(), //
         make_unique<SubscribeAttributeMicrowaveOvenControlEventList>(), //
 #endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadMicrowaveOvenControlAttributeList>(), //
         make_unique<SubscribeAttributeMicrowaveOvenControlAttributeList>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadMicrowaveOvenControlFeatureMap>(), //
         make_unique<SubscribeAttributeMicrowaveOvenControlFeatureMap>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
         make_unique<ReadMicrowaveOvenControlClusterRevision>(), //
         make_unique<SubscribeAttributeMicrowaveOvenControlClusterRevision>(), //
+#endif // MTR_ENABLE_PROVISIONAL
     };
 
     commands.RegisterCluster(clusterName, clusterCommands);
+#endif // MTR_ENABLE_PROVISIONAL
 }
 void registerClusterOperationalState(Commands & commands)
 {