Merge branch 'master' into python/certificate-authority

.github/.wordlist.txt

@@ -22,6 +22,7 @@ acdbc
 ACKed
 ACL
 ACLs
+actdiag
 AdapterAddress
 AdapterName
 adb
@@ -42,12 +43,16 @@ AdvSendAdvert
 AE
 aef
 AES
+AlarmCode
 algs
 alloc
-AlarmCode
 Ameba
 amebad
+AmebaD
 amebaiot
+AmebaZ
+amebaz2
+AmebaZ2
 announcementReason
 AnnounceOTAProvider
 AnnounceOtaProviderRequest
@@ -78,6 +83,9 @@ argc
 args
 argv
 armeabi
+armino
+Armino
+ARMINO
 ARMmbed
 armv
 ASAN
@@ -126,6 +134,7 @@ BDX
 BDXDownloader
 BeagleBone
 befc
+BEKEN
 betaprogram
 BinaryInputBasic
 Binfmt
@@ -139,6 +148,7 @@ BLEManagerImpl
 BlePlatformDelegate
 Blinls
 bloaty
+blockdiag
 blocklist
 blockquote
 bluetoothd
@@ -226,6 +236,7 @@ ChlorineConcentrationMeasurement
 ChlorodibromomethaneConcentrationMeasurement
 ChloroformConcentrationMeasurement
 chmod
+chown
 chrpath
 CIPD
 CircleCI
@@ -377,6 +388,7 @@ DeviceCommissioner
 DeviceCommon
 DeviceController
 DeviceId
+DeviceInstanceInfoProvider
 DeviceLayer
 DeviceNetworkProvisioningDelegate
 DeviceNetworkProvisioningDelegateImpl
@@ -491,6 +503,7 @@ EthyleneOxideConcentrationMeasurement
 EvalCode
 EvalCodeWithName
 EvalFrameDefault
+EVB
 evk
 exceptfds
 ExchangeContext
@@ -559,7 +572,6 @@ GenericThreadStackManagerImpl
 GenericWiFiConfigurationManagerImpl
 GetDeviceId
 GetDeviceInfo
-DeviceInstanceInfoProvider
 GetDns
 GetIP
 getManualTests
@@ -865,6 +877,7 @@ multilib
 Multiprotocol
 multithreaded
 mutexes
+mv
 MX
 mydir
 MyPASSWORD
@@ -911,6 +924,7 @@ nullptr
 NUM
 NVM
 NVS
+nwdiag
 nwk
 NXP
 objcopy
@@ -1127,6 +1141,7 @@ rsn
 RSSI
 RST
 rsync
+rtd
 RTL
 rtld
 RTOS
@@ -1160,6 +1175,7 @@ semver
 SendButton
 SendNewInputEvent
 sendto
+seqdiag
 SERIALDEVICE
 SerialNumber
 ServiceId
@@ -1174,6 +1190,7 @@ SetRequestorInstance
 SetUpPINCode
 SetupQRCode
 sexualized
+sfv
 SHA
 ShadeConfiguration
 showDocumentation
@@ -1204,6 +1221,7 @@ SoftwareVersion
 softwareVersionStr
 SoftwareVersionString
 softwareVersionValid
+sphinxcontrib
 SPI
 spiflash
 spinel
@@ -1234,9 +1252,9 @@ subfolder
 submodule
 submodules
 subprocess
-substeps
 SubscribeResponse
 SubscriptionId
+substeps
 subtype
 sudo
 SulfateConcentrationMeasurement
@@ -1463,6 +1481,7 @@ xFFFF
 xfffff
 xFFFFFFEFFFFFFFFF
 xtensa
+xvzf
 xwayland
 xyz
 xz
@@ -1483,6 +1502,7 @@ zclsubscribe
 zclwrite
 ZephyrConfig
 zephyrproject
+zhengyaohan
 Zigbee
 zigbeealliance
 zigbeethread

.github/workflows/build.yaml

@@ -377,6 +377,9 @@ jobs:
                   scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
             - name: Setup Build, Run Build and Run Tests
               timeout-minutes: 120
+              # We can't enable leak checking here in LSAN_OPTIONS, because on
+              # Darwin that's only supported with a new enough clang, and we're
+              # not building with the pigweed clang here.
               run: |
                   for BUILD_TYPE in default python_lib; do
                       case $BUILD_TYPE in

.github/workflows/cherry-picks.yaml

@@ -14,6 +14,9 @@ jobs:
             (github.event.pull_request.merged == true)
             && (
                    (contains(github.event.pull_request.labels.*.name, 'sve'))
+               ||  (contains(github.event.pull_request.labels.*.name, 'spec'))
+               ||  (contains(github.event.pull_request.labels.*.name, 'request sve'))
+               ||  (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
             )
         steps:
             - name: Checkout
@@ -24,7 +27,7 @@ jobs:
               uses: carloscastrojumo/github-cherry-pick-action@v1.0.1
               with:
                   token: ${{ secrets.MATTER_PAT }}
-                  branch: sve
+                  branch: sve-2
                   labels: |
                       sve cherry pick
                   reviewers: |

.github/workflows/darwin-tests.yaml

@@ -32,9 +32,10 @@ jobs:
 
         strategy:
             matrix:
-                build_variant: [no-ble-asan]
+                build_variant: [no-ble-asan-clang]
         env:
             BUILD_VARIANT: ${{matrix.build_variant}}
+            LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
 
         if: github.actor != 'restyled-io[bot]'
         runs-on: macos-latest

.github/workflows/examples-efr32.yaml

@@ -48,7 +48,7 @@ jobs:
           attempt_limit: 3
           attempt_delay: 2000
       - name: Checkout submodules
-        run: scripts/checkout_submodules.py --shallow --platform efr32
+        run: scripts/checkout_submodules.py --shallow --recursive --platform efr32
 
       # - name: Out of Tree verification
       #   run: third_party/silabs/out_of_tree_verification.sh

.github/workflows/examples-esp32.yaml

@@ -23,7 +23,6 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-    # TODO ESP32 https://github.com/project-chip/connectedhomeip/issues/1510
     esp32:
         name: ESP32
         timeout-minutes: 120

.github/workflows/tests.yaml

@@ -38,6 +38,7 @@ jobs:
             BUILD_VARIANT: ${{matrix.build_variant}}
             CHIP_TOOL_VARIANT: ${{matrix.chip_tool}}
             TSAN_OPTIONS: "halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt"
+            LSAN_OPTIONS: detect_leaks=1
 
         if: github.actor != 'restyled-io[bot]'
         runs-on: ubuntu-latest
@@ -132,6 +133,7 @@ jobs:
             BUILD_VARIANT: ${{matrix.build_variant}}
             CHIP_TOOL_VARIANT: ${{matrix.chip_tool}}
             TSAN_OPTIONS: "halt_on_error=1"
+            LSAN_OPTIONS: detect_leaks=1 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
 
         if: github.actor != 'restyled-io[bot]'
         runs-on: macos-latest

.gitmodules

@@ -78,7 +78,8 @@
 	platforms = qpg
 [submodule "third_party/openthread/ot-efr32"]
 	path = third_party/openthread/ot-efr32
-	url = https://github.com/openthread/ot-efr32.git
+	url = https://github.com/SiliconLabs/ot-efr32.git
+	branch  = matter_sve
 	platforms = efr32
 [submodule "third_party/openthread/ot-ifx"]
 	path = third_party/openthread/ot-ifx

.restyled.yaml

@@ -73,7 +73,6 @@ exclude:
     - "examples/chef/sample_app_util/test_files/*.yaml"
     - "examples/chef/zzz_generated/**/*"
     - "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm" # https://github.com/project-chip/connectedhomeip/issues/20236
-    - "src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm"
 
 
 changed_paths:

.vscode/tasks.json

@@ -331,6 +331,7 @@
                 "android-arm64-chip-tvserver",
                 "android-x64-chip-tool",
                 "android-x86-chip-tool",
+                "bl602-light",
                 "efr32-brd4161a-light",
                 "efr32-brd4163a-light",
                 "efr32-brd4164a-light",

BUILD.gn

@@ -116,10 +116,15 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     source_packages = _matter_python_packages + _pigweed_python_packages
   }
 
+  pw_internal_pip_install("pip_install_matter_packages") {
+    packages = [ "//examples/common/pigweed/rpc_console:chip_rpc_distribution" ]
+  }
+
   # Python packages installed during bootstrap.
   pw_python_group("python_packages") {
     python_deps = [
       ":pip_install_editable_matter_packages",
+      ":pip_install_matter_packages",
       "$dir_pw_env_setup:pip_install_pigweed_package",
     ]
   }
@@ -129,7 +134,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     packages = [
       "//integrations/mobly:chip_mobly",
       "//examples/chef",
-      "//examples/common/pigweed/rpc_console/py:chip_rpc",
     ]
     editable = true
   }

config/ameba/chip.cmake

@@ -104,6 +104,7 @@ string(APPEND CHIP_GN_ARGS "ameba_cc = \"arm-none-eabi-gcc\"\n")
 string(APPEND CHIP_GN_ARGS "ameba_cxx = \"arm-none-eabi-c++\"\n")
 string(APPEND CHIP_GN_ARGS "ameba_cpu = \"ameba\"\n")
 string(APPEND CHIP_GN_ARGS "chip_inet_config_enable_ipv4 = false\n")
+string(APPEND CHIP_GN_ARGS "chip_use_transitional_commissionable_data_provider = false\n")
 
 # Enable persistent storage audit
 if (matter_enable_persistentstorage_audit)

config/beken/.gn

@@ -0,0 +1,28 @@
+# Copyright (c) 2022 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.
+
+import("//build_overrides/build.gni")
+
+# The location of the build configuration file.
+buildconfig = "${build_root}/config/BUILDCONFIG.gn"
+
+# CHIP uses angle bracket includes.
+check_system_includes = true
+
+default_args = {
+  target_cpu = "risc-v"
+  target_os = "freertos"
+
+  import("//args.gni")
+}

config/beken/BUILD.gn

@@ -0,0 +1,28 @@
+# Copyright (c) 2022 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.
+
+# Options from standalone-chip.mk that differ from configure defaults. These
+# options are used from examples/.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+#import("${chip_root}/build/chip/tests.gni")
+
+group("beken") {
+  deps = [ "${chip_root}/src/lib" ]
+}
+group("default") {
+  deps = [ ":beken" ]
+}

config/beken/args.gni

@@ -0,0 +1,38 @@
+# Copyright (c) 2022 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.
+
+# Options from standalone-chip.mk that differ from configure defaults. These
+# options are used from examples/.
+
+chip_device_platform = "beken"
+
+chip_project_config_include = ""
+chip_system_project_config_include = ""
+chip_ble_project_config_include = ""
+
+mbedtls_target = "//mbedtls:mbedtls"
+lwip_platform = "external"
+
+chip_build_tests = false
+
+chip_inet_config_enable_tcp_endpoint = true
+chip_inet_config_enable_udp_endpoint = true
+
+chip_config_network_layer_ble = true
+chip_config_memory_management = "platform"
+chip_enable_additional_data_advertising = true
+chip_enable_rotating_device_id = true
+chip_enable_ota_requestor = true
+
+custom_toolchain = "//third_party/connectedhomeip/config/beken/toolchain:beken"

config/beken/build

@@ -0,0 +1 @@
+third_party/connectedhomeip/build

config/beken/build_overrides

@@ -0,0 +1 @@
+../../examples/build_overrides