CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[2.0.x] EEPROM code cleanup (#10710)

Browse Source
This commit is contained in:
Giuliano 2018-05-12 01:06:04 +02:00 committed by Scott Lahteine
parent 8679f671ed
commit d99f1b2245
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/module/configuration_store.cpp
View File

@ -954,7 +954,6 @@ void MarlinSettings::postprocess() {
SERIAL_ECHOPAIR_P(port, "(EEPROM=", stored_ver); SERIAL_ECHOPAIR_P(port, "(EEPROM=", stored_ver);
SERIAL_ECHOLNPGM_P(port, " Marlin=" EEPROM_VERSION ")"); SERIAL_ECHOLNPGM_P(port, " Marlin=" EEPROM_VERSION ")");
#endif #endif
if (!validating) reset();
eeprom_error = true; eeprom_error = true;
} }
else { else {
@ -1511,14 +1510,12 @@ void MarlinSettings::postprocess() {
#endif #endif
} }
if (!validating) { if (!validating && !eeprom_error) postprocess();
if (eeprom_error) reset(); else postprocess();
}
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
if (!validating) {
ubl.report_state(); ubl.report_state();
if (!validating) {
if (!ubl.sanity_check()) { if (!ubl.sanity_check()) {
SERIAL_EOL_P(port); SERIAL_EOL_P(port);
#if ENABLED(EEPROM_CHITCHAT) #if ENABLED(EEPROM_CHITCHAT)

7
Marlin/src/module/configuration_store.h
View File

@ -45,15 +45,16 @@ class MarlinSettings {
static bool save(PORTINIT_SOLO); // Return 'true' if data was saved static bool save(PORTINIT_SOLO); // Return 'true' if data was saved
FORCE_INLINE static bool init_eeprom() { FORCE_INLINE static bool init_eeprom() {
bool success = true;
reset(); reset();
#if ENABLED(EEPROM_SETTINGS) #if ENABLED(EEPROM_SETTINGS)
success = save(); const bool success = save();
#if ENABLED(EEPROM_CHITCHAT) #if ENABLED(EEPROM_CHITCHAT)
if (success) report(); if (success) report();
#endif #endif
#endif
return success; return success;
#else
return true;
#endif
} }
#if ENABLED(EEPROM_SETTINGS) #if ENABLED(EEPROM_SETTINGS)