Skip to content

Commit c363ddd

Browse files
andreilitvinandreilitvin
committed
Merge branch 'master' into im_dm_decoupling
2 parents 7d99ad5 + d8245cb commit c363ddd

File tree

472 files changed

+7152
-3389
lines changed

Some content is hidden

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

472 files changed

+7152
-3389
lines changed

‎.github/.wordlist.txt

+5
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,8 @@ GenericWiFiConfigurationManagerImpl
585585
GetDeviceId
586586
GetDeviceInfo
587587
GetDns
588+
getter
589+
getters
588590
GetInDevelopmentTests
589591
GetIP
590592
getManualTests
@@ -907,6 +909,7 @@ Multicast
907909
multilib
908910
Multiprotocol
909911
multithreaded
912+
mutex
910913
mutexes
911914
mv
912915
MX
@@ -936,6 +939,7 @@ nfds
936939
NitricOxideConcentrationMeasurement
937940
NitrogenDioxideConcentrationMeasurement
938941
nl
942+
nltest
939943
NLUnitTest
940944
NLUnitTests
941945
nmcli
@@ -1499,6 +1503,7 @@ utils
14991503
UUID
15001504
ux
15011505
validator
1506+
valgrind
15021507
vcom
15031508
VCP
15041509
Vectorcall

‎.github/workflows/darwin-tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Darwin Tests
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123
workflow_dispatch:

‎.github/workflows/darwin.yaml

+20-32
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@ name: Darwin
1717
on:
1818
push:
1919
branches-ignore:
20-
- 'dependabot/**'
20+
- "dependabot/**"
2121
pull_request:
2222
merge_group:
2323
workflow_dispatch:
2424

2525
concurrency:
26-
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
26+
group:
27+
${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name ==
28+
'pull_request' && github.event.number) || (github.event_name ==
29+
'workflow_dispatch' && github.run_number) || github.sha }}
2730
cancel-in-progress: true
2831

2932
env:
@@ -51,33 +54,33 @@ jobs:
5154
- name: Checkout submodules & Bootstrap
5255
uses: ./.github/actions/checkout-submodules-and-bootstrap
5356
with:
54-
platform: darwin
55-
bootstrap-log-name: bootstrap-logs-framework-${{ matrix.options.flavor }}
57+
platform: darwin
58+
bootstrap-log-name:
59+
bootstrap-logs-framework-${{ matrix.options.flavor }}
5660
- name: Block zap-cli from being used
5761
env:
58-
PW_ENVSETUP_NO_BANNER: 1
62+
PW_ENVSETUP_NO_BANNER: 1
5963
run: |
60-
# Framework builds are NOT expected to require zap-cli
61-
scripts/run_in_build_env.sh 'rm -- "$(which zap-cli)"'
62-
# run_in_build_env.sh is used to ensure PATH is set to something that would otherwise find zap-cli
63-
scripts/run_in_build_env.sh '(zap-cli --version && exit 1) || exit 0'
64+
# Framework builds are NOT expected to require zap-cli
65+
scripts/run_in_build_env.sh 'rm -- "$(which zap-cli)"'
66+
# run_in_build_env.sh is used to ensure PATH is set to something that would otherwise find zap-cli
67+
scripts/run_in_build_env.sh '(zap-cli --version && exit 1) || exit 0'
6468
- name: Build
6569
working-directory: src/darwin/Framework
6670
run: xcodebuild -target "Matter" ${{ matrix.options.arguments }}
6771

6872
tests:
6973
name: Run framework tests
7074
if: github.actor != 'restyled-io[bot]'
71-
needs: [ framework ] # serialize to avoid running to many parallel macos runners
75+
needs: [framework] # serialize to avoid running to many parallel macos runners
7276
runs-on: macos-13
7377
strategy:
7478
matrix:
7579
options: # We don't need a full matrix
7680
- flavor: asan
77-
arguments: -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES
78-
- flavor: asan-global-storage
79-
arguments: -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES
80-
defines: MTR_PER_CONTROLLER_STORAGE_ENABLED=0
81+
arguments:
82+
-enableAddressSanitizer YES
83+
-enableUndefinedBehaviorSanitizer YES
8184
- flavor: tsan
8285
arguments: -enableThreadSanitizer YES
8386
steps:
@@ -86,8 +89,9 @@ jobs:
8689
- name: Checkout submodules & Bootstrap
8790
uses: ./.github/actions/checkout-submodules-and-bootstrap
8891
with:
89-
platform: darwin
90-
bootstrap-log-name: bootstrap-logs-framework-${{ matrix.options.flavor }}
92+
platform: darwin
93+
bootstrap-log-name:
94+
bootstrap-logs-framework-${{ matrix.options.flavor }}
9195
- name: Build example All Clusters Server
9296
run: |
9397
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug chip_config_network_layer_ble=false
@@ -127,19 +131,3 @@ jobs:
127131
name: darwin-framework-test-logs-${{ matrix.options.flavor }}
128132
path: /tmp/darwin/framework-tests
129133
retention-days: 5
130-
131-
tv-casting-bridge:
132-
name: Build TV Casting Bridge example
133-
if: github.actor != 'restyled-io[bot]'
134-
needs: [ framework ] # serialize to avoid running to many parallel macos runners
135-
runs-on: macos-13
136-
steps:
137-
- name: Checkout
138-
uses: actions/checkout@v4
139-
- name: Checkout submodules & Bootstrap
140-
uses: ./.github/actions/checkout-submodules-and-bootstrap
141-
with:
142-
platform: darwin
143-
- name: Build
144-
working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge
145-
run: xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos

‎.github/workflows/example-tv-casting-darwin.yaml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Copyright (c) 2020-2021 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: TV Casting Example - Darwin
16+
17+
on:
18+
push:
19+
branches-ignore:
20+
- "dependabot/**"
21+
pull_request:
22+
merge_group:
23+
workflow_dispatch:
24+
25+
concurrency:
26+
group:
27+
${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name ==
28+
'pull_request' && github.event.number) || (github.event_name ==
29+
'workflow_dispatch' && github.run_number) || github.sha }}
30+
cancel-in-progress: true
31+
32+
env:
33+
CHIP_NO_LOG_TIMESTAMPS: true
34+
35+
jobs:
36+
tv-casting-bridge:
37+
name: Build TV Casting Bridge example
38+
if: github.actor != 'restyled-io[bot]'
39+
runs-on: macos-13
40+
steps:
41+
- name: Checkout
42+
uses: actions/checkout@v4
43+
- name: Checkout submodules & Bootstrap
44+
uses: ./.github/actions/checkout-submodules-and-bootstrap
45+
with:
46+
platform: darwin
47+
- name: Build
48+
working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge
49+
run: xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos

‎.github/workflows/examples-cc13xx_26xx.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Build example - TI CC13XX_26XX
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123

‎.github/workflows/examples-linux-tv-casting-app.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Test TV Casting Example
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123

‎.github/workflows/examples-nxp.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Build example - NXP
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123

‎.github/workflows/examples-rw61x.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Build example - RW61X
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123

‎.github/workflows/lint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ jobs:
9696
--known-failure app/app-platform/ContentAppPlatform.h \
9797
--known-failure controller/ExamplePersistentStorage.cpp \
9898
--known-failure controller/ExamplePersistentStorage.h \
99-
--known-failure app/AttributeAccessInterface.h \
10099
--known-failure app/AttributeAccessToken.h \
101100
--known-failure app/CommandHandler.h \
102101
--known-failure app/CommandHandlerInterface.h \
@@ -107,11 +106,11 @@ jobs:
107106
--known-failure app/reporting/tests/MockReportScheduler.cpp \
108107
--known-failure app/reporting/tests/MockReportScheduler.h \
109108
--known-failure app/util/attribute-storage.cpp \
110-
--known-failure app/util/attribute-storage.h \
111109
--known-failure app/util/attribute-storage-detail.h \
110+
--known-failure app/util/attribute-storage.h \
112111
--known-failure app/util/attribute-table.cpp \
113-
--known-failure app/util/attribute-table.h \
114112
--known-failure app/util/attribute-table-detail.h \
113+
--known-failure app/util/attribute-table.h \
115114
--known-failure app/util/binding-table.cpp \
116115
--known-failure app/util/binding-table.h \
117116
--known-failure app/util/config.h \
@@ -123,6 +122,7 @@ jobs:
123122
--known-failure app/util/generic-callbacks.h \
124123
--known-failure app/util/generic-callback-stubs.cpp \
125124
--known-failure app/util/im-client-callbacks.h \
125+
--known-failure app/util/IMClusterCommandHandler.h \
126126
--known-failure app/util/util.cpp \
127127
--known-failure app/util/util.h \
128128
--known-failure app/WriteHandler.h \

‎BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
233233
"//scripts/build:build_examples.tests",
234234
"//scripts/py_matter_idl:matter_idl.tests",
235235
"//scripts/py_matter_yamltests:matter_yamltests.tests",
236+
"//scripts/tests/py:metadata_parser.tests",
236237
"//src:tests_run",
237238
]
238239

‎data_model/clusters/BooleanStateConfiguration.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -104,31 +104,31 @@ Davis, CA 95616, USA
104104
</bitmap>
105105
</dataTypes>
106106
<attributes>
107-
<attribute id="0x0000" name="CurrentSensitivityLevel" type="uint8">
107+
<attribute id="0x0000" name="CurrentSensitivityLevel" type="uint8" default="MS">
108108
<access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
109109
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
110110
<mandatoryConform>
111111
<feature name="SENSLVL"/>
112112
</mandatoryConform>
113113
<constraint type="max" value="SupportedSensitivityLevels - 1"/>
114114
</attribute>
115-
<attribute id="0x0001" name="SupportedSensitivityLevels" type="uint8">
115+
<attribute id="0x0001" name="SupportedSensitivityLevels" type="uint8" default="MS">
116116
<access read="true" readPrivilege="view"/>
117117
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
118118
<mandatoryConform>
119119
<feature name="SENSLVL"/>
120120
</mandatoryConform>
121121
<constraint type="between" from="2" to="10"/>
122122
</attribute>
123-
<attribute id="0x0002" name="DefaultSensitivityLevel" type="uint8">
123+
<attribute id="0x0002" name="DefaultSensitivityLevel" type="uint8" default="MS">
124124
<access read="true" readPrivilege="view"/>
125125
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
126126
<optionalConform>
127127
<feature name="SENSLVL"/>
128128
</optionalConform>
129129
<constraint type="max" value="SupportedSensitivityLevels - 1"/>
130130
</attribute>
131-
<attribute id="0x0003" name="AlarmsActive" type="AlarmModeBitmap">
131+
<attribute id="0x0003" name="AlarmsActive" type="AlarmModeBitmap" default="0">
132132
<access read="true" readPrivilege="view"/>
133133
<mandatoryConform>
134134
<orTerm>
@@ -137,13 +137,13 @@ Davis, CA 95616, USA
137137
</orTerm>
138138
</mandatoryConform>
139139
</attribute>
140-
<attribute id="0x0004" name="AlarmsSuppressed" type="AlarmModeBitmap">
140+
<attribute id="0x0004" name="AlarmsSuppressed" type="AlarmModeBitmap" default="0">
141141
<access read="true" readPrivilege="view"/>
142142
<mandatoryConform>
143143
<feature name="SPRS"/>
144144
</mandatoryConform>
145145
</attribute>
146-
<attribute id="0x0005" name="AlarmsEnabled" type="AlarmModeBitmap">
146+
<attribute id="0x0005" name="AlarmsEnabled" type="AlarmModeBitmap" default="MS">
147147
<access read="true" readPrivilege="view"/>
148148
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
149149
<optionalConform>
@@ -153,7 +153,7 @@ Davis, CA 95616, USA
153153
</orTerm>
154154
</optionalConform>
155155
</attribute>
156-
<attribute id="0x0006" name="AlarmsSupported" type="AlarmModeBitmap">
156+
<attribute id="0x0006" name="AlarmsSupported" type="AlarmModeBitmap" default="0">
157157
<access read="true" readPrivilege="view"/>
158158
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
159159
<mandatoryConform>

‎data_model/clusters/ColorControl.xml

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ Davis, CA 95616, USA
107107
</attribute>
108108
<attribute id="0x0002" name="RemainingTime" type="uint16" default="0">
109109
<access read="true" readPrivilege="view"/>
110-
<quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false"/>
111110
<optionalConform/>
112111
<constraint type="between" from="0" to="65534"/>
113112
</attribute>

‎data_model/clusters/DiagnosticsGeneral.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ Davis, CA 95616, USA
6565
</clusterIds>
6666
<classification hierarchy="base" role="utility" picsCode="DGGEN" scope="Node"/>
6767
<features>
68-
<feature bit="0" code="DMTEST" name="DataModelTest" summary="Support specific testing needs for extended Data Model features">
69-
<optionalConform/>
70-
</feature>
68+
<feature bit="0" code="DMTEST" name="DataModelTest" summary="Support specific testing needs for extended Data Model features"/>
7169
</features>
7270
<dataTypes>
7371
<enum name="BootReasonEnum">

‎data_model/clusters/EnergyEVSE.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Davis, CA 95616, USA
6868
<classification hierarchy="base" role="application" picsCode="EEVSE" scope="Endpoint"/>
6969
<features>
7070
<feature bit="0" code="PREF" name="ChargingPreferences" summary="EVSE supports storing user charging preferences">
71-
<optionalConform/>
71+
<provisionalConform/>
7272
</feature>
7373
<feature bit="1" code="SOC" name="SoCReporting" summary="EVSE supports reporting of vehicle State of Charge (SoC)">
7474
<provisionalConform/>

‎data_model/clusters/LevelControl.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ Davis, CA 95616, USA
7979
<optionalConform/>
8080
</feature>
8181
<feature bit="2" code="FQ" name="Frequency" default="0" summary="Supports frequency attributes and behavior.
82-
The Pulse Width Modulation cluster was created
83-
for frequency control.">
82+
The Pulse Width Modulation cluster was created
83+
for frequency control.">
8484
<provisionalConform/>
8585
</feature>
8686
</features>
@@ -126,7 +126,6 @@ Davis, CA 95616, USA
126126
</attribute>
127127
<attribute id="0x0001" name="RemainingTime" type="uint16" default="0">
128128
<access read="true" readPrivilege="view"/>
129-
<quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false"/>
130129
<mandatoryConform>
131130
<feature name="LT"/>
132131
</mandatoryConform>

0 commit comments

Comments
 (0)