Merge branch 'master' into invalidate-case-session-upon-fabric-update…

…-18431

.github/workflows/lint.yml

@@ -85,6 +85,10 @@ jobs:
               if: always()
               run: scripts/tools/check_includes.sh
 
+            - name: Check for zcl.json and extension sync status
+              if: always()
+              run: scripts/tools/check_zcl_file_sync.py .
+
             - name: Ensure all PICS are set for tests (to true or false)
               if: always()
               run: |

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

@@ -2170,6 +2170,7 @@ server cluster ModeSelect = 80 {
   readonly attribute attrib_id attributeList[] = 65531;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
+  readonly attribute int8u manufacturerExtension = 4293984257;
 
   request struct ChangeToModeRequest {
     INT8U newMode = 0;
@@ -4328,6 +4329,7 @@ endpoint 1 {
     callback attribute attributeList;
     ram      attribute featureMap default = 1;
     ram      attribute clusterRevision default = 1;
+    ram      attribute manufacturerExtension default = 255;
   }
 
   server cluster DoorLock {

examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

@@ -18,7 +18,7 @@
   "package": [
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/zcl/zcl.json",
+      "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
       "version": "ZCL Test Data",
       "type": "zcl-properties"
     },
@@ -12664,6 +12664,22 @@
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
+            },
+            {
+              "name": "ManufacturerExtension",
+              "code": 4293984257,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "255",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
             }
           ]
         },

examples/all-clusters-app/nrfconnect/main/AppTask.cpp

@@ -29,6 +29,7 @@
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/cluster-id.h>
+#include <app/clusters/identify-server/identify-server.h>
 #include <app/util/attribute-storage.h>
 
 #include <credentials/DeviceAttestationCredsProvider.h>
@@ -63,6 +64,40 @@ k_timer sFunctionTimer;
 
 chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 
+constexpr EndpointId kIdentifyEndpointId = 1;
+
+void OnIdentifyTriggerEffect(Identify * identify)
+{
+    ChipLogProgress(Zcl, "OnIdentifyTriggerEffect");
+    switch (identify->mCurrentEffectIdentifier)
+    {
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK:
+        ChipLogProgress(Zcl, "Effect: EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE:
+        ChipLogProgress(Zcl, "Effect: EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY:
+        ChipLogProgress(Zcl, "Effect: EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY");
+        break;
+    case EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE:
+        ChipLogProgress(Zcl, "Effect: EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE");
+        break;
+    default:
+        ChipLogProgress(Zcl, "Effect: No identifier effect");
+        break;
+    }
+    return;
+}
+
+Identify sIdentify = {
+    chip::EndpointId{ kIdentifyEndpointId },
+    [](Identify *) { ChipLogProgress(Zcl, "OnIdentifyStart"); },
+    [](Identify *) { ChipLogProgress(Zcl, "OnIdentifyStop"); },
+    EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_NONE,
+    OnIdentifyTriggerEffect,
+};
+
 } // namespace
 
 constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;

examples/chef/BUILD.gn

@@ -32,7 +32,6 @@ pw_python_package("chef") {
     "constants.py",
     "sample_app_util/__init__.py",
     "sample_app_util/sample_app_util.py",
-    "sample_app_util/test_zap_file_parser.py",
     "sample_app_util/zap_file_parser.py",
     "stateful_shell.py",
   ]

examples/darwin-framework-tool/BUILD.gn

@@ -27,12 +27,19 @@ config("config") {
     "${chip_root}/examples/chip-tool/commands/clusters/ComplexArgument.h",
   ]
 
-  defines = [ "CONFIG_ENABLE_YAML_TESTS=${config_enable_yaml_tests}" ]
+  defines = [
+    "CONFIG_ENABLE_YAML_TESTS=${config_enable_yaml_tests}",
+    "CONFIG_USE_INTERACTIVE_MODE=${config_use_interactive_mode}",
+  ]
 
   cflags = [
     "-Wconversion",
     "-fobjc-arc",
   ]
+
+  if (config_use_interactive_mode) {
+    libs = [ "readline" ]
+  }
 }
 
 executable("darwin-framework-tool") {
@@ -55,6 +62,10 @@ executable("darwin-framework-tool") {
     "main.mm",
   ]
 
+  if (config_use_interactive_mode) {
+    sources += [ "commands/interactive/InteractiveCommands.mm" ]
+  }
+
   if (config_enable_yaml_tests) {
     sources += [ "${chip_root}/zzz_generated/darwin-framework-tool/zap-generated/cluster/CHIPTestClustersObjc.mm" ]
   }

examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.h

@@ -34,6 +34,10 @@ class ModelCommand : public CHIPCommandBridge
         AddArgument("endpoint-id", 0, UINT16_MAX, &mEndPointId);
     }
 
+    void Shutdown() override;
+
+    void Cleanup() override { ModelCommand::Shutdown(); }
+
     /////////// CHIPCommand Interface /////////
     CHIP_ERROR RunCommand() override;
     chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(10); }

examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.mm

@@ -49,3 +49,5 @@
                             }];
     return CHIP_NO_ERROR;
 }
+
+void ModelCommand::Shutdown() { ResetArguments(); }

examples/darwin-framework-tool/commands/clusters/ReportCommandBridge.h

@@ -132,24 +132,25 @@ class SubscribeAttribute : public ModelCommand {
         params.keepPreviousSubscriptions
             = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
         [device subscribeAttributeWithEndpointId:[NSNumber numberWithUnsignedShort:endpointId]
-                                       clusterId:[NSNumber numberWithUnsignedInteger:mClusterId]
-                                     attributeId:[NSNumber numberWithUnsignedInteger:mAttributeId]
-                                     minInterval:[NSNumber numberWithUnsignedInteger:mMinInterval]
-                                     maxInterval:[NSNumber numberWithUnsignedInteger:mMaxInterval]
-                                          params:params
-                                     clientQueue:callbackQueue
-                                   reportHandler:^(
-                                       NSArray<NSDictionary<NSString *, id> *> * _Nullable values, NSError * _Nullable error) {
-                                       if (values) {
-                                           for (id item in values) {
-                                               NSLog(@"Response Item: %@", [item description]);
-                                           }
-                                       }
-                                       if (error || !mWait) {
-                                           SetCommandExitStatus(error);
-                                       }
-                                   }
-                         subscriptionEstablished:nil];
+            clusterId:[NSNumber numberWithUnsignedInteger:mClusterId]
+            attributeId:[NSNumber numberWithUnsignedInteger:mAttributeId]
+            minInterval:[NSNumber numberWithUnsignedInteger:mMinInterval]
+            maxInterval:[NSNumber numberWithUnsignedInteger:mMaxInterval]
+            params:params
+            clientQueue:callbackQueue
+            reportHandler:^(NSArray<NSDictionary<NSString *, id> *> * _Nullable values, NSError * _Nullable error) {
+                if (values) {
+                    for (id item in values) {
+                        NSLog(@"Response Item: %@", [item description]);
+                    }
+                }
+                if (error || !mWait) {
+                    SetCommandExitStatus(error);
+                }
+            }
+            subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
+            }];
 
         return CHIP_NO_ERROR;
     }
@@ -162,10 +163,19 @@ class SubscribeAttribute : public ModelCommand {
 protected:
     chip::Optional<bool> mKeepSubscriptions;
     chip::Optional<bool> mFabricFiltered;
+    bool mSubscriptionEstablished = NO;
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
     bool mWait;
 
+    void Shutdown() override
+    {
+        mSubscriptionEstablished = NO;
+        ModelCommand::Shutdown();
+    }
+
+    bool DeferInteractiveCleanup() override { return mSubscriptionEstablished; }
+
 private:
     chip::ClusterId mClusterId;
     chip::AttributeId mAttributeId;
@@ -216,6 +226,7 @@ class SubscribeEvent : public ModelCommand {
                 }
             }
             subscriptionEstablished:^() {
+                mSubscriptionEstablished = YES;
             }];
 
         return CHIP_NO_ERROR;
@@ -229,6 +240,7 @@ class SubscribeEvent : public ModelCommand {
 protected:
     chip::Optional<bool> mKeepSubscriptions;
     chip::Optional<chip::EventNumber> mEventNumber;
+    bool mSubscriptionEstablished = NO;
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
     bool mWait;

examples/darwin-framework-tool/commands/common/CHIPCommandBridge.h

@@ -45,7 +45,6 @@ class CHIPCommandBridge : public Command
     void SetCommandExitStatus(CHIP_ERROR status)
     {
         mCommandExitStatus = status;
-        ShutdownCommissioner();
         StopWaiting();
     }
 
@@ -76,6 +75,22 @@ class CHIPCommandBridge : public Command
     // if failure).
     void LogNSError(const char * logString, NSError * error);
 
+    // Clean up any resources allocated by the command.  Some commands may hold
+    // on to resources after Shutdown(), but Cleanup() will guarantee those are
+    // cleaned up.
+    virtual void Cleanup() {}
+
+    // If true, skip calling Cleanup() when in interactive mode, so the command
+    // can keep doing work as needed.  Cleanup() will be called when quitting
+    // interactive mode.  This method will be called before Shutdown, so it can
+    // use member values that Shutdown will normally reset.
+    virtual bool DeferInteractiveCleanup() { return NO; }
+
+    // Execute any deferred cleanups.  Used when exiting interactive mode.
+    void ExecuteDeferredCleanups();
+
+    static std::set<CHIPCommandBridge *> sDeferredCleanups;
+
 private:
     CHIP_ERROR InitializeCommissioner(std::string key, chip::FabricId fabricId,
                                       const chip::Credentials::AttestationTrustStore * trustStore);
@@ -87,8 +102,11 @@ class CHIPCommandBridge : public Command
     CHIP_ERROR StartWaiting(chip::System::Clock::Timeout seconds);
     void StopWaiting();
 
+    CHIP_ERROR MaybeSetUpStack();
+    CHIP_ERROR MaybeTearDownStack();
+
     // Our three controllers: alpha, beta, gamma.
-    std::map<std::string, CHIPDeviceController *> mControllers;
+    static std::map<std::string, CHIPDeviceController *> mControllers;
 
     // The current controller; the one the current command should be using.
     CHIPDeviceController * mCurrentController;

examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm

@@ -27,10 +27,36 @@
 
 const uint16_t kListenPort = 5541;
 static CHIPToolPersistentStorageDelegate * storage = nil;
+std::set<CHIPCommandBridge *> CHIPCommandBridge::sDeferredCleanups;
+std::map<std::string, CHIPDeviceController *> CHIPCommandBridge::mControllers;
 
 CHIP_ERROR CHIPCommandBridge::Run()
 {
     ChipLogProgress(chipTool, "Running Command");
+    ReturnErrorOnFailure(MaybeSetUpStack());
+    SetIdentity(mCommissionerName.HasValue() ? mCommissionerName.Value() : kIdentityAlpha);
+    ReturnLogErrorOnFailure(RunCommand());
+    ReturnLogErrorOnFailure(StartWaiting(GetWaitDuration()));
+
+    bool deferCleanup = (IsInteractive() && DeferInteractiveCleanup());
+
+    Shutdown();
+
+    if (deferCleanup) {
+        sDeferredCleanups.insert(this);
+    } else {
+        Cleanup();
+    }
+    ReturnErrorOnFailure(MaybeTearDownStack());
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR CHIPCommandBridge::MaybeSetUpStack()
+{
+    if (IsInteractive()) {
+        return CHIP_NO_ERROR;
+    }
     NSData * ipk;
     CHIPToolKeypair * nocSigner = [[CHIPToolKeypair alloc] init];
     storage = [[CHIPToolPersistentStorageDelegate alloc] init];
@@ -76,15 +102,19 @@
         mControllers[identities[i]] = controller;
     }
 
-    // If no commissioner name passed in, default to alpha.
-    SetIdentity(mCommissionerName.HasValue() ? mCommissionerName.Value() : kIdentityAlpha);
-
-    ReturnLogErrorOnFailure(RunCommand());
-    ReturnLogErrorOnFailure(StartWaiting(GetWaitDuration()));
-
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR CHIPCommandBridge::MaybeTearDownStack()
+{
+    CHIP_ERROR err;
+    if (IsInteractive()) {
+        return CHIP_NO_ERROR;
+    }
+    err = ShutdownCommissioner();
+    return err;
+}
+
 void CHIPCommandBridge::SetIdentity(const char * identity)
 {
     std::string name = std::string(identity);
@@ -116,15 +146,13 @@
 
 CHIP_ERROR CHIPCommandBridge::StartWaiting(chip::System::Clock::Timeout duration)
 {
-    chip::DeviceLayer::PlatformMgr().StartEventLoopTask();
     auto waitingUntil = std::chrono::system_clock::now() + std::chrono::duration_cast<std::chrono::seconds>(duration);
     {
         std::unique_lock<std::mutex> lk(cvWaitingForResponseMutex);
         if (!cvWaitingForResponse.wait_until(lk, waitingUntil, [this]() { return !this->mWaitingForResponse; })) {
             mCommandExitStatus = CHIP_ERROR_TIMEOUT;
         }
     }
-    LogErrorOnFailure(chip::DeviceLayer::PlatformMgr().StopEventLoopTask());
 
     return mCommandExitStatus;
 }
@@ -133,7 +161,7 @@
 {
     {
         std::lock_guard<std::mutex> lk(cvWaitingForResponseMutex);
-        mWaitingForResponse = false;
+        mWaitingForResponse = NO;
     }
     cvWaitingForResponse.notify_all();
 }
@@ -156,3 +184,11 @@
         ChipLogError(chipTool, "%s: %s", logString, chip::ErrorStr(err));
     }
 }
+
+void CHIPCommandBridge::ExecuteDeferredCleanups()
+{
+    for (auto * cmd : sDeferredCleanups) {
+        cmd->Cleanup();
+    }
+    sDeferredCleanups.clear();
+}