Skip to content

Commit f768e20

Browse files
hicklinhicklin
committed
Merge branch 'master' into remove_depricated_RVC_item and regenerated autogen code
2 parents 98750a7 + e5f5d67 commit f768e20

File tree

296 files changed

+18787
-9210
lines changed

Some content is hidden

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

296 files changed

+18787
-9210
lines changed

‎.github/.wordlist.txt

+13
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ ASR
9595
AssertionError
9696
AST
9797
ASYNC
98+
ATLs
9899
atomics
99100
att
100101
attId
@@ -160,6 +161,7 @@ blockquote
160161
bluetoothd
161162
bluez
162163
BOOL
164+
booleans
163165
BooleanState
164166
bootable
165167
Bootloader
@@ -380,6 +382,7 @@ DefaultOTARequestor
380382
DefaultOTARequestorDriver
381383
DefaultOTARequestorStorage
382384
DefaultSuccess
385+
defaultValue
383386
definedValue
384387
DehumidificationControl
385388
DelayedActionTime
@@ -503,6 +506,7 @@ emberAfExternalAttributeReadCallback
503506
emberAfExternalAttributeWriteCallback
504507
EmberAfInitializeAttributes
505508
emberAfSetDynamicEndpoint
509+
emsp
506510
EnableNetwork
507511
EnableWiFiNetwork
508512
endian
@@ -604,6 +608,7 @@ GenericWiFiConfigurationManagerImpl
604608
GetDeviceId
605609
GetDeviceInfo
606610
GetDns
611+
GetInDevelopmentTests
607612
GetIP
608613
getManualTests
609614
GetSafeAttributePersistenceProvider
@@ -673,6 +678,7 @@ IasWd
673678
iaszone
674679
ibb
675680
ICA
681+
ICAC
676682
ICD
677683
ICDs
678684
iCloud
@@ -724,6 +730,7 @@ IoT
724730
ipaddr
725731
iPadOS
726732
ipadr
733+
IPK
727734
ipp
728735
iptables
729736
iputils
@@ -935,6 +942,7 @@ namespacing
935942
nano
936943
natively
937944
navpad
945+
nbsp
938946
NCP
939947
ncs
940948
nding
@@ -1076,6 +1084,7 @@ Pigweed
10761084
PinCode
10771085
pinrequest
10781086
PIXIT
1087+
PIXITs
10791088
pkgconfig
10801089
PKI
10811090
plaintext
@@ -1155,6 +1164,7 @@ RADVD
11551164
raspberryPi
11561165
RasPi
11571166
rAv
1167+
RCAC
11581168
RCP
11591169
ReadAttribute
11601170
ReadConfigValue
@@ -1219,6 +1229,7 @@ RTOS
12191229
RTT
12201230
RTX
12211231
runArgs
1232+
runIf
12221233
RUNAS
12231234
RunMain
12241235
runtime
@@ -1227,6 +1238,7 @@ rw
12271238
RXD
12281239
sandboxed
12291240
saveAs
1241+
saveDataVersschemaionAs
12301242
sbin
12311243
scalability
12321244
scalable
@@ -1377,6 +1389,7 @@ TestArray
13771389
TestCluster
13781390
TestConstraints
13791391
TestEmptyString
1392+
TestEqualities
13801393
TestGenExample
13811394
TestGroupDemoConfig
13821395
TestMultiRead

‎.github/workflows/examples-esp32.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,6 @@ jobs:
165165

166166
- name: Build example Lighting App (external platform)
167167
run: scripts/examples/esp_example.sh lighting-app sdkconfig.ext_plat.defaults
168+
169+
- name: Build example Energy Management App
170+
run: scripts/examples/esp_example.sh energy-management-app sdkconfig.defaults

‎.github/workflows/tests.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@ jobs:
467467
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_CGEN_2_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
468468
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DA_1_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
469469
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TestGroupTableReports.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
470+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TestBatchInvoke.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
470471
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TC_TIMESYNC_2_1.py" --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
471472
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TC_TIMESYNC_2_2.py" --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
472473
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TC_TIMESYNC_2_4.py" --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
@@ -484,6 +485,7 @@ jobs:
484485
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-lit-icd-ipv6only-no-ble-no-wifi-tsan-clang-test/lit-icd-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_ICDM_2_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
485486
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DA_1_5.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
486487
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_IDM_1_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
488+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_IDM_1_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
487489
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_IDM_4_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
488490
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
489491
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
@@ -591,4 +593,3 @@ jobs:
591593
path: objdir-clone/
592594
# objdirs are big; don't hold on to them too long.
593595
retention-days: 5
594-

‎.restyled.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ exclude:
8686
- "scripts/setup/pigweed.json" # TODO(#29547). This file is temporary copy from pigweed repo that has minor edits. No restyle help in diff.
8787
- "docs/ERROR_CODES.md" # generated by scripts, not easy to align tables
8888
- "docs/clusters.md" # generated by scripts, not easy to align tables
89+
- "docs/testing/yaml_pseudocluster.md" # generated by scripts, restyler makes the tables render improperly
90+
- "docs/testing/yaml_schema.md" # generated by scripts, restyler makes the tables render improperly
8991

9092
changed_paths:
9193
maximum: 100000

‎.spellcheck.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#
2121
# Actual run:
2222
#
23-
# pyspelling pyspelling --config .spellcheck.yml
23+
# pyspelling --config .spellcheck.yml
2424

2525
matrix:
2626
- name: markdown
@@ -65,6 +65,6 @@ matrix:
6565
# converts markdown to HTML
6666
- pyspelling.filters.markdown:
6767
sources:
68-
- '**/*.md|!third_party/**|!examples/common/**/repo/**|!docs/ERROR_CODES.md|!docs/clusters.md'
68+
- '**/*.md|!third_party/**|!examples/common/**/repo/**|!docs/ERROR_CODES.md|!docs/clusters.md|!docs/testing/yaml_schema.md|!docs/testing/yaml_pseudocluster.md'
6969
aspell:
7070
ignore-case: true

‎build/chip/chip_test_group.gni

+10-3
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,14 @@ template("chip_test_group") {
3939
[
4040
"build_monolithic_library",
4141
"deps",
42+
"tests",
4243
])
4344

4445
deps = []
45-
foreach(_test, invoker.deps) {
46+
if (defined(invoker.deps)) {
47+
deps = invoker.deps
48+
}
49+
foreach(_test, invoker.tests) {
4650
deps += [ get_label_info(_test, "label_no_toolchain") + ".lib" ]
4751
}
4852

@@ -53,7 +57,7 @@ template("chip_test_group") {
5357

5458
group("${_test_group_name}") {
5559
deps = []
56-
data_deps = invoker.deps
60+
data_deps = invoker.tests
5761

5862
if (_build_monolithic_library) {
5963
deps += [ ":${_lib_target_name}" ]
@@ -64,7 +68,10 @@ template("chip_test_group") {
6468
group("${_test_group_name}_run") {
6569
if (chip_link_tests) {
6670
deps = []
67-
foreach(_test, invoker.deps) {
71+
if (defined(invoker.deps)) {
72+
deps = invoker.deps
73+
}
74+
foreach(_test, invoker.tests) {
6875
deps += [ get_label_info(_test, "label_no_toolchain") + "_run" ]
6976
}
7077
}

‎config/ameba/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ static_library("pw_rpc") {
2424
"$dir_pw_rpc:server",
2525
"$dir_pw_rpc/nanopb:echo_service",
2626
"${chip_root}/examples/platform/ameba/pw_sys_io:pw_sys_io_ameba",
27-
"${dir_pigweed}/pw_hdlc:pw_rpc",
2827
dir_pw_assert,
2928
dir_pw_hdlc,
3029
dir_pw_log,

‎config/bouffalolab/common/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ static_library("pw_rpc") {
3636
"$dir_pw_rpc:server",
3737
"$dir_pw_rpc/nanopb:echo_service",
3838
"${chip_root}/examples/platform/bouffalolab/common/rpc/pw_sys_io:pw_sys_io",
39-
"${dir_pigweed}/pw_hdlc:pw_rpc",
4039
dir_pw_assert,
4140
dir_pw_checksum,
4241
dir_pw_hdlc,

‎config/efr32/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ static_library("pw_rpc") {
2525
"$dir_pw_rpc:server",
2626
"$dir_pw_rpc/nanopb:echo_service",
2727
"${chip_root}/examples/platform/silabs/pw_sys_io:pw_sys_io_silabs",
28-
"${dir_pigweed}/pw_hdlc:pw_rpc",
2928
dir_pw_assert,
3029
dir_pw_checksum,
3130
dir_pw_hdlc,

‎config/esp32/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ static_library("pw_rpc") {
2424
"$dir_pw_rpc:server",
2525
"$dir_pw_rpc/nanopb:echo_service",
2626
"${chip_root}/examples/platform/esp32/pw_sys_io:pw_sys_io_esp32",
27-
"${dir_pigweed}/pw_hdlc:pw_rpc",
2827
dir_pw_assert,
2928
dir_pw_hdlc,
3029
dir_pw_log,

‎config/linux/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ static_library("pw_rpc") {
2222
public_configs = [ "${dir_pigweed}/pw_hdlc:default_config" ]
2323
deps = [
2424
"$dir_pw_hdlc:encoder",
25-
"$dir_pw_hdlc:pw_rpc",
2625
"$dir_pw_hdlc:rpc_channel_output",
2726
"$dir_pw_rpc/system_server:facade",
2827
"$dir_pw_stream:socket_stream",

‎config/mbed/chip-gn/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ static_library("pw_rpc") {
3030
deps = [
3131
"$dir_pw_rpc:server",
3232
"${chip_root}/examples/platform/mbed/pw_sys_io:pw_sys_io_mbed",
33-
"${dir_pigweed}/pw_hdlc:pw_rpc",
3433
dir_pw_assert,
3534
dir_pw_hdlc,
3635
dir_pw_log,

‎config/qpg/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ static_library("pw_rpc") {
3636
"$dir_pw_rpc:server",
3737
"$dir_pw_rpc/nanopb:echo_service",
3838
"${chip_root}/examples/platform/qpg/pw_sys_io:pw_sys_io_qpg",
39-
"${dir_pigweed}/pw_hdlc:pw_rpc",
4039
dir_pw_assert,
4140
dir_pw_checksum,
4241
dir_pw_hdlc,

0 commit comments

Comments
 (0)