Merge branch 'master' into add-water-heater-management-cluster-sdk-su…

…pport

.github/workflows/chef.yaml

@@ -56,7 +56,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:54
+            image: ghcr.io/project-chip/chip-build-esp32:65
             options: --user root
 
         steps:

.github/workflows/examples-esp32.yaml

@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:54
+            image: ghcr.io/project-chip/chip-build-esp32:65
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -126,7 +126,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:54
+            image: ghcr.io/project-chip/chip-build-esp32:65
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

.github/workflows/qemu.yaml

@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32-qemu:54
+            image: ghcr.io/project-chip/chip-build-esp32-qemu:65
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

.github/workflows/release_artifacts.yaml

@@ -32,7 +32,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:54
+            image: ghcr.io/project-chip/chip-build-esp32:65
 
         steps:
             - name: Checkout

.github/workflows/tests.yaml

@@ -576,6 +576,7 @@ jobs:
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_RVCOPSTATE_2_1.py'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_RVCOPSTATE_2_3.py'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_RVCOPSTATE_2_4.py'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_SC_7_1.py'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestConformanceSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestSpecParsingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
@@ -585,6 +586,7 @@ jobs:
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestSpecParsingDeviceType.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
                   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_SC_7_1.py'
 
             - name: Uploading core files
               uses: actions/upload-artifact@v4

config/nrfconnect/chip-module/Kconfig

@@ -34,15 +34,6 @@ config CHIP_NRF_PLATFORM
 config CHIP_DEVICE_VENDOR_NAME
 	default "Nordic Semiconductor ASA"
 
-config CHIP_APP_LOG_LEVEL
-	int "Logging level in application"
-	default LOG_DEFAULT_LEVEL
-	depends on LOG
-	help
-	  Sets the logging level in the Matter application. Use this configuration
-	  option only within the application. To set the logging level for the
-	  Matter stack, use the MATTER_LOG_LEVEL configuration option.
-
 config CHIP_NFC_COMMISSIONING
 	bool "Share onboarding payload in NFC tag"
 	default n

config/nxp/chip-module/Kconfig

@@ -30,15 +30,6 @@ config CHIP_NXP_PLATFORM
 config CHIP_DEVICE_VENDOR_NAME
 	default "NXP Semiconductors"
 
-config CHIP_APP_LOG_LEVEL
-	int "Logging level in application"
-	default LOG_DEFAULT_LEVEL
-	depends on LOG
-	help
-	  Sets the logging level in the Matter application. Use this configuration
-	  option only within the application. To set the logging level for the
-	  Matter stack, use the MATTER_LOG_LEVEL configuration option.
-
 config CHIP_EXAMPLE_DEVICE_INFO_PROVIDER
 	bool "Include default device information provider build"
 	default y

config/telink/chip-module/Kconfig

@@ -22,15 +22,6 @@ if CHIP
 config CHIP_DEVICE_VENDOR_NAME
 	default "Telink Semiconductor"
 
-config CHIP_APP_LOG_LEVEL
-	int "Logging level in application"
-	default LOG_DEFAULT_LEVEL
-	depends on LOG
-	help
-	  Sets the logging level in the Matter application. Use this configuration
-	  option only within the application. To set the logging level for the
-	  Matter stack, use the MATTER_LOG_LEVEL configuration option.
-
 config CHIP_NFC_COMMISSIONING
 	bool "Share onboarding payload in NFC tag"
 	default n

config/zephyr/Kconfig

@@ -42,6 +42,15 @@ menuconfig CHIP
 
 if CHIP
 
+config CHIP_APP_LOG_LEVEL
+	int "Logging level in application"
+	default LOG_DEFAULT_LEVEL
+	depends on LOG
+	help
+	  Sets the logging level in the Matter application. Use this configuration
+	  option only within the application. To set the logging level for the
+	  Matter stack, use the MATTER_LOG_LEVEL configuration option.
+
 # Device and firmware identifers
 
 config CHIP_DEVICE_VENDOR_ID

config/zephyr/chip-module/Kconfig.logging

@@ -0,0 +1,41 @@
+#
+#   Copyright (c) 2021 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.
+#
+
+config LOG
+    default y
+
+if LOG
+
+choice LOG_MODE
+    default LOG_MODE_MINIMAL
+endchoice
+
+choice MATTER_LOG_LEVEL_CHOICE
+    default MATTER_LOG_LEVEL_DBG
+endchoice
+
+config CHIP_APP_LOG_LEVEL
+    default 4 # debug
+
+config LOG_DEFAULT_LEVEL
+    default 1 # error
+
+# disable synchronous printk to avoid blocking IRQs which
+# may affect time sensitive components
+config PRINTK_SYNC
+    default n
+
+endif # LOG

docs/guides/fabric_synchronization_guide.md

@@ -19,6 +19,9 @@ Fabric-Bridge-App example app implements the Aggregator device type with Fabric
 Synchronization condition met and demonstrates the end-to-end Fabric
 Synchronization feature using dynamic endpoints.
 
+The Fabric-Admin and Fabric-Bridge-App example applications must be executed on
+the same physical device and communicate with each other using RPC.
+
 Fabric Synchronization can be triggered from either side. The initiator of the
 Fabric Synchronization process, who shares their devices, takes on the
 Commissioner role. The recipient of the Fabric Synchronization request, who
@@ -82,11 +85,29 @@ fabricsync enable-auto-sync 1
 Pair the Fabric-Source bridge to Fabric-Sync with node ID 1:
 
 ```
-fabricsync add-bridge 1 <fabric-sink-ip>
+fabricsync add-bridge 1 <fabric-source-bridge-ip>
 ```
 
 ### Pair Light Example to Fabric-Source
 
+Since Fabric-Bridge also functions as a Matter server, running it alongside the
+Light Example app on the same machine would cause conflicts. Therefore, you need
+to run the Matter Light Example app on a separate physical machine from the one
+hosting Fabric-Admin and Fabric-Bridge. You can then commission the Matter Light
+Example app using Fabric-Admin on the source side.
+
+There is a workaround to avoid conflicts when running multiple Matter server
+applications on the same machine, you can use different ports and unique
+Key-Value Store (KVS) paths for each app. Here's an example of how to launch a
+Light App with custom settings:
+
+Light App with yet another set of different discriminator/passcode, ports and
+KVS
+
+```
+./out/linux-x64-light-clang/chip-lighting-app --discriminator 3843 --passcode 20202023 --secured-device-port 5543 --unsecured-commissioner-port 5553 --KVS /tmp/chip_kvs_lighting_app
+```
+
 Pair the Light Example with node ID 3 using its payload number:
 
 ```

scripts/setup/constraints.txt

@@ -128,7 +128,7 @@ mobly==1.12.1
     # via -r requirements.all.txt
 msgpack==1.0.4
     # via cachecontrol
-mypy==0.971
+mypy==1.10.1
     # via -r requirements.all.txt
 mypy-extensions==1.0.0
     # via mypy

scripts/setup/requirements.all.txt

@@ -38,7 +38,7 @@ appdirs
 coloredlogs
 watchdog
 build==0.8.0
-mypy==0.971
+mypy==1.10.1
 mypy-protobuf==3.5.0
 protobuf==4.24.4
 types-protobuf==4.24.0.2
@@ -50,4 +50,3 @@ colorama
 
 # update tornado for pw_watch
 tornado
-

src/app/tests/suites/certification/Test_TC_S_2_2.yaml

@@ -81,7 +81,20 @@ tests:
                 value: maxScenesMinusOne / 2
 
     - label:
-          "Step 0a :TH sends KeySetWrite command in the GroupKeyManagement
+          "Step 0a :TH reads attribute {ServerList} from the Descriptor cluster
+          of the endpoint that implements the Scenes Management server on the
+          DUT. DUT responds with a list of server clusters containing the groups
+          cluster."
+      cluster: "Descriptor"
+      command: "readAttribute"
+      attribute: "ServerList"
+      response:
+          constraints:
+              type: list
+              contains: [4]
+
+    - label:
+          "Step 0b :TH sends KeySetWrite command in the GroupKeyManagement
           cluster to DUT using a key that is pre-installed on the TH.
           GroupKeySet fields are as follows:"
       cluster: "Group Key Management"
@@ -103,7 +116,7 @@ tests:
                     }
 
     - label:
-          "Step 0b: TH binds GroupIds 0x0001 and 0x0002 with GroupKeySetID
+          "Step 0c: TH binds GroupIds 0x0001 and 0x0002 with GroupKeySetID
           0x01a1 in the GroupKeyMap attribute list on GroupKeyManagement cluster
           by writing the GroupKeyMap attribute with two entries as follows:"
       cluster: "Group Key Management"
@@ -117,7 +130,7 @@ tests:
                   { FabricIndex: 1, GroupId: G2, GroupKeySetID: 0x01a1 },
               ]
 
-    - label: "Step 0c: TH sends a RemoveAllGroups command to DUT."
+    - label: "Step 0d: TH sends a RemoveAllGroups command to DUT."
       PICS: G.S.C04.Rsp
       cluster: "Groups"
       endpoint: endpoint