Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1

Conflicts: Marlin/Marlin.pde Marlin/ultralcd.cpp Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-04-29 21:13:46 +10:00
parent 9322c408c6 4f96ad5621
commit 788d62bcc4
260 changed files with 225700 additions and 482 deletions
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -43,6 +43,11 @@
  #else
    #include <LiquidCrystal.h>
  #endif
+  #ifdef DOGLCD
+    #include <U8glib.h> // library for graphics LCD by Oli Kraus (https://code.google.com/p/u8glib/)
+  #else
+    #include <LiquidCrystal.h> // library for character LCD
+  #endif
 #endif

 #if DIGIPOTSS_PIN > -1