Skip to content

Commit 827022b

Browse files
authored
Merge branch 'master' into feature/unittest--transport-tests
2 parents 2456239 + 3b1c60a commit 827022b

Some content is hidden

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

51 files changed

+7892
-852
lines changed
+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

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}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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+
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)