Merge f900f46 into f4c2094

project-chip · Oct 12, 2023 · 1516577 · 1516577
2 parents f4c2094 + f900f46
commit 1516577
Show file tree

Hide file tree

Showing 562 changed files with 178,725 additions and 610,531 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -298,8 +298,8 @@ connstring
 conntype
 const
 ContentApp
-ContentApp's
 ContentAppPlatform
+ContentApp's
 ContentLaunch
 ContentLauncher
 continuousHinting
@@ -659,6 +659,8 @@ ICMP
 IDF
 IDL
 IDLs
+idt
+IDT
 idx
 ifconfig
 ifdef
@@ -926,6 +928,7 @@ nl
 NLUnitTest
 NLUnitTests
 nmcli
+nmtui
 noc
 NodeId
 nongnu
@@ -1021,11 +1024,14 @@ params
 PartNumber
 PASE
 Passcode
+passRetained
+passwd
 PBKDF
 pbuf
 pbufs
 pbxproj
 PCA
+pcap
 pcaps
 PDFs
 PDK
@@ -1051,6 +1057,7 @@ PlatformManager
 PlatformManagerImpl
 plt
 png
+Podman
 PollControl
 pollInterval
 polymorphism
@@ -1147,8 +1154,8 @@ REPL
 repo
 req
 Requestor
-Requestor's
 RequestorCanConsent
+Requestor's
 Requestors
 responder
 RestrictedEvent
@@ -1167,6 +1174,7 @@ rootfs
 RPC
 RPCs
 RPi
+RPi's
 RPis
 RSA
 rsn
@@ -1202,8 +1210,8 @@ SDB
 SDC
 SDHC
 SDK
-SDK's
 sdkconfig
+SDK's
 SDKs
 SDKTARGETSYSROOT
 sdl

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -54,6 +54,18 @@ jobs:
               with:
                 gh-context: ${{ toJson(github) }}
 
+            - name: Build example Telink (B92) Air Quality Sensor App
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9528a-air-quality-sensor' build"
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    telink tlsr9528a air-quality-sensor-app \
+                    out/telink-tlsr9528a-air-quality-sensor/zephyr/zephyr.elf \
+                    /tmp/bloat_reports/
+
+            - name: clean out build output
+              run: rm -rf ./out
+
             - name: Build example Telink (B91) All Clusters App
               run: |
                   ./scripts/run_in_build_env.sh \
@@ -124,25 +136,13 @@ jobs:
             - 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 \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9528a-light-rpc-shell-factory-data' build"
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9528a lighting-app-rpc-shell-factory-data \
-                    out/telink-tlsr9528a-light-rpc-shell-factory-data/zephyr/zephyr.elf \
-                    /tmp/bloat_reports/
-
-            - name: clean out build output
-              run: rm -rf ./out
-
-            - name: Build example Telink (B91) Light Switch App
+            - name: Build example Telink (B92) Light Switch App with RPC, Shell and Factory Data
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-light-switch' build"
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9528a-light-switch-rpc-shell-factory-data' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9518adk80d light-switch-app \
-                    out/telink-tlsr9518adk80d-light-switch/zephyr/zephyr.elf \
+                    telink tlsr9528a light-switch-app-rpc-shell-factory-data \
+                    out/telink-tlsr9528a-light-switch-rpc-shell-factory-data/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output

diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml
@@ -92,6 +92,13 @@ jobs:
                       --target linux-x64-java-matter-controller \
                       build \
                    "
+            - name: Build Kotlin Matter Controller
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                   "./scripts/build/build_examples.py \
+                      --target linux-x64-kotlin-matter-controller \
+                      build \
+                   "                   
             - name: Run Discover Commissionables Test
               run: |
                   scripts/run_in_python_env.sh out/venv \
@@ -202,7 +209,51 @@ jobs:
                      --tool-cluster "pairing" \
                      --tool-args "code --nodeid 1 --setup-payload 34970112332 --discover-once 1 --use-only-onnetwork-discovery 0 -t 1000" \
                      --factoryreset \
-                  '                                
+                  '
+            - name: Run Kotlin IM Invoke Test
+              run: |
+                  scripts/run_in_python_env.sh out/venv \
+                  './scripts/tests/run_kotlin_test.py \
+                     --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
+                     --app-args "--discriminator 3840 --interface-id -1" \
+                     --tool-path out/linux-x64-kotlin-matter-controller \
+                     --tool-cluster "im" \
+                     --tool-args "onnetwork-long-im-invoke --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
+                     --factoryreset \
+                  '
+            - name: Run Kotlin IM Read Test
+              run: |
+                  scripts/run_in_python_env.sh out/venv \
+                  './scripts/tests/run_kotlin_test.py \
+                     --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
+                     --app-args "--discriminator 3840 --interface-id -1" \
+                     --tool-path out/linux-x64-kotlin-matter-controller \
+                     --tool-cluster "im" \
+                     --tool-args "onnetwork-long-im-read --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
+                     --factoryreset \
+                  '
+            - name: Run Kotlin IM Write Test
+              run: |
+                  scripts/run_in_python_env.sh out/venv \
+                  './scripts/tests/run_kotlin_test.py \
+                     --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
+                     --app-args "--discriminator 3840 --interface-id -1" \
+                     --tool-path out/linux-x64-kotlin-matter-controller \
+                     --tool-cluster "im" \
+                     --tool-args "onnetwork-long-im-write --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
+                     --factoryreset \
+                  '
+            - name: Run Kotlin IM Subscribe Test
+              run: |
+                  scripts/run_in_python_env.sh out/venv \
+                  './scripts/tests/run_kotlin_test.py \
+                     --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
+                     --app-args "--discriminator 3840 --interface-id -1" \
+                     --tool-path out/linux-x64-kotlin-matter-controller \
+                     --tool-cluster "im" \
+                     --tool-args "onnetwork-long-im-subscribe --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
+                     --factoryreset \
+                  '                                                  
             - name: Uploading core files
               uses: actions/upload-artifact@v3
               if: ${{ failure() && !env.ACT }}

diff --git a/.gn b/.gn
@@ -31,4 +31,15 @@ default_args = {
 
   # GN target to use for the default Python build venv.
   pw_build_PYTHON_BUILD_VENV = "//:matter_build_venv"
+
+  # Required for pw_unit_test
+  pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
+  pw_assert_BACKEND = "$dir_pw_assert_log"
+  pw_log_BACKEND = "$dir_pw_log_basic"
+
+  # TODO: Make sure only unit tests link against this
+  pw_build_LINK_DEPS = [
+    "$dir_pw_assert:impl",
+    "$dir_pw_log:impl",
+  ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -663,6 +663,7 @@
                 "openiotsdk-lock",
                 "openiotsdk-shell",
                 "qpg-qpg6100-lock",
+                "telink-tlsr9518adk80d-air-quality-sensor",
                 "telink-tlsr9518adk80d-all-clusters",
                 "telink-tlsr9518adk80d-all-clusters-minimal",
                 "telink-tlsr9518adk80d-bridge",

diff --git a/build/chip/chip_codegen.cmake b/build/chip/chip_codegen.cmake
@@ -161,7 +161,6 @@ function(chip_zapgen TARGET_NAME)
             #       out links of template files and zap files and such
             SET(EXTRA_DEPENDENCIES
                 "${CHIP_ROOT}/src/app/zap-templates/partials/header.zapt"
-                "${CHIP_ROOT}/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/access.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/CHIPClusters.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/endpoint_config.zapt"

diff --git a/build/chip/chip_codegen.gni b/build/chip/chip_codegen.gni
@@ -141,7 +141,6 @@ template("_chip_build_time_zapgen") {
     #       out links of template files and zap files and such
     _extra_dependencies = [
       "${_partials_dir}/header.zapt",
-      "${_partials_dir}/im_command_handler_cluster_commands.zapt",
 
       # Application templates, actually generating files
       "${_template_dir}/access.zapt",

diff --git a/build/chip/chip_test.gni b/build/chip/chip_test.gni
@@ -38,11 +38,11 @@ if (chip_link_tests) {
       output_dir = _test_output_dir
     }
 
-    group(_test_name + "_lib") {
+    group(_test_name + ".lib") {
     }
 
     if (chip_pw_run_tests) {
-      pw_python_action(_test_name + "_run") {
+      pw_python_action(_test_name + ".run") {
         deps = [ ":${_test_name}" ]
         inputs = [ pw_unit_test_AUTOMATIC_RUNNER ]
         module = "pw_unit_test.test_runner"
@@ -64,7 +64,7 @@ if (chip_link_tests) {
   template("chip_test") {
     group(target_name) {
     }
-    group(target_name + "_lib") {
+    group(target_name + ".lib") {
     }
     not_needed(invoker, "*")
   }

diff --git a/build/chip/chip_test_group.gni b/build/chip/chip_test_group.gni
@@ -31,7 +31,7 @@ template("chip_test_group") {
     _target_type = "group"
   }
 
-  _lib_target_name = "${_test_group_name}_lib"
+  _lib_target_name = "${_test_group_name}.lib"
 
   target(_target_type, _lib_target_name) {
     forward_variables_from(invoker,
@@ -43,7 +43,7 @@ template("chip_test_group") {
 
     deps = []
     foreach(_test, invoker.deps) {
-      deps += [ get_label_info(_test, "label_no_toolchain") + "_lib" ]
+      deps += [ get_label_info(_test, "label_no_toolchain") + ".lib" ]
     }
 
     if (_build_monolithic_library && chip_build_test_static_libraries) {