Merge branch 'master' into camera-zap

Author: lboue

.github/workflows/examples-nrfconnect.yaml

@@ -198,7 +198,7 @@ jobs:
               run: |
                   # Temporarily fix link issue
                   sed -i '151s/<LINK_FLAGS> //' /opt/NordicSemiconductor/nrfconnect/zephyr/cmake/linker/ld/target.cmake
-                  scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target nrf-native-posix-64-tests build"
+                  scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target nrf-native-sim-tests build"
             - name: Uploading Failed Test Logs
               uses: actions/upload-artifact@v4
               if: ${{ failure() && !env.ACT }}

.github/workflows/pr-validation.yaml

@@ -45,7 +45,7 @@ jobs:
       #       })
 
       - name: Fail if PR instructions were not deleted
-        if: steps.check-instructions.outcome == 'failure'
+        if: (steps.check-instructions.outcome == 'failure') && (github.event.pull_request.user.login != 'dependabot[bot]')
         run: |
           python -c 'import sys; print("PR instructions were not replaced"); sys.exit(1)'
 
@@ -63,7 +63,8 @@ jobs:
       #       })
 
       - name: Fail if `### Testing` section not in PR
-        if: steps.check-testing.outcome == 'failure'
+        if: (steps.check-testing.outcome == 'failure') && (github.event.pull_request.user.login != 'dependabot[bot]')
+
         run: |
           python -c 'import sys; print("Testing section missing (test failed)"); sys.exit(1)'
 

.github/workflows/third-party-check.yaml

@@ -28,13 +28,13 @@ jobs:
         name: Check For Submodule Update Label
         runs-on: ubuntu-latest
         steps:
-            - if: ${{ !contains(github.event.pull_request.labels.*.name, 'changing-submodules-on-purpose') }}
-              name: Fail
+            - name: Fail
+              if: (github.event.pull_request.user.login != 'dependabot[bot]') && !contains(github.event.pull_request.labels.*.name, 'changing-submodules-on-purpose')
               run: |
                   echo This pull request attempts to update submodules without the changing-submodules-on-purpose label. Please apply that label if the changes are intentional, or remove those changes.
                   exit 1
-            - if: ${{ contains(github.event.pull_request.labels.*.name, 'changing-submodules-on-purpose') }}
-              name: Success
+            - name: Success
+              if: contains(github.event.pull_request.labels.*.name, 'changing-submodules-on-purpose')
               run: |
                   echo PR looks good.
                   exit 0

config/nrfconnect/chip-module/CMakeLists.txt

@@ -186,9 +186,9 @@ if (CONFIG_CHIP_CRYPTO_PSA)
     matter_add_gn_arg_bool  ("chip_crypto_psa_spake2p" CONFIG_PSA_WANT_ALG_SPAKE2P_MATTER)
 endif()
 
-if (BOARD STREQUAL "native_posix")
+if (BOARD STREQUAL "native_sim")
     matter_add_gn_arg_string("target_cpu" "x86")
-elseif (BOARD STREQUAL "native_posix_64")
+elseif (BOARD STREQUAL "native_sim/native/64")
     matter_add_gn_arg_string("target_cpu" "x64")
 endif()
 

config/nxp/chip-module/CMakeLists.txt

@@ -122,9 +122,9 @@ else()
 endif()
 
 
-# if (BOARD STREQUAL "native_posix")
+# if (BOARD STREQUAL "native_sim")
 #     matter_add_gn_arg_string("target_cpu" "x86")
-# elseif (BOARD STREQUAL "native_posix_64")
+# elseif (BOARD STREQUAL "native_sim/native/64")
 #     matter_add_gn_arg_string("target_cpu" "x64")
 # endif()
 

config/zephyr/chip-module/CMakeLists.txt

@@ -101,9 +101,9 @@ if(CONFIG_CHIP)
     matter_add_gn_arg_bool("chip_inet_config_enable_tcp_endpoint" FALSE)
     matter_add_gn_arg_bool("chip_enable_read_client" CONFIG_CHIP_ENABLE_READ_CLIENT)
 
-    if(BOARD STREQUAL "native_posix")
+    if(BOARD STREQUAL "native_sim")
         matter_add_gn_arg_string("target_cpu" "x86")
-    elseif(BOARD STREQUAL "native_posix_64")
+    elseif(BOARD STREQUAL "native_sim/native/64")
         matter_add_gn_arg_string("target_cpu" "x64")
     endif()
 

docs/development_controllers/chip-repl/index.md

@@ -9,7 +9,7 @@
 ```
 
 -   [Matter REPL](./matter-repl.md)
--   [Intro](./Matter_REPL_Intro.ipynb)
--   [Access Control](./Matter_Access_Control.ipynb)
--   [Basic interactions](./Matter_Basic_Interactions.ipynb)
--   [Fabric Commissioning](./Matter_Multi_Fabric_Commissioning.ipynb)
+-   [Intro](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-repl/Matter_REPL_Intro.ipynb)
+-   [Basic interactions](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-repl/Matter_Basic_Interactions.ipynb)
+-   [Access Control](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-repl/Matter_Access_Control.ipynb)
+-   [Multi Fabric Commissioning](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-repl/Matter_Multi_Fabric_Commissioning.ipynb)

docs/development_controllers/index.md

@@ -9,5 +9,5 @@ chip-repl/index
 chip-tool/index
 ```
 
--   [chip-tool](./chip-tool)
--   [chip-repl](./chip-repl)
+-   [chip-tool](./chip-tool/index.md)
+-   [chip-repl](./chip-repl/index.md)

docs/platforms/esp32/vs_code_development.md

@@ -18,7 +18,9 @@ Follow
 [these](https://github.com/project-chip/connectedhomeip/edit/master/docs/VSCODE_DEVELOPMENT.md)
 steps to set up Visual Studio Code for Matter development.
 
-### Linux <a name="linux">
+(linux)=
+
+### Linux
 
 For Espressif esp32 devices:
 
@@ -68,4 +70,4 @@ For Espressif esp32 devices:
 
 1. Open connectedhomeip within WSL on Visual Studio Code.
 
-1. Perform step 2 onwards from [Linux](#linux) guide.
+1. Perform step 2 onwards from {ref}`linux` guide.

docs/requirements.txt

@@ -1,6 +1,6 @@
-docutils==0.17.1
-Sphinx>=4.5
+docutils==0.21.2
+Sphinx==8.2.0
 sphinx-book-theme
-myst-parser
+myst-parser>=2.0.0
 breathe>=4.34
-pydata-sphinx-theme==0.14.4
+pydata-sphinx-theme==0.16.1

examples/chef/devices/rootnode_rainsensor_a7aa5d7738.matter

@@ -1759,6 +1759,9 @@ endpoint 0 {
     handle command UpdateFabricLabel;
     handle command RemoveFabric;
     handle command AddTrustedRootCertificate;
+    handle command SetVidVerificationStatement;
+    handle command SignVidVerificationRequest;
+    handle command SignVidVerificationResponse;
   }
 
   server cluster GroupKeyManagement {

examples/chef/devices/rootnode_rainsensor_a7aa5d7738.zap

@@ -17,20 +17,20 @@
     }
   ],
   "package": [
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "category": "matter",
-      "version": "chip-v1"
-    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
       "type": "zcl-properties",
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "category": "matter",
+      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
@@ -1584,6 +1584,30 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "SetVidVerificationStatement",
+              "code": 12,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "SignVidVerificationRequest",
+              "code": 13,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "SignVidVerificationResponse",
+              "code": 14,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2738,4 +2762,4 @@
       "parentEndpointIdentifier": 0
     }
   ]
-}
+}

examples/energy-management-app/linux/README.md

@@ -241,7 +241,7 @@ data (e.g. fabric info).
 
 -   See chip-repl documentation in:
     -   [Working with Python CHIP Controller](../../../docs/development_controllers/chip-repl/python_chip_controller_building.md)
-    -   [Matter_REPL_Intro](../../../docs/development_controllers/chip-repl/Matter_REPL_Intro.ipynb)
+    -   [Matter_REPL_Intro](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-repl/Matter_REPL_Intro.ipynb)
 
 ### Building chip-repl:
 

examples/laundry-washer-app/nxp/zephyr/prj_ota.conf

@@ -29,3 +29,6 @@ CONFIG_CHIP_OTA_IMAGE_BUILD=y
 # Note: You need to use the same signature key used by MCUBOOT, i.e BOOT_SIGNATURE_KEY_FILE.
 #       Default CONFIG_BOOT_SIGNATURE_KEY_FILE is defined in config/nxp/app/bootloader.conf
 CONFIG_MCUBOOT_SIGNATURE_KEY_FILE="./bootloader/mcuboot/root-rsa-2048.pem"
+
+# To enable SoftwareDiagnostics cluster's feature WTRMRK on endpoint 0
+CONFIG_CHIP_MALLOC_SYS_HEAP_WATERMARKS_SUPPORT=y

examples/light-switch-app/esp32/sdkconfig.defaults.esp32h2

@@ -0,0 +1,26 @@
+CONFIG_IDF_TARGET="esp32h2"
+
+# Enable OpenThread
+CONFIG_OPENTHREAD_ENABLED=y
+CONFIG_OPENTHREAD_SRP_CLIENT=y
+CONFIG_OPENTHREAD_LOG_LEVEL_DYNAMIC=n
+CONFIG_OPENTHREAD_LOG_LEVEL_NOTE=y
+CONFIG_OPENTHREAD_CLI=n
+CONFIG_OPENTHREAD_DNS_CLIENT=y
+
+# Disable lwip ipv6 autoconfig
+CONFIG_LWIP_IPV6_AUTOCONFIG=n
+
+# LwIP config for OpenThread
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
+CONFIG_LWIP_MULTICAST_PING=y
+
+# MDNS platform
+CONFIG_USE_MINIMAL_MDNS=n
+CONFIG_ENABLE_EXTENDED_DISCOVERY=y
+
+# Disable STA for ESP32H2
+CONFIG_ENABLE_WIFI_STATION=n
+
+# Enable nano format
+CONFIG_NEWLIB_NANO_FORMAT=y

examples/thermostat/nxp/zephyr/prj_ota.conf

@@ -29,3 +29,6 @@ CONFIG_CHIP_OTA_IMAGE_BUILD=y
 # Note: You need to use the same signature key used by MCUBOOT, i.e BOOT_SIGNATURE_KEY_FILE.
 #       Default CONFIG_BOOT_SIGNATURE_KEY_FILE is defined in config/nxp/app/bootloader.conf
 CONFIG_MCUBOOT_SIGNATURE_KEY_FILE="./bootloader/mcuboot/root-rsa-2048.pem"
+
+# To enable SoftwareDiagnostics cluster's feature WTRMRK on endpoint 0
+CONFIG_CHIP_MALLOC_SYS_HEAP_WATERMARKS_SUPPORT=y