bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Consolidate Buzzer

Browse Source
This commit is contained in:
Scott Lahteine
2017-09-14 15:33:07 -05:00
parent bca67a5b79
commit e0a189a481
5 changed files with 119 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Marlin/src/lcd/ultralcd.cpp
View File

@ -34,10 +34,6 @@
#include "../Marlin.h"
#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER)
#include "../libs/buzzer.h"
#endif
#if ENABLED(PRINTCOUNTER)
#include "../module/printcounter.h"
#include "../libs/duration_t.h"
@ -59,6 +55,11 @@
#include "../feature/bedlevel/bedlevel.h"
#endif
// For i2c define BUZZ to use lcd_buzz
#if DISABLED(LCD_USE_I2C_BUZZER)
#include "../libs/buzzer.h"
#endif
// Initialized by settings.load()
int16_t lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
@ -679,7 +680,7 @@ void kill_screen(const char* lcd_msg) {
* Audio feedback for controller clicks
*
*/
void lcd_buzz(long duration, uint16_t freq) {
void lcd_buzz(const long duration, const uint16_t freq) {
#if ENABLED(LCD_USE_I2C_BUZZER)
lcd.buzz(duration, freq);
#elif PIN_EXISTS(BEEPER)
@ -4803,11 +4804,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
#if ENABLED(AUTO_BED_LEVELING_UBL)
void chirp_at_user() {
#if ENABLED(LCD_USE_I2C_BUZZER)
lcd.buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
#elif PIN_EXISTS(BEEPER)
buzzer.tone(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
#endif
lcd_buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
}
bool ubl_lcd_clicked() { return LCD_CLICKED; }

2
Marlin/src/lcd/ultralcd.h
View File

@ -56,7 +56,7 @@
inline void lcd_refresh() { lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
#if HAS_BUZZER
void lcd_buzz(long duration, uint16_t freq);
void lcd_buzz(const long duration, const uint16_t freq);
#endif
#if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0