Skip to content

Commit 561afe5

Browse files
authored
Merge branch 'master' into rename_PositionTag_and_AreaDesc
2 parents 9289fac + 07789d4 commit 561afe5

File tree

226 files changed

+16654
-10553
lines changed

Some content is hidden

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

226 files changed

+16654
-10553
lines changed

.github/workflows/examples-cc13xx_26xx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
run: |
106106
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
107107
cc13x4_26x4 LP_EM_CC1354P10_6 lighting-app \
108-
out/artifacts/ti-cc13x4_26x4-lighting-mtd/chip-LP_EM_CC1354P10_6-lighting-example.out \
108+
out/artifacts/ti-cc13x4_26x4-lighting-ftd/chip-LP_EM_CC1354P10_6-lighting-example.out \
109109
/tmp/bloat_reports/
110110
- name: Uploading Size Reports
111111
uses: ./.github/actions/upload-size-reports

.github/workflows/examples-efr32.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-efr32:73
43+
image: ghcr.io/project-chip/chip-build-efr32:74
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

.gitmodules

+3-3
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,17 @@
213213
[submodule "third_party/silabs/simplicity_sdk"]
214214
path = third_party/silabs/simplicity_sdk
215215
url = https://github.com/SiliconLabs/simplicity_sdk.git
216-
branch = v2024.6.0
216+
branch = v2024.6.1-0
217217
platforms = silabs
218218
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
219219
path = third_party/silabs/wiseconnect-wifi-bt-sdk
220220
url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git
221-
branch = 2.8.2
221+
branch = 2.10.0
222222
platforms = silabs
223223
[submodule "third_party/silabs/wifi_sdk"]
224224
path = third_party/silabs/wifi_sdk
225225
url = https://github.com/SiliconLabs/wiseconnect.git
226-
branch = v3.3.0
226+
branch = v3.3.1
227227
platforms = silabs
228228
[submodule "editline"]
229229
path = third_party/editline/repo

build/config/compiler/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,8 @@ declare_args() {
415415
config("sanitize_address") {
416416
defines = []
417417
cflags = [
418+
"-fsanitize-coverage=inline-8bit-counters,trace-cmp",
419+
"-fno-sanitize-coverage=pc-table",
418420
"-fsanitize=address",
419421
"-fno-omit-frame-pointer",
420422
]

config/telink/chip-module/Kconfig.defaults

-5
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,7 @@ config NVS_LOOKUP_CACHE_SIZE
219219
config SETTINGS_NVS_SECTOR_SIZE_MULT
220220
default 1
221221

222-
# Set sector counter of NVS
223-
config SETTINGS_NVS_SECTOR_COUNT
224-
default 12
225-
226222
# Enable OpenThread
227-
228223
config NET_L2_OPENTHREAD
229224
default y if !WIFI
230225

docs/guides/fabric_synchronization_guide.md

+16-2
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,26 @@ Run the Fabric Synchronization script:
9898

9999
In Ecosystem 1 Fabric-Admin console:
100100

101+
Pair the local bridge of Ecosystem 1 with node ID 1:
102+
103+
```
104+
fabricsync add-local-bridge 1
105+
```
106+
101107
Pair the Ecosystem 2 bridge to Ecosystem 1 with node ID 2:
102108

103109
```
104110
fabricsync add-bridge 2 <e2-fabric-bridge-ip>
105111
```
106112

113+
This command will initiate the reverse commissioning process. After a few
114+
seconds, you should see the following message, indicating that the local bridge
115+
of Ecosystem 1 has successfully paired with Ecosystem 2 on Endpoint 2:
116+
117+
```
118+
>>> A new device is added on Endpoint 2.
119+
```
120+
107121
### Pair Light Example to Ecosystem 2
108122

109123
Since Fabric-Bridge also functions as a Matter server, running it alongside the
@@ -130,8 +144,8 @@ Pair the Light Example with node ID 3 using its payload number:
130144
pairing already-discovered 3 20202021 <ip> 5543
131145
```
132146

133-
After the device is successfully added, you will observe the following on
134-
Ecosystem 2 with the newly assigned Node ID:
147+
After the device is successfully added, you will observe the following message
148+
on Ecosystem 2 with the newly assigned Node ID:
135149

136150
```
137151
>>> New device with Node ID: 0x3 has been successfully added.

examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1856,7 +1856,7 @@ cluster Thermostat = 513 {
18561856
}
18571857

18581858
request struct SetActivePresetRequestRequest {
1859-
octet_string<16> presetHandle = 0;
1859+
nullable octet_string<16> presetHandle = 0;
18601860
}
18611861

18621862
response struct AtomicResponse = 253 {

0 commit comments

Comments
 (0)