Skip to content

[2.0.x] EEprom code cleanup #10710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 2 commits into from
May 11, 2018
Merged

[2.0.x] EEprom code cleanup #10710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50db022
[2.0.x] EEprom code cleanup
GMagician May 11, 2018
fdb02fb
Update configuration_store.h
thinkyhead May 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Marlin/src/module/configuration_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,6 @@ void MarlinSettings::postprocess() {
SERIAL_ECHOPAIR_P(port, "(EEPROM=", stored_ver);
SERIAL_ECHOLNPGM_P(port, " Marlin=" EEPROM_VERSION ")");
#endif
if (!validating) reset();
eeprom_error = true;
}
else {
Expand Down Expand Up @@ -1511,15 +1510,13 @@ void MarlinSettings::postprocess() {
#endif
}

if (!validating) {
if (eeprom_error) reset(); else postprocess();
}
if (!validating && !eeprom_error) postprocess();

#if ENABLED(AUTO_BED_LEVELING_UBL)
ubl.report_state();

if (!validating) {
if (!ubl.sanity_check()) {
ubl.report_state();

if (!ubl.sanity_check()) {
SERIAL_EOL_P(port);
#if ENABLED(EEPROM_CHITCHAT)
ubl.echo_name();
Expand Down
7 changes: 4 additions & 3 deletions Marlin/src/module/configuration_store.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,16 @@ class MarlinSettings {
static bool save(PORTINIT_SOLO); // Return 'true' if data was saved

FORCE_INLINE static bool init_eeprom() {
bool success = true;
reset();
#if ENABLED(EEPROM_SETTINGS)
success = save();
const bool success = save();
#if ENABLED(EEPROM_CHITCHAT)
if (success) report();
#endif
return success;
#else
return true;
#endif
return success;
}

#if ENABLED(EEPROM_SETTINGS)
Expand Down