SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow disable of LCD click

Browse source
This commit is contained in:
Scott Lahteine 2020-05-27 13:12:08 -05:00
parent a49319f3dd
commit 3bf0d8d161
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/src/inc/Conditionals_post.h
View file

@ -1882,6 +1882,9 @@
#endif #endif
#if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER) #if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
#define HAS_BUZZER 1 #define HAS_BUZZER 1
#if LCD_FEEDBACK_FREQUENCY_DURATION_MS && LCD_FEEDBACK_FREQUENCY_HZ
#define HAS_CHIRP 1
#endif
#endif #endif
#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER) #if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
#define USE_BEEPER 1 #define USE_BEEPER 1

15
Marlin/src/lcd/ultralcd.cpp
View file

@ -612,15 +612,12 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
UNUSED(clear_buttons); UNUSED(clear_buttons);
#endif #endif
#if HAS_BUZZER #if HAS_CHIRP
// Buzz and wait. Is the delay needed for buttons to settle? chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ); #if BOTH(HAS_LCD_MENU, USE_BEEPER)
#if HAS_LCD_MENU for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
#if USE_BEEPER #elif HAS_LCD_MENU
for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); } delay(10);
#else
delay(10);
#endif
#endif #endif
#endif #endif
} }

12
Marlin/src/lcd/ultralcd.h
View file

@ -398,6 +398,12 @@ public:
static millis_t next_filament_display; static millis_t next_filament_display;
#endif #endif
FORCE_INLINE static void chirp() {
#if HAS_CHIRP
buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
#endif
}
static void quick_feedback(const bool clear_buttons=true); static void quick_feedback(const bool clear_buttons=true);
#if HAS_BUZZER #if HAS_BUZZER
static void completion_feedback(const bool good=true); static void completion_feedback(const bool good=true);
@ -524,12 +530,6 @@ public:
static void reselect_last_file(); static void reselect_last_file();
#endif #endif
#if ENABLED(G26_MESH_VALIDATION)
FORCE_INLINE static void chirp() {
TERN_(HAS_BUZZER, buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ));
}
#endif
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
static void ubl_plot(const uint8_t x_plot, const uint8_t y_plot); static void ubl_plot(const uint8_t x_plot, const uint8_t y_plot);
#endif #endif