Merge branch 'project-chip:master' into rpc-all-clusters-app

project-chip · Dec 18, 2023 · f5179c3 · f5179c3
2 parents 264a0a0 + 7cbac91
commit f5179c3
Show file tree

Hide file tree

Showing 359 changed files with 13,264 additions and 3,911 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml
@@ -73,7 +73,7 @@ jobs:
                     /tmp/bloat_reports/
 
             - name: "Test: shell example"
-              if: steps.build_shell.outcome == 'success'
+              if: github.event_name == 'workflow_dispatch' && steps.build_shell.outcome == 'success'
               run: |
                   scripts/run_in_python_env.sh out/venv \
                     'scripts/examples/openiotsdk_example.sh --no-activate -C test shell'
@@ -103,7 +103,7 @@ jobs:
                     /tmp/bloat_reports/
 
             - name: "Test: tv-app example"
-              if: steps.build_tv_app.outcome == 'success'
+              if: github.event_name == 'workflow_dispatch' && steps.build_tv_app.outcome == 'success'
               timeout-minutes: 10
               run: |
                   scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
@@ -125,7 +125,7 @@ jobs:
                     /tmp/bloat_reports/
 
             - name: "Test: all-clusters-app example"
-              if: steps.build_all_clusters_app.outcome == 'success'
+              if: github.event_name == 'workflow_dispatch' && steps.build_all_clusters_app.outcome == 'success'
               timeout-minutes: 5
               run: |
                   scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
@@ -161,15 +161,15 @@ jobs:
                   scripts/examples/gn_build_example.sh examples/ota-provider-app/linux/ out/ota-provider chip_config_network_layer_ble=false
 
             - name: "Test: lock-app example (mbedtls)"
-              if: steps.build_lock_app_mbedtls.outcome == 'success'
+              if: github.event_name == 'workflow_dispatch' && steps.build_lock_app_mbedtls.outcome == 'success'
               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 lock-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'
+              if: github.event_name == 'workflow_dispatch' && steps.build_ota_requestor_app.outcome == 'success' && steps.build_ota_provider_app.outcome == 'success'
               timeout-minutes: 30
               run: |
                   mkdir out/binaries
@@ -182,7 +182,7 @@ jobs:
                   scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
 
             - name: "Test: unit-tests (mbedtls)"
-              if: steps.build_unit_tests_mbedtls.outcome == 'success'
+              if: github.event_name == 'workflow_dispatch' && steps.build_unit_tests_mbedtls.outcome == 'success'
               run: |
                   scripts/run_in_python_env.sh out/venv \
                     'scripts/examples/openiotsdk_example.sh --no-activate -C test unit-tests'
@@ -199,7 +199,7 @@ jobs:
                     /tmp/bloat_reports/
 
             - name: "Test: lock-app example (psa)"
-              if: steps.build_lock_app_psa.outcome == 'success'
+              if: github.event_name == 'workflow_dispatch' && steps.build_lock_app_psa.outcome == 'success'
               run: |
                   scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
                   scripts/run_in_python_env.sh out/venv \
@@ -212,7 +212,7 @@ jobs:
                   scripts/examples/openiotsdk_example.sh -b psa unit-tests
 
             - name: "Test: unit-tests (psa)"
-              if: steps.build_unit_tests_psa.outcome == 'success'
+              if: github.event_name == 'workflow_dispatch' && steps.build_unit_tests_psa.outcome == 'success'
               run: |
                   scripts/run_in_python_env.sh out/venv \
                     'scripts/examples/openiotsdk_example.sh --no-activate -C test unit-tests'
diff --git a/.github/workflows/labeler.yaml b/.github/workflows/labeler.yaml
@@ -4,11 +4,12 @@ on:
 
 jobs:
   triage:
+    name: Label Triage
     permissions:
       contents: read
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/BUILD.gn b/BUILD.gn
@@ -37,6 +37,10 @@ import("${build_root}/config/compiler/compiler.gni")
 
 import("//src/crypto/crypto.gni")
 
+if (chip_with_lwip) {
+  import("//build_overrides/lwip.gni")
+}
+
 if (current_toolchain != "${dir_pw_toolchain}/default:default") {
   declare_args() {
     chip_enable_python_modules =
@@ -146,13 +150,13 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
 
     if (chip_build_tests) {
       deps += [ "//src:tests" ]
-      if (current_os == "android") {
+      if (current_os == "android" && current_toolchain == default_toolchain) {
         deps += [ "${chip_root}/build/chip/java/tests:java_build_test" ]
       }
     }
 
     if (chip_with_lwip) {
-      deps += [ "${chip_root}/src/lwip" ]
+      deps += [ "${lwip_root}:lwip" ]
     }
 
     if (chip_build_tools) {

diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt
@@ -95,6 +95,7 @@ matter_add_gn_arg_bool  ("chip_enable_openthread"                 CONFIG_NET_L2_
 matter_add_gn_arg_bool  ("chip_openthread_ftd"                    CONFIG_OPENTHREAD_FTD)
 matter_add_gn_arg_bool  ("chip_config_network_layer_ble"          CONFIG_BT)
 matter_add_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_NET_IPV4)
+matter_add_gn_arg_bool  ("chip_enable_nfc"                        CONFIG_CHIP_NFC_COMMISSIONING)
 matter_add_gn_arg_bool  ("chip_enable_ota_requestor"              CONFIG_CHIP_OTA_REQUESTOR)
 matter_add_gn_arg_bool  ("chip_enable_bootloader_mcuboot"         CONFIG_BOOTLOADER_MCUBOOT)
 matter_add_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   CONFIG_CHIP_BUILD_TESTS)

diff --git a/config/telink/chip-module/Kconfig b/config/telink/chip-module/Kconfig
@@ -31,6 +31,19 @@ config CHIP_APP_LOG_LEVEL
 	  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
+	imply I2C
+	imply ST25DVXXKC
+	imply NFC		
+	imply NFC_NDEF
+	imply NFC_NDEF_MSG
+	imply NFC_NDEF_RECORD
+	imply NFC_NDEF_URI_REC
+	imply NFC_NDEF_URI_MSG
+	help
+	  Enables sharing the onboarding payload in the NFC tag.
 
 # See config/zephyr/Kconfig for full definition
 config CHIP_OTA_REQUESTOR

diff --git a/docs/examples/index.md b/docs/examples/index.md
@@ -247,6 +247,15 @@ smoke-co-alarm-app/**/README
 dishwasher-app/**/README
 ```
 
+## Microwave oven example
+
+```{toctree}
+:glob:
+:maxdepth: 1
+
+microwave-oven-app/**/README
+```
+
 ## Temperature measurement example
 
 ```{toctree}

diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
@@ -811,8 +811,8 @@ cluster GeneralDiagnostics = 51 {
   }
 
   response struct TimeSnapshotResponse = 2 {
-    systime_us systemTimeUs = 0;
-    nullable epoch_us UTCTimeUs = 1;
+    systime_ms systemTimeMs = 0;
+    nullable posix_ms posixTimeMs = 1;
   }
 
   /** Provide a means for certification tests to trigger some test-plan-specific events */

diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
@@ -764,8 +764,8 @@ cluster GeneralDiagnostics = 51 {
   }
 
   response struct TimeSnapshotResponse = 2 {
-    systime_us systemTimeUs = 0;
-    nullable epoch_us UTCTimeUs = 1;
+    systime_ms systemTimeMs = 0;
+    nullable posix_ms posixTimeMs = 1;
   }
 
   /** Provide a means for certification tests to trigger some test-plan-specific events */