From ad08722d0de51e3bda05985416800818e7f0d310 Mon Sep 17 00:00:00 2001
From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 1 Jun 2020 20:40:51 -0700
Subject: [PATCH] Chirp followup 2 (#18176)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
Marlin/src/inc/Conditionals_post.h | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 57295f84b9..97f4d1eb88 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2352,6 +2352,13 @@
/**
* Buzzer/Speaker
*/
+#if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
+ #define HAS_BUZZER 1
+ #if DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
+ #define USE_BEEPER 1
+ #endif
+#endif
+
#if ENABLED(LCD_USE_I2C_BUZZER)
#ifndef LCD_FEEDBACK_FREQUENCY_HZ
#define LCD_FEEDBACK_FREQUENCY_HZ 1000
@@ -2368,14 +2375,8 @@
#endif
#endif
-#if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
- #define HAS_BUZZER 1
- #if LCD_FEEDBACK_FREQUENCY_DURATION_MS && LCD_FEEDBACK_FREQUENCY_HZ
- #define HAS_CHIRP 1
- #endif
-#endif
-#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
- #define USE_BEEPER 1
+#if HAS_BUZZER && LCD_FEEDBACK_FREQUENCY_DURATION_MS && LCD_FEEDBACK_FREQUENCY_HZ
+ #define HAS_CHIRP 1
#endif
/**