Skip to content

Commit a220c57

Browse files
bhmanda-silabsbhmanda-silabs
authored
Merge branch 'master' into feature/update_wifi_sdk_v3.3.3
2 parents 3ecca43 + 44db0f6 commit a220c57

File tree

388 files changed

+11797
-7817
lines changed

Some content is hidden

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

388 files changed

+11797
-7817
lines changed

‎.github/issue-labeler.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,18 @@ darwin:
1212
# (?![a-z]) means "there is no next char in the range a-z".
1313
- "/(\\b[Ii][Oo][Ss](?![a-zA-Z])|[Hh][Oo][Mm][Ee][Pp][Oo][Dd]|[Dd][Aa][Rr][Ww][Ii][Nn]|\\bm[Aa][Cc]\\b|\\bMa[Cc]\\b|\\bM[Aa]c\\b|[Mm][Aa][Cc][Oo][Ss])/"
1414

15-
linux:
16-
- "/(linux)/i"
15+
16+
# NOTE:
17+
# Linux intentionally disabled: most people compile either on linux or darwin and
18+
# as a result a lot of issues get tagged as such even though they are not platform specific
19+
# (e.g. we get test case failures reported as linux even though they are just normal
20+
# test runs)
21+
#
22+
# Linux label should be reserved to platform-specific problems (usually bootstrap/packages
23+
# or integration with wifi/ethernet/bluetootn/etc.)
24+
#
25+
# linux:
26+
# - "/(linux)/i"
1727

1828
# Special Keywords for Cert Blockers
1929
air purifiers:

‎.github/labeler.yml

+25-3
Original file line numberDiff line numberDiff line change
@@ -275,38 +275,54 @@ darwin:
275275
silabs:
276276
- changed-files:
277277
- any-glob-to-any-file:
278+
- examples/platform/silabs/*
279+
- examples/platform/silabs/**/*
278280
- src/platform/silabs/*
279281
- src/platform/silabs/**/*
282+
- src/test_driver/efr32/*
283+
- src/test_driver/efr32/**/*
280284

281285
esp32:
282286
- changed-files:
283287
- any-glob-to-any-file:
288+
- examples/platform/esp32/*
289+
- examples/platform/esp32/**/*
284290
- src/platform/ESP32/*
285291
- src/platform/ESP32/**/*
292+
- src/test_driver/esp32/*
293+
- src/test_driver/esp32/**/*
286294

287295
freeRTOS:
288296
- changed-files:
289297
- any-glob-to-any-file:
290298
- src/platform/FreeRTOS/*
291299
- src/platform/FreeRTOS/**/*
292300

293-
k32w:
301+
nxp:
294302
- changed-files:
295303
- any-glob-to-any-file:
296-
- src/platform/K32W/*
297-
- src/platform/K32W/**/*
304+
- examples/platform/nxp/*
305+
- examples/platform/nxp/**/*
306+
- src/platform/nxp/*
307+
- src/platform/nxp/**/*
298308

299309
linux:
300310
- changed-files:
301311
- any-glob-to-any-file:
312+
- examples/platform/linux/*
313+
- examples/platform/linux/**/*
302314
- src/platform/Linux/*
303315
- src/platform/Linux/**/*
304316

305317
nrf connect:
306318
- changed-files:
307319
- any-glob-to-any-file:
320+
- examples/platform/nrfconnect/*
321+
- examples/platform/nrfconnect/**/*
308322
- src/platform/nrfconnect/*
309323
- src/platform/nrfconnect/**/*
324+
- src/test_driver/nrfconnect/*
325+
- src/test_driver/nrfconnect/**/*
310326

311327
openthread:
312328
- changed-files:
@@ -323,11 +339,17 @@ zephyr:
323339
telink:
324340
- changed-files:
325341
- any-glob-to-any-file:
342+
- examples/platform/telink/*
343+
- examples/platform/telink/**/*
326344
- src/platform/telink/*
327345
- src/platform/telink/**/*
328346

329347
tizen:
330348
- changed-files:
331349
- any-glob-to-any-file:
350+
- examples/platform/tizen/*
351+
- examples/platform/tizen/**/*
332352
- src/platform/Tizen/*
333353
- src/platform/Tizen/**/*
354+
- src/test_driver/tizen/*
355+
- src/test_driver/tizen/**/*

‎.github/workflows/examples-telink.yaml

+30
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ jobs:
6161
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 3ed7686a9378de6be1368c912f9a42f998bbfb18"
6262

6363
- name: Build example Telink (B92 retention) Air Quality Sensor App
64+
# Run test for master and s07641069 PRs
65+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
6466
run: |
6567
./scripts/run_in_build_env.sh \
6668
"./scripts/build/build_examples.py --target 'telink-tlsr9528a_retention-air-quality-sensor' build"
@@ -73,6 +75,8 @@ jobs:
7375
run: rm -rf ./out
7476

7577
- name: Build example Telink (W91) All Clusters App
78+
# Run test for master and s07641069 PRs
79+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
7680
continue-on-error: true
7781
run: |
7882
./scripts/run_in_build_env.sh \
@@ -86,6 +90,8 @@ jobs:
8690
run: rm -rf ./out
8791

8892
- name: Build example Telink (B92) All Clusters Minimal App
93+
# Run test for master and s07641069 PRs
94+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
8995
run: |
9096
./scripts/run_in_build_env.sh \
9197
"./scripts/build/build_examples.py --target 'telink-tlsr9528a-all-clusters-minimal' build"
@@ -98,6 +104,7 @@ jobs:
98104
run: rm -rf ./out
99105

100106
- name: Build example Telink (B95) Bridge App
107+
# Run test for master and all PRs
101108
run: |
102109
./scripts/run_in_build_env.sh \
103110
"./scripts/build/build_examples.py --target 'telink-tlsr9258a-bridge' build"
@@ -110,6 +117,7 @@ jobs:
110117
run: rm -rf ./out
111118

112119
- name: Build example Telink (B92 retention) Contact Sensor App
120+
# Run test for master and all PRs
113121
run: |
114122
./scripts/run_in_build_env.sh \
115123
"./scripts/build/build_examples.py --target 'telink-tlsr9528a_retention-contact-sensor' build"
@@ -122,6 +130,7 @@ jobs:
122130
run: rm -rf ./out
123131

124132
- name: Build tools required for Factory Data
133+
# Run test for master and all PRs
125134
run: |
126135
./scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform linux
127136
./scripts/build/gn_gen.sh
@@ -132,6 +141,7 @@ jobs:
132141
run: rm -rf ./out/telink*
133142

134143
- name: Build example Telink (W91) Lighting App with OTA, Factory Data
144+
# Run test for master and all PRs
135145
continue-on-error: true
136146
run: |
137147
./scripts/run_in_build_env.sh \
@@ -145,6 +155,7 @@ jobs:
145155
run: rm -rf ./out/telink*
146156

147157
- name: Build example Telink (B91) Lighting App with OTA, RPC, Factory Data and 4Mb flash
158+
# Run test for master and all PRs
148159
run: |
149160
./scripts/run_in_build_env.sh \
150161
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-light-ota-rpc-factory-data-4mb' build"
@@ -157,6 +168,7 @@ jobs:
157168
run: rm -rf ./out/telink*
158169

159170
- name: Build example Telink (B92) Light Switch App with OTA, Shell, Factory Data
171+
# Run test for master and all PRs
160172
run: |
161173
./scripts/run_in_build_env.sh \
162174
"./scripts/build/build_examples.py --target 'telink-tlsr9528a-light-switch-ota-shell-factory-data' build"
@@ -169,6 +181,8 @@ jobs:
169181
run: rm -rf ./out
170182

171183
- name: Build example Telink (B92) Lock App with DFU
184+
# Run test for master and s07641069 PRs
185+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
172186
run: |
173187
./scripts/run_in_build_env.sh \
174188
"./scripts/build/build_examples.py --target 'telink-tlsr9528a-lock-dfu' build"
@@ -181,6 +195,8 @@ jobs:
181195
run: rm -rf ./out
182196

183197
- name: Build example Telink (B95) OTA Requestor App
198+
# Run test for master and s07641069 PRs
199+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
184200
run: |
185201
./scripts/run_in_build_env.sh \
186202
"./scripts/build/build_examples.py --target 'telink-tlsr9258a-ota-requestor' build"
@@ -193,6 +209,8 @@ jobs:
193209
run: rm -rf ./out
194210

195211
- name: Build example Telink (B91 USB) Pump App
212+
# Run test for master and s07641069 PRs
213+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
196214
run: |
197215
./scripts/run_in_build_env.sh \
198216
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-pump-usb' build"
@@ -205,6 +223,8 @@ jobs:
205223
run: rm -rf ./out
206224

207225
- name: Build example Telink (B91) Pump Controller App
226+
# Run test for master and s07641069 PRs
227+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
208228
run: |
209229
./scripts/run_in_build_env.sh \
210230
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-pump-controller' build"
@@ -217,6 +237,8 @@ jobs:
217237
run: rm -rf ./out
218238

219239
- name: Build example Telink (B91) Shell App
240+
# Run test for master and s07641069 PRs
241+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
220242
run: |
221243
./scripts/run_in_build_env.sh \
222244
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-shell' build"
@@ -229,6 +251,8 @@ jobs:
229251
run: rm -rf ./out
230252

231253
- name: Build example Telink (B92 retention) Smoke CO Alarm App
254+
# Run test for master and s07641069 PRs
255+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
232256
run: |
233257
./scripts/run_in_build_env.sh \
234258
"./scripts/build/build_examples.py --target 'telink-tlsr9528a_retention-smoke-co-alarm' build"
@@ -241,6 +265,8 @@ jobs:
241265
run: rm -rf ./out
242266

243267
- name: Build example Telink (B91 Mars) Temperature Measurement App with OTA
268+
# Run test for master and s07641069 PRs
269+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
244270
run: |
245271
./scripts/run_in_build_env.sh \
246272
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-temperature-measurement-mars-ota' build"
@@ -253,6 +279,8 @@ jobs:
253279
run: rm -rf ./out
254280

255281
- name: Build example Telink (B91) Thermostat App
282+
# Run test for master and s07641069 PRs
283+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
256284
run: |
257285
./scripts/run_in_build_env.sh \
258286
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-thermostat' build"
@@ -265,6 +293,8 @@ jobs:
265293
run: rm -rf ./out
266294

267295
- name: Build example Telink (W91) Window Covering App
296+
# Run test for master and s07641069 PRs
297+
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
268298
continue-on-error: true
269299
run: |
270300
./scripts/run_in_build_env.sh \

‎config/nxp/chip-module/Kconfig.defaults

+3
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,9 @@ choice NXP_ENET_DRIVER
336336
default ETH_NXP_ENET
337337
endchoice
338338

339+
config NET_SOCKETS_POLL_MAX
340+
default 7
341+
339342
endif
340343

341344
# Configure MBEDTLS lib

‎config/nxp/chip-module/Kconfig.features

+2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ config CHIP_ETHERNET
9595
select NET_TCP
9696
select DNS_RESOLVER
9797
select MDNS_RESOLVER
98+
select MDNS_RESPONDER
99+
select DNS_SD
98100
select MBEDTLS_PKCS5_C
99101
select MBEDTLS_HKDF_C
100102
select MBEDTLS_ECDSA_C

‎config/telink/chip-module/Kconfig.defaults

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ config BT_BUF_ACL_TX_SIZE
137137
default 251
138138

139139
config BT_RX_STACK_SIZE
140-
default 810 if BT_B9X
140+
default 1352 if BT_B9X
141141
default 2048 if BT_W91
142142

143143
config BT_HCI_TX_STACK_SIZE

‎data_model/1.4/clusters/DeviceEnergyManagement.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ Davis, CA 95616, USA
6565
<revision revision="4" summary="Updates to feature conformance. Corrected ForecastID type"/>
6666
</revisionHistory>
6767
<clusterIds>
68-
<clusterId id="0x0098" name="Device Energy Management">
69-
<provisionalConform/>
70-
</clusterId>
68+
<clusterId id="0x0098" name="Device Energy Management"/>
7169
</clusterIds>
7270
<classification hierarchy="base" role="application" picsCode="DEM" scope="Endpoint"/>
7371
<features>
@@ -566,7 +564,6 @@ Davis, CA 95616, USA
566564
</field>
567565
<field id="1" name="Cause" type="AdjustmentCauseEnum">
568566
<mandatoryConform/>
569-
<constraint type="desc"/>
570567
</field>
571568
</command>
572569
<command id="0x03" name="PauseRequest" direction="commandToServer" response="Y">
@@ -580,7 +577,6 @@ Davis, CA 95616, USA
580577
</field>
581578
<field id="1" name="Cause" type="AdjustmentCauseEnum">
582579
<mandatoryConform/>
583-
<constraint type="desc"/>
584580
</field>
585581
</command>
586582
<command id="0x04" name="ResumeRequest" direction="commandToServer" response="Y">
@@ -604,7 +600,6 @@ Davis, CA 95616, USA
604600
</field>
605601
<field id="2" name="Cause" type="AdjustmentCauseEnum">
606602
<mandatoryConform/>
607-
<constraint type="desc"/>
608603
</field>
609604
</command>
610605
<command id="0x06" name="RequestConstraintBasedForecast" direction="commandToServer" response="Y">
@@ -619,7 +614,6 @@ Davis, CA 95616, USA
619614
</field>
620615
<field id="1" name="Cause" type="AdjustmentCauseEnum">
621616
<mandatoryConform/>
622-
<constraint type="desc"/>
623617
</field>
624618
</command>
625619
<command id="0x07" name="CancelRequest" direction="commandToServer" response="Y">

‎data_model/1.4/clusters/DiagnosticsGeneral.xml

-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ Davis, CA 95616, USA
263263
<mandatoryConform/>
264264
</attribute>
265265
<attribute id="0x0009" name="DoNotUse">
266-
<access read="true" readPrivilege="view"/>
267266
<disallowConform/>
268267
</attribute>
269268
</attributes>

‎data_model/1.4/clusters/DiagnosticsThread.xml

+8-2
Original file line numberDiff line numberDiff line change
@@ -669,12 +669,18 @@ Davis, CA 95616, USA
669669
<attribute id="0x003F" name="ExtAddress" type="uint64">
670670
<access read="true" readPrivilege="view"/>
671671
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
672-
<mandatoryConform/>
672+
<otherwiseConform>
673+
<provisionalConform/>
674+
<mandatoryConform/>
675+
</otherwiseConform>
673676
</attribute>
674677
<attribute id="0x0040" name="Rloc16" type="uint16">
675678
<access read="true" readPrivilege="view"/>
676679
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
677-
<mandatoryConform/>
680+
<otherwiseConform>
681+
<provisionalConform/>
682+
<mandatoryConform/>
683+
</otherwiseConform>
678684
</attribute>
679685
</attributes>
680686
<commands>

‎data_model/1.4/clusters/DoorLock.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Davis, CA 95616, USA
6666
<revision revision="5" summary="CCB 3472 3474 3338"/>
6767
<revision revision="6" summary="New data model format and notation. Added User features. General cleanup of functionality"/>
6868
<revision revision="7" summary="Added support for European door locks (unbolt feature)"/>
69-
<revision revision="8" summary="Removed LOG feature, fixed constraints on NumberOf*Schedules attributes.
69+
<revision revision="8" summary="Removed LOG and NOT feature, fixed constraints on NumberOf*Schedules attributes.
7070
and added support for Aliro credential provisioning"/>
7171
</revisionHistory>
7272
<clusterIds>
@@ -600,9 +600,6 @@ Davis, CA 95616, USA
600600
<bitfield name="LockFactoryReset" bit="1" summary="Lock Reset to Factory Defaults">
601601
<optionalConform/>
602602
</bitfield>
603-
<bitfield name="N/A" bit="2" summary="Reserved">
604-
<optionalConform/>
605-
</bitfield>
606603
<bitfield name="LockRadioPowerCycled" bit="3" summary="RF Module Power Cycled">
607604
<optionalConform/>
608605
</bitfield>

‎data_model/1.4/clusters/bridge-clusters-EcosystemInformationCluster.xml ‎data_model/1.4/clusters/EcosystemInformationCluster.xml

File renamed without changes.

‎data_model/1.4/clusters/EnergyEVSE.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ Davis, CA 95616, USA
6969
<classification hierarchy="base" role="application" picsCode="EEVSE" scope="Endpoint"/>
7070
<features>
7171
<feature bit="0" code="PREF" name="ChargingPreferences" summary="EVSE supports storing user charging preferences">
72-
<otherwiseConform>
73-
<provisionalConform/>
74-
<mandatoryConform/>
75-
</otherwiseConform>
72+
<mandatoryConform/>
7673
</feature>
7774
<feature bit="1" code="SOC" name="SoCReporting" summary="EVSE supports reporting of vehicle State of Charge (SoC)">
7875
<otherwiseConform>
@@ -240,7 +237,6 @@ Davis, CA 95616, USA
240237
<struct name="ChargingTargetScheduleStruct">
241238
<field id="0" name="DayOfWeekForSequence" type="TargetDayOfWeekBitmap">
242239
<mandatoryConform/>
243-
<constraint type="desc"/>
244240
</field>
245241
<field id="1" name="ChargingTargets" type="list">
246242
<entry type="ChargingTargetStruct"/>

0 commit comments

Comments
 (0)