3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

shipping prep. reset sets wizard flag, shipping prep wizard improvements

Browse source
This commit is contained in:
PavelSindler 2017-12-12 19:17:37 +01:00
parent 86418eed2d
commit 997c8de161
2 changed files with 4 additions and 0 deletions

2
Firmware/Marlin_main.cpp
View file

@ -727,6 +727,7 @@ void factory_reset(char level, bool quiet)
lcd_force_language_selection(); lcd_force_language_selection();
// Force the "Follow calibration flow" message at the next boot up. // Force the "Follow calibration flow" message at the next boot up.
calibration_status_store(CALIBRATION_STATUS_Z_CALIBRATION); calibration_status_store(CALIBRATION_STATUS_Z_CALIBRATION);
eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard
farm_no = 0; farm_no = 0;
farm_mode == false; farm_mode == false;
eeprom_update_byte((uint8_t*)EEPROM_FARM_MODE, farm_mode); eeprom_update_byte((uint8_t*)EEPROM_FARM_MODE, farm_mode);
@ -1998,6 +1999,7 @@ bool gcode_M45(bool onlyZ) {
if (calibration_status() == CALIBRATION_STATUS_Z_CALIBRATION) if (calibration_status() == CALIBRATION_STATUS_Z_CALIBRATION)
// Shipped, the nozzle height has been set already. The user can start printing now. // Shipped, the nozzle height has been set already. The user can start printing now.
calibration_status_store(CALIBRATION_STATUS_CALIBRATED); calibration_status_store(CALIBRATION_STATUS_CALIBRATED);
final_result = true;
// babystep_apply(); // babystep_apply();
} }
} }

2
Firmware/ultralcd.cpp
View file

@ -3562,6 +3562,8 @@ void lcd_wizard(int state) {
break; break;
case 4: //z cal. case 4: //z cal.
lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_Z_CAL); lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_Z_CAL);
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_STEEL_SHEET_CHECK, false, false);
if (!wizard_event) lcd_show_fullscreen_message_and_wait_P(MSG_PLACE_STEEL_SHEET);
wizard_event = gcode_M45(true); wizard_event = gcode_M45(true);
if (wizard_event) state = 11; //shipped, no need to set first layer, go to final message directly if (wizard_event) state = 11; //shipped, no need to set first layer, go to final message directly
else end = true; else end = true;