Merge branch 'master' into wildcard-reads

project-chip · Nov 28, 2021 · c0475e0 · c0475e0
2 parents c5f1b91 + ab5734c
commit c0475e0
Show file tree

Hide file tree

Showing 82 changed files with 1,028 additions and 2,574 deletions.
diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-k32w:0.5.28
+            image: connectedhomeip/chip-build-k32w:0.5.29
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -174,7 +174,7 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
-                     --target-skip-glob 'tv-*' \
+                     --target-skip-glob 'TV_*' \
                      run \
                      --iterations 2 \
                      --chip-tool ./out/debug/standalone/chip-tool \

diff --git a/build_overrides/k32w0_sdk.gni b/build_overrides/k32w0_sdk.gni
@@ -14,5 +14,5 @@
 
 declare_args() {
   # Root directory for K32W SDK build files.
-  k32w0_sdk_build_root = "//third_party/k32w_sdk/nxp/k32w/k32w0"
+  k32w0_sdk_build_root = "//third_party/nxp/k32w0_sdk"
 }
diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -220,4 +220,11 @@ target_link_options(${COMPONENT_LIB}
     "-T${PIGWEED_ROOT}/pw_tokenizer/pw_tokenizer_linker_sections.ld"
 )
 
+target_compile_options(${COMPONENT_LIB} PRIVATE
+                       "-DPW_RPC_ATTRIBUTE_SERVICE=1"
+                       "-DPW_RPC_BUTTON_SERVICE=1"
+                       "-DPW_RPC_DEVICE_SERVICE=1"
+                       "-DPW_RPC_LIGHTING_SERVICE=1"
+                       "-DPW_RPC_LOCKING_SERVICE=1")
+
 endif (CONFIG_ENABLE_PW_RPC)
diff --git a/examples/all-clusters-app/esp32/main/Rpc.cpp b/examples/all-clusters-app/esp32/main/Rpc.cpp
diff --git a/examples/build_overrides/k32w0_sdk.gni b/examples/build_overrides/k32w0_sdk.gni
@@ -15,5 +15,5 @@
 declare_args() {
   # Root directory for k32w SDK.
   k32w0_sdk_build_root =
-      "//third_party/connectedhomeip/third_party/k32w_sdk/nxp/k32w/k32w0"
+      "//third_party/connectedhomeip/third_party/nxp/k32w0_sdk"
 }