bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Apply all changes from latest Marlin_V1

Browse Source 
Diffed and merged, preserving my updates
This commit is contained in:
Scott Lahteine
2013-06-06 15:49:25 -07:00
parent a5cd582665
commit 5dabc95409
22 changed files with 3221 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin.pde
View File

@ -34,13 +34,19 @@
#include "pins.h"
#ifdef ULTRA_LCD
#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
#if defined(LCD_I2C_TYPE_PCF8575)
#include <Wire.h>
#include <LiquidCrystal_I2C.h>
#elif defined(LCD_I2C_TYPE_MCP23017) || defined(LCD_I2C_TYPE_MCP23008)
#include <Wire.h>
#include <LiquidTWI2.h>
#elif defined(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
#if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1
#include <SPI.h>
#endif