From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 8 Aug 2012 17:14:06 +0000 (+0100)
Subject: refresh
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3b2cb451a3aebc862cb72e96f2848780f4faf836;p=marlin.git

refresh
---

diff --git a/meta b/meta
index 951a6aa..d185e15 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: c60be95da3d2f251ede83cfd865c8358c10badc7
-Head: edae6510a61235f8d98f9725b593aec4c8778d59
+Previous: 59a4b65ae1c76b708419c2dcd655222facc08dd9
+Head: d8e404a6e1984efdaa7ede947fed09a0bcf9051c
 Applied:
-  enable-eeprom-settings: 69566454491f7b7df675ad052f508f8e638e723d
-  refresh-temp: edae6510a61235f8d98f9725b593aec4c8778d59
+  enable-eeprom-settings: d8e404a6e1984efdaa7ede947fed09a0bcf9051c
 Unapplied:
   marlin-pde-include-comment-for: 096a27b572271c36dd71ee76cd7783e4c51dd5d5
   makefile-support-v-1: 4b98b847ffa96793fd76bf092b3c567fa77befe3
diff --git a/patches/enable-eeprom-settings b/patches/enable-eeprom-settings
index c378a8f..036ceef 100644
--- a/patches/enable-eeprom-settings
+++ b/patches/enable-eeprom-settings
@@ -1,18 +1,18 @@
 Bottom: c655a797e3b5192e7f839c7c53285901284a2b4b
-Top:    72bb8f0614b029798a6c8b8db38d8d7ccd5bbcf7
+Top:    f1ffc5304dbad10f158614da132103ce0a1370ea
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 17:57:15 +0100
 
-ENABLE EEPROM SETTINGS NOT FOR UPSTREAM
+ENABLE EEPROM SETTINGS AND SDSUPPORT NOT FOR UPSTREAM
 
 
 ---
 
 diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
-index 1248029..6c3bdb2 100644
+index 1248029..6552b07 100644
 --- a/Marlin/Configuration.h
 +++ b/Marlin/Configuration.h
-@@ -232,7 +232,7 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
+@@ -232,14 +232,14 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
  // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).  
  // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
  //define this to enable eeprom support
@@ -21,3 +21,11 @@ index 1248029..6c3bdb2 100644
  //to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
  // please keep turned on if you can.
  //#define EEPROM_CHITCHAT
+ 
+ //LCD and SD support
+ //#define ULTRA_LCD  //general lcd support, also 16x2
+-//#define SDSUPPORT // Enable SD Card Support in Hardware Console
++#define SDSUPPORT // Enable SD Card Support in Hardware Console
+ 
+ //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
+ //#define ULTIPANEL  //the ultipanel as on thingiverse
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 5d1de05..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 72bb8f0614b029798a6c8b8db38d8d7ccd5bbcf7
-Top:    f1ffc5304dbad10f158614da132103ce0a1370ea
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-08 18:13:56 +0100
-
-Refresh of enable-eeprom-settings
-
----
-
-diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
-index 6c3bdb2..6552b07 100644
---- a/Marlin/Configuration.h
-+++ b/Marlin/Configuration.h
-@@ -239,7 +239,7 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
- 
- //LCD and SD support
- //#define ULTRA_LCD  //general lcd support, also 16x2
--//#define SDSUPPORT // Enable SD Card Support in Hardware Console
-+#define SDSUPPORT // Enable SD Card Support in Hardware Console
- 
- //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
- //#define ULTIPANEL  //the ultipanel as on thingiverse