thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved EEPROM boot error (#17916)

Browse Source
This commit is contained in:
Scott Lahteine
2020-05-10 00:12:56 -05:00
committed by GitHub
parent 91fe0e1022
commit 52aa459a2d
13 changed files with 125 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/src/lcd/menu/menu_configuration.cpp
View File

@@ -30,8 +30,6 @@
#include "menu.h"
#include "../../module/configuration_store.h"
#if HAS_FILAMENT_SENSOR
#include "../../feature/runout.h"
#endif
@@ -174,7 +172,7 @@ void menu_advanced_settings();
EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
#if ENABLED(EEPROM_SETTINGS)
ACTION_ITEM(MSG_STORE_EEPROM, lcd_store_settings);
ACTION_ITEM(MSG_STORE_EEPROM, ui.store_settings);
#endif
END_MENU();
}
@@ -335,7 +333,7 @@ void menu_advanced_settings();
EDIT_ITEM(int3, MSG_BED, &ui.preheat_bed_temp[material], BED_MINTEMP, BED_MAX_TARGET);
#endif
#if ENABLED(EEPROM_SETTINGS)
ACTION_ITEM(MSG_STORE_EEPROM, lcd_store_settings);
ACTION_ITEM(MSG_STORE_EEPROM, ui.store_settings);
#endif
END_MENU();
}
@@ -439,12 +437,11 @@ void menu_configuration() {
#endif
#if ENABLED(EEPROM_SETTINGS)
ACTION_ITEM(MSG_STORE_EEPROM, lcd_store_settings);
if (!busy) ACTION_ITEM(MSG_LOAD_EEPROM, lcd_load_settings);
ACTION_ITEM(MSG_STORE_EEPROM, ui.store_settings);
if (!busy) ACTION_ITEM(MSG_LOAD_EEPROM, ui.load_settings);
#endif
if (!busy)
ACTION_ITEM(MSG_RESTORE_DEFAULTS, []{ settings.reset(); ui.completion_feedback(); });
if (!busy) ACTION_ITEM(MSG_RESTORE_DEFAULTS, ui.reset_settings);
END_MENU();
}