Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compile error when using TURBO_BACK_MENU_ITEM #15019

Merged
merged 2 commits into from
Aug 24, 2019
Merged

Fix compile error when using TURBO_BACK_MENU_ITEM #15019

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a82b95d
Fix compile error when using TURBO_BACK_MENU_ITEM
marcio-ao Aug 21, 2019
ed6e8b3
Update ultralcd.h
thinkyhead Aug 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Marlin/src/lcd/ultralcd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,10 +449,16 @@ class MarlinUI {
static void save_previous_screen();
static void goto_previous_screen(
#if ENABLED(TURBO_BACK_MENU_ITEM)
const bool is_back=false
const bool is_back
#endif
);

#if ENABLED(TURBO_BACK_MENU_ITEM)
// Various menu items require a "void (*)()" to point to
// this function so a default argument *won't* work
static inline void goto_previous_screen() { goto_previous_screen(false); }
#endif

static void return_to_status();
static inline bool on_status_screen() { return currentScreen == status_screen; }
static inline void run_current_screen() { (*currentScreen)(); }
Expand Down