Merge branch 'master' into feature/contribution-testplans-8

Author: chulspro

.github/workflows/chef.yaml

@@ -96,7 +96,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:172
+            image: ghcr.io/project-chip/chip-build-esp32:174
             options: --user root
 
         steps:
@@ -106,6 +106,16 @@ jobs:
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
                 platform: esp32
+
+            # We cannot add esp-idf-kconfig==2.5.0 to rquirements.txt because it
+            # will break the nuttx workflow which requires the older version of
+            # the kconfiglib and esp-idf-kconfig==2.5.0 installs newer version
+            # so, install it in in the virtual environment here
+            - name: Install esp-idf-kconfig
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                    "pip install esp-idf-kconfig==2.5.0"
+
             - name: CI Examples ESP32
               shell: bash
               run: |

.github/workflows/examples-esp32.yaml

@@ -55,8 +55,10 @@ jobs:
               with:
                 gh-context: ${{ toJson(github) }}
 
-            # Install esp-idf-kconfig==2.5.0 in the virtual environment here
-            # so it will not affect other workflows
+            # We cannot add esp-idf-kconfig==2.5.0 to rquirements.txt because it
+            # will break the nuttx workflow which requires the older version of
+            # the kconfiglib and esp-idf-kconfig==2.5.0 installs newer version
+            # so, install it in in the virtual environment here
             - name: Install esp-idf-kconfig
               run: |
                   ./scripts/run_in_build_env.sh \
@@ -79,6 +81,9 @@ jobs:
                      out/esp32-c3devkit-all-clusters/chip-all-clusters-app.elf \
                      /tmp/bloat_reports/
 
+            - name: Remove built artifacts for all-clusters
+              run: rm -rf out/esp32-c3devkit-all-clusters
+
             - name: Prepare code pregen and ensure compile time pregen not possible
               run: |
                   ./scripts/run_in_build_env.sh "./scripts/codepregen.py ./zzz_pregenerated"
@@ -104,6 +109,9 @@ jobs:
                   mv scripts/codegen.py.renamed scripts/codegen.py
                   mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
 
+            - name: Remove built artifacts for all-clusters-minimal
+              run: rm -rf out/esp32-m5stack-all-clusters-minimal
+
             - name: Check for changed paths
               uses: dorny/paths-filter@v3
               id: changed_paths
@@ -139,6 +147,9 @@ jobs:
                         --copy-artifacts-to out/artifacts \
                      "
 
+            - name: Remove built artifacts for all-clusters-rpc-ipv6only
+              run: rm -rf out/esp32-devkitc-all-clusters-rpc-ipv6only
+
             - name: Build example Lighting App (Target:ESP32C6)
               run: scripts/examples/esp_example.sh lighting-app sdkconfig.wifi_thread.defaults esp32c6
 

.restyled.yaml

@@ -224,21 +224,12 @@ restylers:
           - "**/*.sh"
           - "**/*.bash"
     - name: autopep8
-      image: restyled/restyler-autopep8:v2.3.1
-      command:
-          - autopep8
-          - "--in-place"
-      arguments: []
-      include:
-          - "**/*.py"
-      interpreters:
-          - python
+      image: public.ecr.aws/restyled-io/restyler-autopep8:v2.3
     - name: isort
-      image: restyled/restyler-isort:v5.11.2
+      image: public.ecr.aws/restyled-io/restyler-isort:v7.0
+    - name: ruff
+      image: public.ecr.aws/restyled-io/restyler-ruff:v0.14
       command:
-          - isort
-      arguments: []
-      include:
-          - "**/*.py"
-      interpreters:
-          - python
+          - ruff
+          - check
+          - --fix-only

credentials/fetch_paa_certs_from_dcl.py

@@ -48,24 +48,30 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND)
 
 flashing_script()
 
-if (CONFIG_ENABLE_PW_RPC)
-get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH)
-include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake)
-include($ENV{PW_ROOT}/pw_assert/backend.cmake)
-include($ENV{PW_ROOT}/pw_log/backend.cmake)
-include($ENV{PW_ROOT}/pw_sys_io/backend.cmake)
-include($ENV{PW_ROOT}/pw_trace/backend.cmake)
+if(CONFIG_ENABLE_PW_RPC)
+  include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake)
+  include($ENV{PW_ROOT}/pw_assert/backend.cmake)
+  include($ENV{PW_ROOT}/pw_log/backend.cmake)
+  include($ENV{PW_ROOT}/pw_sys_io/backend.cmake)
+  include($ENV{PW_ROOT}/pw_trace/backend.cmake)
+  include($ENV{PW_ROOT}/pw_interrupt/backend.cmake)
+  include($ENV{PW_ROOT}/pw_sync/backend.cmake)
+  include($ENV{PW_ROOT}/third_party/freertos/backend.cmake)
 
-pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
+  pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
 
-pw_set_backend(pw_log pw_log_basic)
-pw_set_backend(pw_assert.check pw_assert_log.check_backend)
-pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
-pw_set_backend(pw_sys_io pw_sys_io.esp32)
-pw_set_backend(pw_trace pw_trace_tokenized)
-
-add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
-add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
-add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
+  pw_set_backend(pw_log pw_log_basic)
+  pw_set_backend(pw_assert.check pw_assert_log.check_backend)
+  pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
+  pw_set_backend(pw_sys_io pw_sys_io.esp32)
+  pw_set_backend(pw_trace pw_trace_tokenized)
+  pw_set_backend(pw_interrupt.context pw_interrupt_freertos.context)
+  pw_set_backend(pw_sync.interrupt_spin_lock pw_sync.esp32_interrupt_spin_lock)
+  pw_set_backend(pw_sync.mutex pw_sync.esp32)
+  pw_set_backend(pw_third_party.freertos idf::freertos)
 
+  add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
+  add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
+  add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
+  add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sync)
 endif(CONFIG_ENABLE_PW_RPC)

examples/all-clusters-app/esp32/CMakeLists.txt

@@ -93,4 +93,4 @@ CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE=512
 CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=512
 
 # Optimize Flash
-CONFIG_NEWLIB_NANO_FORMAT=y
+CONFIG_NEWLIB_NANO_FORMAT=y

examples/all-clusters-app/esp32/sdkconfig_m5stack_rpc.defaults

@@ -92,4 +92,4 @@ CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE=512
 CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=512
 
 # Optimize Flash
-CONFIG_NEWLIB_NANO_FORMAT=y
+CONFIG_NEWLIB_NANO_FORMAT=y

examples/all-clusters-app/esp32/sdkconfig_rpc.defaults

@@ -30,6 +30,7 @@ pw_rpc_system_server_BACKEND = "${chip_root}/config/linux/lib/pw_rpc:pw_rpc"
 dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo"
 pw_chrono_SYSTEM_CLOCK_BACKEND = "$dir_pw_chrono_stl:system_clock"
 pw_sync_MUTEX_BACKEND = "$dir_pw_sync_stl:mutex_backend"
+pw_sync_INTERRUPT_SPIN_LOCK_BACKEND = "$dir_pw_sync_stl:interrupt_spin_lock"
 pw_thread_YIELD_BACKEND = "$dir_pw_thread_stl:yield"
 pw_thread_SLEEP_BACKEND = "$dir_pw_thread_stl:sleep"