Merge branch 'master' into CommandTesting

Author: LyudmilaKostanyan

build/chip/chip_test_suite.gni

@@ -95,6 +95,7 @@ template("chip_test_suite") {
     } else {
       public_deps += [ "${chip_root}/src/platform/logging:default" ]
     }
+    public_deps += [ "${chip_root}/src/lib/support/tests:pw-test-macros" ]
 
     if (chip_device_platform == "esp32") {
       complete_static_lib = true

config/common/cmake/make_gn_args.py

@@ -56,12 +56,12 @@ def write_gn_args(args):
         filtered_value = filter(lambda v: v != "D", filtered_value)
         filtered_value = filter(lambda v: v != "isystem", filtered_value)
         # Escaped quote and dollar sign characters
-        filtered_value = map(lambda v: v.replace('"', '\\"'), filtered_value)
-        filtered_value = map(lambda v: v.replace('$', '\\$'), filtered_value)
+        filtered_value = (v.replace('"', '\\"') for v in filtered_value)
+        filtered_value = (v.replace('$', '\\$') for v in filtered_value)
         # Remove white spaces around the argument and remove internal whitespace
         # for correct splitting in string_split() function
-        filtered_value = map(lambda v: v.strip(), filtered_value)
-        filtered_value = map(lambda v: v.replace(' ', ''), filtered_value)
+        filtered_value = (v.strip() for v in filtered_value)
+        filtered_value = (v.replace(' ', '') for v in filtered_value)
         #  Remove duplicates
         filtered_value = list(dict.fromkeys(filtered_value))
 

config/esp32/components/chip/create_args_gn.py

@@ -44,11 +44,13 @@
     compile_commands = json.load(compile_commands_json)
 
     def get_compile_flags(src_file):
-        compile_command = list(map(lambda res: res["command"],
-                               filter(lambda cmd: cmd["file"] == src_file, compile_commands)))
+        compile_command = [
+            res["command"]
+            for res in filter(lambda cmd: cmd["file"] == src_file, compile_commands)
+        ]
 
         if len(compile_command) != 1:
-            raise Exception("Failed to resolve compile flags for %s", src_file)
+            raise Exception(f"Failed to resolve compile flags for {src_file}")
 
         compile_command = compile_command[0]
         # Trim compiler, input and output
@@ -57,12 +59,10 @@ def get_compile_flags(src_file):
         replace = "-I%s" % args.idf_path
         replace_with = "-isystem%s" % args.idf_path
 
-        compile_flags = list(map(lambda f: ('"%s"' % f).replace(
-            replace, replace_with), compile_flags))
+        compile_flags = [f'"{f}"'.replace(replace, replace_with) for f in compile_flags]
 
         if args.filter_out:
-            filter_out = list(map(lambda f: ('"%s"' % f),
-                              args.filter_out.split(';')))
+            filter_out = [f'"{f}"' for f in args.filter_out.split(';')]
             compile_flags = [c for c in compile_flags if c not in filter_out]
 
         return compile_flags

config/nxp/cmake/Kconfig.matter.common

@@ -400,6 +400,13 @@ config CHIP_ICD_UAT_SUPPORT
 	  Enables the User Active Mode Trigger (UAT) support in Matter. It allows the User to use application specific
 	  means (e.g. button press) to trigger an ICD device to enter the active mode and become responsive.
 
+config CHIP_ICD_DSLS_SUPPORT
+	bool "Intermittently Connected Device Dynamic SIT LIT support"
+	depends on CHIP_ICD_LIT_SUPPORT
+	help
+	  Enables the Dynamic SIT LIT support in Matter. It allows the application to dynamically switch between
+	  SIT and LIT modes, as long as the requirements for these modes are met (e.g. device has at least one active ICD client).
+
 config CHIP_ICD_CLIENTS_PER_FABRIC
 	int "Intermittently Connected Device number of clients per fabric"
 	default 2

config/nxp/cmake/common.cmake

@@ -49,6 +49,7 @@ matter_add_gn_arg_bool("chip_enable_ethernet" CONFIG_CHIP_ETHERNET)
 matter_add_gn_arg_bool("chip_system_config_provide_statistics" CONFIG_CHIP_STATISTICS)
 matter_add_gn_arg_bool("chip_enable_icd_server" CONFIG_CHIP_ENABLE_ICD_SUPPORT)
 matter_add_gn_arg_bool("chip_enable_icd_lit" CONFIG_CHIP_ICD_LIT_SUPPORT)
+matter_add_gn_arg_bool("chip_enable_icd_dsls" CONFIG_CHIP_ICD_DSLS_SUPPORT)
 matter_add_gn_arg_bool("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR)
 matter_add_gn_arg_bool("chip_system_config_use_openthread_inet_endpoints" CONFIG_CHIP_USE_OT_ENDPOINT)
 

credentials/generate_revocation_set.py

@@ -46,7 +46,7 @@
 __LOG_LEVELS__ = {
     'debug': logging.DEBUG,
     'info': logging.INFO,
-    'warn': logging.WARN,
+    'warn': logging.WARNING,
     'fatal': logging.FATAL,
 }
 

docs/_extensions/external_content.py

@@ -169,13 +169,13 @@ def sync_contents(app: Sphinx) -> None:
 
     srcdir = Path(app.srcdir).resolve()
     to_copy = []
-    to_delete = set(f for f in srcdir.glob("**/*") if not f.is_dir())
-    to_keep = set(
+    to_delete = {f for f in srcdir.glob("**/*") if not f.is_dir()}
+    to_keep = {
         f
         for k in app.config.external_content_keep
         for f in srcdir.glob(k)
         if not f.is_dir()
-    )
+    }
 
     for content in app.config.external_content_contents:
         prefix_src, glob = content

examples/camera-app/linux/include/clusters/webrtc-provider/webrtc-provider-manager.h

@@ -80,6 +80,8 @@ class WebRTCProviderManager : public Delegate, public WebRTCTransportProviderCon
 
     CHIP_ERROR ValidateAudioStreamID(uint16_t audioStreamId) override;
 
+    CHIP_ERROR IsStreamUsageSupported(StreamUsageEnum streamUsage) override;
+
     CHIP_ERROR IsHardPrivacyModeActive(bool & isActive) override;
 
     CHIP_ERROR IsSoftRecordingPrivacyModeActive(bool & isActive) override;

examples/camera-app/linux/src/clusters/webrtc-provider/webrtc-provider-manager.cpp

@@ -529,6 +529,30 @@ CHIP_ERROR WebRTCProviderManager::ValidateAudioStreamID(uint16_t audioStreamId)
     return avsmController.ValidateAudioStreamID(audioStreamId);
 }
 
+CHIP_ERROR WebRTCProviderManager::IsStreamUsageSupported(StreamUsageEnum streamUsage)
+{
+    if (mCameraDevice == nullptr)
+    {
+        ChipLogError(Camera, "CameraDeviceInterface not initialized");
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+
+    auto & hal                   = mCameraDevice->GetCameraHALInterface();
+    auto & streamUsagePriorities = hal.GetStreamUsagePriorities();
+
+    // Check if the streamUsage is in the StreamUsagePriorities list
+    for (const auto & usage : streamUsagePriorities)
+    {
+        if (usage == streamUsage)
+        {
+            return CHIP_NO_ERROR;
+        }
+    }
+
+    ChipLogError(Camera, "StreamUsage %u not found in StreamUsagePriorities", to_underlying(streamUsage));
+    return CHIP_ERROR_NOT_FOUND;
+}
+
 CHIP_ERROR WebRTCProviderManager::IsHardPrivacyModeActive(bool & isActive)
 {
     if (mCameraDevice == nullptr)

examples/chef/chef.py

@@ -69,12 +69,12 @@ def splash() -> None:
 
 
 def load_config() -> None:
-    config = dict()
-    config["nrfconnect"] = dict()
-    config["esp32"] = dict()
-    config["silabs-thread"] = dict()
-    config["ameba"] = dict()
-    config["telink"] = dict()
+    config = {}
+    config["nrfconnect"] = {}
+    config["esp32"] = {}
+    config["silabs-thread"] = {}
+    config["ameba"] = {}
+    config["telink"] = {}
     configFile = f"{_CHEF_SCRIPT_PATH}/config.yaml"
     if (os.path.exists(configFile)):
         configStream = open(configFile, 'r')