Browse Source

code formatting

Christian Bohn 10 years ago
parent
commit
eab5fad539
2 changed files with 28 additions and 24 deletions
  1. 2
    2
      Marlin/Configuration.h
  2. 26
    22
      Marlin/ultralcd.cpp

+ 2
- 2
Marlin/Configuration.h View File

579
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking
579
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking
580
 //#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
580
 //#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
581
 //#define ULTIPANEL  //the UltiPanel as on Thingiverse
581
 //#define ULTIPANEL  //the UltiPanel as on Thingiverse
582
-#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
583
-#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
582
+//#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
583
+//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
584
                                                // 0 to disable buzzer feedback  
584
                                                // 0 to disable buzzer feedback  
585
 
585
 
586
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
586
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)

+ 26
- 22
Marlin/ultralcd.cpp View File

1137
 static void lcd_quick_feedback() {
1137
 static void lcd_quick_feedback() {
1138
   lcdDrawUpdate = 2;
1138
   lcdDrawUpdate = 2;
1139
   blocking_enc = millis() + 500;
1139
   blocking_enc = millis() + 500;
1140
-  
1141
-#ifdef LCD_USE_I2C_BUZZER
1142
-#if defined(LCD_FEEDBACK_FREQUENCY_DURATION_MS) && defined(LCD_FEEDBACK_FREQUENCY_HZ)
1143
-	lcd_buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
1144
-#else
1145
-	lcd_buzz(1000/6, 100);
1146
-#endif
1147
-#elif defined(BEEPER) && BEEPER > -1
1148
-	SET_OUTPUT(BEEPER);
1149
-#if !defined(LCD_FEEDBACK_FREQUENCY_HZ) || !defined(LCD_FEEDBACK_FREQUENCY_DURATION_MS)
1150
-#define LCD_FEEDBACK_FREQUENCY_HZ 500	
1151
-#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 50
1152
-#endif
1153
-	const unsigned int delay = 1000000 / LCD_FEEDBACK_FREQUENCY_HZ / 2;
1154
-	int8_t i = LCD_FEEDBACK_FREQUENCY_DURATION_MS * LCD_FEEDBACK_FREQUENCY_HZ / 1000;
1155
-	while (i--) {
1156
-	WRITE(BEEPER,HIGH);
1157
-	delayMicroseconds(delay);
1158
-	WRITE(BEEPER,LOW);
1159
-	delayMicroseconds(delay);
1160
-}
1161
-#endif
1140
+    
1141
+  #ifdef LCD_USE_I2C_BUZZER
1142
+    #ifndef LCD_FEEDBACK_FREQUENCY_HZ
1143
+      #define LCD_FEEDBACK_FREQUENCY_HZ 100
1144
+    #endif
1145
+    #ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
1146
+      #define LCD_FEEDBACK_FREQUENCY_DURATION_MS (1000/6)
1147
+    #endif    
1148
+    lcd_buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
1149
+  #elif defined(BEEPER) && BEEPER > -1
1150
+    SET_OUTPUT(BEEPER);
1151
+    #ifndef LCD_FEEDBACK_FREQUENCY_HZ
1152
+      #define LCD_FEEDBACK_FREQUENCY_HZ 500
1153
+    #endif
1154
+    #ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
1155
+      #define LCD_FEEDBACK_FREQUENCY_DURATION_MS 50
1156
+    #endif
1157
+    const unsigned int delay = 1000000 / LCD_FEEDBACK_FREQUENCY_HZ / 2;
1158
+    int i = LCD_FEEDBACK_FREQUENCY_DURATION_MS * LCD_FEEDBACK_FREQUENCY_HZ / 1000;
1159
+    while (i--) {
1160
+      WRITE(BEEPER,HIGH);
1161
+      delayMicroseconds(delay);
1162
+      WRITE(BEEPER,LOW);
1163
+      delayMicroseconds(delay);
1164
+     }
1165
+  #endif
1162
 }
1166
 }
1163
 
1167
 
1164
 /** Menu action functions **/
1168
 /** Menu action functions **/

Loading…
Cancel
Save