From d256c186355cbe4ed3faf4694f31357e849c98fb Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 23:17:19 +0200 Subject: [PATCH] Fix first layer calibration wizard. Do not jump to WizState::LoadFil if calibration is supposed to be performed. --- Firmware/ultralcd.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d944ae1fe..0e0822290 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2139,13 +2139,19 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) nTargetOld = target_temperature[0]; nTargetBedOld = target_temperature_bed; setTargetHotend0((float )nTemp); - if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) setTargetBed((float) nTempBed); + + if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) || + eFilamentAction == FilamentAction::Lay1Cal) + { + setTargetBed((float) nTempBed); + } if (eFilamentAction == FilamentAction::Preheat || eFilamentAction == FilamentAction::Lay1Cal) { if (eFilamentAction == FilamentAction::Lay1Cal) lcd_commands_type = LcdCommands::Layer1Cal; lcd_return_to_status(); - if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) lcd_wizard(WizState::LoadFil); + if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) && + eFilamentAction == FilamentAction::Preheat) lcd_wizard(WizState::LoadFil); return; }