|
@@ -1045,7 +1045,7 @@ void setup()
|
|
SERIAL_ECHOLN((int)sizeof(block_t)*BLOCK_BUFFER_SIZE);
|
|
SERIAL_ECHOLN((int)sizeof(block_t)*BLOCK_BUFFER_SIZE);
|
|
lcd_update_enable(false);
|
|
lcd_update_enable(false);
|
|
// loads data from EEPROM if available else uses defaults (and resets step acceleration rate)
|
|
// loads data from EEPROM if available else uses defaults (and resets step acceleration rate)
|
|
- settings_from_eeprom = Config_RetrieveSettings();
|
|
|
|
|
|
+ bool previous_settings_retrieved = Config_RetrieveSettings();
|
|
SdFatUtil::set_stack_guard(); //writes magic number at the end of static variables to protect against overwriting static memory by stack
|
|
SdFatUtil::set_stack_guard(); //writes magic number at the end of static variables to protect against overwriting static memory by stack
|
|
tp_init(); // Initialize temperature loop
|
|
tp_init(); // Initialize temperature loop
|
|
plan_init(); // Initialize planner;
|
|
plan_init(); // Initialize planner;
|
|
@@ -1209,11 +1209,14 @@ void setup()
|
|
lcd_show_fullscreen_message_and_wait_P(MSG_FOLLOW_CALIBRATION_FLOW);
|
|
lcd_show_fullscreen_message_and_wait_P(MSG_FOLLOW_CALIBRATION_FLOW);
|
|
}
|
|
}
|
|
for (int i = 0; i<4; i++) EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]);
|
|
for (int i = 0; i<4; i++) EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]);
|
|
|
|
+
|
|
|
|
+ //If eeprom version for storing parameters to eeprom using M500 changed, default settings are used. Inform user in this case
|
|
|
|
+ if (!previous_settings_retrieved) {
|
|
|
|
+ lcd_show_fullscreen_message_and_wait_P(MSG_DEFAULT_SETTINGS_LOADED);
|
|
|
|
+ }
|
|
|
|
+
|
|
lcd_update_enable(true);
|
|
lcd_update_enable(true);
|
|
|
|
|
|
- //If eeprom version for storing parameters to eeprom using M500 changed, default settings are used. Inform user in this case.
|
|
|
|
- if(!setting_from_eeprom) lcd_show_fullscreen_message_and_wait_P(MSG_DEFAULT_SETTINGS_LOADED);
|
|
|
|
-
|
|
|
|
// Store the currently running firmware into an eeprom,
|
|
// Store the currently running firmware into an eeprom,
|
|
// so the next time the firmware gets updated, it will know from which version it has been updated.
|
|
// so the next time the firmware gets updated, it will know from which version it has been updated.
|
|
update_current_firmware_version_to_eeprom();
|
|
update_current_firmware_version_to_eeprom();
|
|
@@ -4953,10 +4956,6 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
#endif
|
|
#endif
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
|
|
case 500: // M500 Store settings in EEPROM
|
|
case 500: // M500 Store settings in EEPROM
|
|
{
|
|
{
|