From 4c7cc5520e83f6ae1b2ef31ee939ab8db51be339 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Sun, 26 Nov 2017 21:26:36 +0100 Subject: [PATCH 1/2] "confirm nozzle clean" message re-added --- Firmware/Marlin_main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1cd9a6bf..d298b828 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1919,6 +1919,7 @@ bool gcode_M45(bool onlyZ) { KEEPALIVE_STATE(PAUSED_FOR_USER); bool result = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_STEEL_SHEET_CHECK, false, false); if(result) lcd_show_fullscreen_message_and_wait_P(MSG_REMOVE_STEEL_SHEET); + lcd_show_fullscreen_message_and_wait_P(MSG_CONFIRM_NOZZLE_CLEAN); lcd_show_fullscreen_message_and_wait_P(MSG_PAPER); KEEPALIVE_STATE(IN_HANDLER); lcd_display_message_fullscreen_P(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1); From 7de187d8134857dd44ea897f48ba73a346f1b18a Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 27 Nov 2017 00:17:45 +0100 Subject: [PATCH 2/2] if user dont confirm live adjust Z by pressing the knob, save last live adjust value to eeprom --- Firmware/Marlin_main.cpp | 2 +- Firmware/ultralcd.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d298b828..0c6c3ba5 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1089,7 +1089,7 @@ void setup() #ifndef DEBUG_DISABLE_STARTMSGS if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { - lcd_wizard(0); + lcd_wizard(0); } else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 0) { //dont show calibration status messages if wizard is currently active if (calibration_status() == CALIBRATION_STATUS_ASSEMBLED || diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index bed0da31..01cb739c 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1121,6 +1121,7 @@ void lcd_commands() lcd_setstatuspgm(WELCOME_MSG); lcd_commands_step = 0; lcd_commands_type = 0; + menuExiting = true; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by going to status screen if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { lcd_wizard(10); } @@ -3564,7 +3565,9 @@ void lcd_wizard(int state) { case 10: //repeat first layer cal.? wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_REPEAT_V2_CAL, false); if (wizard_event) { + //reset status and live adjust z value in eeprom calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST); + EEPROM_save_B(EEPROM_BABYSTEP_Z, 0); lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_CLEAN_HEATBED); state = 9; }