From f194bb12424b84aa27ac66d388e200fce9ba8f9d Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 12 Dec 2022 18:22:43 +0100 Subject: [PATCH] wizard: Allow finishing the calibration through menus If the wizard is interrupted during model calibration, allow the menu to mark "temperature model" calibration as complete. --- Firmware/ultralcd.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 642f17086..c8d757d81 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1065,9 +1065,16 @@ void lcd_commands() case 1: lcd_commands_step = 0; lcd_commands_type = LcdCommands::Idle; - if ((eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) && temp_model_autotune_result()) { - // calibration successful, resume the wizard - lcd_wizard(WizState::IsFil); + + if (temp_model_autotune_result()) { + if (calibration_status() == CALIBRATION_STATUS_TEMP_MODEL_CALIBRATION) { + // move to the next calibration step if not fully calibrated + calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST); + } + if ((eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1)) { + // successful: resume the wizard + lcd_wizard(WizState::IsFil); + } } break; }