Skip to content

Add custom nvs namespace feature. #1125

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

Open
h2zero wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add custom nvs namespace feature. #1125

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
22 changes: 21 additions & 1 deletion src/nimble/nimble/host/store/config/src/ble_store_nvs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#define NIMBLE_NVS_CCCD_SEC_KEY "cccd_sec"
#define NIMBLE_NVS_CSFC_SEC_KEY "csfc_sec"
#define NIMBLE_NVS_PEER_RECORDS_KEY "p_dev_rec"
#define NIMBLE_NVS_NAMESPACE "nimble_bond"
#define NIMBLE_NVS_DEFAULT_NAMESPACE "nimble_bond"

#if MYNEWT_VAL(ENC_ADV_DATA)
#define NIMBLE_NVS_EAD_SEC_KEY "ead_sec"
Expand All @@ -53,11 +53,31 @@
typedef uint32_t nvs_handle_t;

static const char *LOG_TAG = "NIMBLE_NVS";
static char nimble_nvs_namespace_buf[NIMBLE_NVS_STR_NAME_MAX_LEN];
static const char *NIMBLE_NVS_NAMESPACE = NIMBLE_NVS_DEFAULT_NAMESPACE;

/*****************************************************************************
* $ MISC *
*****************************************************************************/

void
set_nimble_nvs_namespace(const char *ns)
{
if (ns == NULL) {
NIMBLE_NVS_NAMESPACE = NIMBLE_NVS_DEFAULT_NAMESPACE;
return;
}

if (strlen(ns) < NIMBLE_NVS_STR_NAME_MAX_LEN) {
strncpy(nimble_nvs_namespace_buf, ns, NIMBLE_NVS_STR_NAME_MAX_LEN - 1);
nimble_nvs_namespace_buf[NIMBLE_NVS_STR_NAME_MAX_LEN - 1] = '\0';
NIMBLE_NVS_NAMESPACE = nimble_nvs_namespace_buf;
} else {
ESP_LOGE(LOG_TAG, "Namespace string is too long, using default namespace");
NIMBLE_NVS_NAMESPACE = NIMBLE_NVS_DEFAULT_NAMESPACE;
}
}

static void
get_nvs_key_string(int obj_type, int index, char *key_string)
{
Expand Down
4 changes: 4 additions & 0 deletions src/nimconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@
# define MYNEWT_VAL_BLE_HCI_VS (0)
# endif

# ifdef __cplusplus
extern "C" void set_nimble_nvs_namespace(const char *ns);
# endif

#else // !ESP_PLATFORM
# if defined(NRF51)
# include "syscfg/devcfg/nrf51cfg.h"
Expand Down
Loading