Skip to content

Commit c5eea35

Browse files
stingchangstingchang
authored
Merge branch 'master' into chef-robotic-vacuum-cleaner-326681447
2 parents 3f9beca + 242accd commit c5eea35

File tree

153 files changed

+9905
-7568
lines changed

Some content is hidden

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

153 files changed

+9905
-7568
lines changed

‎.github/workflows/cert_test_checks.yaml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Copyright (c) 2024 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: Certification test checks
16+
17+
on:
18+
pull_request:
19+
paths:
20+
- "src/app/tests/suites/certification/**"
21+
22+
jobs:
23+
check-certification-tests:
24+
name: Check for common problems in certification tests
25+
runs-on: ubuntu-latest
26+
27+
container:
28+
image: ghcr.io/project-chip/chip-build
29+
30+
steps:
31+
- name: Checkout
32+
uses: actions/checkout@v4
33+
- name: Run checks
34+
run: |
35+
python3 scripts/tests/matter_yaml_linter.py

‎.github/workflows/examples-infineon.yaml

+65-17
Original file line numberDiff line numberDiff line change
@@ -107,41 +107,89 @@ jobs:
107107
out/artifacts/infineon-psoc6-light/chip-psoc6-lighting-example.out \
108108
/tmp/bloat_reports/
109109
110-
- name: Build example CYW30739 Apps
110+
- name: Build CYW30739 Lighting App
111111
run: |
112112
./scripts/run_in_build_env.sh \
113113
"./scripts/build/build_examples.py \
114-
--target cyw30739-cyw930739m2evb_01-light \
115-
--target cyw30739-cyw930739m2evb_01-lock \
116-
--target cyw30739-cyw930739m2evb_01-ota-requestor \
117-
--target cyw30739-cyw930739m2evb_01-switch \
114+
--target cyw30739-cyw30739b2_p5_evk_01-light \
115+
--target cyw30739-cyw30739b2_p5_evk_02-light \
116+
--target cyw30739-cyw30739b2_p5_evk_03-light \
117+
--target cyw30739-cyw930739m2evb_02-light \
118118
build \
119119
--copy-artifacts-to out/artifacts \
120120
"
121121
- name: Get light size stats
122122
run: |
123123
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
124-
cyw30739 cyw930739m2evb_01 light \
125-
out/artifacts/cyw30739-cyw930739m2evb_01-light/chip-cyw30739-lighting-example.elf \
124+
cyw30739 CYW30739B2-P5-EVK-01 light \
125+
out/artifacts/cyw30739-cyw30739b2_p5_evk_01-light/lighting_app-CYW30739B2-P5-EVK-01.elf \
126+
/tmp/bloat_reports/
127+
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
128+
cyw30739 CYW30739B2-P5-EVK-02 light \
129+
out/artifacts/cyw30739-cyw30739b2_p5_evk_02-light/lighting_app-CYW30739B2-P5-EVK-02.elf \
126130
/tmp/bloat_reports/
127-
- name: Get lock size stats
128-
run: |
129131
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
130-
cyw30739 cyw930739m2evb_01 lock \
131-
out/artifacts/cyw30739-cyw930739m2evb_01-lock/chip-cyw30739-lock-example.elf \
132+
cyw30739 CYW30739B2-P5-EVK-03 light \
133+
out/artifacts/cyw30739-cyw30739b2_p5_evk_03-light/lighting_app-CYW30739B2-P5-EVK-03.elf \
132134
/tmp/bloat_reports/
133-
- name: Get ota-requestor size stats
135+
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
136+
cyw30739 CYW930739M2EVB-02 light \
137+
out/artifacts/cyw30739-cyw930739m2evb_02-light/lighting_app-CYW930739M2EVB-02.elf \
138+
/tmp/bloat_reports/
139+
- name: Clean out build output
140+
run: rm -rf ./out
141+
- name: Build CYW30739 Light Switch App
142+
run: |
143+
./scripts/run_in_build_env.sh \
144+
"./scripts/build/build_examples.py \
145+
--target cyw30739-cyw30739b2_p5_evk_01-light-switch \
146+
--target cyw30739-cyw30739b2_p5_evk_02-light-switch \
147+
--target cyw30739-cyw30739b2_p5_evk_03-light-switch \
148+
build \
149+
--copy-artifacts-to out/artifacts \
150+
"
151+
- name: Get light-switch size stats
134152
run: |
135153
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
136-
cyw30739 cyw930739m2evb_01 ota-requestor \
137-
out/artifacts/cyw30739-cyw930739m2evb_01-ota-requestor/chip-cyw30739-ota-requestor-example.elf \
154+
cyw30739 CYW30739B2-P5-EVK-01 light-switch \
155+
out/artifacts/cyw30739-cyw30739b2_p5_evk_01-light-switch/light_switch_app-CYW30739B2-P5-EVK-01.elf \
156+
/tmp/bloat_reports/
157+
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
158+
cyw30739 CYW30739B2-P5-EVK-02 light-switch \
159+
out/artifacts/cyw30739-cyw30739b2_p5_evk_02-light-switch/light_switch_app-CYW30739B2-P5-EVK-02.elf \
138160
/tmp/bloat_reports/
139-
- name: Get switch size stats
161+
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
162+
cyw30739 CYW30739B2-P5-EVK-03 light-switch \
163+
out/artifacts/cyw30739-cyw30739b2_p5_evk_03-light-switch/light_switch_app-CYW30739B2-P5-EVK-03.elf \
164+
/tmp/bloat_reports/
165+
- name: Clean out build output
166+
run: rm -rf ./out
167+
- name: Build CYW30739 Lock App
140168
run: |
169+
./scripts/run_in_build_env.sh \
170+
"./scripts/build/build_examples.py \
171+
--target cyw30739-cyw30739b2_p5_evk_01-lock \
172+
--target cyw30739-cyw30739b2_p5_evk_02-lock \
173+
--target cyw30739-cyw30739b2_p5_evk_03-lock \
174+
build \
175+
--copy-artifacts-to out/artifacts \
176+
"
177+
- name: Get lock size stats
178+
run: |
179+
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
180+
cyw30739 CYW30739B2-P5-EVK-01 lock \
181+
out/artifacts/cyw30739-cyw30739b2_p5_evk_01-lock/lock_app-CYW30739B2-P5-EVK-01.elf \
182+
/tmp/bloat_reports/
183+
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
184+
cyw30739 CYW30739B2-P5-EVK-02 lock \
185+
out/artifacts/cyw30739-cyw30739b2_p5_evk_02-lock/lock_app-CYW30739B2-P5-EVK-02.elf \
186+
/tmp/bloat_reports/
141187
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
142-
cyw30739 cyw930739m2evb_01 switch \
143-
out/artifacts/cyw30739-cyw930739m2evb_01-switch/chip-cyw30739-light-switch-example.elf \
188+
cyw30739 CYW30739B2-P5-EVK-03 lock \
189+
out/artifacts/cyw30739-cyw30739b2_p5_evk_03-lock/lock_app-CYW30739B2-P5-EVK-03.elf \
144190
/tmp/bloat_reports/
191+
- name: Clean out build output
192+
run: rm -rf ./out
145193
- name: Uploading Size Reports
146194
uses: ./.github/actions/upload-size-reports
147195
if: ${{ !env.ACT }}

‎.gitmodules

+8-18
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
[submodule "ot-stm32"]
7777
path = third_party/openthread/ot-stm32
7878
url = https://github.com/openthread/openthread
79-
branch = eb6377f
80-
platforms = stm32
79+
branch = eb6377f
80+
platforms = stm32
8181
[submodule "third_party/openthread/ot-ifx"]
8282
path = third_party/openthread/ot-ifx
8383
url = https://github.com/Infineon/ot-ifx-release.git
@@ -189,22 +189,6 @@
189189
[submodule "third_party/jsoncpp/repo"]
190190
path = third_party/jsoncpp/repo
191191
url = https://github.com/open-source-parsers/jsoncpp.git
192-
[submodule "cyw30739_sdk/30739A0"]
193-
path = third_party/infineon/cyw30739_sdk/repos/30739A0
194-
url = https://github.com/Infineon/OT-Matter-30739A0.git
195-
platforms = infineon
196-
[submodule "cyw30739_sdk/include"]
197-
path = third_party/infineon/cyw30739_sdk/repos/btsdk-include
198-
url = https://github.com/Infineon/btsdk-include.git
199-
platforms = infineon
200-
[submodule "cyw30739_sdk/target"]
201-
path = third_party/infineon/cyw30739_sdk/repos/CYW930739M2EVB-01
202-
url = https://github.com/Infineon/OT-Matter-TARGET_CYW930739M2EVB-01.git
203-
platforms = infineon
204-
[submodule "cyw30739_sdk/tools"]
205-
path = third_party/infineon/cyw30739_sdk/repos/btsdk-tools
206-
url = https://github.com/Infineon/btsdk-tools.git
207-
platforms = infineon
208192
[submodule "third_party/p6/p6_sdk/libs/anycloud-ota"]
209193
path = third_party/infineon/psoc6/psoc6_sdk/libs/anycloud-ota
210194
url = https://github.com/Infineon/anycloud-ota
@@ -217,6 +201,12 @@
217201
path = third_party/infineon/psoc6/psoc6_sdk/libs/serial-flash
218202
url = https://github.com/Infineon/serial-flash
219203
platforms = infineon
204+
[submodule "infineon/matter-wpan-sdk"]
205+
path = third_party/infineon/repos/matter-wpan-sdk
206+
url = https://github.com/Infineon/matter-wpan-sdk.git
207+
branch = main
208+
platforms = infineon
209+
recursive = true
220210
[submodule "ti_simplelink_sdk"]
221211
path = third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx
222212
url = https://github.com/TexasInstruments/cc13xx_cc26xx_sdk.git

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

+13-1
Original file line numberDiff line numberDiff line change
@@ -203,15 +203,27 @@ config CHIP_QSPI_NOR
203203
default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
204204

205205
# nRF7002DK uses SPI NOR external flash
206+
207+
if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
208+
206209
config CHIP_SPI_NOR
207-
default y if BOARD_NRF7002DK_NRF5340_CPUAPP
210+
default y
211+
212+
endif # BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
208213

209214
config BOOT_IMAGE_ACCESS_HOOKS
210215
default y if SOC_SERIES_NRF53X
211216

212217
config UPDATEABLE_IMAGE_NUMBER
218+
default 3 if NRF_WIFI_PATCHES_EXT_FLASH_STORE
213219
default 2 if SOC_SERIES_NRF53X
214220

221+
config DFU_MULTI_IMAGE_MAX_IMAGE_COUNT
222+
default 3 if NRF_WIFI_PATCHES_EXT_FLASH_STORE
223+
224+
config NRF_WIFI_FW_PATCH_DFU
225+
default y if NRF_WIFI_PATCHES_EXT_FLASH_STORE
226+
215227
# ==============================================================================
216228
# OpenThread configuration
217229
# ==============================================================================

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if CHIP
2121

2222
config CHIP_WIFI
2323
bool "Enable nrfconnect Wi-Fi support"
24-
default y if SHIELD_NRF7002EK || BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB
24+
default y if SHIELD_NRF7002EK || BOARD_NRF7002DK_NRF5340_CPUAPP || SHIELD_NRF7002EB || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
2525
select WIFI_NRF700X
2626
select WIFI
2727
select WPA_SUPP
@@ -149,7 +149,7 @@ endif
149149
config CHIP_DFU_OVER_BT_SMP
150150
bool "Enable DFU over Bluetooth LE SMP feature set"
151151
imply CHIP_QSPI_NOR if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
152-
imply CHIP_SPI_NOR if BOARD_NRF7002DK_NRF5340_CPUAPP
152+
imply CHIP_SPI_NOR if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
153153
imply BOOTLOADER_MCUBOOT
154154
select MCUMGR
155155
select MCUMGR_TRANSPORT_BT

‎config/nrfconnect/chip-module/Kconfig.mcuboot.defaults

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ choice LIBC_IMPLEMENTATION
3939
endchoice
4040

4141
# nRF7002DK uses SPI NOR external flash
42-
if BOARD_NRF7002DK_NRF5340_CPUAPP
42+
if BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
4343

4444
config SPI
4545
default y

‎docs/examples/index.md

+9
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,15 @@ darwin-framework-tool/README
8585
energy-management-app/**/README
8686
```
8787

88+
## Fabric Bridge example
89+
90+
```{toctree}
91+
:glob:
92+
:maxdepth: 1
93+
94+
fabric-bridge-app/**/README
95+
```
96+
8897
## Java matter controller example
8998

9099
```{toctree}

‎examples/build_overrides/cyw30739_sdk.gni

+5-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
# limitations under the License.
1414

1515
declare_args() {
16+
# Root directory for Matter WPAN SDK.
17+
matter_wpan_sdk_build_root =
18+
"//third_party/connectedhomeip/third_party/infineon/repos/matter-wpan-sdk"
19+
1620
# Root directory for CYW30739 SDK.
17-
cyw30739_sdk_build_root =
18-
"//third_party/connectedhomeip/third_party/infineon/cyw30739_sdk"
21+
cyw30739_sdk_build_root = "//third_party/connectedhomeip/third_party/infineon/repos/matter-wpan-sdk/cyw30739"
1922
}

‎third_party/infineon/cyw30739_sdk/cyw30739_arm.gni ‎examples/fabric-bridge-app/fabric-bridge-common/BUILD.gn

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020 Project CHIP Authors
1+
# Copyright (c) 2024 Project CHIP Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,6 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
arm_cpu = "cortex-m4"
16-
arm_float_abi = "hard"
17-
arm_fpu = "fpv4-sp-d16"
15+
import("//build_overrides/chip.gni")
16+
17+
import("${chip_root}/src/app/chip_data_model.gni")
18+
19+
chip_data_model("fabric-bridge-common") {
20+
zap_file = "fabric-bridge-app.zap"
21+
22+
is_server = true
23+
24+
cflags = [ "-DDYNAMIC_ENDPOINT_COUNT=16" ]
25+
}

0 commit comments

Comments
 (0)