Merge branch 'master' into refactor/spi-multiplex-rs91x-ncp

.clang-tidy

@@ -10,20 +10,23 @@ Checks: >
   readability-redundant-control-flow,
   readability-redundant-string-cstr,
   readability-redundant-string-init,
-  -bugprone-assignment-in-if-condition,  
+  -bugprone-assignment-in-if-condition,
   -bugprone-branch-clone,
   -bugprone-copy-constructor-init,
   -bugprone-easily-swappable-parameters,
   -bugprone-forward-declaration-namespace,
   -bugprone-forwarding-reference-overload,
   -bugprone-implicit-widening-of-multiplication-result,
+  -bugprone-inc-dec-in-conditions,
   -bugprone-macro-parentheses,
   -bugprone-misplaced-widening-cast,
+  -bugprone-multi-level-implicit-pointer-conversion,
   -bugprone-narrowing-conversions,
   -bugprone-not-null-terminated-result,
   -bugprone-reserved-identifier,
   -bugprone-signed-char-misuse,
   -bugprone-suspicious-include,
+  -bugprone-switch-missing-default-case,
   -bugprone-undelegated-constructor,
   -bugprone-unused-return-value,
   -clang-analyzer-core.CallAndMessage,

.github/.wordlist.txt

@@ -1562,3 +1562,5 @@ zhengyaohan
 Zigbee
 zigbeealliance
 zigbeethread
+PIXIT
+RVC

.github/workflows/build.yaml

@@ -200,7 +200,7 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                     "./scripts/run-clang-tidy-on-compile-commands.py \
                        --compile-database out/sanitizers/compile_commands.json \
-                       --file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/' \
+                       --file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/|-ReadImpl|-InvokeSubscribeImpl' \
                        check \
                     "
             - name: Clean output

.github/workflows/chef.yaml

@@ -96,7 +96,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:10
+            image: ghcr.io/project-chip/chip-build-telink:12
             options: --user root
 
         steps:

.github/workflows/examples-bouffalolab.yaml

@@ -78,8 +78,8 @@ jobs:
           ./scripts/run_in_build_env.sh \
             "./scripts/build/build_examples.py \
               --target bouffalolab-bl706-night-light-light \
-              --target bouffalolab-bl706-eth-light \
-              --target bouffalolab-bl706-wifi-light \
+              --target bouffalolab-bl706dk-light-ethernet \
+              --target bouffalolab-bl706dk-light-wifi-fp \
               --target bouffalolab-xt-zb6-devkit-light-115200-rpc \
               build \
               --copy-artifacts-to out/artifacts \
@@ -92,11 +92,11 @@ jobs:
               /tmp/bloat_reports/
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702 bl706-eth lighting-app \
-              out/artifacts/bouffalolab-bl706-eth-light/chip-bl702-lighting-example.out \
+              out/artifacts/bouffalolab-bl706dk-light-ethernet/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702 bl706-wifi lighting-app \
-              out/artifacts/bouffalolab-bl706-wifi-light/chip-bl702-lighting-example.out \
+              out/artifacts/bouffalolab-bl706dk-light-wifi-fp/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702 bl702+rpc lighting-app \
@@ -110,15 +110,15 @@ jobs:
         run: |
           ./scripts/run_in_build_env.sh \
             "./scripts/build/build_examples.py \
-              --target bouffalolab-bl704l-dvk-light \
+              --target bouffalolab-bl704ldk-light \
               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 lighting-app \
-              out/artifacts/bouffalolab-bl704l-dvk-light/chip-bl702l-lighting-example.out \
+              out/artifacts/bouffalolab-bl704ldk-light/chip-bl702l-lighting-example.out \
               /tmp/bloat_reports/
       - name: Clean out build output
         run: rm -rf ./out

.github/workflows/examples-telink.yaml

@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:10
+            image: ghcr.io/project-chip/chip-build-telink:12
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -102,18 +102,28 @@ jobs:
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: Build example Telink (B91) Lighting App with RPC, Shell and Factory Data
+            - name: Build tools required for Factory Data
               run: |
                   ./scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform linux
                   ./scripts/build/gn_gen.sh
                   ./scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE chip-cert chip-tool spake2p"
+                  mv ./out/$BUILD_TYPE/chip-cert ./out/$BUILD_TYPE/chip-tool ./out/$BUILD_TYPE/spake2p ./out
+
+            - name: clean out build output (keep tools)
+              run: rm -rf ./out/telink*
+
+            - name: Build example Telink (B91) Lighting App with RPC, Shell and Factory Data
+              run: |
                   ./scripts/run_in_build_env.sh \
                     "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-light-rpc-shell-factory-data' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     telink tlsr9518adk80d lighting-app-rpc-shell-factory-data \
                     out/telink-tlsr9518adk80d-light-rpc-shell-factory-data/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
+            - name: clean out build output (keep tools)
+              run: rm -rf ./out/telink*
+
             - name: Build example Telink (B92) Lighting App with RPC, Shell and Factory Data
               run: |
                   ./scripts/run_in_build_env.sh \
@@ -186,6 +196,18 @@ jobs:
             - name: clean out build output
               run: rm -rf ./out
 
+            - name: Build example Telink (B91) Resource Monitoring App
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-resource-monitoring' build"
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    telink tlsr9518adk80d resource-monitoring-app \
+                    out/telink-tlsr9518adk80d-resource-monitoring/zephyr/zephyr.elf \
+                    /tmp/bloat_reports/
+
+            - name: clean out build output
+              run: rm -rf ./out
+
             - name: Build example Telink (B91) Shell App
               run: |
                   ./scripts/run_in_build_env.sh \

.vscode/tasks.json

@@ -673,6 +673,7 @@
                 "telink-tlsr9518adk80d-ota-requestor",
                 "telink-tlsr9518adk80d-pump-app",
                 "telink-tlsr9518adk80d-pump-controller-app",
+                "telink-tlsr9518adk80d-resource-monitoring-app",
                 "telink-tlsr9518adk80d-shell",
                 "telink-tlsr9518adk80d-smoke-co-alarm-app",
                 "telink-tlsr9518adk80d-temperature-measurement",

build/chip/linux/gdbus_library.gni

@@ -35,6 +35,12 @@ template("gdbus_library") {
     include_dirs = [ "${root_gen_dir}/include" ]
   }
 
+  config("${library_name}_compile_config") {
+    # dbus code generation may generate some code detected as unreacheable
+    # by recent enough clang
+    cflags = [ "-Wno-unreachable-code" ]
+  }
+
   dbus_sources = []
   foreach(xml, invoker.sources) {
     name = get_path_info(xml, "name")
@@ -94,6 +100,7 @@ template("gdbus_library") {
     sources = dbus_sources
     deps = [ ":${library_name}_gen" ]
 
+    configs += [ ":${library_name}_compile_config" ]
     public_configs = [
       ":${library_name}_config",
       glib_config,

build/config/compiler/BUILD.gn

@@ -485,8 +485,12 @@ config("coverage_default") {
 }
 
 declare_args() {
-  # Enable Runtime Type Information (RTTI)
+  # Enable or disable Runtime Type Information (RTTI).
+  # Defaults true on darwin because Darwin.framework uses it.
   enable_rtti = current_os == "mac" || current_os == "ios"
+
+  # Enable or disable support for C++ exceptions.
+  enable_exceptions = false
 }
 
 config("no_rtti") {
@@ -514,7 +518,11 @@ config("exceptions") {
 }
 
 config("exceptions_default") {
-  configs = [ ":no_exceptions" ]
+  if (enable_exceptions) {
+    configs = [ ":exceptions" ]
+  } else {
+    configs = [ ":no_exceptions" ]
+  }
 }
 
 config("unwind_tables") {

config/esp32/components/chip/CMakeLists.txt

@@ -486,12 +486,12 @@ endforeach()
 set(components_to_link esp_event hal esp_system soc efuse vfs driver esp_coex freertos)
 idf_build_get_property(build_components BUILD_COMPONENTS)
 foreach(component ${components_to_link})
-	# Some of the components are not present in IDF v4.x
-        # So, Check if the component is in the list of build components
-   	if("${component}" IN_LIST build_components)
+    # Some of the components are not present in IDF v4.x
+    # So, Check if the component is in the list of build components
+    if("${component}" IN_LIST build_components)
         idf_component_get_property(lib_name ${component} COMPONENT_LIB)
+        list(APPEND chip_libraries $<TARGET_FILE:${lib_name}>)
     endif()
-    list(APPEND chip_libraries $<TARGET_FILE:${lib_name}>)
 endforeach()
 
 target_link_libraries(${COMPONENT_LIB} INTERFACE -Wl,--start-group

config/nrfconnect/chip-module/CMakeLists.txt

@@ -135,6 +135,7 @@ matter_add_gn_arg_bool  ("chip_automation_logging"                FALSE)
 matter_add_gn_arg_bool  ("chip_malloc_sys_heap"                   CONFIG_CHIP_MALLOC_SYS_HEAP)
 matter_add_gn_arg_bool  ("chip_enable_wifi"                       CONFIG_WIFI_NRF700X)
 matter_add_gn_arg_bool  ("chip_system_config_provide_statistics"  CONFIG_CHIP_STATISTICS)
+matter_add_gn_arg_bool  ("chip_enable_icd_server"                 CONFIG_CHIP_ENABLE_ICD_SUPPORT)
 
 if (CONFIG_CHIP_FACTORY_DATA)
     matter_add_gn_arg_bool("chip_use_transitional_commissionable_data_provider" FALSE)

config/nrfconnect/chip-module/Kconfig.features

@@ -230,27 +230,4 @@ config CHIP_WIFI_CONNECTION_RECOVERY_JITTER
 	  a random jitter interval is added to it to avoid periodicity. The random jitter is selected
 	  within range [-JITTER; +JITTER].
 
-config CHIP_ICD_SUBSCRIPTION_HANDLING
-	bool "Enables platform specific handling of ICD subscriptions"
-	help
-	  Enables platform specific implementation that handles ICD subscription requests
-	  and selects subscription report interval value considering maximum interval preferred
-	  by the publisher.
-
-if CHIP_ICD_SUBSCRIPTION_HANDLING
-
-config CHIP_MAX_PREFERRED_SUBSCRIPTION_REPORT_INTERVAL
-	int "Maximum preferred interval of sending subscription reports (s)"
-	default 60
-	help
-	  Provides maximum preferred interval to be used by a publisher for negotiation
-	  of the final maximum subscription report interval, after receiving a subscription
-	  request from the initiator. This value should be selected as a compromise between
-	  keeping the power consumption low due to not sending reports too often, and allowing
-	  the initiator device to detect the publisher absence reasonably fast due to not sending
-	  the reports too rarely. The current algorithm is to select bigger value from the one
-	  requested by the initiator and the one preferred by the publisher.
-
-endif # CHIP_ICD_SUBSCRIPTION_HANDLING
-
 endif # CHIP