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

Fix issue 25718 ui.quick_feedback() error #25720

Merged
merged 2 commits into from
Apr 22, 2023
Merged

Fix issue 25718 ui.quick_feedback() error #25720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16aa506
move quick_feedback and completion_feedback
ellensp Apr 21, 2023
39bc33a
consistency
thinkyhead Apr 22, 2023
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
7 changes: 7 additions & 0 deletions Marlin/src/lcd/marlinui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,6 +1424,13 @@ void MarlinUI::init() {

#endif // HAS_ENCODER_ACTION

#if HAS_SOUND
void MarlinUI::completion_feedback(const bool good/*=true*/) {
TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up on rotary encoder click...
if (good) OKAY_BUZZ(); else ERR_BUZZ();
}
#endif

#endif // HAS_WIRED_LCD

#if HAS_STATUS_MESSAGE
Expand Down
10 changes: 5 additions & 5 deletions Marlin/src/lcd/marlinui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,11 +494,6 @@ class MarlinUI {

static void status_screen();

#else

static void quick_feedback(const bool=true) {}
static void completion_feedback(const bool=true) {}

#endif

#if HAS_MARLINUI_U8GLIB
Expand Down Expand Up @@ -529,6 +524,11 @@ class MarlinUI {

#endif

#if !HAS_WIRED_LCD
static void quick_feedback(const bool=true) {}
static void completion_feedback(const bool=true) {}
#endif

#if ENABLED(SDSUPPORT)
#if BOTH(SCROLL_LONG_FILENAMES, HAS_MARLINUI_MENU)
#define MARLINUI_SCROLL_NAME 1
Expand Down
7 changes: 0 additions & 7 deletions Marlin/src/lcd/menu/menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,6 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
encoderTopLine = encoderLine;
}

#if HAS_SOUND
void MarlinUI::completion_feedback(const bool good/*=true*/) {
TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up on rotary encoder click...
if (good) OKAY_BUZZ(); else ERR_BUZZ();
}
#endif

#if HAS_LINE_TO_Z

void line_to_z(const_float_t z) {
Expand Down