From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 9 Aug 2012 18:15:32 +0000 (+0100)
Subject: refresh
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a24f60eb38b75c78cd39787ebf4a0a990a91b3e8;p=marlin.git

refresh
---

diff --git a/meta b/meta
index ffba799..ef5b2bb 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 380d13d4c22c5fd7d21f7005577e15fb9ef58f5c
-Head: 0ff40d5bc51e631e72be628f482b0e1592a09026
+Previous: 00a21fa35bf8e1da0fe743133f12a1bf6da8dd41
+Head: 5d9833e6ae33fa8ce0f0d8323954721e6c3af35b
 Applied:
-  enable-eeprom-settings: 069e11d31f9392485b0b19143b65f783a21449ea
-  refresh-temp: 0ff40d5bc51e631e72be628f482b0e1592a09026
+  enable-eeprom-settings: 5d9833e6ae33fa8ce0f0d8323954721e6c3af35b
 Unapplied:
   marlin-pde-include-comment-for: b359c0676f4aad490effaac6f95a01bf75798e32
   add-to-marlin-gitignore: 8e56383c4b4d91986f73ae7278a06595f2201f9e
diff --git a/patches/enable-eeprom-settings b/patches/enable-eeprom-settings
index cdb07b1..036ceef 100644
--- a/patches/enable-eeprom-settings
+++ b/patches/enable-eeprom-settings
@@ -1,5 +1,5 @@
 Bottom: c655a797e3b5192e7f839c7c53285901284a2b4b
-Top:    c655a797e3b5192e7f839c7c53285901284a2b4b
+Top:    f1ffc5304dbad10f158614da132103ce0a1370ea
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 17:57:15 +0100
 
@@ -8,4 +8,24 @@ ENABLE EEPROM SETTINGS AND SDSUPPORT NOT FOR UPSTREAM
 
 ---
 
-
+diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
+index 1248029..6552b07 100644
+--- a/Marlin/Configuration.h
++++ b/Marlin/Configuration.h
+@@ -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
+-//#define EEPROM_SETTINGS
++#define EEPROM_SETTINGS
+ //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 12aa398..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: c655a797e3b5192e7f839c7c53285901284a2b4b
-Top:    f1ffc5304dbad10f158614da132103ce0a1370ea
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-09 19:15:31 +0100
-
-Refresh of enable-eeprom-settings
-
----
-
-diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
-index 1248029..6552b07 100644
---- a/Marlin/Configuration.h
-+++ b/Marlin/Configuration.h
-@@ -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
--//#define EEPROM_SETTINGS
-+#define EEPROM_SETTINGS
- //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