Skip to content

Commit abdac73

Browse files
austina-csaaustina-csa
authored
Merge branch 'project-chip:master' into issue_226_temp_2
2 parents 172bf5f + 1bebacd commit abdac73

File tree

681 files changed

+42368
-6560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

681 files changed

+42368
-6560
lines changed

‎.github/.wordlist.txt

+1
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,7 @@ href
650650
HSM
651651
hsm
652652
HTTPS
653+
Humidistat
653654
HW
654655
hwadr
655656
HydrogenConcentrationMeasurement

‎.github/workflows/chef.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
if: github.actor != 'restyled-io[bot]'
5757

5858
container:
59-
image: ghcr.io/project-chip/chip-build-esp32:66
59+
image: ghcr.io/project-chip/chip-build-esp32:67
6060
options: --user root
6161

6262
steps:

‎.github/workflows/darwin-tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ jobs:
9595
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
9696
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
9797
--target darwin-x64-rvc-${BUILD_VARIANT} \
98+
--target darwin-x64-network-manager-${BUILD_VARIANT} \
9899
build \
99100
--copy-artifacts-to objdir-clone \
100101
"
@@ -116,6 +117,7 @@ jobs:
116117
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
117118
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
118119
--rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
120+
--network-manager-app ./out/darwin-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
119121
"
120122
- name: Run OTA Test
121123
run: |

‎.github/workflows/examples-esp32.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-esp32:66
39+
image: ghcr.io/project-chip/chip-build-esp32:67
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

@@ -126,7 +126,7 @@ jobs:
126126
if: github.actor != 'restyled-io[bot]'
127127

128128
container:
129-
image: ghcr.io/project-chip/chip-build-esp32:66
129+
image: ghcr.io/project-chip/chip-build-esp32:67
130130
volumes:
131131
- "/tmp/bloat_reports:/tmp/bloat_reports"
132132

‎.github/workflows/examples-nxp.yaml

+64
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,71 @@ jobs:
9696
if: ${{ !env.ACT }}
9797
with:
9898
platform-name: K32W
99+
rw61x:
100+
name: RW61X
99101

102+
env:
103+
BUILD_TYPE: gn_rw61x
104+
105+
runs-on: ubuntu-latest
106+
if: github.actor != 'restyled-io[bot]'
107+
108+
container:
109+
image: ghcr.io/project-chip/chip-build-rw61x:66
110+
volumes:
111+
- "/tmp/bloat_reports:/tmp/bloat_reports"
112+
steps:
113+
- name: Checkout
114+
uses: actions/checkout@v4
115+
- name: Checkout submodules & Bootstrap
116+
uses: ./.github/actions/checkout-submodules-and-bootstrap
117+
with:
118+
platform: nxp
119+
extra-submodule-parameters: --recursive
120+
121+
- name: Set up environment for size reports
122+
uses: ./.github/actions/setup-size-reports
123+
if: ${{ !env.ACT }}
124+
with:
125+
gh-context: ${{ toJson(github) }}
126+
127+
- name: Build RW61X all clusters example app
128+
run: |
129+
scripts/run_in_build_env.sh "\
130+
./scripts/build/build_examples.py \
131+
--target nxp-rw61x-freertos-all-clusters-wifi \
132+
--target nxp-rw61x-freertos-all-clusters-thread \
133+
--target nxp-rw61x-freertos-all-clusters-thread-wifi \
134+
build \
135+
--copy-artifacts-to out/artifacts \
136+
"
137+
138+
- name: Build RW61X thermostat example app
139+
run: |
140+
scripts/run_in_build_env.sh "\
141+
./scripts/build/build_examples.py \
142+
--target nxp-rw61x-freertos-thermostat-wifi \
143+
--target nxp-rw61x-freertos-thermostat-thread \
144+
--target nxp-rw61x-freertos-thermostat-thread-wifi \
145+
build \
146+
--copy-artifacts-to out/artifacts \
147+
"
148+
149+
- name: Build RW61X laundry-washer example app
150+
run: |
151+
scripts/run_in_build_env.sh "\
152+
./scripts/build/build_examples.py \
153+
--target nxp-rw61x-freertos-laundry-washer-wifi \
154+
--target nxp-rw61x-freertos-laundry-washer-thread \
155+
--target nxp-rw61x-freertos-laundry-washer-thread-wifi \
156+
build \
157+
--copy-artifacts-to out/artifacts \
158+
"
159+
- name: Uploading Size Reports
160+
uses: ./.github/actions/upload-size-reports
161+
if: ${{ !env.ACT }}
162+
with:
163+
platform-name: RW61X
100164
zephyr:
101165
name: ZEPHYR_RW61X
102166

‎.github/workflows/examples-rw61x.yaml

-96
This file was deleted.

‎.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ jobs:
290290
git grep -I -n 'emberAfWriteAttribute' -- './*' \
291291
':(exclude).github/workflows/lint.yml' \
292292
':(exclude)examples/common/pigweed/rpc_services/Attributes.h' \
293-
':(exclude)src/app/codegen-data-model/CodegenDataModel_Write.cpp' \
294-
':(exclude)src/app/codegen-data-model/tests/EmberReadWriteOverride.cpp' \
293+
':(exclude)src/app/codegen-data-model-provider/CodegenDataModelProvider_Write.cpp' \
294+
':(exclude)src/app/codegen-data-model-provider/tests/EmberReadWriteOverride.cpp' \
295295
':(exclude)src/app/util/attribute-table.cpp' \
296296
':(exclude)src/app/util/attribute-table.h' \
297297
':(exclude)src/app/util/ember-compatibility-functions.cpp' \

‎.github/workflows/qemu.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-esp32-qemu:66
43+
image: ghcr.io/project-chip/chip-build-esp32-qemu:67
4444
volumes:
4545
- "/tmp/log_output:/tmp/test_logs"
4646

‎.github/workflows/release_artifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333

3434
container:
35-
image: ghcr.io/project-chip/chip-build-esp32:66
35+
image: ghcr.io/project-chip/chip-build-esp32:67
3636

3737
steps:
3838
- name: Checkout

‎.github/workflows/tests.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ jobs:
186186
src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml \
187187
src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml \
188188
src/app/zap-templates/zcl/data-model/chip/thread-network-diagnostics-cluster.xml \
189+
src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml \
189190
src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml \
190191
src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml \
191192
src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml \
@@ -223,6 +224,7 @@ jobs:
223224
--target linux-x64-lit-icd-${BUILD_VARIANT} \
224225
--target linux-x64-microwave-oven-${BUILD_VARIANT} \
225226
--target linux-x64-rvc-${BUILD_VARIANT} \
227+
--target linux-x64-network-manager-${BUILD_VARIANT} \
226228
build \
227229
--copy-artifacts-to objdir-clone \
228230
"
@@ -245,6 +247,7 @@ jobs:
245247
--lit-icd-app ./out/linux-x64-lit-icd-${BUILD_VARIANT}/lit-icd-app \
246248
--microwave-oven-app ./out/linux-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
247249
--rvc-app ./out/linux-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
250+
--network-manager-app ./out/linux-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
248251
"
249252
250253
- name: Run purposeful failure tests using the python parser sending commands to chip-tool
@@ -286,6 +289,7 @@ jobs:
286289
--lit-icd-app ./out/linux-x64-lit-icd-${BUILD_VARIANT}/lit-icd-app \
287290
--microwave-oven-app ./out/linux-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
288291
--rvc-app ./out/linux-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
292+
--network-manager-app ./out/linux-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
289293
"
290294
- name: Run Tests using chip-repl (including slow)
291295
if: github.event_name == 'push'
@@ -305,6 +309,7 @@ jobs:
305309
--lit-icd-app ./out/linux-x64-lit-icd-${BUILD_VARIANT}/lit-icd-app \
306310
--microwave-oven-app ./out/linux-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
307311
--rvc-app ./out/linux-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
312+
--network-manager-app ./out/linux-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
308313
"
309314
- name: Uploading core files
310315
uses: actions/upload-artifact@v4
@@ -373,6 +378,7 @@ jobs:
373378
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
374379
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
375380
--target darwin-x64-rvc-${BUILD_VARIANT} \
381+
--target darwin-x64-network-manager-${BUILD_VARIANT} \
376382
build \
377383
--copy-artifacts-to objdir-clone \
378384
"
@@ -396,6 +402,7 @@ jobs:
396402
--lit-icd-app ./out/darwin-x64-lit-icd-${BUILD_VARIANT}/lit-icd-app \
397403
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
398404
--rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
405+
--network-manager-app ./out/darwin-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
399406
"
400407
401408
- name: Run purposeful failure tests using the python parser sending commands to chip-tool
@@ -502,6 +509,7 @@ jobs:
502509
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_ACE_1_4.py'
503510
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_ACE_1_5.py'
504511
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_AccessChecker.py'
512+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_CC_2_2.py'
505513
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_CC_10_1.py'
506514
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_CGEN_2_4.py'
507515
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_CNET_1_4.py'
@@ -570,6 +578,7 @@ jobs:
570578
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OPSTATE_2_3.py'
571579
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OPSTATE_2_4.py'
572580
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OPSTATE_2_5.py'
581+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OPSTATE_2_6.py'
573582
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OVENOPSTATE_2_1.py'
574583
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OVENOPSTATE_2_2.py'
575584
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OVENOPSTATE_2_3.py'
@@ -591,6 +600,10 @@ jobs:
591600
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_RVCOPSTATE_2_4.py'
592601
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_SC_7_1.py'
593602
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_SWTCH.py'
603+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_WHM_1_2.py'
604+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_WHM_2_1.py'
605+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_LVL_2_3.py'
606+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TCP_Tests.py'
594607
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestConformanceSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
595608
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
596609
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestSpecParsingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'

‎BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
5757
"${chip_root}/src/lib/core/tests:fuzz-tlv-reader",
5858
"${chip_root}/src/lib/dnssd/minimal_mdns/tests:fuzz-minmdns-packet-parsing",
5959
"${chip_root}/src/lib/format/tests:fuzz-payload-decoder",
60+
"${chip_root}/src/setup_payload/tests:fuzz-setup-payload-base38",
61+
"${chip_root}/src/setup_payload/tests:fuzz-setup-payload-base38-decode",
6062
]
6163
}
6264
}

‎build/config/compiler/BUILD.gn

+9-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import("//build_overrides/build.gni")
1616
import("//build_overrides/pigweed.gni")
17+
import("//build_overrides/pigweed_environment.gni")
1718
import("${build_root}/chip/java/config.gni")
1819
import("${build_root}/config/compiler/compiler.gni")
1920
import("${build_root}/config/sysroot.gni")
@@ -348,7 +349,14 @@ config("cosmetic_default") {
348349
}
349350

350351
config("runtime_default") {
351-
if (is_clang) { # Using Pigweed clang instead of Darwin host clang
352+
if (is_clang &&
353+
current_os == "mac") { # Using Pigweed clang instead of Darwin host clang
354+
# Without pw_env_setup_CIPD_PIGWEED defined the hostclang:no_system_libcpp
355+
# config silently uses the system libc++, usually resulting in linker errors.
356+
assert(
357+
defined(pw_env_setup_CIPD_PIGWEED),
358+
"//build_overrides/pigweed_environment.gni must define pw_env_setup_CIPD_PIGWEED when using pigweed clang")
359+
352360
configs = [
353361
"$dir_pw_toolchain/host_clang:no_system_libcpp",
354362
"$dir_pw_toolchain/host_clang:xcode_sysroot",

‎config/esp32/components/chip/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,12 @@ else()
237237
chip_gn_arg_append("chip_openthread_ftd" "false")
238238
endif()
239239

240+
if (CONFIG_OPENTHREAD_BORDER_ROUTER)
241+
chip_gn_arg_append("chip_openthread_border_router" "true")
242+
else()
243+
chip_gn_arg_append("chip_openthread_border_router" "false")
244+
endif()
245+
240246
if (CONFIG_ENABLE_OTA_REQUESTOR)
241247
chip_gn_arg_append("chip_enable_ota_requestor" "true")
242248
endif()

0 commit comments

Comments
 (0)