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

Merge pull request #3393 from gudnimg/add-menu-back-arrow-to-preheat-menu

Browse Source 
Add menu back arrow to the Preheat menu
This commit is contained in:
Alex Voinea 2022-02-15 08:49:07 +01:00 committed by GitHub
commit 73406f53e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Firmware/ultralcd.cpp
View File

@ -2384,7 +2384,6 @@ static void mFilamentItem_PVB()
void mFilamentBack() void mFilamentBack()
{ {
menu_back();
if (eFilamentAction == FilamentAction::AutoLoad || if (eFilamentAction == FilamentAction::AutoLoad ||
eFilamentAction == FilamentAction::Preheat || eFilamentAction == FilamentAction::Preheat ||
eFilamentAction == FilamentAction::Lay1Cal) eFilamentAction == FilamentAction::Lay1Cal)
@ -2398,14 +2397,10 @@ void lcd_generic_preheat_menu()
MENU_BEGIN(); MENU_BEGIN();
if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE))
{ {
if (eFilamentAction == FilamentAction::Lay1Cal) ON_MENU_LEAVE(
{ mFilamentBack();
MENU_ITEM_FUNCTION_P(_T(MSG_BACK), mFilamentBack); );
} MENU_ITEM_BACK_P(_T(eFilamentAction == FilamentAction::Lay1Cal ? MSG_BACK : MSG_MAIN));
else
{
MENU_ITEM_FUNCTION_P(_T(MSG_MAIN), mFilamentBack);
}
} }
if (farm_mode) if (farm_mode)
{ {