josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix first layer calibration wizard. Do not jump to WizState::LoadFil if calibration is supposed to be performed.

This commit is contained in:
Marek Bel 2019-09-12 23:17:19 +02:00
parent 73642632f5
commit d256c18635
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/ultralcd.cpp
View File

@ -2139,13 +2139,19 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
nTargetOld = target_temperature[0]; nTargetOld = target_temperature[0];
nTargetBedOld = target_temperature_bed; nTargetBedOld = target_temperature_bed;
setTargetHotend0((float )nTemp); 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::Preheat || eFilamentAction == FilamentAction::Lay1Cal)
{ {
if (eFilamentAction == FilamentAction::Lay1Cal) lcd_commands_type = LcdCommands::Layer1Cal; if (eFilamentAction == FilamentAction::Lay1Cal) lcd_commands_type = LcdCommands::Layer1Cal;
lcd_return_to_status(); 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; return;
} }