♻️ Small sound / buzz refactor (#24520)

This commit is contained in:
Scott Lahteine
2022-07-18 19:53:36 -05:00
parent 97a73147fa
commit f752fe75ee
16 changed files with 49 additions and 55 deletions

View File

@ -3564,8 +3564,11 @@
#if PIN_EXISTS(BEEPER)
#define HAS_BEEPER 1
#endif
#if ANY(HAS_BEEPER, LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
#define HAS_BUZZER 1
#if ANY(IS_TFTGLCD_PANEL, PCA9632_BUZZER, LCD_USE_I2C_BUZZER)
#define USE_MARLINUI_BUZZER 1
#endif
#if EITHER(HAS_BEEPER, USE_MARLINUI_BUZZER)
#define HAS_SOUND 1
#endif
#if ENABLED(LCD_USE_I2C_BUZZER)
@ -3575,7 +3578,7 @@
#ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100
#endif
#elif HAS_BUZZER
#elif HAS_SOUND
#ifndef LCD_FEEDBACK_FREQUENCY_HZ
#define LCD_FEEDBACK_FREQUENCY_HZ 5000
#endif
@ -3584,12 +3587,13 @@
#endif
#endif
#if HAS_BUZZER
#if HAS_SOUND
#if LCD_FEEDBACK_FREQUENCY_DURATION_MS && LCD_FEEDBACK_FREQUENCY_HZ
#define HAS_CHIRP 1
#endif
#else
#undef SOUND_MENU_ITEM // No buzzer menu item without a buzzer
#undef SOUND_ON_DEFAULT
#endif
/**