josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep wizard flag==2 even when a user restarts during Z-calibration 

i.e. prevent jumping into the standard wizard if reset during Z-
calibration
This commit is contained in:
D.R.racer 2021-02-18 15:39:29 +01:00
parent c3bea4d71c
commit 87f416f303
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Firmware/ultralcd.cpp
View File

@ -4988,17 +4988,16 @@ void lcd_wizard(WizState state)
if( eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)==2){ if( eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)==2){
lcd_show_fullscreen_message_and_wait_P(_i("Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."));////MSG_WIZARD_WELCOME_SHIPPING c=20 r=7 lcd_show_fullscreen_message_and_wait_P(_i("Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."));////MSG_WIZARD_WELCOME_SHIPPING c=20 r=7
wizard_event = 1; state = S::Restore;
} else { } else {
wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"), false, true);////MSG_WIZARD_WELCOME c=20 r=7 wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"), false, true);////MSG_WIZARD_WELCOME c=20 r=7
} if (wizard_event) {
if (wizard_event) { state = S::Restore;
state = S::Restore; eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1);
eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); } else {
} eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 0);
else { end = true;
eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 0); }
end = true;
} }
break; break;
case S::Restore: case S::Restore: