Merge branch 'master' into TC-OPCREDS-3.2-issue-281

project-chip · Oct 24, 2024 · 7eba71b · 7eba71b
2 parents 26578ca + 00890a6
commit 7eba71b
Show file tree

Hide file tree

Showing 398 changed files with 2,491 additions and 121,164 deletions.
diff --git a/.github/workflows/cert_test_checks.yaml b/.github/workflows/cert_test_checks.yaml
@@ -18,6 +18,8 @@ on:
   pull_request:
     paths:
       - "src/app/tests/suites/certification/**"
+permissions:
+  contents: read
 
 jobs:
   check-certification-tests:
@@ -30,6 +32,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Run checks
         run: |
           python3 scripts/tests/matter_yaml_linter.py
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -41,7 +41,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:84
+      image: ghcr.io/project-chip/chip-build-efr32:85
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
@@ -64,7 +64,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:84
+            image: ghcr.io/project-chip/chip-build-efr32:85
         steps:
             - name: Checkout
               uses: actions/checkout@v4

diff --git a/.gitmodules b/.gitmodules
@@ -213,7 +213,7 @@
 [submodule "third_party/silabs/simplicity_sdk"]
 	path = third_party/silabs/simplicity_sdk
 	url = https://github.com/SiliconLabs/simplicity_sdk.git
-	branch = v2024.6.1-0
+	branch = v2024.6.2
 	platforms = silabs
 [submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
 	path = third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -329,6 +329,9 @@
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
 	url = https://github.com/Infineon/lwip-network-interface-integration.git
 	platforms = infineon
+[submodule "third_party/lwip/repo"]
+	path = third_party/lwip/repo
+	url = https://github.com/lwip-tcpip/lwip.git
 [submodule "third_party/abseil-cpp/src"]
 	path = third_party/abseil-cpp/src
 	url = https://github.com/abseil/abseil-cpp.git
@@ -340,7 +343,7 @@
 [submodule "third_party/googletest"]
 	path = third_party/googletest
 	url = https://github.com/google/googletest
-	platforms = linux,darwin
+	platforms = linux,android,darwin,tizen
 [submodule "third_party/re2/src"]
 	path = third_party/re2/src
 	url = https://github.com/google/re2.git

diff --git a/.gn b/.gn
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/build.gni")
+import("//build_overrides/googletest.gni")
 import("//build_overrides/pigweed.gni")
 
 # The location of the build configuration file.
@@ -33,6 +34,11 @@ default_args = {
   # GN target to use for the default Python build venv.
   pw_build_PYTHON_BUILD_VENV = "//:matter_build_venv"
 
+  # Use the GoogleTest backend for unit tests running on host.
+  pw_unit_test_BACKEND = "$dir_pw_unit_test:googletest"
+  pw_unit_test_MAIN = "$dir_pigweed/third_party/googletest:gmock_main"
+  dir_pw_third_party_googletest = "$dir_googletest"
+
   # Required for pw_unit_test
   pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
   pw_assert_BACKEND = "$dir_pw_assert_log"

diff --git a/build/toolchain/pw_fuzzer/BUILD.gn b/build/toolchain/pw_fuzzer/BUILD.gn
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/build.gni")
+import("//build_overrides/googletest.gni")
 import("//build_overrides/pigweed.gni")
 
 import("$dir_pigweed/targets/host/target_toolchains.gni")
@@ -61,7 +62,7 @@ gcc_toolchain("chip_pw_fuzztest") {
 
     dir_pw_third_party_abseil_cpp = "//third_party/abseil-cpp/src"
     dir_pw_third_party_fuzztest = "//third_party/fuzztest"
-    dir_pw_third_party_googletest = "//third_party/googletest"
+    dir_pw_third_party_googletest = "$dir_googletest"
 
     # TODO: Seems that re2 support within FuzzTest was deprecated, keeping it defined is triggering warning
     # Remove if re2 is indeed not needed

diff --git a/build_overrides/googletest.gni b/build_overrides/googletest.gni
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+declare_args() {
+  # Location of the GoogleTest repository.
+  dir_googletest = "//third_party/googletest"
+}
diff --git a/config/ios/args.gni → config/darwin/args.gni b/config/ios/args.gni → config/darwin/args.gni
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2024 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 
 import("//build_overrides/chip.gni")
 
-chip_system_config_clock = "gettimeofday"
 chip_device_platform = "darwin"
 
-chip_project_config_include_dirs = [ "${chip_root}/config/ios" ]
+chip_project_config_include = ""
+chip_system_project_config_include = ""
 
 pw_build_PIP_CONSTRAINTS = [ "${chip_root}/scripts/setup/constraints.txt" ]
diff --git a/config/esp32/components/chip/idf_component.yml b/config/esp32/components/chip/idf_component.yml
@@ -7,7 +7,7 @@ dependencies:
             - if: "target != esp32h2"
 
     espressif/esp_secure_cert_mgr:
-        version: "^2.3.0"
+        version: "^2.5.0"
         rules:
             - if: "idf_version >=4.3"
 

diff --git a/config/ios/CHIPProjectConfig.h b/config/ios/CHIPProjectConfig.h
diff --git a/config/ios/SystemProjectConfig.h b/config/ios/SystemProjectConfig.h
diff --git a/docs/development_controllers/chip-tool/chip_tool_guide.md b/docs/development_controllers/chip-tool/chip_tool_guide.md
@@ -9,33 +9,29 @@ the setup payload or performing discovery actions.
 
 <hr>
 
-## Source files
+## Installation
 
-You can find source files of the CHIP Tool in the `examples/chip-tool`
-directory.
-
-> **Note:** The CHIP Tool caches the configuration state in the
-> `/tmp/chip_tool_config.ini` file. Deleting this and other `.ini` files in the
-> `/tmp` directory can sometimes resolve issues related to stale configuration.
+On Linux distributions
+[running snapd](https://snapcraft.io/docs/installing-snapd), such as Ubuntu, the
+CHIP Tool can be installed using the
+[chip-tool snap](https://snapcraft.io/chip-tool). To do this, run:
 
-> **Note:** To make the configuration persistent (since `/tmp` directory might
-> be flushed at each reboot) you can change the directory where CHIP Tool caches
-> its configuration by using the option `--storage-directory`
+```
+sudo snap install chip-tool
+```
 
-<hr>
+## Building from source
 
-## Building and running the CHIP Tool
+The source files of the CHIP Tool are available in the `examples/chip-tool`
+directory.
 
-Before you can use the CHIP Tool, you must compile it from source on Linux
-(amd64/aarch64) or macOS. If you want to run it on Raspberry Pi, it must use a
-64-bit OS.
+The source can be compiled on Linux (amd64/aarch64) or macOS. If you want to run
+it on Raspberry Pi, you must use a 64-bit OS.
 
 > **Note:** To ensure compatibility, always build the CHIP Tool and the Matter
 > device from the same revision of the `connectedhomeip` repository.
 
-### Building the CHIP Tool
-
-To build and run the CHIP Tool:
+To build the CHIP Tool:
 
 1. Install all required packages for Matter and prepare the source code and the
    build system. Read the [Building Matter](../../guides/BUILDING.md) guide for
@@ -50,10 +46,16 @@ To build and run the CHIP Tool:
     In this command, `BUILD_PATH` specifies where the target binaries are to be
     placed.
 
-### Running the CHIP Tool
+## Running the CHIP Tool
+
+If you installed the CHIP Tool as a snap, the command to run it would be:
+
+```
+$ chip-tool
+```
 
-To check if the CHIP Tool runs correctly, execute the following command from the
-`BUILD_PATH` directory:
+If you compiled the CHIP Tool from source, it can be executed with the following
+command from the `BUILD_PATH` directory:
 
 ```
 $ ./chip-tool
@@ -68,6 +70,13 @@ more complex command by appending it with sub-commands. Examples of specific
 commands and their use cases are described in the
 [Supported commands and options](#supported-commands-and-options) section.
 
+> **Note:** The CHIP Tool caches the configuration state in the
+> `/tmp/chip_tool_config.ini` file. Deleting this and other `.ini` files in the
+> `/tmp` directory can sometimes resolve issues related to stale configuration.
+> To make the configuration persistent you can change the directory where CHIP
+> Tool caches its configuration by using the command line option
+> `--storage-directory`
+
 <hr>
 
 ## CHIP Tool modes

diff --git a/examples/all-clusters-app/nxp/common/main/main.cpp b/examples/all-clusters-app/nxp/common/main/main.cpp
@@ -32,7 +32,7 @@ uint8_t __attribute__((section(".heap"))) ucHeap[configTOTAL_HEAP_SIZE];
 
 using namespace ::chip::DeviceLayer;
 
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     TaskHandle_t taskHandle;
 

diff --git a/examples/build_overrides/googletest.gni b/examples/build_overrides/googletest.gni
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+declare_args() {
+  # Location of the GoogleTest repository.
+  dir_googletest = "//third_party/connectedhomeip/third_party/googletest"
+}
diff --git a/examples/contact-sensor-app/nxp/common/main.cpp b/examples/contact-sensor-app/nxp/common/main.cpp
@@ -30,7 +30,7 @@ extern "C" void main_task(void const * argument)
     chip::NXP::App::GetAppTask().Start();
 }
 #else
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     chip::DeviceLayer::PlatformMgrImpl().HardwareInit();
     chip::NXP::App::GetAppTask().Start();

diff --git a/examples/darwin-framework-tool/args.gni b/examples/darwin-framework-tool/args.gni
@@ -14,15 +14,4 @@
 
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/config/standalone/args.gni")
-
-chip_crypto = "boringssl"
-
-chip_device_project_config_include =
-    "${chip_root}/examples/darwin-framework-tool/include/CHIPProjectAppConfig.h"
-chip_project_config_include =
-    "${chip_root}/examples/darwin-framework-tool/include/CHIPProjectAppConfig.h"
-
-chip_project_config_include_dirs =
-    [ "${chip_root}/examples/darwin-framework-tool/include" ]
-chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
+import("${chip_root}/config/darwin/args.gni")