Skip to content

Commit

Permalink
🩹 Status / Host Prompt followup (MarlinFirmware#25720)
Browse files Browse the repository at this point in the history
Followup to MarlinFirmware#25679

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
  • Loading branch information
2 people authored and SMHRambo committed Jul 17, 2023
1 parent 3f19cee commit 83249dd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
7 changes: 7 additions & 0 deletions Marlin/src/lcd/marlinui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,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
Original file line number Diff line number Diff line change
Expand Up @@ -492,11 +492,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 @@ -527,6 +522,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
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

0 comments on commit 83249dd

Please sign in to comment.