sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🩹 Status / Host Prompt followup (#25720)

Browse Source 
Followup to #25679

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
ellensp
2023-04-23 08:59:51 +12:00
committed by Scott Lahteine
parent 2fb47afa4a
commit 0ece7ca66d
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/lcd/marlinui.cpp
View File

@@ -1413,6 +1413,13 @@ void MarlinUI::init() {
#endif // HAS_ENCODER_ACTION #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 #endif // HAS_WIRED_LCD
#if HAS_STATUS_MESSAGE #if HAS_STATUS_MESSAGE

10
Marlin/src/lcd/marlinui.h
View File

@@ -492,11 +492,6 @@ public:
static void status_screen(); static void status_screen();
#else
static void quick_feedback(const bool=true) {}
static void completion_feedback(const bool=true) {}
#endif #endif
#if HAS_MARLINUI_U8GLIB #if HAS_MARLINUI_U8GLIB
@@ -527,6 +522,11 @@ public:
#endif #endif
#if !HAS_WIRED_LCD
static void quick_feedback(const bool=true) {}
static void completion_feedback(const bool=true) {}
#endif
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
#if BOTH(SCROLL_LONG_FILENAMES, HAS_MARLINUI_MENU) #if BOTH(SCROLL_LONG_FILENAMES, HAS_MARLINUI_MENU)
#define MARLINUI_SCROLL_NAME 1 #define MARLINUI_SCROLL_NAME 1

7
Marlin/src/lcd/menu/menu.cpp
View File

@@ -271,13 +271,6 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
encoderTopLine = encoderLine; 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 #if HAS_LINE_TO_Z
void line_to_z(const_float_t z) { void line_to_z(const_float_t z) {