Mirrors/ESP3D
2
0
Fork 0
mirror of https://github.com/luc-github/ESP3D.git synced 2026-03-21 07:06:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add sanity check to avoid error if preferences key does not exist (which should never happen if user do a proper reset)

Browse Source
This commit is contained in:
Luc
2022-07-18 10:38:35 +08:00
parent 7d924e4aa6
commit 32b7e4664a
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
esp3d/src/core/settings_esp3d.cpp
View File

@@ -787,7 +787,11 @@ uint8_t Settings_ESP3D::read_byte (int pos, bool * haserror)
return value;
}
String p = "P_" + String(pos);
value = prefs.getChar(p.c_str(), get_default_byte_value(pos));
if (prefs.isKey(p.c_str())) {
value = prefs.getChar(p.c_str(), get_default_byte_value(pos));
} else {
value = get_default_byte_value(pos);
}
prefs.end();
#endif //SETTINGS_IN_PREFERENCES
if(haserror) {
@@ -901,7 +905,11 @@ const char * Settings_ESP3D::read_string (int pos, bool *haserror)
return "";
}
String p = "P_" + String(pos);
res = prefs.getString(p.c_str(), get_default_string_value(pos));
if (prefs.isKey(p.c_str())) {
res = prefs.getString(p.c_str(), get_default_string_value(pos));
} else {
res = get_default_string_value(pos);
}
prefs.end();
if (res.length() > size_max) {
@@ -996,7 +1004,11 @@ uint32_t Settings_ESP3D::read_uint32(int pos, bool * haserror)
return res;
}
String p = "P_" + String(pos);
res = prefs.getUInt(p.c_str(), res);
if (prefs.isKey(p.c_str())) {
res = prefs.getUInt(p.c_str(), res);
} else {
res = get_default_int32_value(pos);
}
prefs.end();
#endif //SETTINGS_IN_PREFERENCES
if (haserror) {