Merge remote-tracking branch 'upstream/master' into dm_xmls_tot

.clang-tidy

@@ -12,6 +12,7 @@ Checks: >
   readability-redundant-string-init,
   -bugprone-assignment-in-if-condition,
   -bugprone-branch-clone,
+  -bugprone-casting-through-void, #TODO remove this after fixing issues in source code, issue 34008
   -bugprone-copy-constructor-init,
   -bugprone-easily-swappable-parameters,
   -bugprone-forward-declaration-namespace,

.github/workflows/build.yaml

@@ -332,7 +332,7 @@ jobs:
                   scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
                   scripts/run_in_build_env.sh 'virtualenv pyenv'
                   source pyenv/bin/activate
-                  pip3 install -r src/setup_payload/python/requirements.txt
+                  pip3 install -r scripts/setup/requirements.setuppayload.txt
                   python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
 
     build_linux_python_lighting_device:

.github/workflows/chef.yaml

@@ -98,7 +98,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:54
+            image: ghcr.io/project-chip/chip-build-telink:57
             options: --user root
 
         steps:
@@ -110,7 +110,7 @@ jobs:
                 platform: telink
             # - name: Update Zephyr to specific revision (for developers purpose)
             #   shell: bash
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
             - name: CI Examples Telink
               shell: bash
               run: |

.github/workflows/examples-efr32.yaml

@@ -33,14 +33,14 @@ jobs:
     name: EFR32
 
     env:
-      SILABS_BOARD: BRD4161A
+      SILABS_BOARD: BRD4187C
       BUILD_TYPE: gn_efr32
 
     runs-on: ubuntu-latest
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:54
+      image: ghcr.io/project-chip/chip-build-efr32:56
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

.github/workflows/examples-linux-tv-casting-app.yaml

@@ -61,7 +61,7 @@ jobs:
             - name: Build Linux tv-casting-app
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app"
+                    "scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app chip_casting_simplified=true"
 
             - name: Test casting from Linux tv-casting-app to Linux tv-app
               run: |

.github/workflows/examples-mbed.yaml

@@ -158,7 +158,8 @@ jobs:
                   rm -rf ./out
 
             - name: Build unit tests
-              # Temporarily disable build due to running out of flash space
+              # Temporarily disabled build due to running out of flash space
+              # TODO Issue #33978: re-enable unit testing after split of unit tests is done
               if: false
               run: scripts/tests/mbed/mbed_unit_tests.sh -b=$APP_TARGET -p=$APP_PROFILE
 

.github/workflows/examples-telink.yaml

@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:54
+            image: ghcr.io/project-chip/chip-build-telink:57
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -57,7 +57,7 @@ jobs:
                 gh-context: ${{ toJson(github) }}
 
             # - name: Update Zephyr to specific revision (for developers purpose)
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
 
             - name: Build example Telink (B92 retention) Air Quality Sensor App
               run: |

.github/workflows/release_artifacts.yaml

@@ -58,13 +58,13 @@ jobs:
     efr32:
         name: EFR32
         env:
-            SILABS_BOARD: BRD4161A
-            BUILD_DIRECTORY: out/lock_app_debug/BRD4161A
+            SILABS_BOARD: BRD4187C
+            BUILD_DIRECTORY: out/lock_app_debug/BRD4187C
 
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:54
+            image: ghcr.io/project-chip/chip-build-efr32:56
         steps:
             - name: Checkout
               uses: actions/checkout@v4

.gitmodules

@@ -231,10 +231,10 @@
 	url = https://github.com/SiliconLabs/sdk_support.git
 	branch = main
 	platforms = silabs,silabs_docker
-[submodule "third_party/silabs/gecko_sdk"]
-	path = third_party/silabs/gecko_sdk
-	url = https://github.com/SiliconLabs/gecko_sdk.git
-	branch = v4.4.2
+[submodule "third_party/silabs/simplicity_sdk"]
+	path = third_party/silabs/simplicity_sdk
+	url = https://github.com/SiliconLabs/simplicity_sdk.git
+	branch = v2024.6.0
 	platforms = silabs
 [submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
 	path = third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -244,14 +244,15 @@
 [submodule "third_party/silabs/wifi_sdk"]
 	path = third_party/silabs/wifi_sdk
 	url = https://github.com/SiliconLabs/wiseconnect.git
-	branch = v3.1.3-matter-hotfix.4
+	branch = v3.3.0
 	platforms = silabs
 [submodule "editline"]
 	path = third_party/editline/repo
 	url = https://github.com/troglobit/editline.git
 [submodule "third_party/boringssl/repo/src"]
 	path = third_party/boringssl/repo/src
 	url = https://github.com/google/boringssl.git
+	branch = master
 [submodule "third_party/mt793x_sdk/filogic"]
 	path = third_party/mt793x_sdk/filogic
 	url = https://github.com/MediaTek-Labs/genio-matter-bsp.git

.pullapprove.yml

@@ -133,6 +133,14 @@ groups:
             teams: [reviewers-google]
         reviews:
             request: 10
+    shared-reviewers-grundfos:
+        type: optional
+        conditions:
+            - files.include('*')
+        reviewers:
+            teams: [reviewers-grundfos]
+        reviews:
+            request: 10
     shared-reviewers-irobot:
         type: optional
         conditions:

.vscode/tasks.json

@@ -557,54 +557,18 @@
                 "bouffalolab-xt-zb6-devkit-light",
                 "bouffalolab-xt-zb6-devkit-light-rpc-115200",
                 "bouffalolab-bl706-night-light-light",
-                "efr32-brd4161a-light",
-                "efr32-brd4163a-light",
-                "efr32-brd4164a-light",
-                "efr32-brd4166a-light",
-                "efr32-brd4170a-light",
-                "efr32-brd4186a-light",
-                "efr32-brd4187a-light",
-                "efr32-brd4304a-light",
-                "efr32-brd4161a-light-rpc",
-                "efr32-brd4163a-light-rpc",
-                "efr32-brd4164a-light-rpc",
-                "efr32-brd4166a-light-rpc",
-                "efr32-brd4170a-light-rpc",
-                "efr32-brd4186a-light-rpc",
-                "efr32-brd4187a-light-rpc",
-                "efr32-brd4304a-light-rpc",
-                "efr32-brd4161a-lock",
-                "efr32-brd4163a-lock",
-                "efr32-brd4164a-lock",
-                "efr32-brd4166a-lock",
-                "efr32-brd4170a-lock",
-                "efr32-brd4186a-lock",
-                "efr32-brd4187a-lock",
-                "efr32-brd4304a-lock",
-                "efr32-brd4161a-unit-test",
-                "efr32-brd4163a-unit-test",
-                "efr32-brd4164a-unit-test",
-                "efr32-brd4166a-unit-test",
-                "efr32-brd4170a-unit-test",
-                "efr32-brd4186a-unit-test",
-                "efr32-brd4187a-unit-test",
-                "efr32-brd4304a-unit-test",
-                "efr32-brd4161a-switch",
-                "efr32-brd4163a-switch",
-                "efr32-brd4164a-switch",
-                "efr32-brd4166a-switch",
-                "efr32-brd4170a-switch",
-                "efr32-brd4186a-switch",
-                "efr32-brd4187a-switch",
-                "efr32-brd4304a-switch",
-                "efr32-brd4161a-window-covering",
-                "efr32-brd4163a-window-covering",
-                "efr32-brd4164a-window-covering",
-                "efr32-brd4166a-window-covering",
-                "efr32-brd4170a-window-covering",
-                "efr32-brd4186a-window-covering",
-                "efr32-brd4187a-window-covering",
-                "efr32-brd4304a-window-covering",
+                "efr32-brd4186c-light",
+                "efr32-brd4186c-light-rpc",
+                "efr32-brd4186c-lock",
+                "efr32-brd4186c-unit-test",
+                "efr32-brd4186c-switch",
+                "efr32-brd4186c-window-covering",
+                "efr32-brd4187c-light",
+                "efr32-brd4187c-light-rpc",
+                "efr32-brd4187c-lock",
+                "efr32-brd4187c-unit-test",
+                "efr32-brd4187c-switch",
+                "efr32-brd4187c-window-covering",
                 "efr32-brd4338a-light-wifi-917_soc-skip_rps_generation",
                 "esp32-c3devkit-all-clusters",
                 "esp32-devkitc-all-clusters",

BUILD.gn

@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/mbedtls.gni")
 import("//build_overrides/nlassert.gni")
-import("//build_overrides/nlunit_test.gni")
 import("//build_overrides/pigweed.gni")
 
 import("//src/lwip/lwip.gni")
@@ -135,7 +134,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
       "${chip_root}/src/system",
       "${chip_root}/src/transport",
       "${nlassert_root}:nlassert",
-      "${nlunit_test_root}:nlunit-test",
     ]
 
     if (enable_fuzz_test_targets) {
@@ -163,6 +161,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
         "${chip_root}/examples/shell/standalone:chip-shell",
         "${chip_root}/src/app/tests/integration:chip-im-initiator",
         "${chip_root}/src/app/tests/integration:chip-im-responder",
+        "${chip_root}/src/inet/tests:inet-layer-test-tool",
         "${chip_root}/src/lib/address_resolve:address-resolve-tool",
         "${chip_root}/src/messaging/tests/echo:chip-echo-requester",
         "${chip_root}/src/messaging/tests/echo:chip-echo-responder",

build/chip/chip_test_suite.gni

@@ -33,8 +33,8 @@ assert(chip_build_tests)
 #   ]
 #
 #   test_sources = [
-#     "TestFoo.cpp",    # Files are parsed for `CHIP_REGISTER_TEST_SUITE(...)`
-#     "TestBar.cpp",    # and a driver is created automatically
+#     "TestFoo.cpp",
+#     "TestBar.cpp",
 #   ]
 #
 #   public_deps = [
@@ -94,9 +94,12 @@ template("chip_test_suite") {
 
     deps = [ dir_pw_unit_test ]
 
-    if (current_os != "zephyr" && current_os != "mbed") {
+    if (current_os != "zephyr" && current_os != "mbed" &&
+        chip_device_platform != "efr32") {
       # Depend on stdio logging, and have it take precedence over the default platform backend
-      public_deps += [ "${chip_root}/src/platform/logging:force_stdio" ]
+      public_deps += [ "${chip_root}/src/platform/logging:stdio" ]
+    } else {
+      public_deps += [ "${chip_root}/src/platform/logging:default" ]
     }
   }
   if (chip_link_tests) {
@@ -175,100 +178,3 @@ template("chip_test_suite") {
     }
   }
 }
-
-# TODO [PW_MIGRATION]: remove this once transition away from nlunit-test is completed
-template("chip_test_suite_using_nltest") {
-  _suite_name = target_name
-
-  # Ensures that the common library has sources containing both common
-  # and individual unit tests.
-  if (!defined(invoker.sources)) {
-    invoker.sources = []
-  }
-
-  if (defined(invoker.test_sources)) {
-    invoker.sources += invoker.test_sources
-  }
-
-  if (chip_build_test_static_libraries) {
-    _target_type = "static_library"
-  } else {
-    _target_type = "source_set"
-  }
-  target(_target_type, "${_suite_name}.lib") {
-    forward_variables_from(invoker, "*", [ "tests" ])
-
-    output_dir = "${root_out_dir}/lib"
-
-    if (!defined(invoker.public_deps)) {
-      public_deps = []
-    }
-
-    if (current_os != "zephyr" && current_os != "mbed") {
-      # Depend on stdio logging, and have it take precedence over the default platform backend
-      public_deps += [ "${chip_root}/src/platform/logging:force_stdio" ]
-    }
-  }
-  if (chip_link_tests) {
-    tests = []
-
-    if (defined(invoker.test_sources)) {
-      foreach(_test, invoker.test_sources) {
-        _test_name = string_replace(_test, ".cpp", "")
-
-        _driver_name = "${root_gen_dir}/${_test_name}.driver.cpp"
-
-        action("${_test_name}_generate_driver") {
-          script = "${chip_root}/scripts/gen_test_driver.py"
-
-          inputs = [ _test ]
-          outputs = [ _driver_name ]
-          args = [
-            "--input_file=" + rebase_path(_test, root_build_dir),
-            "--output_file=" + rebase_path(_driver_name, root_build_dir),
-          ]
-        }
-
-        chip_test(_test_name) {
-          sources = [ _driver_name ]
-          public_deps = [
-            ":${_suite_name}.lib",
-            ":${_test_name}_generate_driver",
-          ]
-        }
-        tests += [ _test_name ]
-      }
-    }
-
-    if (defined(invoker.tests)) {
-      foreach(_test, invoker.tests) {
-        chip_test(_test) {
-          sources = [ "${_test}Driver.cpp" ]
-
-          public_deps = [ ":${_suite_name}.lib" ]
-        }
-        tests += [ _test ]
-      }
-    }
-
-    group(_suite_name) {
-      deps = []
-      foreach(_test, tests) {
-        deps += [ ":${_test}" ]
-      }
-    }
-
-    if (chip_pw_run_tests) {
-      group("${_suite_name}_run") {
-        deps = []
-        foreach(_test, tests) {
-          deps += [ ":${_test}.run" ]
-        }
-      }
-    }
-  } else {
-    group(_suite_name) {
-      deps = [ ":${_suite_name}.lib" ]
-    }
-  }
-}

build/chip/fuzz_test.gni

@@ -36,7 +36,6 @@ declare_args() {
 #
 #   public_deps = [
 #     "${chip_root}/src/lib/foo",         # add dependencies here
-#     "${nlunit_test_root}:nlunit-test",
 #   ]
 # }
 #