Skip to content

Commit

Permalink
Merge branch 'master' into rename_PositionTag_and_AreaDesc
Browse files Browse the repository at this point in the history
  • Loading branch information
hicklin authored Aug 22, 2024
2 parents 9289fac + 07789d4 commit 561afe5
Show file tree
Hide file tree
Showing 226 changed files with 16,654 additions and 10,553 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/examples-cc13xx_26xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
run: |
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
cc13x4_26x4 LP_EM_CC1354P10_6 lighting-app \
out/artifacts/ti-cc13x4_26x4-lighting-mtd/chip-LP_EM_CC1354P10_6-lighting-example.out \
out/artifacts/ti-cc13x4_26x4-lighting-ftd/chip-LP_EM_CC1354P10_6-lighting-example.out \
/tmp/bloat_reports/
- name: Uploading Size Reports
uses: ./.github/actions/upload-size-reports
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-efr32:73
image: ghcr.io/project-chip/chip-build-efr32:74
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -213,17 +213,17 @@
[submodule "third_party/silabs/simplicity_sdk"]
path = third_party/silabs/simplicity_sdk
url = https://github.com/SiliconLabs/simplicity_sdk.git
branch = v2024.6.0
branch = v2024.6.1-0
platforms = silabs
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
path = third_party/silabs/wiseconnect-wifi-bt-sdk
url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git
branch = 2.8.2
branch = 2.10.0
platforms = silabs
[submodule "third_party/silabs/wifi_sdk"]
path = third_party/silabs/wifi_sdk
url = https://github.com/SiliconLabs/wiseconnect.git
branch = v3.3.0
branch = v3.3.1
platforms = silabs
[submodule "editline"]
path = third_party/editline/repo
Expand Down
2 changes: 2 additions & 0 deletions build/config/compiler/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,8 @@ declare_args() {
config("sanitize_address") {
defines = []
cflags = [
"-fsanitize-coverage=inline-8bit-counters,trace-cmp",
"-fno-sanitize-coverage=pc-table",
"-fsanitize=address",
"-fno-omit-frame-pointer",
]
Expand Down
5 changes: 0 additions & 5 deletions config/telink/chip-module/Kconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,7 @@ config NVS_LOOKUP_CACHE_SIZE
config SETTINGS_NVS_SECTOR_SIZE_MULT
default 1

# Set sector counter of NVS
config SETTINGS_NVS_SECTOR_COUNT
default 12

# Enable OpenThread

config NET_L2_OPENTHREAD
default y if !WIFI

Expand Down
18 changes: 16 additions & 2 deletions docs/guides/fabric_synchronization_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,26 @@ Run the Fabric Synchronization script:

In Ecosystem 1 Fabric-Admin console:

Pair the local bridge of Ecosystem 1 with node ID 1:

```
fabricsync add-local-bridge 1
```

Pair the Ecosystem 2 bridge to Ecosystem 1 with node ID 2:

```
fabricsync add-bridge 2 <e2-fabric-bridge-ip>
```

This command will initiate the reverse commissioning process. After a few
seconds, you should see the following message, indicating that the local bridge
of Ecosystem 1 has successfully paired with Ecosystem 2 on Endpoint 2:

```
>>> A new device is added on Endpoint 2.
```

### Pair Light Example to Ecosystem 2

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

After the device is successfully added, you will observe the following on
Ecosystem 2 with the newly assigned Node ID:
After the device is successfully added, you will observe the following message
on Ecosystem 2 with the newly assigned Node ID:

```
>>> New device with Node ID: 0x3 has been successfully added.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1856,7 +1856,7 @@ cluster Thermostat = 513 {
}

request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
nullable octet_string<16> presetHandle = 0;
}

response struct AtomicResponse = 253 {
Expand Down
Loading

0 comments on commit 561afe5

Please sign in to comment.