From 997c8de1613d6357d707f98c744bbfac2645021c Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 12 Dec 2017 19:17:37 +0100 Subject: [PATCH] shipping prep. reset sets wizard flag, shipping prep wizard improvements --- Firmware/Marlin_main.cpp | 2 ++ Firmware/ultralcd.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ee75901ba..943ceaaa8 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -727,6 +727,7 @@ void factory_reset(char level, bool quiet) lcd_force_language_selection(); // Force the "Follow calibration flow" message at the next boot up. calibration_status_store(CALIBRATION_STATUS_Z_CALIBRATION); + eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard farm_no = 0; farm_mode == false; 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) // Shipped, the nozzle height has been set already. The user can start printing now. calibration_status_store(CALIBRATION_STATUS_CALIBRATED); + final_result = true; // babystep_apply(); } } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 53b2a339e..3691ed07b 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3562,6 +3562,8 @@ void lcd_wizard(int state) { break; case 4: //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); if (wizard_event) state = 11; //shipped, no need to set first layer, go to final message directly else end = true;