Merge https://github.com/ErikZalm/Marlin into Marlin_v1

2014-12-04 21:09:03 +00:00
parent b81021f475 2f9ed1777d
commit 64139f5e5a
13 changed files with 465 additions and 85 deletions
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@ -49,6 +49,8 @@
  void lcd_buzz(long duration,uint16_t freq);
  bool lcd_clicked();

+  void lcd_ignore_click(bool b=true);
+
  #ifdef NEWPANEL
    #define EN_C (1<<BLEN_C)
    #define EN_B (1<<BLEN_B)