Skip to content

Commit 7fdc8a7

Browse files
kkasperczyk-noArekBalysNordic
authored andcommitted
samples: matter: Pulled ICD and persistent subscriptions changes
Updated Matter revision to pull changes modifying the ICD configs default values and enabling persistent subscriptions. Signed-off-by: Kamil Kasperczyk <[email protected]>
1 parent b826614 commit 7fdc8a7

File tree

6 files changed

+9
-28
lines changed

6 files changed

+9
-28
lines changed

applications/matter_bridge/sample.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ tests:
106106
- CONFIG_CHIP_MEMORY_PROFILING=y
107107
- CONFIG_BRIDGED_DEVICE_BT=y
108108
- CONFIG_BRIDGE_MIGRATE_VERSION_1=n
109-
- CONFIG_WIFI_NM_WPA_SUPPLICANT_WPA3=n
110109
integration_platforms:
111110
- nrf5340dk/nrf5340/cpuapp
112111
platform_allow:

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,13 @@ Matter samples
533533

534534
* The Bluetooth Low Energy variant of the Soft Device Controller (SDC) to use the Peripheral-only role in all Matter samples.
535535
* API of the ``ncs_configure_data_model`` cmake method that does not use ``ZAP_FILE`` argument anymore, but creates path to ZAP file based on :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH` Kconfig option.
536-
* Renamed the :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILES_PATH` Kconfig option to :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH` and changed it purpose to configure the absolute path under which ZAP file is located.
536+
* By renaming the :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILES_PATH` Kconfig option to :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH` and changed its purpose to configure the absolute path under which the ZAP file is located.
537+
* By enabling Matter persistent subscriptions by default for all Matter samples.
538+
* By changing the default values of the following ICD parameters:
539+
540+
* :kconfig:option:`CONFIG_CHIP_ICD_SLOW_POLL_INTERVAL` from ``1000`` to ``2500`` ms for SIT devices.
541+
* :kconfig:option:`CONFIG_CHIP_ICD_ACTIVE_MODE_THRESHOLD` from ``300`` to ``0`` ms for SIT devices.
542+
* :kconfig:option:`CONFIG_CHIP_ICD_FAST_POLLING_INTERVAL` from ``200`` to ``500`` ms.
537543

538544
Networking samples
539545
------------------

samples/matter/light_bulb/sample.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,10 @@ tests:
9090
- sysbuild
9191
- ci_samples_matter
9292
# Sample to execute load tests
93-
sample.matter.light_bulb.memory_profiling.persistent_subscriptions:
93+
sample.matter.light_bulb.memory_profiling:
9494
sysbuild: true
9595
build_only: true
9696
extra_args:
97-
- CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y
9897
- CONFIG_CHIP_MEMORY_PROFILING=y
9998
- CONFIG_SHELL_MINIMAL=y
10099
platform_allow:

samples/matter/light_switch/sample.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,3 @@ tests:
6060
tags:
6161
- sysbuild
6262
- ci_samples_matter
63-
# Sample to execute load tests
64-
sample.matter.light_switch.persistent_subscriptions:
65-
sysbuild: true
66-
build_only: true
67-
extra_args:
68-
- CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y
69-
- CONFIG_WIFI_NM_WPA_SUPPLICANT_WPA3=n
70-
platform_allow:
71-
- nrf52840dk/nrf52840
72-
- nrf5340dk/nrf5340/cpuapp
73-
- nrf7002dk/nrf5340/cpuapp
74-
- nrf54l15dk/nrf54l15/cpuapp
75-
integration_platforms:
76-
- nrf52840dk/nrf52840
77-
- nrf5340dk/nrf5340/cpuapp
78-
- nrf7002dk/nrf5340/cpuapp
79-
- nrf54l15dk/nrf54l15/cpuapp
80-
tags:
81-
- sysbuild
82-
- ci_samples_matter

snippets/matter-power-consumption-tests/power_consumption_tests.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,3 @@
88

99
# Enable pairing autostart to avoid issues with IO adapter
1010
CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
11-
12-
# Enable persistent subscriptions to automatically recover connection after reboot.
13-
CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ manifest:
157157
- name: matter
158158
repo-path: sdk-connectedhomeip
159159
path: modules/lib/matter
160-
revision: ee1f9441e70a1b103dd736201905d0a7d27de841
160+
revision: 4c03537c9ae96c46aea9c2594abe2a2498a50fba
161161
west-commands: scripts/west/west-commands.yml
162162
submodules:
163163
- name: nlio

0 commit comments

Comments
 (0)