From 9a0b6e77df78c9796e534f70ee23ba5b77694acf Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Thu, 2 Dec 2021 10:15:12 +0100
Subject: [PATCH 1/2] [placeholder] Enable SetRegulatoryConfig command

---
 .../placeholder/linux/apps/app1/config.zap     | 18 +++++++++++++++++-
 .../zcl/data-model/chip/matter-devices.xml     |  6 ++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index 2b6fdfb3150d9c..92076c38fa584c 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -406,6 +406,14 @@
               "incoming": 1,
               "outgoing": 0
             },
+            {
+              "name": "SetRegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "incoming": 1,
+              "outgoing": 0
+            },
             {
               "name": "CommissioningComplete",
               "code": 4,
@@ -449,6 +457,14 @@
               "incoming": 0,
               "outgoing": 1
             },
+            {
+              "name": "SetRegulatoryConfigResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 0,
+              "outgoing": 1
+            },
             {
               "name": "CommissioningCompleteResponse",
               "code": 5,
@@ -1924,4 +1940,4 @@
     }
   ],
   "log": []
-}
\ No newline at end of file
+}
diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index 36673e94130518..ddb249bb1a0cb6 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -46,10 +46,12 @@ limitations under the License.
                 <requireAttribute>CLIENT_LIST</requireAttribute>
                 <requireAttribute>PARTS_LIST</requireAttribute>
             </include>
+            <include cluster="General Commissioning" client="false" server="true" clientLocked="true" serverLocked="true">
+                <requireCommand>SetRegulatoryConfig</requireCommand>
+            </include>
             <include cluster="Power Source Configuration" client="false" server="false" clientLocked="true" serverLocked="false"></include>
             <include cluster="Time Synchronization" client="false" server="false" clientLocked="true" serverLocked="false"></include>
             <include cluster="Group Key Management" client="false" server="true" clientLocked="true" serverLocked="true"></include>
-            <include cluster="General Commissioning" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="Network Commissioning" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="AdministratorCommissioning" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="Operational Credentials" client="false" server="true" clientLocked="true" serverLocked="true"></include>
@@ -2226,4 +2228,4 @@ limitations under the License.
             <include cluster="Temperature Measurement" client="false" server="true" clientLocked="true" serverLocked="true"></include>
         </clusters>
     </deviceType>
-</configurator>
\ No newline at end of file
+</configurator>

From 15a55e013b7e787f93c65d7ede21952b6412c7ce Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Thu, 2 Dec 2021 10:05:29 +0100
Subject: [PATCH 2/2] Update generated code

---
 .../app1/zap-generated/IMClusterCommandHandler.cpp       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp
index d19b8317c1eadf..f8563cc33d3aca 100644
--- a/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp
@@ -138,6 +138,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
             }
             break;
         }
+        case Commands::SetRegulatoryConfig::Id: {
+            Commands::SetRegulatoryConfig::DecodableType commandData;
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            if (TLVError == CHIP_NO_ERROR)
+            {
+                wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData);
+            }
+            break;
+        }
         default: {
             // Unrecognized command ID, error status will apply.
             ReportCommandUnsupported(apCommandObj, aCommandPath);