Merge branch 'master' into osirko-tc_flabel_2_1_python_test

.github/.wordlist.txt

@@ -757,7 +757,6 @@ js
 json
 JTAG
 Jupyter
-judgement
 jupyterlab
 KA
 kAdminister

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,13 +1,18 @@
-> !!!!!!!!!! Please delete the instructions below and replace with PR description
+
+#### Testing
+
+> !!!!!!!!!! Please delete the instructions below and replace with PR
+> description above.
 >
-> If you have an issue number, please use a syntax of
-> `Fixes #12345` and a brief change description
+> If you have an issue number, please use a syntax of `Fixes #12345` and a brief
+> change description
 >
-> If you do not have an issue number, please have a good description of
-> the problem and the fix. Help the reviewer understand what to expect.
+> If you do not have an issue number, please have a good description of the
+> problem and the fix. Help the reviewer understand what to expect.
 >
-> Add a `### Testing` section to your PR to describe how testing was done.
-> See </~https://github.com/project-chip/connectedhomeip/blob/master/CONTRIBUTING.md#pull-requests>
+> Complete/append to the `### Testing` section above, to describe how testing
+> was done. See
+> </~https://github.com/project-chip/connectedhomeip/blob/master/CONTRIBUTING.md#pull-requests>
 >
 > Make sure you delete these instructions (to prove you have read them).
 >

.github/workflows/build.yaml

@@ -363,6 +363,8 @@ jobs:
                   python -m ensurepip --upgrade
                   python -m pip install -r scripts/setup/requirements.setuppayload.txt
                   python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
+            - name: Run revocation set generation tests
+              run: scripts/run_in_build_env.sh 'python3 -m unittest -v credentials/generate_revocation_set.py'
 
     build_linux_python_lighting_device:
         name: Build on Linux (python lighting-app)

.github/workflows/cancel_workflows_for_pr.yaml

@@ -35,19 +35,19 @@ jobs:
                 python-version: '3.12'
             - name: Setup pip modules we use
               run: |
-                  pip install         \
+                  python3 -m venv venv
+                  venv/bin/pip3 install \
                       click           \
                       coloredlogs     \
                       python-dateutil \
                       pygithub        \
-                      && echo "DONE installint python prerequisites"
+                      && echo "DONE installing python prerequisites"
             - name: Cancel runs
               run: |
-                  scripts/tools/cancel_workflows_for_pr.py       \
+                  venv/bin/python3 scripts/tools/cancel_workflows_for_pr.py \
                     --gh-api-token "${{ secrets.GITHUB_TOKEN }}" \
                     --require "Restyled"       \
                     --require "Lint Code Base" \
                     --require "ZAP"            \
                     --require "Run misspell"   \
-                    --require "PR validity"    \
                     --max-pr-age-minutes 20

.github/workflows/darwin.yaml

@@ -117,9 +117,18 @@ jobs:
                   export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
 
                   # Disable BLE (CHIP_IS_BLE=NO) because the app does not have the permission to use it and that may crash the CI.
-                  xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx ${{ matrix.options.arguments }} \
+                  xcodebuild test -target "Matter" -scheme "Matter Framework Tests" \
+                    -resultBundlePath /tmp/darwin/framework-tests/TestResults.xcresult \
+                    -sdk macosx ${{ matrix.options.arguments }} \
                     CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
                     > >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
+            - name: Generate Summary
+              if: always()
+              working-directory: /tmp
+              run: |
+                  wget /~https://github.com/a7ex/xcresultparser/releases/download/1.8.4/xcresultparser.zip
+                  unzip -j xcresultparser.zip
+                  ./xcresultparser --output-format md --failed-tests-only /tmp/darwin/framework-tests/TestResults.xcresult >>"$GITHUB_STEP_SUMMARY"
             - name: Collect crash logs
               if: failure() && !env.ACT
               run: |

.github/workflows/docbuild.yaml

@@ -29,17 +29,18 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
           cache-dependency-path: matter/docs/requirements.txt
           cache: pip
       - name: Install base dependencies
         working-directory: matter
         run: |
-          sudo pip3 install -U pip
-          pip3 install -r docs/requirements.txt
+          python3 -m venv venv
+          venv/bin/pip3 install -r docs/requirements.txt
       - name: Build documentation
         working-directory: matter/docs
         run: |
+          source ../venv/bin/activate
           mkdir -p _build/src
           make html
           touch _build/html/.nojekyll

.github/workflows/examples-bouffalolab.yaml

@@ -116,8 +116,26 @@ jobs:
       - name: Clean out build output
         run: rm -rf ./out
 
+      - name: Build example BL702L Contact Sensor
+        timeout-minutes: 30
+        run: |
+          ./scripts/run_in_build_env.sh \
+            "./scripts/build/build_examples.py \
+              --target bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd \
+              build \
+              --copy-artifacts-to out/artifacts \
+            "
+      - name: Prepare some bloat report from the previous builds
+        run: |
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+              bl702l bl702l+mfd+littlefs contact-sensor-app \
+              out/artifacts/bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd/chip-bl702l-contact-sensor-example.out \
+              /tmp/bloat_reports/
+      - name: Clean out build output
+        run: rm -rf ./out
+
       - name: Uploading Size Reports
         uses: ./.github/actions/upload-size-reports
         if: ${{ !env.ACT }}
         with:
-          platform-name: BouffaloLab
+          platform-name: BouffaloLab

.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:94
+      image: ghcr.io/project-chip/chip-build-efr32:95
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

.github/workflows/pr-validation.yaml

@@ -8,18 +8,25 @@ jobs:
   check_testing_header:
     runs-on: ubuntu-latest
     steps:
-
       - name: Check for `### Testing` section in PR
         id: check-testing
         continue-on-error: true
         run: |
-          python -c 'import sys; pr_summary = """${{ github.event.pull_request.body }}"""; sys.exit(0 if "### Testing" in pr_summary else 1)'
+          cat >/tmp/pr-summary.txt << "EndMarkerForPrSummary"
+          ${{ github.event.pull_request.body }}
+          EndMarkerForPrSummary
+
+          python -c 'import sys; pr_summary = open("/tmp/pr-summary.txt", "rt").read(); sys.exit(0 if "### Testing" in pr_summary else 1)'
 
       - name: Check for PR starting instructions
         id: check-instructions
         continue-on-error: true
         run: |
-          python -c 'import sys; pr_summary = """${{ github.event.pull_request.body }}"""; sys.exit(1 if "Make sure you delete these instructions" in pr_summary else 0)'
+          cat >/tmp/pr-summary.txt << "EndMarkerForPrSummary"
+          ${{ github.event.pull_request.body }}
+          EndMarkerForPrSummary
+
+          python -c 'import sys; pr_summary = open("/tmp/pr-summary.txt", "rt").read(); sys.exit(1 if "Make sure you delete these instructions" in pr_summary else 0)'
 
       # NOTE: comments disabled for now as separate permissions are required
       #       failing CI step may be sufficient to start (although it contains less information about why it failed)

.github/workflows/protocol_compatibility.yaml

@@ -30,11 +30,11 @@ jobs:
        - name: Setup python
          uses: actions/setup-python@v5
          with:
-           python-version: 3.11
+           python-version: 3.12
        - name: Install dependencies
          run: |
-           python -m pip install --upgrade pip
-           pip install click coloredlogs lark
+           python3 -m venv venv
+           venv/bin/pip3 install click coloredlogs lark
        - name: Create old/new copies
          run: |
            mkdir -p out
@@ -45,5 +45,4 @@ jobs:
            patch -p1 <out/patch.diff
        - name: Check backwards compatibility
          run: |
-           scripts/backwards_compatibility_checker.py out/old_version.matter out/new_version.matter
-
+           venv/bin/python3 scripts/backwards_compatibility_checker.py out/old_version.matter out/new_version.matter

.github/workflows/tests.yaml

@@ -96,6 +96,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/global-bitmaps.xml \
                       src/app/zap-templates/zcl/data-model/chip/global-enums.xml \
                       src/app/zap-templates/zcl/data-model/chip/global-structs.xml \
+                      src/app/zap-templates/zcl/data-model/chip/push-av-stream-transport-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/semantic-tag-namespace-enums.xml \
                       src/app/zap-templates/zcl/data-model/chip/access-control-definitions.xml \
                       src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml \
@@ -197,6 +198,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/tls-certificate-management-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \
@@ -525,7 +527,8 @@ jobs:
             - name: Verify Testing Support
               run: |
                   scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/test_IDM_10_4.py'
-                  scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/test_TC_ICDM_2_1.py'
+                  scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/test_TC_ICDM_2_1_full_pics.py'
+                  scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/test_TC_ICDM_2_1_min_pics.py'
                   scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/test_TC_SC_7_1.py'
                   scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/TestDecorators.py'
                   scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/TestChoiceConformanceSupport.py'

.vscode/tasks.json

@@ -157,6 +157,30 @@
                 ]
             }
         },
+        {
+            "label": "Build EFR32 Unit Tests and Test Runner",
+            "type": "shell",
+            "command": "source scripts/activate.sh; scripts/build/build_examples.py --target efr32-${input:efr32Board}-unit-test build; scripts/build/build_examples.py --target linux-x64-efr32-test-runner build; pip3 install out/linux-x64-efr32-test-runner/chip_pw_test_runner_wheels/*.whl --force-reinstall",
+            "problemMatcher": []
+        },
+        {
+            "label": "Rebuild EFR32 Unit Tests and Test Runner",
+            "type": "shell",
+            "command": "source scripts/activate.sh; rm -rf out/efr32-brd*-unit-test out/linux-x64-efr32-test-runner; scripts/build/build_examples.py --target efr32-${input:efr32Board}-unit-test build; scripts/build/build_examples.py --target linux-x64-efr32-test-runner build; pip3 install out/linux-x64-efr32-test-runner/chip_pw_test_runner_wheels/*.whl --force-reinstall",
+            "problemMatcher": []
+        },
+        {
+            "label": "Clean EFR32 Unit Tests and Test Runner",
+            "type": "shell",
+            "command": "rm -rf out/efr32-brd*-unit-test out/linux-x64-efr32-test-runner",
+            "problemMatcher": []
+        },
+        {
+            "label": "Run EFR32 Unit Tests",
+            "type": "shell",
+            "command": "source scripts/activate.sh; python -m src.test_driver.efr32.py.pw_test_runner.pw_test_runner -d /dev/ttyACM1 -f out/efr32-brd2703a-unit-test/tests -o out.log",
+            "problemMatcher": []
+        },
         {
             "label": "Flash EFR32 board",
             "type": "shell",
@@ -646,6 +670,27 @@
                 "tizen-arm-light"
             ]
         },
+        {
+            "type": "pickString",
+            "id": "efr32Board",
+            "description": "Which board",
+            "options": [
+                "brd2704b",
+                "brd4316a",
+                "brd4317a",
+                "brd4318a",
+                "brd4319a",
+                "brd4186a",
+                "brd4187a",
+                "brd2601b",
+                "brd4187c",
+                "brd4186c",
+                "brd2703a",
+                "brd4338a",
+                "brd2605a",
+                "brd4343a"
+            ]
+        },
         {
             "type": "promptString",
             "id": "tizenTargetDeviceAddress",

CONTRIBUTING.md

@@ -198,13 +198,13 @@ to open the pull request for details or open additional issue in GitHub)
 Ensure that there is sufficient detail in issue summaries to make the content of
 the PR clear:
 
--   a `TLDR` of the change content. This is a judgement call on details,
+-   a `TLDR` of the change content. This is a judgment call on details,
     generally you should include a what was changed and why. The change is
     trivial/short, this can be very short (i.e. "fixed typos" is perfectly
     acceptable, however if changing 100-1000s of line, the areas of changes
     should be explained)
 -   If a crash/error is fixed, explain the root cause and if the fix is not
-    obvious (again, judgement call), explain why the given approach was taken.
+    obvious (again, judgment call), explain why the given approach was taken.
 -   Help the reviewer out with any notable information (specific platform
     issues, extra thoughts or requests for feedback or gotchas on tricky code,
     followup work or PR dependencies)
@@ -230,7 +230,7 @@ out of convenience.
     updated to cover functionality" or "existing tests already cover this" (make
     sure they do. Integration tests often only cover happy paths).
 
-    Add any notes on not covered things. It is a judgement call on how much can
+    Add any notes on not covered things. It is a judgment call on how much can
     be covered as 100% sounds great however not always possible.
 
 -   Manual testing

config/esp32/components/chip/CMakeLists.txt

@@ -432,6 +432,10 @@ if (CONFIG_OPENTHREAD_BORDER_ROUTER)
     list(APPEND matter_requires espressif__esp_rcp_update)
 endif()
 
+if (CONFIG_SEC_CERT_DAC_PROVIDER)
+    list(APPEND matter_requires espressif__esp_secure_cert_mgr)
+endif()
+
 add_prebuilt_library(matterlib "${CMAKE_CURRENT_BINARY_DIR}/lib/libCHIP.a"
                      REQUIRES ${matter_requires})
 

config/nrfconnect/chip-module/CMakeLists.txt

@@ -88,7 +88,7 @@ matter_add_cxxflags(${ZEPHYR_GNU_CPP_STD})
 # Set up custom OpenThread configuration
 
 if (CONFIG_CHIP_OPENTHREAD_CONFIG)
-    get_filename_component(CHIP_OPENTHREAD_CONFIG 
+    get_filename_component(CHIP_OPENTHREAD_CONFIG
         ${CONFIG_CHIP_OPENTHREAD_CONFIG}
         REALPATH
         BASE_DIR ${CMAKE_SOURCE_DIR}
@@ -125,7 +125,7 @@ matter_add_gn_arg_bool  ("chip_enable_openthread"                 CONFIG_NET_L2_
 matter_add_gn_arg_bool  ("chip_openthread_ftd"                    CONFIG_OPENTHREAD_FTD)
 matter_add_gn_arg_bool  ("chip_config_network_layer_ble"          CONFIG_BT)
 matter_add_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_CHIP_IPV4)
-matter_add_gn_arg_bool  ("chip_enable_nfc"                        CONFIG_CHIP_NFC_COMMISSIONING)
+matter_add_gn_arg_bool  ("chip_enable_nfc_onboarding_payload"     CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD)
 matter_add_gn_arg_bool  ("chip_enable_ota_requestor"              CONFIG_CHIP_OTA_REQUESTOR)
 matter_add_gn_arg_bool  ("chip_persist_subscriptions"             CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS)
 matter_add_gn_arg_bool  ("chip_monolithic_tests"                  CONFIG_CHIP_BUILD_TESTS)

config/nrfconnect/chip-module/Kconfig

@@ -34,7 +34,7 @@ config CHIP_NRF_PLATFORM
 config CHIP_DEVICE_VENDOR_NAME
 	default "Nordic Semiconductor ASA"
 
-config CHIP_NFC_COMMISSIONING
+config CHIP_NFC_ONBOARDING_PAYLOAD
 	bool "Share onboarding payload in NFC tag"
 	default n
 	imply NFC_T2T_NRFXLIB

config/nrfconnect/chip-module/Kconfig.defaults

@@ -178,10 +178,10 @@ config MPSL_FEM_NRF21540_RUNTIME_PA_GAIN_CONTROL
     default y if MPSL_FEM
 
 # ==============================================================================
-# NFC configuration
+# NFC Onboarding Payload configuration
 # ==============================================================================
 
-config CHIP_NFC_COMMISSIONING
+config CHIP_NFC_ONBOARDING_PAYLOAD
     default y
 
 # Disable not needed NFC callback to save flash

config/qpg/chip-gn/args.gni

@@ -24,7 +24,7 @@ lwip_debug = false
 chip_enable_openthread = true
 chip_config_network_layer_ble = true
 chip_inet_config_enable_ipv4 = false
-chip_enable_nfc = false
+chip_enable_nfc_onboarding_payload = false
 chip_build_tests = false
 chip_monolithic_tests = false
 chip_inet_config_enable_tcp_endpoint = false

config/telink/chip-module/CMakeLists.txt

@@ -69,7 +69,7 @@ matter_add_flags(-DMBEDTLS_USER_CONFIG_FILE=<telink-mbedtls-config.h>)
 # Set up custom OpenThread configuration
 
 if (CONFIG_CHIP_OPENTHREAD_CONFIG)
-    get_filename_component(CHIP_OPENTHREAD_CONFIG 
+    get_filename_component(CHIP_OPENTHREAD_CONFIG
         ${CONFIG_CHIP_OPENTHREAD_CONFIG}
         REALPATH
         BASE_DIR ${CMAKE_SOURCE_DIR}
@@ -96,7 +96,7 @@ matter_add_gn_arg_bool  ("chip_enable_openthread"                 CONFIG_NET_L2_
 matter_add_gn_arg_bool  ("chip_openthread_ftd"                    CONFIG_OPENTHREAD_FTD)
 matter_add_gn_arg_bool  ("chip_config_network_layer_ble"          CONFIG_BT)
 matter_add_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_CHIP_IPV4)
-matter_add_gn_arg_bool  ("chip_enable_nfc"                        CONFIG_CHIP_NFC_COMMISSIONING)
+matter_add_gn_arg_bool  ("chip_enable_nfc_onboarding_payload"     CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD)
 matter_add_gn_arg_bool  ("chip_enable_ota_requestor"              CONFIG_CHIP_OTA_REQUESTOR)
 matter_add_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   FALSE)
 matter_add_gn_arg_bool  ("chip_error_logging"                     CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 1)

config/telink/chip-module/Kconfig

@@ -22,7 +22,7 @@ if CHIP
 config CHIP_DEVICE_VENDOR_NAME
 	default "Telink Semiconductor"
 
-config CHIP_NFC_COMMISSIONING
+config CHIP_NFC_ONBOARDING_PAYLOAD
 	bool "Share onboarding payload in NFC tag"
 	default n
 	imply I2C