Browse Source

Allow disable of LCD click

Scott Lahteine 4 years ago
parent
commit
3bf0d8d161
3 changed files with 15 additions and 15 deletions
  1. 3
    0
      Marlin/src/inc/Conditionals_post.h
  2. 6
    9
      Marlin/src/lcd/ultralcd.cpp
  3. 6
    6
      Marlin/src/lcd/ultralcd.h

+ 3
- 0
Marlin/src/inc/Conditionals_post.h View File

1882
 #endif
1882
 #endif
1883
 #if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
1883
 #if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
1884
   #define HAS_BUZZER 1
1884
   #define HAS_BUZZER 1
1885
+  #if LCD_FEEDBACK_FREQUENCY_DURATION_MS && LCD_FEEDBACK_FREQUENCY_HZ
1886
+    #define HAS_CHIRP 1
1887
+  #endif
1885
 #endif
1888
 #endif
1886
 #if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
1889
 #if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
1887
   #define USE_BEEPER 1
1890
   #define USE_BEEPER 1

+ 6
- 9
Marlin/src/lcd/ultralcd.cpp View File

612
     UNUSED(clear_buttons);
612
     UNUSED(clear_buttons);
613
   #endif
613
   #endif
614
 
614
 
615
-  #if HAS_BUZZER
616
-    // Buzz and wait. Is the delay needed for buttons to settle?
617
-    buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
618
-    #if HAS_LCD_MENU
619
-      #if USE_BEEPER
620
-        for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
621
-      #else
622
-        delay(10);
623
-      #endif
615
+  #if HAS_CHIRP
616
+    chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
617
+    #if BOTH(HAS_LCD_MENU, USE_BEEPER)
618
+      for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
619
+    #elif HAS_LCD_MENU
620
+      delay(10);
624
     #endif
621
     #endif
625
   #endif
622
   #endif
626
 }
623
 }

+ 6
- 6
Marlin/src/lcd/ultralcd.h View File

398
         static millis_t next_filament_display;
398
         static millis_t next_filament_display;
399
       #endif
399
       #endif
400
 
400
 
401
+      FORCE_INLINE static void chirp() {
402
+        #if HAS_CHIRP
403
+          buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
404
+        #endif
405
+      }
406
+
401
       static void quick_feedback(const bool clear_buttons=true);
407
       static void quick_feedback(const bool clear_buttons=true);
402
       #if HAS_BUZZER
408
       #if HAS_BUZZER
403
         static void completion_feedback(const bool good=true);
409
         static void completion_feedback(const bool good=true);
524
       static void reselect_last_file();
530
       static void reselect_last_file();
525
     #endif
531
     #endif
526
 
532
 
527
-    #if ENABLED(G26_MESH_VALIDATION)
528
-      FORCE_INLINE static void chirp() {
529
-        TERN_(HAS_BUZZER, buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ));
530
-      }
531
-    #endif
532
-
533
     #if ENABLED(AUTO_BED_LEVELING_UBL)
533
     #if ENABLED(AUTO_BED_LEVELING_UBL)
534
       static void ubl_plot(const uint8_t x_plot, const uint8_t y_plot);
534
       static void ubl_plot(const uint8_t x_plot, const uint8_t y_plot);
535
     #endif
535
     #endif

Loading…
Cancel
Save