Apply three more commits

2015-04-12 18:07:08 -07:00
parent e7aae314de
commit ccddc280be
14 changed files with 337 additions and 371 deletions
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@ -49,10 +49,11 @@
  extern bool cancel_heatup;
  
  #ifdef FILAMENT_LCD_DISPLAY
-    extern unsigned long message_millis;
+    extern millis_t previous_lcd_status_ms;
  #endif

  void lcd_buzz(long duration,uint16_t freq);
+  void lcd_quick_feedback(); // Audible feedback for a button click - could also be visual
  bool lcd_clicked();

  void lcd_ignore_click(bool b=true);