bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Prevent extra settings.load on boot (#14499)

Browse Source
This commit is contained in:
Tanguy Pruvot
2019-07-06 05:25:59 +02:00
committed by Scott Lahteine
parent dc02d0720d
commit 8873c583d3
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,8 +29,6 @@
class MarlinSettings {
public:
MarlinSettings() { }
static uint16_t datasize();
static void reset();
@ -55,9 +53,15 @@ class MarlinSettings {
#endif
#if ENABLED(EEPROM_SETTINGS)
static bool load(); // Return 'true' if data was loaded ok
static bool validate(); // Return 'true' if EEPROM data is ok
static inline void first_load() {
static bool loaded = false;
if (!loaded && load()) loaded = true;
}
#if ENABLED(AUTO_BED_LEVELING_UBL) // Eventually make these available if any leveling system
// That can store is enabled
static uint16_t meshes_start_index();
@ -73,6 +77,8 @@ class MarlinSettings {
#else
FORCE_INLINE
static bool load() { reset(); report(); return true; }
FORCE_INLINE
static void first_load() { (void)load(); }
#endif
#if DISABLED(DISABLE_M503)