Skip to content

Commit 8c1d85c

Browse files
akredalenrlubos
akredalen
authored and
rlubos
committed
samples: bluetooth: mesh: add ZMS to samples
Replace usage of NVS with ZMS when compiling samples for nrf54L15. Signed-off-by: Stine Akredalen <[email protected]>
1 parent 72fac47 commit 8c1d85c

20 files changed

+195
-13
lines changed

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -462,19 +462,11 @@ Bluetooth Fast Pair samples
462462
Bluetooth Mesh samples
463463
----------------------
464464

465-
* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` board and removed support for the nRF54L15 PDK in the following samples:
466-
467-
* :ref:`bluetooth_mesh_sensor_client`
468-
* :ref:`bluetooth_mesh_sensor_server`
469-
* :ref:`bluetooth_ble_peripheral_lbs_coex`
470-
* :ref:`bt_mesh_chat`
471-
* :ref:`bluetooth_mesh_light_switch`
472-
* :ref:`bluetooth_mesh_silvair_enocean`
473-
* :ref:`bluetooth_mesh_light_dim`
474-
* :ref:`bluetooth_mesh_light`
475-
* :ref:`bluetooth_mesh_light_lc`
476-
* :ref:`ble_mesh_dfu_target`
477-
* :ref:`ble_mesh_dfu_distributor`
465+
* For all Bluetooth Mesh samples:
466+
467+
* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` board.
468+
* Added support for Zephyr Memory Storage (ZMS) when compiling for the :ref:`zephyr:nrf54l15dk_nrf54l15` board.
469+
* Removed support for the nRF54L15 PDK.
478470

479471
* :ref:`bluetooth_ble_peripheral_lbs_coex` sample:
480472

‎samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l15_cpuapp.conf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,13 @@
77
# Application overlay - nrf54l15
88

99
CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n
10+
CONFIG_NVS=n
11+
CONFIG_NVS_LOOKUP_CACHE=n
12+
CONFIG_SETTINGS_NVS_NAME_CACHE=n
13+
CONFIG_ZMS=y
14+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
15+
CONFIG_ZMS_LOOKUP_CACHE=y
16+
CONFIG_ZMS_LOOKUP_CACHE_SIZE=512
17+
CONFIG_SETTINGS_ZMS_NAME_CACHE=y
18+
CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
19+
CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y

‎samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15pdk_nrf54l15_cpuapp.conf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,13 @@
77
# Application overlay - nrf54l15
88

99
CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n
10+
CONFIG_NVS=n
11+
CONFIG_NVS_LOOKUP_CACHE=n
12+
CONFIG_SETTINGS_NVS_NAME_CACHE=n
13+
CONFIG_ZMS=y
14+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
15+
CONFIG_ZMS_LOOKUP_CACHE=y
16+
CONFIG_ZMS_LOOKUP_CACHE_SIZE=512
17+
CONFIG_SETTINGS_ZMS_NAME_CACHE=y
18+
CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
19+
CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y

‎samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,13 @@
77
# Application overlay - nrf54l15
88

99
CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n
10+
CONFIG_NVS=n
11+
CONFIG_NVS_LOOKUP_CACHE=n
12+
CONFIG_SETTINGS_NVS_NAME_CACHE=n
13+
CONFIG_ZMS=y
14+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
15+
CONFIG_ZMS_LOOKUP_CACHE=y
16+
CONFIG_ZMS_LOOKUP_CACHE_SIZE=512
17+
CONFIG_SETTINGS_ZMS_NAME_CACHE=y
18+
CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
19+
CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y

‎samples/bluetooth/mesh/chat/boards/nrf54l15pdk_nrf54l15_cpuapp.conf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,13 @@
77
# Application overlay - nrf54l15
88

99
CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n
10+
CONFIG_NVS=n
11+
CONFIG_NVS_LOOKUP_CACHE=n
12+
CONFIG_SETTINGS_NVS_NAME_CACHE=n
13+
CONFIG_ZMS=y
14+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
15+
CONFIG_ZMS_LOOKUP_CACHE=y
16+
CONFIG_ZMS_LOOKUP_CACHE_SIZE=512
17+
CONFIG_SETTINGS_ZMS_NAME_CACHE=y
18+
CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
19+
CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y

‎samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15pdk_nrf54l15_cpuapp.conf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,13 @@
77
# Application overlay - nrf54l15
88

99
CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n
10+
CONFIG_NVS=n
11+
CONFIG_NVS_LOOKUP_CACHE=n
12+
CONFIG_SETTINGS_NVS_NAME_CACHE=n
13+
CONFIG_ZMS=y
14+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
15+
CONFIG_ZMS_LOOKUP_CACHE=y
16+
CONFIG_ZMS_LOOKUP_CACHE_SIZE=512
17+
CONFIG_SETTINGS_ZMS_NAME_CACHE=y
18+
CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
19+
CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y

‎samples/bluetooth/mesh/dfu/target/boards/nrf54l15pdk_nrf54l15_cpuapp.conf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,13 @@
77
# Application overlay - nrf54l15
88

99
CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n
10+
CONFIG_NVS=n
11+
CONFIG_NVS_LOOKUP_CACHE=n
12+
CONFIG_SETTINGS_NVS_NAME_CACHE=n
13+
CONFIG_ZMS=y
14+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
15+
CONFIG_ZMS_LOOKUP_CACHE=y
16+
CONFIG_ZMS_LOOKUP_CACHE_SIZE=512
17+
CONFIG_SETTINGS_ZMS_NAME_CACHE=y
18+
CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
19+
CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y

‎samples/bluetooth/mesh/light/boards/nrf54l15pdk_nrf54l15_cpuapp.conf‎

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

99
CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n
1010
CONFIG_SPI_NOR=n
11+
CONFIG_NVS=n
12+
CONFIG_NVS_LOOKUP_CACHE=n
13+
CONFIG_SETTINGS_NVS_NAME_CACHE=n
14+
CONFIG_ZMS=y
15+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
16+
CONFIG_ZMS_LOOKUP_CACHE=y
17+
CONFIG_ZMS_LOOKUP_CACHE_SIZE=512
18+
CONFIG_SETTINGS_ZMS_NAME_CACHE=y
19+
CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
20+
CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y

‎samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,13 @@
77
# Application overlay - nrf54l15
88

99
CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n
10+
CONFIG_NVS=n
11+
CONFIG_NVS_LOOKUP_CACHE=n
12+
CONFIG_SETTINGS_NVS_NAME_CACHE=n
13+
CONFIG_ZMS=y
14+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
15+
CONFIG_ZMS_LOOKUP_CACHE=y
16+
CONFIG_ZMS_LOOKUP_CACHE_SIZE=512
17+
CONFIG_SETTINGS_ZMS_NAME_CACHE=y
18+
CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
19+
CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y

‎samples/bluetooth/mesh/light_ctrl/boards/nrf54l15pdk_nrf54l15_cpuapp.conf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,13 @@
77
# Application overlay - nrf54l15
88

99
CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n
10+
CONFIG_NVS=n
11+
CONFIG_NVS_LOOKUP_CACHE=n
12+
CONFIG_SETTINGS_NVS_NAME_CACHE=n
13+
CONFIG_ZMS=y
14+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
15+
CONFIG_ZMS_LOOKUP_CACHE=y
16+
CONFIG_ZMS_LOOKUP_CACHE_SIZE=512
17+
CONFIG_SETTINGS_ZMS_NAME_CACHE=y
18+
CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
19+
CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y

0 commit comments

Comments
 (0)