mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-29 17:19:50 +02:00
Code Issues Releases Wiki Activity

Fixed settings reset error due to Startup gcode line name change.

Browse Source 
- Line0 vs N0
This commit is contained in:
bdring
2020-07-20 19:37:27 -05:00
parent d35d67e195
commit 804a6bb13d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Grbl_Esp32/ProcessSettings.cpp
View File

@@ -43,13 +43,14 @@ void settings_restore(uint8_t restore_flag) {
}
#endif
if (restore_flag & SETTINGS_RESTORE_DEFAULTS) {
for (Setting *s = Setting::List; s; s = s->next()) {
bool restore_startup = restore_flag & SETTINGS_RESTORE_STARTUP_LINES;
for (Setting* s = Setting::List; s; s = s->next()) {
if (!s->getDescription()) {
const char *name = s->getName();
if (restore_startup || ((strcmp(name, "N0") != 0) && (strcmp(name, "N1") == 0))) {
const char* name = s->getName();
if (restore_startup) // all settings get restored
s->setDefault();
else if ((strcmp(name, "Line0") != 0) && (strcmp(name, "Line1") != 0)) // non startup settings get restored
s->setDefault();
}
}
}
}