Skip to content

Commit 5d8d38a

Browse files
ellenspthinkyhead
andauthored
🩹 Status / Host Prompt followup (MarlinFirmware#25720)
Followup to MarlinFirmware#25679 Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
1 parent 3117339 commit 5d8d38a

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
@@ -1424,6 +1424,13 @@ void MarlinUI::init() {
14241424

14251425
#endif // HAS_ENCODER_ACTION
14261426

1427+
#if HAS_SOUND
1428+
void MarlinUI::completion_feedback(const bool good/*=true*/) {
1429+
TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up on rotary encoder click...
1430+
if (good) OKAY_BUZZ(); else ERR_BUZZ();
1431+
}
1432+
#endif
1433+
14271434
#endif // HAS_WIRED_LCD
14281435

14291436
#if HAS_STATUS_MESSAGE

Marlin/src/lcd/marlinui.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -494,11 +494,6 @@ class MarlinUI {
494494

495495
static void status_screen();
496496

497-
#else
498-
499-
static void quick_feedback(const bool=true) {}
500-
static void completion_feedback(const bool=true) {}
501-
502497
#endif
503498

504499
#if HAS_MARLINUI_U8GLIB
@@ -529,6 +524,11 @@ class MarlinUI {
529524

530525
#endif
531526

527+
#if !HAS_WIRED_LCD
528+
static void quick_feedback(const bool=true) {}
529+
static void completion_feedback(const bool=true) {}
530+
#endif
531+
532532
#if ENABLED(SDSUPPORT)
533533
#if BOTH(SCROLL_LONG_FILENAMES, HAS_MARLINUI_MENU)
534534
#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)