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

refresh
---

diff --git a/meta b/meta
index 38330f5..2bea164 100644
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 818fa35c8c95902b0187240de7478a2684e2885f
-Head: ee32245bb3999b3b33cf8ddf271d16fb3f1c5430
+Previous: ddeb95626dd85ac2e809416f97ea9a1f74df59c0
+Head: bb3eec4aa60cbfc88238166d067cc513f3dd7ad4
 Applied:
   makefile-support-v-1: 59de9f09a248a5af04203378018ff95f86ff092d
   m206-always-use-homing-homeing: 704568f265fbb370658a153f8240239dd776f5cc
   eeprom-provide-smaller-code-fo: 3f690257c022b5c6945f7d2f070c89ee1c8275c8
   marlin-pde-include-comment-for: 78a2b7d92b8ee452c22db01b3236ad16047533c2
-  enable-eeprom-settings: e71322f7939e7b728ae98e4f7546ef47298ec3b6
-  refresh-temp: ee32245bb3999b3b33cf8ddf271d16fb3f1c5430
+  enable-eeprom-settings: bb3eec4aa60cbfc88238166d067cc513f3dd7ad4
 Unapplied:
   m206-save-values-in-eeprom: a7ff3675bdb6149f684e0e3a15c1a594ea2db815
 Hidden:
diff --git a/patches/enable-eeprom-settings b/patches/enable-eeprom-settings
index f8557ea..a640a65 100644
--- a/patches/enable-eeprom-settings
+++ b/patches/enable-eeprom-settings
@@ -1,5 +1,5 @@
 Bottom: 2ef6975e6b8b4864d232a7e9c1fadb3d2a6bb3b3
-Top:    2ef6975e6b8b4864d232a7e9c1fadb3d2a6bb3b3
+Top:    e801707aef83979bce33278501a19bbc200940b9
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 17:57:15 +0100
 
@@ -8,4 +8,16 @@ ENABLE EEPROM SETTINGS NOT FOR UPSTREAM
 
 ---
 
-
+diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
+index 1248029..6c3bdb2 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
+ // 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
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 24bb4b4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 2ef6975e6b8b4864d232a7e9c1fadb3d2a6bb3b3
-Top:    e801707aef83979bce33278501a19bbc200940b9
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-08 17:57:56 +0100
-
-Refresh of enable-eeprom-settings
-
----
-
-diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
-index 1248029..6c3bdb2 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
- // 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