MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[1.1.x] EEPROM init fix (#9002)

Browse Source
This commit is contained in:
Tannoo 2018-01-03 03:28:15 -07:00 committed by Scott Lahteine
parent c893a90d64
commit d3139e47f8
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/configuration_store.h
View File

@ -32,6 +32,21 @@ class MarlinSettings {
static void reset(); static void reset();
static bool save(); static bool save();
FORCE_INLINE static bool init_eeprom() {
bool success = true;
reset();
#if ENABLED(EEPROM_SETTINGS)
if ((success = save())) {
#if ENABLED(AUTO_BED_LEVELING_UBL)
success = load(); // UBL uses load() to know the end of EEPROM
#elif ENABLED(EEPROM_CHITCHAT)
report();
#endif
}
#endif
return success;
}
#if ENABLED(EEPROM_SETTINGS) #if ENABLED(EEPROM_SETTINGS)
static bool load(); static bool load();

3
Marlin/ultralcd.cpp
View File

@ -3127,8 +3127,7 @@ void kill_screen(const char* lcd_msg) {
#if ENABLED(EEPROM_SETTINGS) #if ENABLED(EEPROM_SETTINGS)
static void lcd_init_eeprom() { static void lcd_init_eeprom() {
lcd_factory_settings(); lcd_completion_feedback(settings.init_eeprom());
settings.save();
lcd_goto_previous_menu(); lcd_goto_previous_menu();
} }