Skip to content

Commit 0245436

Browse files
committed
Merge branch 'upstream-master' into dem-test-issues
2 parents 69f2ea1 + 1d1319b commit 0245436

File tree

536 files changed

+25457
-17188
lines changed

Some content is hidden

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

536 files changed

+25457
-17188
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/esp32/components/chip/idf_component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies:
2727
- if: "target != esp32h2"
2828

2929
espressif/esp_rcp_update:
30-
version: "1.0.3"
30+
version: "1.2.0"
3131
rules:
3232
- if: "idf_version >=5.0"
3333

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/QUICK_START.md

-52
This file was deleted.

docs/README.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Building and Developing
44

5+
- A quick start guide to building a demo application and controller is
6+
available in the [Getting started](./getting_started/) guide
7+
- A guide to new cluster and device type development is available in the
8+
[New Cluster and Device Type Developement Guide](./cluster_and_device_type_dev/)
59
- Documentation about building from the command line can be found in
610
[the build guide](guides/BUILDING.md)
711
- Documentation about running [cirque](https://github.com/openweave/cirque)

docs/api/device_runner.md

-103
This file was deleted.

0 commit comments

Comments
 (0)