alex/esp-rainmaker
1
0
Fork 0
mirror of https://github.com/espressif/esp-rainmaker.git synced 2026-01-15 06:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_nvs_set_incorrect' into 'master'

Browse Source 
esp_rmaker_param: Fix for a 4000 byte limitation on persistent param values

See merge request app-frameworks/esp-rainmaker!249
This commit is contained in:
Piyush Shah
2021-07-09 14:48:25 +00:00
parent cc3051d6a7 b5952ed4ac
commit 5667d2bb46
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/esp_rainmaker/src/core/esp_rmaker_param.c
View File

@@ -393,7 +393,18 @@ esp_err_t esp_rmaker_param_get_stored_value(_esp_rmaker_param_t *param, esp_rmak
if ((param->val.type == RMAKER_VAL_TYPE_STRING) || (param->val.type == RMAKER_VAL_TYPE_OBJECT) ||
(param->val.type == RMAKER_VAL_TYPE_ARRAY)) {
size_t len = 0;
if ((err = nvs_get_str(handle, param->name, NULL, &len)) == ESP_OK) {
if ((err = nvs_get_blob(handle, param->name, NULL, &len)) == ESP_OK) {
char *s_val = calloc(1, len + 1);
if (!s_val) {
err = ESP_ERR_NO_MEM;
} else {
nvs_get_blob(handle, param->name, s_val, &len);
s_val[len] = '\0';
val->type = param->val.type;
val->val.s = s_val;
}
} else if ((err = nvs_get_str(handle, param->name, NULL, &len)) == ESP_OK) {
/* In order to be compatible with the previous nvs_set_str() */
char *s_val = calloc(1, len);
if (!s_val) {
err = ESP_ERR_NO_MEM;
@@ -425,7 +436,7 @@ esp_err_t esp_rmaker_param_store_value(_esp_rmaker_param_t *param)
(param->val.type == RMAKER_VAL_TYPE_ARRAY)) {
/* Store only if value is not NULL */
if (param->val.val.s) {
err = nvs_set_str(handle, param->name, param->val.val.s);
err = nvs_set_blob(handle, param->name, param->val.val.s, strlen(param->val.val.s));
nvs_commit(handle);
} else {
err = ESP_OK;