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

Fix condition for returning to wizard. eFilamentAction == FilamentAction::Preheat was never true as eFilamentAction is set to eFilamentAction::None in lcd_return_to_status().

This commit is contained in:
Marek Bel 2019-09-13 00:19:37 +02:00
parent f1d190d2d5
commit e754780717
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Firmware/ultralcd.cpp
View File

@ -2146,14 +2146,22 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
setTargetBed((float) nTempBed); setTargetBed((float) nTempBed);
} }
if (eFilamentAction == FilamentAction::Preheat || eFilamentAction == FilamentAction::Lay1Cal)
{ {
if (eFilamentAction == FilamentAction::Lay1Cal) lcd_commands_type = LcdCommands::Layer1Cal; const FilamentAction action = eFilamentAction;
if (action == FilamentAction::Preheat || action == FilamentAction::Lay1Cal)
{
lcd_return_to_status(); lcd_return_to_status();
if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) && if (action == FilamentAction::Lay1Cal)
eFilamentAction == FilamentAction::Preheat) lcd_wizard(WizState::LoadFil); {
lcd_commands_type = LcdCommands::Layer1Cal;
}
else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE))
{
lcd_wizard(WizState::LoadFil);
}
return; return;
} }
}
lcd_timeoutToStatus.stop(); lcd_timeoutToStatus.stop();