Skip to content

Commit 1dd7b95

Browse files
ellenspthinkyhead
authored andcommitted
🩹 Status / Host Prompt followup (MarlinFirmware#25720)
Followup to MarlinFirmware#25679 Co-authored-by: Scott Lahteine <[email protected]>
1 parent 09ce724 commit 1dd7b95

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

Marlin/src/lcd/marlinui.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -1413,6 +1413,13 @@ void MarlinUI::init() {
14131413

14141414
#endif // HAS_ENCODER_ACTION
14151415

1416+
#if HAS_SOUND
1417+
void MarlinUI::completion_feedback(const bool good/*=true*/) {
1418+
TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up on rotary encoder click...
1419+
if (good) OKAY_BUZZ(); else ERR_BUZZ();
1420+
}
1421+
#endif
1422+
14161423
#endif // HAS_WIRED_LCD
14171424

14181425
#if HAS_STATUS_MESSAGE

Marlin/src/lcd/marlinui.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -492,11 +492,6 @@ class MarlinUI {
492492

493493
static void status_screen();
494494

495-
#else
496-
497-
static void quick_feedback(const bool=true) {}
498-
static void completion_feedback(const bool=true) {}
499-
500495
#endif
501496

502497
#if HAS_MARLINUI_U8GLIB
@@ -527,6 +522,11 @@ class MarlinUI {
527522

528523
#endif
529524

525+
#if !HAS_WIRED_LCD
526+
static void quick_feedback(const bool=true) {}
527+
static void completion_feedback(const bool=true) {}
528+
#endif
529+
530530
#if ENABLED(SDSUPPORT)
531531
#if BOTH(SCROLL_LONG_FILENAMES, HAS_MARLINUI_MENU)
532532
#define MARLINUI_SCROLL_NAME 1

Marlin/src/lcd/menu/menu.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,6 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
271271
encoderTopLine = encoderLine;
272272
}
273273

274-
#if HAS_SOUND
275-
void MarlinUI::completion_feedback(const bool good/*=true*/) {
276-
TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up on rotary encoder click...
277-
if (good) OKAY_BUZZ(); else ERR_BUZZ();
278-
}
279-
#endif
280-
281274
#if HAS_LINE_TO_Z
282275

283276
void line_to_z(const_float_t z) {

0 commit comments

Comments
 (0)