Merge branch 'master' into fix_SetSafeAttributePersistenceProvider_Wr…

…iteScalarValue

.github/.wordlist.txt

@@ -632,6 +632,7 @@ hci
 hciattach
 hciconfig
 hdlc
+HEPA
 HKDF
 HMAC
 hoc
@@ -641,7 +642,6 @@ HomePods
 hostapd
 hostname
 href
-HEPA
 HTTPS
 HW
 hwadr
@@ -652,6 +652,7 @@ IasWd
 iaszone
 ibb
 ICA
+ICD
 iCloud
 ICMP
 IDF

.github/workflows/chef.yaml

@@ -54,7 +54,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:1
+            image: ghcr.io/project-chip/chip-build-esp32:2
             options: --user root
 
         steps:
@@ -64,8 +64,6 @@ jobs:
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
                 platform: esp32
-            - name: Fixup GdbGui requirement
-              run: perl -i -pe 's/^gdbgui==/# gdbgui==/' /opt/espressif/esp-idf/requirements.txt
             - name: CI Examples ESP32
               shell: bash
               run: |

.github/workflows/darwin.yaml

@@ -95,10 +95,12 @@ jobs:
             - name: Build example OTA Provider
               run: |
                   scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug chip_config_network_layer_ble=false
-            - name: Build OTA image files with software version number 5
+            - name: Build OTA image files with software version number 5 and 10
               run: |
                   scripts/examples/gn_build_example.sh examples/ota-requestor-app/linux out/debug chip_config_network_layer_ble=false non_spec_compliant_ota_action_delay_floor=0 chip_device_config_device_software_version=5 chip_device_config_device_software_version_string='"5.0"'
-                  cp out/debug/chip-ota-requestor-app /tmp/ota-test005-raw-image
+                  cp out/debug/chip-ota-requestor-app /tmp/ota-raw-image-v5
+                  scripts/examples/gn_build_example.sh examples/ota-requestor-app/linux out/debug chip_config_network_layer_ble=false non_spec_compliant_ota_action_delay_floor=0 chip_device_config_device_software_version=10 chip_device_config_device_software_version_string='"10.0"'
+                  cp out/debug/chip-ota-requestor-app /tmp/ota-raw-image-v10
             - name: Build example OTA Requestor
               run: |
                   scripts/examples/gn_build_example.sh examples/ota-requestor-app/linux out/debug chip_config_network_layer_ble=false non_spec_compliant_ota_action_delay_floor=0
@@ -120,6 +122,7 @@ jobs:
                   # And a different port from the test harness too; the test harness uses port 5541.
                   ../../../out/debug/chip-ota-requestor-app --interface-id -1 --secured-device-port 5542 --discriminator 1111 --KVS /tmp/chip-ota-requestor-kvs1 --otaDownloadPath /tmp/chip-ota-requestor-downloaded-image1 --autoApplyImage > >(tee /tmp/darwin/framework-tests/ota-requestor-app-1.log) 2> >(tee /tmp/darwin/framework-tests/ota-requestor-app-err-1.log >&2) &
                   ../../../out/debug/chip-ota-requestor-app --interface-id -1 --secured-device-port 5543 --discriminator 1112 --KVS /tmp/chip-ota-requestor-kvs2 --otaDownloadPath /tmp/chip-ota-requestor-downloaded-image2 --autoApplyImage > >(tee /tmp/darwin/framework-tests/ota-requestor-app-2.log) 2> >(tee /tmp/darwin/framework-tests/ota-requestor-app-err-2.log >&2) &
+                  ../../../out/debug/chip-ota-requestor-app --interface-id -1 --secured-device-port 5544 --discriminator 1113 --KVS /tmp/chip-ota-requestor-kvs3 --otaDownloadPath /tmp/chip-ota-requestor-downloaded-image3 --autoApplyImage > >(tee /tmp/darwin/framework-tests/ota-requestor-app-3.log) 2> >(tee /tmp/darwin/framework-tests/ota-requestor-app-err-3.log >&2) &
                   # Disable BLE because the app does not have the permission to use
                   # it and that may crash the CI.
                   #

.github/workflows/examples-ameba.yaml

@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ameba:1
+            image: ghcr.io/project-chip/chip-build-ameba:4
             options: --user root
 
         steps:

.github/workflows/examples-efr32.yaml

@@ -61,22 +61,42 @@ jobs:
            scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4187C --slc_generate --docker
            scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4164A --slc_generate --docker
            rm -rf ./out/
-      - name: Build some BRD4187C variants
+      - name: Build some BRD4187C variants (1)
         run: |
           ./scripts/run_in_build_env.sh \
              "./scripts/build/build_examples.py \
                 --enable-flashbundle \
-                --target efr32-brd4187c-window-covering-additional_data_advertising \
                 --target efr32-brd4187c-thermostat-openthread_mtd \
                 --target efr32-brd4187c-switch-sed-shell-use_ot_coap_lib \
                 --target efr32-brd4187c-unit-test \
+                build \
+                --copy-artifacts-to out/artifacts \
+             "
+      - name: Clean out build output
+        run: rm -rf ./out
+      - name: Build some BRD4187C variants (2)
+        run: |
+          ./scripts/run_in_build_env.sh \
+             "./scripts/build/build_examples.py \
+                --enable-flashbundle \
                 --target efr32-brd4187c-light-use_ot_lib \
-                --target efr32-brd4187c-light-rpc \
                 --target efr32-brd4187c-pump \
                 --target efr32-brd4187c-lock-rpc-shell-enable_heap_monitoring \
                 build \
                 --copy-artifacts-to out/artifacts \
              "
+      - name: Clean out build output
+        run: rm -rf ./out
+      - name: Build BRD4187C variants (3)
+        run: |
+          ./scripts/run_in_build_env.sh \
+             "./scripts/build/build_examples.py \
+                --enable-flashbundle \
+                --target efr32-brd4187c-window-covering-additional_data_advertising \
+                --target efr32-brd4187c-light-rpc \
+                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 \

.github/workflows/examples-esp32.yaml

@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:1
+            image: ghcr.io/project-chip/chip-build-esp32:2
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -46,9 +46,6 @@ jobs:
               with:
                 platform: esp32
 
-            - name: Fixup GdbGui requirement
-              run: perl -i -pe 's/^gdbgui==/# gdbgui==/' /opt/espressif/esp-idf/requirements.txt
-
             - name: Set up environment for size reports
               uses: ./.github/actions/setup-size-reports
               if: ${{ !env.ACT }}
@@ -130,7 +127,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:1
+            image: ghcr.io/project-chip/chip-build-esp32:2
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -142,9 +139,6 @@ jobs:
               with:
                 platform: esp32
 
-            - name: Fixup GdbGui requirement
-              run: perl -i -pe 's/^gdbgui==/# gdbgui==/' /opt/espressif/esp-idf/requirements.txt
-
             - name: Build example Bridge App
               run: scripts/examples/esp_example.sh bridge-app
 

.github/workflows/examples-openiotsdk.yaml

@@ -72,6 +72,15 @@ jobs:
                     examples/shell/openiotsdk/build/chip-openiotsdk-shell-example.elf \
                     /tmp/bloat_reports/
 
+            - name: "Test: shell example"
+              if: steps.build_shell.outcome == 'success'
+              run: |
+                  scripts/run_in_python_env.sh out/venv \
+                    'scripts/examples/openiotsdk_example.sh --no-activate -C test shell'
+
+            - name: Clean shell output
+              run: rm -rf examples/shell/openiotsdk/build
+
             - name: Build lock-app example (mbedtls)
               # Disabled being tracked here: https://github.com/project-chip/connectedhomeip/issues/28026
               if: false
@@ -93,6 +102,18 @@ jobs:
                     examples/tv-app/openiotsdk/build/chip-openiotsdk-tv-app-example.elf \
                     /tmp/bloat_reports/
 
+            - name: "Test: tv-app example"
+              if: steps.build_tv_app.outcome == 'success'
+              timeout-minutes: 10
+              run: |
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
+                  scripts/run_in_python_env.sh out/venv \
+                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap tv-app'
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
+
+            - name: Clean tv-app output
+              run: rm -rf examples/tv-app/openiotsdk/build
+
             - name: Build all-clusters-app example
               id: build_all_clusters_app
               timeout-minutes: 10
@@ -103,6 +124,18 @@ jobs:
                     examples/all-clusters-app/openiotsdk/build/chip-openiotsdk-all-clusters-app-example.elf \
                     /tmp/bloat_reports/
 
+            - name: "Test: all-clusters-app example"
+              if: steps.build_all_clusters_app.outcome == 'success'
+              timeout-minutes: 5
+              run: |
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
+                  scripts/run_in_python_env.sh out/venv \
+                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap all-clusters-app'
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
+
+            - name: Clean all-clusters-app output
+              run: rm -rf examples/all-clusters-app/openiotsdk/build
+
             - name: Build ota-requestor-app example
               id: build_ota_requestor_app
               timeout-minutes: 10
@@ -127,12 +160,6 @@ jobs:
               run: |
                   scripts/examples/gn_build_example.sh examples/ota-provider-app/linux/ out/ota-provider chip_config_network_layer_ble=false
 
-            - name: "Test: shell example"
-              if: steps.build_shell.outcome == 'success'
-              run: |
-                  scripts/run_in_python_env.sh out/venv \
-                    'scripts/examples/openiotsdk_example.sh --no-activate -C test shell'
-
             - name: "Test: lock-app example (mbedtls)"
               if: steps.build_lock_app_mbedtls.outcome == 'success'
               run: |
@@ -141,24 +168,6 @@ jobs:
                     'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap lock-app'
                   scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
 
-            - name: "Test: tv-app example"
-              if: steps.build_tv_app.outcome == 'success'
-              timeout-minutes: 10
-              run: |
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
-                  scripts/run_in_python_env.sh out/venv \
-                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap tv-app'
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
-
-            - name: "Test: all-clusters-app example"
-              if: steps.build_all_clusters_app.outcome == 'success'
-              timeout-minutes: 5
-              run: |
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
-                  scripts/run_in_python_env.sh out/venv \
-                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap all-clusters-app'
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
-
             - name: "Test: ota-requestor-app example"
               if: steps.build_ota_requestor_app.outcome == 'success' && steps.build_ota_provider_app.outcome == 'success'
               timeout-minutes: 30
@@ -189,11 +198,6 @@ jobs:
                     examples/lock-app/openiotsdk/build/chip-openiotsdk-lock-app-example.elf \
                     /tmp/bloat_reports/
 
-            - name: Build unit tests (psa)
-              id: build_unit_tests_psa
-              run: |
-                  scripts/examples/openiotsdk_example.sh -b psa unit-tests
-
             - name: "Test: lock-app example (psa)"
               if: steps.build_lock_app_psa.outcome == 'success'
               run: |
@@ -202,6 +206,11 @@ jobs:
                     'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap lock-app'
                   scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
 
+            - name: Build unit tests (psa)
+              id: build_unit_tests_psa
+              run: |
+                  scripts/examples/openiotsdk_example.sh -b psa unit-tests
+
             - name: "Test: unit-tests (psa)"
               if: steps.build_unit_tests_psa.outcome == 'success'
               run: |

.github/workflows/kotlin-style.yaml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: "detekt"
-        uses: natiginfo/action-detekt-all@1.23.0
+        uses: natiginfo/action-detekt-all@1.23.1
         # Detekt seems not to like circular symlinks, so we set up
         # explicit paths below
         with:

.github/workflows/qemu.yaml

@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32-qemu:1
+            image: ghcr.io/project-chip/chip-build-esp32-qemu:2
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
@@ -50,9 +50,6 @@ jobs:
               with:
                 platform: esp32
 
-            - name: Fixup GdbGui requirement
-              run: perl -i -pe 's/^gdbgui==/# gdbgui==/' /opt/espressif/esp-idf/requirements.txt
-
             - name: Build ESP32 QEMU test images
               run: |
                   scripts/run_in_build_env.sh "         \

.github/workflows/release_artifacts.yaml

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

build/chip/java/config.gni

@@ -15,6 +15,9 @@
 java_path = getenv("JAVA_PATH")
 declare_args() {
   java_matter_controller_dependent_paths = []
+
+  # The class of each cluster created by ZAP is added to the library. (e.g., ChipClusters)
+  matter_enable_java_generated_api = true
   matter_enable_java_compilation = false
   if (java_path != "" && current_os == "linux") {
     java_matter_controller_dependent_paths += [ "${java_path}/include/" ]
@@ -27,6 +30,7 @@ declare_args() {
           [ "${java_path}/include/linux/" ]
     }
 
+    matter_enable_java_generated_api = false
     matter_enable_java_compilation = true
   }
 }

config/efr32/lib/pw_rpc/BUILD.gn

@@ -24,7 +24,7 @@ static_library("pw_rpc") {
   public_deps = [
     "$dir_pw_rpc:server",
     "$dir_pw_rpc/nanopb:echo_service",
-    "${chip_root}/examples/platform/silabs/efr32/pw_sys_io:pw_sys_io_efr32",
+    "${chip_root}/examples/platform/silabs/pw_sys_io:pw_sys_io_silabs",
     "${dir_pigweed}/pw_hdlc:pw_rpc",
     dir_pw_assert,
     dir_pw_checksum,

config/efr32/lib/pw_rpc/pw_rpc.gni

@@ -19,7 +19,7 @@ pw_log_BACKEND = "$dir_pw_log_basic"
 pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
 pw_sys_io_BACKEND =
-    "${chip_root}/examples/platform/silabs/efr32/pw_sys_io:pw_sys_io_efr32"
+    "${chip_root}/examples/platform/silabs/pw_sys_io:pw_sys_io_silabs"
 
 pw_build_LINK_DEPS = [
   "$dir_pw_assert:impl",

config/esp32/components/chip/CMakeLists.txt

@@ -124,6 +124,10 @@ if(CONFIG_DISABLE_IPV4)
     chip_gn_arg_append("chip_inet_config_enable_ipv4"        "false")
 endif()
 
+if(CONFIG_DISABLE_READ_CLIENT)
+    chip_gn_arg_append("chip_enable_read_client"             "false")
+endif()
+
 if(CHIP_CODEGEN_PREGEN_DIR)
     chip_gn_arg_append("chip_code_pre_generated_directory"  "\"${CHIP_CODEGEN_PREGEN_DIR}\"")
 endif()
@@ -462,26 +466,11 @@ foreach(phy_blob ${phy_blobs})
     list(APPEND chip_libraries "${esp_phy_dir}/lib/${target_name}/lib${phy_blob}.a")
 endforeach()
 
-idf_component_get_property(esp_event_lib esp_event COMPONENT_LIB)
-list(APPEND chip_libraries $<TARGET_FILE:${esp_event_lib}>)
-
-idf_component_get_property(hal_lib hal COMPONENT_LIB)
-list(APPEND chip_libraries $<TARGET_FILE:${hal_lib}>)
-
-idf_component_get_property(esp_system_lib esp_system COMPONENT_LIB)
-list(APPEND chip_libraries $<TARGET_FILE:${esp_system_lib}>)
-
-idf_component_get_property(soc_lib soc COMPONENT_LIB)
-list(APPEND chip_libraries $<TARGET_FILE:${soc_lib}>)
-
-idf_component_get_property(efuse_lib efuse COMPONENT_LIB)
-list(APPEND chip_libraries $<TARGET_FILE:${efuse_lib}>)
-
-idf_component_get_property(vfs_lib vfs COMPONENT_LIB)
-list(APPEND chip_libraries $<TARGET_FILE:${vfs_lib}>)
-
-idf_component_get_property(driver_lib driver COMPONENT_LIB)
-list(APPEND chip_libraries $<TARGET_FILE:${driver_lib}>)
+set(components_to_link esp_event hal esp_system soc efuse vfs driver esp_coex freertos)
+foreach(component ${components_to_link})
+    idf_component_get_property(lib_name ${component} COMPONENT_LIB)
+    list(APPEND chip_libraries $<TARGET_FILE:${lib_name}>)
+endforeach()
 
 target_link_libraries(${COMPONENT_LIB} INTERFACE -Wl,--start-group
                                                 ${chip_libraries}