Skip to content

Commit fbc494a

Browse files
ArekBalysNordicArekBalysNordic
committed
samples: matter: fix samples consistency
Fixed consistency of sample and documentation. - Fixed memory requirements tables. - Fixed links to sdk-connectedhomeip. Signed-off-by: Arkadiusz Balys <[email protected]>
1 parent a823b50 commit fbc494a

File tree

162 files changed

+550
-880
lines changed

Some content is hidden

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

162 files changed

+550
-880
lines changed

‎applications/matter_bridge/CMakeLists.txt‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -25,109 +25,109 @@ include(${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/cmake/zap_helpers.cmake)
2525
ncs_get_zap_parent_dir(ZAP_PARENT_DIR)
2626

2727
target_include_directories(app PRIVATE
28-
src
29-
src/bridged_device_types
30-
${ZAP_PARENT_DIR}
31-
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/
32-
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/util
28+
src
29+
src/bridged_device_types
30+
${ZAP_PARENT_DIR}
31+
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/
32+
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/util
3333
)
3434

3535
target_sources(app PRIVATE
36-
src/app_task.cpp
37-
src/main.cpp
38-
src/bridge_shell.cpp
39-
src/zcl_callbacks.cpp
40-
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/bridge_manager.cpp
41-
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/matter_bridged_device.cpp
42-
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/bridge_storage_manager.cpp
43-
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/bridged_device_data_provider.cpp
44-
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/binding/binding_handler.cpp
36+
src/app_task.cpp
37+
src/main.cpp
38+
src/bridge_shell.cpp
39+
src/zcl_callbacks.cpp
40+
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/bridge_manager.cpp
41+
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/matter_bridged_device.cpp
42+
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/bridge_storage_manager.cpp
43+
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/bridged_device_data_provider.cpp
44+
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/binding/binding_handler.cpp
4545
)
4646

4747
if(CONFIG_BRIDGED_DEVICE_BT)
48-
target_sources(app PRIVATE
49-
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/ble_connectivity_manager.cpp
50-
src/ble_providers/ble_bridged_device_factory.cpp
51-
)
52-
target_include_directories(app PRIVATE src/ble_providers)
48+
target_sources(app PRIVATE
49+
${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/ble_connectivity_manager.cpp
50+
src/ble_providers/ble_bridged_device_factory.cpp
51+
)
52+
target_include_directories(app PRIVATE src/ble_providers)
5353

5454
if(CONFIG_BRIDGE_ONOFF_LIGHT_BRIDGED_DEVICE AND (CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE OR CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE))
55-
target_sources(app PRIVATE
56-
src/bridged_device_types/onoff_light.cpp
57-
src/ble_providers/ble_lbs_data_provider.cpp
58-
)
55+
target_sources(app PRIVATE
56+
src/bridged_device_types/onoff_light.cpp
57+
src/ble_providers/ble_lbs_data_provider.cpp
58+
)
5959

6060
if(CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE)
61-
target_sources(app PRIVATE src/bridged_device_types/generic_switch.cpp)
61+
target_sources(app PRIVATE src/bridged_device_types/generic_switch.cpp)
6262
endif()
6363

6464
if(CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE)
65-
target_sources(app PRIVATE
66-
src/bridged_device_types/onoff_light_switch.cpp
67-
)
65+
target_sources(app PRIVATE
66+
src/bridged_device_types/onoff_light_switch.cpp
67+
)
6868
endif()
6969

7070
endif() # CONFIG_BRIDGE_ONOFF_LIGHT_BRIDGED_DEVICE AND (CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE OR CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE)
7171

7272
if(CONFIG_BRIDGE_HUMIDITY_SENSOR_BRIDGED_DEVICE)
73-
target_sources(app PRIVATE
74-
src/bridged_device_types/humidity_sensor.cpp
75-
)
73+
target_sources(app PRIVATE
74+
src/bridged_device_types/humidity_sensor.cpp
75+
)
7676
endif() # CONFIG_BRIDGE_HUMIDITY_SENSOR_BRIDGED_DEVICE
7777

7878
if(CONFIG_BRIDGE_TEMPERATURE_SENSOR_BRIDGED_DEVICE)
79-
target_sources(app PRIVATE
80-
src/bridged_device_types/temperature_sensor.cpp
81-
)
79+
target_sources(app PRIVATE
80+
src/bridged_device_types/temperature_sensor.cpp
81+
)
8282
endif() # CONFIG_BRIDGE_TEMPERATURE_SENSOR_BRIDGED_DEVICE
8383

8484
# Assume it makes no sense to support BLE environmental sensor without all Matter counterparts
8585
if(CONFIG_BRIDGE_TEMPERATURE_SENSOR_BRIDGED_DEVICE AND CONFIG_BRIDGE_HUMIDITY_SENSOR_BRIDGED_DEVICE)
86-
target_sources(app PRIVATE
87-
src/ble_providers/ble_environmental_data_provider.cpp
88-
)
86+
target_sources(app PRIVATE
87+
src/ble_providers/ble_environmental_data_provider.cpp
88+
)
8989
endif() # CONFIG_BRIDGE_TEMPERATURE_SENSOR_BRIDGED_DEVICE AND CONFIG_BRIDGE_HUMIDITY_SENSOR_BRIDGED_DEVICE
9090

9191
else()
92-
target_sources(app PRIVATE
93-
src/simulated_providers/simulated_bridged_device_factory.cpp
94-
)
95-
target_include_directories(app PRIVATE src/simulated_providers)
92+
target_sources(app PRIVATE
93+
src/simulated_providers/simulated_bridged_device_factory.cpp
94+
)
95+
target_include_directories(app PRIVATE src/simulated_providers)
9696

9797
if(CONFIG_BRIDGE_ONOFF_LIGHT_BRIDGED_DEVICE AND (CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE OR CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE))
98-
target_sources(app PRIVATE
99-
src/bridged_device_types/onoff_light.cpp
100-
src/simulated_providers/simulated_onoff_light_data_provider.cpp
101-
)
98+
target_sources(app PRIVATE
99+
src/bridged_device_types/onoff_light.cpp
100+
src/simulated_providers/simulated_onoff_light_data_provider.cpp
101+
)
102102

103103
if(CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE)
104-
target_sources(app PRIVATE
105-
src/bridged_device_types/generic_switch.cpp
106-
src/simulated_providers/simulated_generic_switch_data_provider.cpp
107-
)
104+
target_sources(app PRIVATE
105+
src/bridged_device_types/generic_switch.cpp
106+
src/simulated_providers/simulated_generic_switch_data_provider.cpp
107+
)
108108
endif()
109109

110110
if(CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE)
111-
target_sources(app PRIVATE
112-
src/bridged_device_types/onoff_light_switch.cpp
113-
src/simulated_providers/simulated_onoff_light_switch_data_provider.cpp
114-
)
111+
target_sources(app PRIVATE
112+
src/bridged_device_types/onoff_light_switch.cpp
113+
src/simulated_providers/simulated_onoff_light_switch_data_provider.cpp
114+
)
115115
endif()
116116

117117
endif() # CONFIG_BRIDGE_ONOFF_LIGHT_BRIDGED_DEVICE AND (CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE OR CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE))
118118

119119
if(CONFIG_BRIDGE_TEMPERATURE_SENSOR_BRIDGED_DEVICE)
120-
target_sources(app PRIVATE
121-
src/bridged_device_types/temperature_sensor.cpp
122-
src/simulated_providers/simulated_temperature_sensor_data_provider.cpp
123-
)
120+
target_sources(app PRIVATE
121+
src/bridged_device_types/temperature_sensor.cpp
122+
src/simulated_providers/simulated_temperature_sensor_data_provider.cpp
123+
)
124124
endif() # CONFIG_BRIDGE_TEMPERATURE_SENSOR_BRIDGED_DEVICE
125125

126126
if(CONFIG_BRIDGE_HUMIDITY_SENSOR_BRIDGED_DEVICE)
127-
target_sources(app PRIVATE
128-
src/bridged_device_types/humidity_sensor.cpp
129-
src/simulated_providers/simulated_humidity_sensor_data_provider.cpp
130-
)
127+
target_sources(app PRIVATE
128+
src/bridged_device_types/humidity_sensor.cpp
129+
src/simulated_providers/simulated_humidity_sensor_data_provider.cpp
130+
)
131131
endif() # CONFIG_BRIDGE_HUMIDITY_SENSOR_BRIDGED_DEVICE
132132

133133
endif() # CONFIG_BRIDGED_DEVICE_BT

‎applications/matter_bridge/boards/nrf7002dk_nrf5340_cpuapp.overlay‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
*/
66

7+
#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
8+
79
/ {
810
chosen {
911
nordic,pm-ext-flash = &mx25r64;
@@ -12,4 +14,10 @@
1214
aliases {
1315
watchdog0 = &wdt0;
1416
};
17+
18+
};
19+
20+
/* Set IPC thread priority to the highest value to not collide with other threads. */
21+
&ipc0 {
22+
zephyr,priority = <0 PRIO_COOP>;
1523
};

‎applications/matter_bridge/pm_static_nrf5340dk_nrf5340_cpuapp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ mcuboot_secondary_1:
4646
device: MX25R64
4747
region: external_flash
4848
external_flash:
49-
address: 0x12F000
49+
address: 0x12f000
5050
size: 0x6D1000
5151
device: MX25R64
5252
region: external_flash

‎applications/matter_bridge/sample.yaml‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
sample:
22
description: Matter Bridge
33
name: Matter Bridge application
4+
common:
5+
tags:
6+
- sysbuild
7+
- ci_applications_matter
48
tests:
59
applications.matter_bridge.release:
610
sysbuild: true
@@ -15,9 +19,6 @@ tests:
1519
platform_allow:
1620
- nrf7002dk/nrf5340/cpuapp
1721
- nrf5340dk/nrf5340/cpuapp
18-
tags:
19-
- sysbuild
20-
- ci_applications_matter
2122
applications.matter_bridge.debug:
2223
sysbuild: true
2324
build_only: true
@@ -30,9 +31,6 @@ tests:
3031
platform_allow:
3132
- nrf7002dk/nrf5340/cpuapp
3233
- nrf5340dk/nrf5340/cpuapp
33-
tags:
34-
- sysbuild
35-
- ci_applications_matter
3634
applications.matter_bridge.br_ble:
3735
sysbuild: true
3836
build_only: true
@@ -46,9 +44,6 @@ tests:
4644
platform_allow:
4745
- nrf7002dk/nrf5340/cpuapp
4846
- nrf5340dk/nrf5340/cpuapp
49-
tags:
50-
- sysbuild
51-
- ci_applications_matter
5247
applications.matter_bridge.release.br_ble:
5348
sysbuild: true
5449
build_only: true
@@ -63,9 +58,6 @@ tests:
6358
platform_allow:
6459
- nrf7002dk/nrf5340/cpuapp
6560
- nrf5340dk/nrf5340/cpuapp
66-
tags:
67-
- sysbuild
68-
- ci_applications_matter
6961
applications.matter_bridge.br_ble.smp_dfu:
7062
sysbuild: true
7163
build_only: true
@@ -77,9 +69,6 @@ tests:
7769
integration_platforms:
7870
- nrf7002dk/nrf5340/cpuapp
7971
platform_allow: nrf7002dk/nrf5340/cpuapp
80-
tags:
81-
- sysbuild
82-
- ci_applications_matter
8372
applications.matter_bridge.nrf5340.wifi:
8473
sysbuild: true
8574
build_only: true
@@ -94,9 +83,6 @@ tests:
9483
integration_platforms:
9584
- nrf5340dk/nrf5340/cpuapp
9685
platform_allow: nrf5340dk/nrf5340/cpuapp
97-
tags:
98-
- sysbuild
99-
- ci_applications_matter
10086
applications.matter_bridge.br_ble.memory_profiling:
10187
sysbuild: true
10288
build_only: true
@@ -110,9 +96,6 @@ tests:
11096
- nrf5340dk/nrf5340/cpuapp
11197
platform_allow:
11298
- nrf5340dk/nrf5340/cpuapp
113-
tags:
114-
- sysbuild
115-
- ci_applications_matter
11699
applications.matter_bridge.memory_profiling:
117100
sysbuild: true
118101
build_only: true
@@ -124,9 +107,6 @@ tests:
124107
- nrf7002dk/nrf5340/cpuapp
125108
platform_allow:
126109
- nrf7002dk/nrf5340/cpuapp
127-
tags:
128-
- sysbuild
129-
- ci_applications_matter
130110
applications.matter_bridge.smart_plug:
131111
sysbuild: true
132112
build_only: true
@@ -135,6 +115,3 @@ tests:
135115
integration_platforms:
136116
- nrf5340dk/nrf5340/cpuapp
137117
platform_allow: nrf5340dk/nrf5340/cpuapp
138-
tags:
139-
- sysbuild
140-
- ci_applications_matter

‎applications/matter_bridge/src/ble_providers/ble_bridged_device_factory.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ CHIP_ERROR BluetoothDeviceConnected(bool success, void *context)
229229

230230
return err;
231231
}
232-
} // namespace
232+
} /* namespace */
233233

234234
BleBridgedDeviceFactory::BridgedDeviceFactory &BleBridgedDeviceFactory::GetBridgedDeviceFactory()
235235
{

‎applications/matter_bridge/src/bridged_device_types/generic_switch.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <app-common/zap-generated/ids/Commands.h>
1212
#include <app-common/zap-generated/attributes/Accessors.h>
13-
// #include <app-common/zap-generated/cluster-objects.h>
1413
#include <app/clusters/switch-server/switch-server.h>
1514

1615
LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);

‎applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,3 @@
77
CONFIG_NORDIC_QSPI_NOR=y
88
CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
99
CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
10-
11-
# The following configurations are required to support simultaneous multi image update
12-
CONFIG_PCD_APP=y
13-
14-
CONFIG_BOOT_SWAP_USING_MOVE=n
15-
16-
# The network core cannot access external flash directly. The flash simulator must be used to
17-
# provide a memory region that is used to forward the new firmware to the network core.
18-
CONFIG_FLASH_SIMULATOR=y
19-
CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y
20-
CONFIG_FLASH_SIMULATOR_STATS=n
21-
22-
CONFIG_ZCBOR=y

‎applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
};
1212
};
1313

14-
// Disable GPIO forwarder for nRF7002 EK compatibility
14+
/* Disable GPIO forwarder for nRF7002 EK compatibility */
1515
&gpio_fwd {
1616
status = "disabled";
1717
};

‎applications/matter_bridge/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ CONFIG_SPI_NOR=y
1111
CONFIG_SPI_NOR_SFDP_DEVICETREE=y
1212
CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
1313

14-
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
15-
16-
# The following configurations are required to support simultaneous multi image update
14+
# The following configurations are required to support simultaneous multi-image update
1715
CONFIG_PCD_APP=y
1816

1917
# The network core cannot access external flash directly. The flash simulator must be used to

‎applications/matter_weather_station/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ include(${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/cmake/zap_helpers.cmake)
2525
ncs_get_zap_parent_dir(ZAP_PARENT_DIR)
2626

2727
target_include_directories(app PRIVATE
28-
src
29-
${ZAP_PARENT_DIR}
28+
src
29+
${ZAP_PARENT_DIR}
3030
)
3131

3232
target_sources(app PRIVATE
33-
src/app_task.cpp
34-
src/main.cpp
35-
src/battery.cpp
36-
src/buzzer.cpp
33+
src/app_task.cpp
34+
src/main.cpp
35+
src/battery.cpp
36+
src/buzzer.cpp
3737
)
3838

3939
ncs_configure_data_model()

0 commit comments

Comments
 (0)