Unify buzz methods as MarlinUI::buzz (#14803)
This commit is contained in:
@ -22,7 +22,7 @@
|
||||
|
||||
#include "../inc/MarlinConfig.h"
|
||||
|
||||
#if DISABLED(LCD_USE_I2C_BUZZER) && PIN_EXISTS(BEEPER)
|
||||
#if USE_BEEPER
|
||||
|
||||
#include "buzzer.h"
|
||||
#include "../module/temperature.h"
|
||||
@ -78,4 +78,4 @@ void Buzzer::tick() {
|
||||
else if (ELAPSED(now, state.endtime)) reset();
|
||||
}
|
||||
|
||||
#endif // !LCD_USE_I2C_BUZZER && BEEPER
|
||||
#endif // USE_BEEPER
|
||||
|
@ -23,16 +23,7 @@
|
||||
|
||||
#include "../inc/MarlinConfig.h"
|
||||
|
||||
#if ENABLED(LCD_USE_I2C_BUZZER)
|
||||
|
||||
#define BUZZ(d,f) ui.buzz(d,f)
|
||||
|
||||
#elif ENABLED(PCA9632_BUZZER)
|
||||
|
||||
#include "../feature/leds/pca9632.h"
|
||||
#define BUZZ(d, f) pca9632_buzz(d,f)
|
||||
|
||||
#elif PIN_EXISTS(BEEPER)
|
||||
#if USE_BEEPER
|
||||
|
||||
#include "circularqueue.h"
|
||||
|
||||
@ -120,10 +111,18 @@
|
||||
|
||||
// Provide a buzzer instance
|
||||
extern Buzzer buzzer;
|
||||
|
||||
// Buzz directly via the BEEPER pin tone queue
|
||||
#define BUZZ(d,f) buzzer.tone(d, f)
|
||||
|
||||
#else // No buzz capability
|
||||
#elif HAS_BUZZER
|
||||
|
||||
// Buzz indirectly via the MarlinUI instance
|
||||
#define BUZZ(d,f) ui.buzz(d,f)
|
||||
|
||||
#else
|
||||
|
||||
// No buzz capability
|
||||
#define BUZZ(d,f) NOOP
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user