Merge with master

.devcontainer/Dockerfile

@@ -25,9 +25,10 @@ ENV LANG en_US.utf8
 
 # these are installed for terminal/dev convenience.  If more tooling for build is required, please
 #  add them to chip-build (in integrations/docker/images/chip-build)
-RUN apt-get update
-RUN apt-get install -y locales && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-RUN apt-get -fy install git vim emacs sudo \
+RUN apt-get update \
+    && apt-get install -y locales \
+    && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
+    && apt-get -fy install git vim emacs sudo \
     apt-utils dialog zsh \
     iproute2 procps lsb-release \
     bash-completion \
@@ -36,49 +37,31 @@ RUN apt-get -fy install git vim emacs sudo \
     docker.io \
     iputils-ping net-tools \
     libncurses5 \
-    libpython2.7
-
-RUN groupadd -g $USER_GID $USERNAME
-RUN useradd -s /bin/bash -u $USER_UID -g $USER_GID -G docker -m $USERNAME
-RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
-RUN chmod 0440 /etc/sudoers.d/$USERNAME
-
-RUN mkdir -p /var/downloads
-RUN cd /var/downloads
-RUN curl -JL https://github.com/microsoft/vscode-cpptools/releases/download/0.27.0/cpptools-linux.vsix > extension.zip
-RUN unzip extension.zip
-RUN mkdir -p /home/$USERNAME/.vscode-server/extensions
-RUN mv extension /home/$USERNAME/.vscode-server/extensions/ms-vscode.cpptools-0.27.0
-RUN mkdir -p /home/$USERNAME/bin
-RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/restyle-path -o /home/$USERNAME/bin/restyle-path
-RUN chmod +x /home/$USERNAME/bin/restyle-path
-RUN chown -R $USERNAME:$USERNAME /home/$USERNAME
-RUN echo "PATH=/home/$USERNAME/bin:${PATH}" >> /home/$USERNAME/.bashrc
-
-# $USERNAME needs to own the esp-idf and tools for the examples to build
-RUN chown -R $USERNAME:$USERNAME /opt/espressif/esp-idf
-RUN chown -R $USERNAME:$USERNAME /opt/espressif/tools
-
-# $USERNAME needs to own west configuration to build nRF Connect examples
-RUN chown -R $USERNAME:$USERNAME /opt/NordicSemiconductor/nrfconnect/
-
-# allow read/write access to header and libraries
-RUN chown -R $USERNAME:$USERNAME /opt/ubuntu-21.04-aarch64-sysroot/usr/
-
-# allow licenses to be accepted
-RUN chown -R $USERNAME:$USERNAME /opt/android/sdk
-
-# AmebaD requires access to change build_info.h
-RUN chown -R $USERNAME:$USERNAME /opt/ameba/ambd_sdk_with_chip_non_NDA/
-
-# NXP uses a patch_sdk script to change SDK files
-RUN mkdir -p /opt/sdk/sdks/
-RUN chown -R $USERNAME:$USERNAME /opt/sdk/sdks/
-
-RUN chown -R $USERNAME:$USERNAME /opt/fsl-imx-xwayland/5.15-kirkstone/
-
-# Add access to openocd for VSCode debugging
-RUN chown -R $USERNAME:$USERNAME /opt/openocd
+    libpython2.7 \
+    && :
+
+RUN groupadd -g $USER_GID $USERNAME \
+    && useradd -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $USERNAME \
+    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+    && chmod 0440 /etc/sudoers.d/$USERNAME \
+    && :
+
+RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/restyle-path -o /usr/local/bin/restyle-path \
+    && chmod +x /usr/local/bin/restyle-path \
+    && :
+
+RUN mkdir -p /opt/sdk/sdks/ \
+    && chown -R $USERNAME:$USERNAME \
+    /opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
+    /opt/espressif/esp-idf `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
+    /opt/espressif/tools \
+    /opt/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \
+    /opt/ubuntu-21.04-aarch64-sysroot/usr/ `# allow read/write access to header and libraries` \
+    /opt/android/sdk `# allow licenses to be accepted` \
+    /opt/ameba/ambd_sdk_with_chip_non_NDA/ `# AmebaD requires access to change build_info.h` \
+    /opt/fsl-imx-xwayland/5.15-kirkstone/ \
+    /opt/openocd \
+    && :
 
 # Fix Tizen SDK paths for new user
 RUN sed -i '/^TIZEN_SDK_DATA_PATH/d' $TIZEN_SDK_ROOT/sdk.info \

.devcontainer/devcontainer.json

@@ -17,7 +17,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "BUILD_VERSION": "0.6.18"
+            "BUILD_VERSION": "0.6.47"
         }
     },
     "remoteUser": "vscode",
@@ -34,6 +34,7 @@
         "maelvalais.autoconf",
         "marus25.cortex-debug",
         "ms-azuretools.vscode-docker",
+        "ms-vscode.cpptools",
         "msedge-dev.gnls",
         "redhat.vscode-yaml",
         "vadimcn.vscode-lldb",

.flake8

@@ -1,2 +1,96 @@
 [flake8]
 max-line-length = 132
+exclude = third_party
+          .*
+          out/*
+          scripts/idl/*
+          ./examples/common/QRCode/*
+          # temporarily scan only directories with fixed files
+          # TODO: Remove the paths below when all bugs are fixed
+          src/tools/chip-cert/*
+          src/test_driver/mbed/*
+          src/test_driver/linux-cirque/*
+          build/chip/java/tests/*
+          build/chip/linux/*
+          build/config/linux/*
+          credentials/fetch-paa-certs-from-dcl.py
+          docs/_extensions/external_content.py
+          examples/common/pigweed/rpc_console/py/chip_rpc/console.py
+          examples/lighting-app/python/lighting.py
+          examples/platform/mbed/ota/generate_ota_list_image.py
+          scripts/build/build/target.py
+          scripts/build/build/targets.py
+          scripts/build/builders/android.py
+          scripts/build/builders/bouffalolab.py
+          scripts/build/builders/cc13x2x7_26x2x7.py
+          scripts/build/builders/genio.py
+          scripts/build/builders/gn.py
+          scripts/build/builders/imx.py
+          scripts/build/builders/infineon.py
+          scripts/codegen.py
+          scripts/codepregen.py
+          scripts/error_table.py
+          scripts/examples/gn_to_cmakelists.py
+          scripts/flashing/bouffalolab_firmware_utils.py
+          scripts/flashing/cyw30739_firmware_utils.py
+          scripts/gen_chip_version.py
+          scripts/helpers/bloat_check.py
+          scripts/pregenerate/using_codegen.py
+          scripts/pregenerate/using_zap.py
+          scripts/py_matter_yamltests/matter_yamltests/constraints.py
+          scripts/py_matter_yamltests/matter_yamltests/definitions.py
+          scripts/py_matter_yamltests/matter_yamltests/fixes.py
+          scripts/py_matter_yamltests/matter_yamltests/parser.py
+          scripts/py_matter_yamltests/matter_yamltests/pics_checker.py
+          scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/pseudo_clusters.py
+          scripts/py_matter_yamltests/matter_yamltests/yaml_loader.py
+          scripts/py_matter_yamltests/test_pics_checker.py
+          scripts/py_matter_yamltests/test_spec_definitions.py
+          scripts/py_matter_yamltests/test_yaml_loader.py
+          scripts/py_matter_yamltests/test_yaml_parser.py
+          scripts/run-clang-tidy-on-compile-commands.py
+          scripts/tests/chiptest/yamltest_with_chip_repl_tester.py
+          scripts/tools/check_zcl_file_sync.py
+          scripts/tools/convert_ini.py
+          scripts/tools/memory/memdf/__init__.py
+          scripts/tools/memory/report_summary.py
+          scripts/tools/silabs/FactoryDataProvider.py
+          scripts/tools/zap/generate.py
+          scripts/tools/zap/prune_outputs.py
+          scripts/tools/zap/version_update.py
+          scripts/tools/zap/zap_download.py
+          scripts/tools/zap_convert_all.py
+          src/app/ota_image_tool.py
+          src/app/zap_cluster_list.py
+          src/controller/python/build-chip-wheel.py
+          src/controller/python/chip-device-ctrl.py
+          src/controller/python/chip/CertificateAuthority.py
+          src/controller/python/chip/ChipBleUtility.py
+          src/controller/python/chip/ChipBluezMgr.py
+          src/controller/python/chip/ChipCommissionableNodeCtrl.py
+          src/controller/python/chip/ChipCoreBluetoothMgr.py
+          src/controller/python/chip/ChipDeviceCtrl.py
+          src/controller/python/chip/ChipReplStartup.py
+          src/controller/python/chip/ChipStack.py
+          src/controller/python/chip/ChipUtility.py
+          src/controller/python/chip/FabricAdmin.py
+          src/controller/python/chip/ble/scan_devices.py
+          src/controller/python/chip/clusters/Attribute.py
+          src/controller/python/chip/clusters/ClusterObjects.py
+          src/controller/python/chip/clusters/Command.py
+          src/controller/python/chip/clusters/__init__.py
+          src/controller/python/chip/discovery/__init__.py
+          src/controller/python/chip/interaction_model/__init__.py
+          src/controller/python/chip/interaction_model/delegate.py
+          src/controller/python/chip/internal/commissioner.py
+          src/controller/python/chip/setup_payload/setup_payload.py
+          src/controller/python/chip/storage/__init__.py
+          src/controller/python/chip/tlv/__init__.py
+          src/controller/python/chip/utils/CommissioningBuildingBlocks.py
+          src/controller/python/chip/yaml/__init__.py
+          src/controller/python/chip/yaml/format_converter.py
+          src/controller/python/chip/yaml/runner.py
+          src/lib/asn1/gen_asn1oid.py
+          src/pybindings/pycontroller/build-chip-wheel.py
+          src/pybindings/pycontroller/pychip/__init__.py
+          src/setup_payload/python/generate_setup_payload.py

.github/.wordlist.txt

@@ -54,7 +54,7 @@ AmebaZ
 amebaz2
 announcementReason
 AnnounceOTAProvider
-AnnounceOtaProviderRequest
+AnnounceOTAProviderRequest
 APIs
 apk
 AppConfig
@@ -159,7 +159,7 @@ bouffalolab
 BRD
 breakpoint
 bredr
-BridgedDeviceBasic
+BridgedDeviceBasicInformation
 bridgedLightEndpoint
 bringup
 BromateConcentrationMeasurement
@@ -416,6 +416,7 @@ diffsyms
 dimmable
 dirname
 dirs
+disableNotifyUpdateApplied
 disambiguated
 discoverable
 DispatchEvent
@@ -1163,6 +1164,8 @@ saveAs
 sbin
 scalability
 scalable
+schema
+schemas
 scm
 sco
 scp
@@ -1202,13 +1205,15 @@ SHA
 ShadeConfiguration
 SHAs
 showDocumentation
+showsdks
 shubhamdp
 SIGINT
 SiLabs
 Silabs's
 SiliconLabs
 SimpleFileExFlags
 SimpleLink
+SiWx
 sizedb
 sl
 SLAAC
@@ -1382,6 +1387,7 @@ ug
 ui
 uint
 ULA
+Ultrafast
 UNBLUR
 uncommissioned
 Unencrypted
@@ -1454,6 +1460,7 @@ wic
 WiFiNetworkDiagnostics
 WindowCovering
 WindowCoveringGoToLiftPercentage
+WiseMCU
 wlan
 wmm
 WPA
@@ -1474,6 +1481,7 @@ xbef
 xc
 xcd
 Xcode
+xcodebuild
 xcodeproj
 xcworkspace
 xd

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-> !!!!!!!!!! Please delete the instructions below and replace with PR desription
+> !!!!!!!!!! Please delete the instructions below and replace with PR description
 >
 > If you have an issue number, please use a syntax of
 > `Fixes #12345` and a brief change description

.github/boring-cyborg.yml

@@ -105,7 +105,7 @@ labelPRBasedOnFilePath:
         - src/darwin/*
 
     efr32:
-        - src/platform/EFR32/*
+        - src/platform/efr32/*
 
     esp32:
         - src/platform/ESP32/*

.github/dependabot.yml

@@ -1,5 +1,11 @@
 version: 2
 updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
   - package-ecosystem: "gitsubmodule"
     directory: "/"
     schedule:

.github/labeler.yml

@@ -182,8 +182,8 @@ darwin:
     - examples/darwin-framework-tool/**/*
 
 efr32:
-    - src/platform/EFR32/*
-    - src/platform/EFR32/**/*
+    - src/platform/efr32/*
+    - src/platform/efr32/**/*
 
 esp32:
     - src/platform/ESP32/*

.github/workflows/bloat_check.yaml

@@ -27,10 +27,13 @@ jobs:
     pull_request_update:
         name: Report on pull requests
 
+        # Don't run on forked repos
+        if: github.repository_owner == 'project-chip'
+
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.6.18
+            image: connectedhomeip/chip-build:0.6.47
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.36