Skip to content

Commit 53c385b

Browse files
drempelgdrempelg
committed
Merge branch 'master' into feature/presets
2 parents a1ec85f + 4bb4592 commit 53c385b

File tree

637 files changed

+39171
-63038
lines changed

Some content is hidden

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

637 files changed

+39171
-63038
lines changed

‎.github/.wordlist.txt

+21
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ables
1717
AccessControl
1818
AccessControlEntry
1919
accessor
20+
Accessors
2021
AccountLogin
2122
acdbc
2223
ack
@@ -31,7 +32,9 @@ AddNOC
3132
AddOrUpdateThreadNetwork
3233
AddOrUpdateWiFiNetwork
3334
addr
35+
AddResponse
3436
AddThreadNetwork
37+
AddStatus
3538
adk
3639
AdministratorCommissioning
3740
adoc
@@ -97,6 +100,7 @@ att
97100
attId
98101
attr
99102
attrib
103+
AttributeAccessInterface
100104
attributeValue
101105
attrListName
102106
attrMask
@@ -256,6 +260,7 @@ clusterAttrs
256260
clusterId
257261
clusterList
258262
clusterListName
263+
ClusterName
259264
ClusterObjectTests
260265
ClusterRevision
261266
ClusterTestGeneration
@@ -276,6 +281,8 @@ codelabs
276281
ColorControl
277282
Comcast
278283
Commandline
284+
CommandHandlerInterface
285+
CommandName
279286
Commissionable
280287
CommissionableDataProvider
281288
commissionables
@@ -289,6 +296,7 @@ configs
289296
configTOTAL
290297
ConfigurationManager
291298
ConfigurationManagerImpl
299+
conformant
292300
connectedhomeip
293301
ConnectionData
294302
ConnectIP
@@ -490,8 +498,11 @@ eg
490498
EjQ
491499
elftools
492500
elock
501+
emberAf
493502
emberAfExternalAttributeReadCallback
494503
emberAfExternalAttributeWriteCallback
504+
EmberAfInitializeAttributes
505+
emberAfSetDynamicEndpoint
495506
EnableNetwork
496507
EnableWiFiNetwork
497508
endian
@@ -521,6 +532,7 @@ EvalCodeWithName
521532
EvalFrameDefault
522533
EV
523534
EVB
535+
EventLogging
524536
evk
525537
EVSE
526538
exceptfds
@@ -594,6 +606,7 @@ GetDeviceInfo
594606
GetDns
595607
GetIP
596608
getManualTests
609+
GetSafeAttributePersistenceProvider
597610
getstarted
598611
getTests
599612
GH
@@ -629,6 +642,7 @@ Gv
629642
gz
630643
gzbf
631644
HaloaceticAcidsConcentrationMeasurement
645+
HandleCommand
632646
hardcoded
633647
hardknott
634648
hardwarever
@@ -700,6 +714,7 @@ installDebug
700714
instantiation
701715
integrations
702716
IntelliSense
717+
InteractionModelEngine
703718
InteractionModelVersion
704719
Interoperable
705720
introvideos
@@ -804,6 +819,7 @@ localhost
804819
LocalizationConfiguration
805820
localstatedir
806821
LockingState
822+
LogEvent
807823
loopback
808824
LowPower
809825
LPC
@@ -832,6 +848,7 @@ matterc
832848
MatterCustomTrace
833849
matterd
834850
MatterLock
851+
MatterReportingAttributeChangeCallback
835852
matterSdkSourceBuild
836853
matterSourceBuildAbiFilters
837854
matterUTestLib
@@ -1065,6 +1082,7 @@ plaintext
10651082
PlatformManager
10661083
PlatformManagerImpl
10671084
plt
1085+
PluginServerCallback
10681086
png
10691087
Podman
10701088
PollControl
@@ -1152,6 +1170,8 @@ recommand
11521170
recommanded
11531171
recurse
11541172
regen
1173+
registerAttributeAccessOverride
1174+
RegisterCommandHandler
11551175
RelativeHumidityMeasurement
11561176
RemainAfterExit
11571177
remoteDeviceId
@@ -1161,6 +1181,7 @@ RendezvousParameters
11611181
RendezVousTest
11621182
REPL
11631183
repo
1184+
repos
11641185
req
11651186
Requestor
11661187
Requestor's

‎.github/workflows/examples-stm32.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,14 @@ jobs:
6262
"./scripts/build/build_examples.py \
6363
--target stm32-STM32WB5MM-DK-light build \
6464
"
65-
65+
66+
- name: Gather size reports
67+
run: |
68+
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
69+
stm32 STM32WB5MM-DK light \
70+
out/stm32-stm32wb5mm-dk-light/chip-stm32-lighting-example.elf \
71+
/tmp/bloat_reports/
72+
6673
- name: Uploading Size Reports
6774
uses: ./.github/actions/upload-size-reports
6875
if: ${{ !env.ACT }}

‎.github/workflows/tests.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,15 @@ jobs:
114114
src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml \
115115
src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml \
116116
src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml \
117+
src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml \
117118
src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \
118119
src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml \
119120
src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml \
120121
src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml \
121122
src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml \
122123
src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml \
123124
src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml \
125+
src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml \
124126
src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml \
125127
src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml \
126128
src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml \
@@ -461,6 +463,7 @@ jobs:
461463
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_ACE_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"'
462464
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_ACE_1_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --int-arg PIXIT.ACE.APPENDPOINT:1 PIXIT.ACE.APPDEVTYPEID:0x0100 --string-arg PIXIT.ACE.APPCLUSTER:OnOff PIXIT.ACE.APPATTRIBUTE:OnOff --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
463465
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_ACE_1_3.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"'
466+
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_ACE_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"'
464467
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"'
465468
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"'
466469
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"'
@@ -481,6 +484,9 @@ jobs:
481484
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"'
482485
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"'
483486
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"'
487+
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"'
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_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"'
489+
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"'
484490
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_3.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"'
485491
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_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"'
486492
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_5.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"'
@@ -585,3 +591,4 @@ jobs:
585591
path: objdir-clone/
586592
# objdirs are big; don't hold on to them too long.
587593
retention-days: 5
594+

‎build/chip/esp32/esp32_codegen.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ macro(chip_app_component_codegen IDL_NAME)
3333
OUTPUTS
3434
"app/PluginApplicationCallbacks.h"
3535
"app/callback-stub.cpp"
36+
"app/cluster-init-callback.cpp"
3637
OUTPUT_PATH APP_GEN_DIR
3738
OUTPUT_FILES APP_GEN_FILES
3839
)

‎data_model/clusters/BooleanStateConfiguration.xml

+7-8
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,12 @@ Davis, CA 95616, USA
6868
<optionalConform/>
6969
</feature>
7070
<feature bit="2" code="SPRS" name="AlarmSuppress" summary="Supports ability to suppress or acknowledge alarms">
71-
<optionalConform/>
71+
<optionalConform>
72+
<orTerm>
73+
<feature name="VIS"/>
74+
<feature name="AUD"/>
75+
</orTerm>
76+
</optionalConform>
7277
</feature>
7378
<feature bit="3" code="SENSLVL" name="SensitivityLevel" summary="Supports ability to set sensor sensitivity">
7479
<optionalConform/>
@@ -130,13 +135,7 @@ Davis, CA 95616, USA
130135
<attribute id="0x0004" name="AlarmsSuppressed" type="AlarmModeBitmap">
131136
<access read="true" readPrivilege="view"/>
132137
<mandatoryConform>
133-
<andTerm>
134-
<orTerm>
135-
<feature name="VIS"/>
136-
<feature name="AUD"/>
137-
</orTerm>
138-
<feature name="SPRS"/>
139-
</andTerm>
138+
<feature name="SPRS"/>
140139
</mandatoryConform>
141140
</attribute>
142141
<attribute id="0x0005" name="AlarmsEnabled" type="AlarmModeBitmap">

0 commit comments

Comments
 (0)