Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DODO�
arduino-esp32
提交
8d0e68db
A
arduino-esp32
项目概览
DODO�
/
arduino-esp32
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
arduino-esp32
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
8d0e68db
编写于
1月 16, 2021
作者:
B
bot1131357
提交者:
GitHub
1月 15, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added parameter to Preferences::begin to select non-default NVS partition (#4718)
上级
d2530850
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
3 deletion
+14
-3
libraries/Preferences/src/Preferences.cpp
libraries/Preferences/src/Preferences.cpp
+13
-2
libraries/Preferences/src/Preferences.h
libraries/Preferences/src/Preferences.h
+1
-1
未找到文件。
libraries/Preferences/src/Preferences.cpp
浏览文件 @
8d0e68db
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
#include "Preferences.h"
#include "Preferences.h"
#include "nvs.h"
#include "nvs.h"
#include "nvs_flash.h"
const
char
*
nvs_errors
[]
=
{
"OTHER"
,
"NOT_INITIALIZED"
,
"NOT_FOUND"
,
"TYPE_MISMATCH"
,
"READ_ONLY"
,
"NOT_ENOUGH_SPACE"
,
"INVALID_NAME"
,
"INVALID_HANDLE"
,
"REMOVE_FAILED"
,
"KEY_TOO_LONG"
,
"PAGE_FULL"
,
"INVALID_STATE"
,
"INVALID_LENGTH"
};
const
char
*
nvs_errors
[]
=
{
"OTHER"
,
"NOT_INITIALIZED"
,
"NOT_FOUND"
,
"TYPE_MISMATCH"
,
"READ_ONLY"
,
"NOT_ENOUGH_SPACE"
,
"INVALID_NAME"
,
"INVALID_HANDLE"
,
"REMOVE_FAILED"
,
"KEY_TOO_LONG"
,
"PAGE_FULL"
,
"INVALID_STATE"
,
"INVALID_LENGTH"
};
#define nvs_error(e) (((e)>ESP_ERR_NVS_BASE)?nvs_errors[(e)&~(ESP_ERR_NVS_BASE)]:nvs_errors[0])
#define nvs_error(e) (((e)>ESP_ERR_NVS_BASE)?nvs_errors[(e)&~(ESP_ERR_NVS_BASE)]:nvs_errors[0])
...
@@ -28,12 +29,22 @@ Preferences::~Preferences(){
...
@@ -28,12 +29,22 @@ Preferences::~Preferences(){
end
();
end
();
}
}
bool
Preferences
::
begin
(
const
char
*
name
,
bool
readOnly
){
bool
Preferences
::
begin
(
const
char
*
name
,
bool
readOnly
,
const
char
*
partition_label
){
if
(
_started
){
if
(
_started
){
return
false
;
return
false
;
}
}
_readOnly
=
readOnly
;
_readOnly
=
readOnly
;
esp_err_t
err
=
nvs_open
(
name
,
readOnly
?
NVS_READONLY
:
NVS_READWRITE
,
&
_handle
);
esp_err_t
err
=
ESP_OK
;
if
(
partition_label
!=
NULL
)
{
err
=
nvs_flash_init_partition
(
partition_label
);
if
(
err
)
{
log_e
(
"nvs_flash_init_partition failed: %s"
,
nvs_error
(
err
));
return
false
;
}
err
=
nvs_open_from_partition
(
partition_label
,
name
,
readOnly
?
NVS_READONLY
:
NVS_READWRITE
,
&
_handle
);
}
else
{
err
=
nvs_open
(
name
,
readOnly
?
NVS_READONLY
:
NVS_READWRITE
,
&
_handle
);
}
if
(
err
){
if
(
err
){
log_e
(
"nvs_open failed: %s"
,
nvs_error
(
err
));
log_e
(
"nvs_open failed: %s"
,
nvs_error
(
err
));
return
false
;
return
false
;
...
...
libraries/Preferences/src/Preferences.h
浏览文件 @
8d0e68db
...
@@ -29,7 +29,7 @@ class Preferences {
...
@@ -29,7 +29,7 @@ class Preferences {
Preferences
();
Preferences
();
~
Preferences
();
~
Preferences
();
bool
begin
(
const
char
*
name
,
bool
readOnly
=
false
);
bool
begin
(
const
char
*
name
,
bool
readOnly
=
false
,
const
char
*
partition_label
=
NULL
);
void
end
();
void
end
();
bool
clear
();
bool
clear
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录