[ultimaker2-marlin-firmware] Less content of Marlin.pdo => avoid unnecessary includes and possible weird errors

[Miro Hrončok]

commit c3b5d869c5d70f16bb0863957ea6096ce442aba8
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Tue Jun 24 12:22:39 2014 +0200

    Less content of Marlin.pdo => avoid unnecessary includes and possible weird errors

 ultimaker2-marlin-firmware-marlin-pde.patch |   20 +++++++++++---------
 ultimaker2-marlin-firmware.spec             |    5 ++++-
 2 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/ultimaker2-marlin-firmware-marlin-pde.patch b/ultimaker2-marlin-firmware-marlin-pde.patch
index 0f0792c..f27bdc5 100644
--- a/ultimaker2-marlin-firmware-marlin-pde.patch
+++ b/ultimaker2-marlin-firmware-marlin-pde.patch
@@ -1,23 +1,25 @@
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 2d6211c..8d01dc4 100644
+index 2d6211c..6f8e4b2 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
-@@ -34,16 +34,10 @@
+@@ -33,20 +33,6 @@
+ #include "Configuration.h"
  #include "pins.h"
  
- #ifdef ULTRA_LCD
+-#ifdef ULTRA_LCD
 -  #if defined(LCD_I2C_TYPE_PCF8575)
-+  #if defined(LCD_I2C_TYPE_PCF8575) || defined(LCD_I2C_TYPE_MCP23017) || defined(LCD_I2C_TYPE_MCP23008)
-     #include <Wire.h>
+-    #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
+-  #else
 -    #include <LiquidCrystal.h> // library for character LCD
-+    #include <LiquidCrystal.h>
-   #endif
+-  #endif
+-#endif
+-
+ #if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1
+ #include <SPI.h>
  #endif
- 
diff --git a/ultimaker2-marlin-firmware.spec b/ultimaker2-marlin-firmware.spec
index dfd0170..ace308a 100644
--- a/ultimaker2-marlin-firmware.spec
+++ b/ultimaker2-marlin-firmware.spec
@@ -2,7 +2,7 @@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 Name:           ultimaker2-marlin-firmware
 Version:        14.06.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Ultimaker2 firmware for the 3D printer
 #this uses the arduino cross-compiler, so the output is arch-independent
 BuildArch:      noarch
@@ -46,6 +46,9 @@ install -Dpm0644 .build/%{platform}/firmware.hex %{buildroot}%{_datadir}/%{name}
 %doc src/COPYING README.md LCDMenuTree.pdf
 
 %changelog
+* Tue Jun 24 2014 Miro Hrončok <mhroncok at redhat.com> - 14.06.1-2
+- Less content of Marlin.pdo => avoid unnecessary includes and possible weird errors
+
 * Tue Jun 24 2014 Miro Hrončok <mhroncok at redhat.com> - 14.06.1-1
 - New version 14.06.1