From eab5fad53983b1ca39fa3e29e2d67ec8db706794 Mon Sep 17 00:00:00 2001
From: Christian Bohn <christianbohn@posteo.de>
Date: Thu, 26 Mar 2015 09:00:34 +0100
Subject: [PATCH] code formatting
---
Marlin/Configuration.h | 4 ++--
Marlin/ultralcd.cpp | 48 +++++++++++++++++++++++-------------------
2 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index cffcf40c46..7ee90d1179 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -579,8 +579,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
//#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking
//#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
//#define ULTIPANEL //the UltiPanel as on Thingiverse
-#define LCD_FEEDBACK_FREQUENCY_HZ 1000 // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
-#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
+//#define LCD_FEEDBACK_FREQUENCY_HZ 1000 // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
+//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
// 0 to disable buzzer feedback
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 846a5ac096..0bc49dea5f 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -1137,28 +1137,32 @@ menu_edit_type(unsigned long, long5, ftostr5, 0.01)
static void lcd_quick_feedback() {
lcdDrawUpdate = 2;
blocking_enc = millis() + 500;
-
-#ifdef LCD_USE_I2C_BUZZER
-#if defined(LCD_FEEDBACK_FREQUENCY_DURATION_MS) && defined(LCD_FEEDBACK_FREQUENCY_HZ)
- lcd_buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
-#else
- lcd_buzz(1000/6, 100);
-#endif
-#elif defined(BEEPER) && BEEPER > -1
- SET_OUTPUT(BEEPER);
-#if !defined(LCD_FEEDBACK_FREQUENCY_HZ) || !defined(LCD_FEEDBACK_FREQUENCY_DURATION_MS)
-#define LCD_FEEDBACK_FREQUENCY_HZ 500
-#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 50
-#endif
- const unsigned int delay = 1000000 / LCD_FEEDBACK_FREQUENCY_HZ / 2;
- int8_t i = LCD_FEEDBACK_FREQUENCY_DURATION_MS * LCD_FEEDBACK_FREQUENCY_HZ / 1000;
- while (i--) {
- WRITE(BEEPER,HIGH);
- delayMicroseconds(delay);
- WRITE(BEEPER,LOW);
- delayMicroseconds(delay);
-}
-#endif
+
+ #ifdef LCD_USE_I2C_BUZZER
+ #ifndef LCD_FEEDBACK_FREQUENCY_HZ
+ #define LCD_FEEDBACK_FREQUENCY_HZ 100
+ #endif
+ #ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
+ #define LCD_FEEDBACK_FREQUENCY_DURATION_MS (1000/6)
+ #endif
+ lcd_buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
+ #elif defined(BEEPER) && BEEPER > -1
+ SET_OUTPUT(BEEPER);
+ #ifndef LCD_FEEDBACK_FREQUENCY_HZ
+ #define LCD_FEEDBACK_FREQUENCY_HZ 500
+ #endif
+ #ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
+ #define LCD_FEEDBACK_FREQUENCY_DURATION_MS 50
+ #endif
+ const unsigned int delay = 1000000 / LCD_FEEDBACK_FREQUENCY_HZ / 2;
+ int i = LCD_FEEDBACK_FREQUENCY_DURATION_MS * LCD_FEEDBACK_FREQUENCY_HZ / 1000;
+ while (i--) {
+ WRITE(BEEPER,HIGH);
+ delayMicroseconds(delay);
+ WRITE(BEEPER,LOW);
+ delayMicroseconds(delay);
+ }
+ #endif
}
/** Menu action functions **/