Skip to content

samples: matter: Fix preprocesor conditions for persistent storage #17939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

samples: matter: Fix preprocesor conditions for persistent storage #17939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include "persistent_storage_shell.h"

#ifdef CONFIG_NVS
#if defined(CONFIG_NVS)
#include <zephyr/fs/nvs.h>
#elif CONFIG_ZMS
#elif defined(CONFIG_ZMS)
#include <zephyr/fs/zms.h>
#endif
#include <zephyr/settings/settings.h>
Expand All @@ -18,9 +18,9 @@ using namespace Nrf;

namespace
{
#ifdef CONFIG_NVS
#if defined(CONFIG_NVS)
nvs_fs *sStorage = nullptr;
#elif CONFIG_ZMS
#elif defined(CONFIG_ZMS)
zms_fs *sStorage = nullptr;
#endif

Expand All @@ -32,9 +32,9 @@ struct SettingsParams {

int CalculateFreeSpace()
{
#ifdef CONFIG_NVS
#if defined(CONFIG_NVS)
return nvs_calc_free_space(sStorage);
#elif CONFIG_ZMS
#elif defined(CONFIG_ZMS)
return zms_calc_free_space(sStorage);
#endif
}
Expand Down Expand Up @@ -133,9 +133,9 @@ bool PersistentStorageShell::Init()
return false;
}

#ifdef CONFIG_NVS
#if defined(CONFIG_NVS)
sStorage = reinterpret_cast<nvs_fs *>(storage);
#elif CONFIG_ZMS
#elif defined(CONFIG_ZMS)
sStorage = reinterpret_cast<zms_fs *>(storage);
#endif

Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ manifest:
- name: matter
repo-path: sdk-connectedhomeip
path: modules/lib/matter
revision: 9a4ea8e45736c356a58bd7b29774d18a8d78441f
revision: pull/496/head
west-commands: scripts/west/west-commands.yml
submodules:
- name: nlio
Expand Down
Loading