pop

diff --git a/meta b/meta
index 1a399a4d60473ce20d3769abd667394156d0deb3..845d846bee323080dceca834f7b4186b20ea9a35 100644 (file)
--- a/meta
+++ b/meta
@@ -1,17 +1,17 @@
 Version: 1
-Previous: 2f42925e5aa4a66ec1a7ce61671716d3cdbdc70a
-Head: d8e404a6e1984efdaa7ede947fed09a0bcf9051c
+Previous: 98bbc58d9298bd4de7779809c7479952cfa091a2
+Head: a81f189d50f98d7009e1441433cdada098dd90f2
 Applied:
-  enable-eeprom-settings: d8e404a6e1984efdaa7ede947fed09a0bcf9051c
+  enable-eeprom-settings: a81f189d50f98d7009e1441433cdada098dd90f2
+  marlin-pde-include-comment-for: b359c0676f4aad490effaac6f95a01bf75798e32
+  add-to-marlin-gitignore: 8e56383c4b4d91986f73ae7278a06595f2201f9e
+  makefile-support-v-1: 3afb003abe4aed7ed33159751fc0423ad4f5e1da
+  makefile-avr-size: 88b92d70a176ebddd9cdcb07f30767fbd29eb967
+  motion-control-max-min: b85bf1bde850a0c72728219cf2c4ef32ccc137c4
+  m206-always-use-homing-homeing: 9f74e16cd52c7e6c36dfc6bfceebeb78cd91eaa7
+  eeprom-provide-smaller-code-fo: 8604528d8e167013ac72cd2cb6d8880ad8d80db2
+  m206-save-values-in-eeprom: 9664e099a404f0c5797299e72c55fb5b97dbc066
+  homeaxis-function: 2bb979c95c3b6cef4b98899f231d19527e725dda
+  enable-eeprom-settings: a81f189d50f98d7009e1441433cdada098dd90f2
 Unapplied:
-  marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
-  add-to-marlin-gitignore: 6a0fad50983c4fb5b60173ae96a6eb96ae9d4976
-  makefile-support-v-1: 90c247c0f2f80ca736bb1d43ff738460f0d1a824
-  makefile-avr-size: e7ca49239c134da3660d80b1005a9564672d6c6b
-  motion-control-max-min: 91d59adf663163ca1d6a8795fc22cfc5c9902dfe
-  m206-always-use-homing-homeing: b5a83e7c60fcd37ea70396d521924b6c62555feb
-  eeprom-provide-smaller-code-fo: 734e4f2645cecfee83e7ac0cb12ffe2a393f5f91
-  m206-save-values-in-eeprom: edd3bb378915a4d3e17e3425db249807c73cc223
-  homeaxis-function: 54328adc5660f884168c99eb86bffe0d4f2192c0
-  enable-eeprom-settings: d8e404a6e1984efdaa7ede947fed09a0bcf9051c
 Hidden:

diff --git a/patches/add-to-marlin-gitignore b/patches/add-to-marlin-gitignore
index b4a5f9eed8b8b745fa858b37a91a6767949815ef..a6b87404d286135b32d7a67b1fa418037da6f74e 100644 (file)
--- a/patches/add-to-marlin-gitignore
+++ b/patches/add-to-marlin-gitignore
@@ -1,5 +1,5 @@
-Bottom: ea0dec1cbcd304d9d1750032f70194ceeb751dd6
-Top:    b7add21b1bd3c563a45013d967bebaa01b5078e9
+Bottom: d880bdbb38fe403e9c5c14329f8c597f7aa61915
+Top:    14bc9d1eb448d5d15914da3b747d6bfeb25d4d02
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:32:51 +0100
 

diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo
index 3d434f34f2b7972ce0cdecd8e1f9df9a0cec0e12..349f1aaf6564656066b1a42fa531e52ea203fb36 100644 (file)
--- a/patches/eeprom-provide-smaller-code-fo
+++ b/patches/eeprom-provide-smaller-code-fo
@@ -1,5 +1,5 @@
-Bottom: c2feea4afd56caea863e82cd486423f93f510614
-Top:    5fef2109692f8670c2a81bbe08b6d303f46832ff
+Bottom: 7e084583c87b600a15270498fb6f4ea1a0905ea2
+Top:    b6d9726ae79f8ecc62717c6fa4de84312ec70f15
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-04 16:13:25 +0100
 

diff --git a/patches/enable-eeprom-settings b/patches/enable-eeprom-settings
index 036ceef89081dc8357db2458cb82fdc59fc792c2..0c91b278bcda42e3a85806ae36935268d72d122e 100644 (file)
--- a/patches/enable-eeprom-settings
+++ b/patches/enable-eeprom-settings
@@ -1,5 +1,5 @@
-Bottom: c655a797e3b5192e7f839c7c53285901284a2b4b
-Top:    f1ffc5304dbad10f158614da132103ce0a1370ea
+Bottom: 0decc7c1e59075f6cb5577574384824fb2616c3d
+Top:    0decc7c1e59075f6cb5577574384824fb2616c3d
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 17:57:15 +0100
 
@@ -8,24 +8,4 @@ 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/homeaxis-function b/patches/homeaxis-function
index 8224317b196681fe8e1b51d9f3fb117a1c642fc0..a68f361ef719121937cd9672dd049184b75699ac 100644 (file)
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
-Bottom: 52539e835a54ac0f6858a1c830cc03875bec4769
-Top:    65e89c3d4bc0793f6319f43ce50abe85a5c9509c
+Bottom: d3b079400a0c64d8d0c9442045e7b7b9945aa2e5
+Top:    0decc7c1e59075f6cb5577574384824fb2616c3d
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:30:34 +0100
 

diff --git a/patches/m206-always-use-homing-homeing b/patches/m206-always-use-homing-homeing
index 52d971ae4572301e175c8fa2184d2abe845cb56a..56a35b20fa3e70d11d65cded3b43a3d5fc0acbc8 100644 (file)
--- a/patches/m206-always-use-homing-homeing
+++ b/patches/m206-always-use-homing-homeing
@@ -1,5 +1,5 @@
-Bottom: ff33f6a6b492d6f370c84bddac52ac277dbd0fd9
-Top:    c2feea4afd56caea863e82cd486423f93f510614
+Bottom: f1a87ebeaf9dd1bf7fbcb3dc2b08e14e6b6b099b
+Top:    7e084583c87b600a15270498fb6f4ea1a0905ea2
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:12:14 +0100
 

diff --git a/patches/m206-save-values-in-eeprom b/patches/m206-save-values-in-eeprom
index 91e949735a4dbcfed83cb8784cc3e3828e2004fd..cf070cbde5b2deaf030d08ebac615d8cee3d66b6 100644 (file)
--- a/patches/m206-save-values-in-eeprom
+++ b/patches/m206-save-values-in-eeprom
@@ -1,5 +1,5 @@
-Bottom: 5fef2109692f8670c2a81bbe08b6d303f46832ff
-Top:    52539e835a54ac0f6858a1c830cc03875bec4769
+Bottom: b6d9726ae79f8ecc62717c6fa4de84312ec70f15
+Top:    d3b079400a0c64d8d0c9442045e7b7b9945aa2e5
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:18:08 +0100
 

diff --git a/patches/makefile-avr-size b/patches/makefile-avr-size
index 69d52c14f719ac718bd834da4a5f1561a0b7980d..2c8c416fe16fa77bee23abf7d6938757e6680f55 100644 (file)
--- a/patches/makefile-avr-size
+++ b/patches/makefile-avr-size
@@ -1,5 +1,5 @@
-Bottom: fe29c935d597df4792c2f9c33288912120351048
-Top:    4fa736aa57e0b7f1687af78e8c0f83fa18dc2549
+Bottom: 0f4749fc55a84a1d7a6a8ba5539b96ad503c0480
+Top:    b1472b618e2c4c50d401c9455d84795ed4493277
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-09 19:03:12 +0100
 

diff --git a/patches/makefile-support-v-1 b/patches/makefile-support-v-1
index b8352a7ba92a54e9c6730fcfea8bd7294fdc585d..29dbe6e88154840e3f3882f15c9be3c3c62d90ea 100644 (file)
--- a/patches/makefile-support-v-1
+++ b/patches/makefile-support-v-1
@@ -1,5 +1,5 @@
-Bottom: b7add21b1bd3c563a45013d967bebaa01b5078e9
-Top:    fe29c935d597df4792c2f9c33288912120351048
+Bottom: 14bc9d1eb448d5d15914da3b747d6bfeb25d4d02
+Top:    0f4749fc55a84a1d7a6a8ba5539b96ad503c0480
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:31:38 +0100
 

diff --git a/patches/marlin-pde-include-comment-for b/patches/marlin-pde-include-comment-for
index 73739996ceefe04d8241f458fc2f6042c99911f2..9520ab3dfdf6e21db7c49a0d7f3194696a42eb06 100644 (file)
--- a/patches/marlin-pde-include-comment-for
+++ b/patches/marlin-pde-include-comment-for
@@ -1,5 +1,5 @@
-Bottom: c655a797e3b5192e7f839c7c53285901284a2b4b
-Top:    ea0dec1cbcd304d9d1750032f70194ceeb751dd6
+Bottom: f1ffc5304dbad10f158614da132103ce0a1370ea
+Top:    d880bdbb38fe403e9c5c14329f8c597f7aa61915
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 17:56:39 +0100
 

diff --git a/patches/motion-control-max-min b/patches/motion-control-max-min
index 3a8aeb6eff5aa15cbf167a1c33ae88adcadc1489..3a2be74e98c7b623adf14f0eabebe898ebe13d00 100644 (file)
--- a/patches/motion-control-max-min
+++ b/patches/motion-control-max-min
@@ -1,5 +1,5 @@
-Bottom: 4fa736aa57e0b7f1687af78e8c0f83fa18dc2549
-Top:    ff33f6a6b492d6f370c84bddac52ac277dbd0fd9
+Bottom: b1472b618e2c4c50d401c9455d84795ed4493277
+Top:    f1a87ebeaf9dd1bf7fbcb3dc2b08e14e6b6b099b
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-09 18:15:32 +0100