浏览代码

use only one implementation for beeper feedback

Christian Bohn 10 年前
父节点
当前提交
4c3cbc0961
共有 3 个文件被更改,包括 22 次插入39 次删除
  1. 0
    12
      Marlin/dogm_lcd_implementation.h
  2. 22
    1
      Marlin/ultralcd.cpp
  3. 0
    26
      Marlin/ultralcd_implementation_hitachi_HD44780.h

+ 0
- 12
Marlin/dogm_lcd_implementation.h 查看文件

@@ -408,16 +408,4 @@ static void _drawmenu_sd(bool isSelected, uint8_t row, const char* pstr, const c
408 408
 #define lcd_implementation_drawmenu_gcode(sel, row, pstr, gcode) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
409 409
 #define lcd_implementation_drawmenu_function(sel, row, pstr, data) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
410 410
 
411
-static void lcd_implementation_quick_feedback() {
412
-  #if BEEPER > -1
413
-    SET_OUTPUT(BEEPER);
414
-    for(int8_t i=0; i<10; i++) {
415
-      WRITE(BEEPER,HIGH);
416
-      delay(3);
417
-      WRITE(BEEPER,LOW);
418
-      delay(3);
419
-    }
420
-  #endif
421
-}
422
-
423 411
 #endif //__DOGM_LCD_IMPLEMENTATION_H

+ 22
- 1
Marlin/ultralcd.cpp 查看文件

@@ -1137,7 +1137,28 @@ menu_edit_type(unsigned long, long5, ftostr5, 0.01)
1137 1137
 static void lcd_quick_feedback() {
1138 1138
   lcdDrawUpdate = 2;
1139 1139
   blocking_enc = millis() + 500;
1140
-  lcd_implementation_quick_feedback();
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
1141 1162
 }
1142 1163
 
1143 1164
 /** Menu action functions **/

+ 0
- 26
Marlin/ultralcd_implementation_hitachi_HD44780.h 查看文件

@@ -709,32 +709,6 @@ static void lcd_implementation_drawmenu_sddirectory(bool sel, uint8_t row, const
709 709
 #define lcd_implementation_drawmenu_gcode(sel, row, pstr, gcode) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
710 710
 #define lcd_implementation_drawmenu_function(sel, row, pstr, data) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
711 711
 
712
-static void lcd_implementation_quick_feedback()
713
-{
714
-  #ifdef LCD_USE_I2C_BUZZER
715
-    #if defined(LCD_FEEDBACK_FREQUENCY_DURATION_MS) && defined(LCD_FEEDBACK_FREQUENCY_HZ)
716
-      lcd_buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
717
-    #else
718
-      lcd_buzz(1000/6, 100);
719
-    #endif
720
-  #elif defined(BEEPER) && BEEPER > -1
721
-    SET_OUTPUT(BEEPER);
722
-    #if !defined(LCD_FEEDBACK_FREQUENCY_HZ) || !defined(LCD_FEEDBACK_FREQUENCY_DURATION_MS)
723
-      const unsigned int delay = 100;
724
-      uint8_t i = 10;
725
-    #else
726
-      const unsigned int delay = 1000000 / LCD_FEEDBACK_FREQUENCY_HZ / 2;
727
-      int8_t i = LCD_FEEDBACK_FREQUENCY_DURATION_MS * LCD_FEEDBACK_FREQUENCY_HZ / 1000;
728
-    #endif
729
-    while (i--) {
730
-      WRITE(BEEPER,HIGH);
731
-      delayMicroseconds(delay);
732
-      WRITE(BEEPER,LOW);
733
-      delayMicroseconds(delay);
734
-    }
735
-  #endif
736
-}
737
-
738 712
 #ifdef LCD_HAS_STATUS_INDICATORS
739 713
 static void lcd_implementation_update_indicators()
740 714
 {

正在加载...
取消
保存