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

pop
---

diff --git a/meta b/meta
index e790bac..02057b5 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 29a5226c1e9301a1080d603715b65d4390637416
-Head: 71f5d005126298c899d87701cbdd432c76dd4480
+Previous: 5deeb9a5c414da4c6fe18f6ac3038e7f89d6d558
+Head: 18d670fdea53726fb2223927fcbb49df7037aa7e
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -8,9 +8,9 @@ Applied:
   makefile-avr-size: 560fd88074327c52739beb389cd339c78f009adf
   motion-control-max-min: 33f9aa6d9952e7f643bb2f7eba39f7bd1a765f86
   m206-always-use-homing-homeing: 71f5d005126298c899d87701cbdd432c76dd4480
+  eeprom-provide-smaller-code-fo: e8dc1bb8684120aa0cd81ed49eb995d25ef674a7
+  m206-save-values-in-eeprom: ac0da6f0b1fce9846af9935fe249f928be814ee3
+  homeaxis-function: 18d670fdea53726fb2223927fcbb49df7037aa7e
 Unapplied:
-  eeprom-provide-smaller-code-fo: 7efd5690d57a016afbe296adc23a652966703635
-  m206-save-values-in-eeprom: 59c1673d4b5d6cf92e3cd9d164a88222fe658d69
-  homeaxis-function: 9d990cf5e09c2e8657adb772ce83707ec1cf75d8
 Hidden:
   enable-eeprom-settings: 5d9833e6ae33fa8ce0f0d8323954721e6c3af35b
diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo
index 3d434f3..54c637d 100644
--- a/patches/eeprom-provide-smaller-code-fo
+++ b/patches/eeprom-provide-smaller-code-fo
@@ -1,5 +1,5 @@
-Bottom: c2feea4afd56caea863e82cd486423f93f510614
-Top:    5fef2109692f8670c2a81bbe08b6d303f46832ff
+Bottom: ad98c0229e8c7036d7c4e6d12cdf7a7e26176d84
+Top:    1bd17dcdb2e343f4dbb916d3f957e80d5a871447
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-04 16:13:25 +0100
 
@@ -36,7 +36,7 @@ index b465d85..8e833d1 100644
  
  //things to write to serial from Programmemory. saves 400 to 2k of RAM.
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index be91124..9bcbf21 100644
+index 05e7d5a..ba8b3b8 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -203,6 +203,13 @@ bool Stopped=false;
diff --git a/patches/homeaxis-function b/patches/homeaxis-function
index effd4e5..30460bc 100644
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
-Bottom: 52539e835a54ac0f6858a1c830cc03875bec4769
-Top:    65e89c3d4bc0793f6319f43ce50abe85a5c9509c
+Bottom: 9a0ce0894a85394f8a809bbf367c27ad9ed0d2b4
+Top:    2a3d2a3be2b45419cfad09f37d1236ef022acbd3
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:30:34 +0100
 
@@ -15,7 +15,7 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 ---
 
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 9bcbf21..b159cb9 100644
+index ba8b3b8..c93825f 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -552,9 +552,15 @@ bool code_seen(char code)
@@ -37,8 +37,8 @@ index 9bcbf21..b159cb9 100644
  
  static void axis_is_at_home(int axis) {
    current_position[axis] = base_home_pos[axis] + add_homeing[axis];
-@@ -564,32 +570,41 @@ static void axis_is_at_home(int axis) {
-   else max_pos[axis] += add_homeing[axis];
+@@ -562,32 +568,41 @@ static void axis_is_at_home(int axis) {
+   max_pos[axis] = base_max_pos[axis] + add_homeing[axis];
  }
  
 -#define HOMEAXIS(LETTER) \
diff --git a/patches/m206-save-values-in-eeprom b/patches/m206-save-values-in-eeprom
index 91e9497..27c2570 100644
--- a/patches/m206-save-values-in-eeprom
+++ b/patches/m206-save-values-in-eeprom
@@ -1,5 +1,5 @@
-Bottom: 5fef2109692f8670c2a81bbe08b6d303f46832ff
-Top:    52539e835a54ac0f6858a1c830cc03875bec4769
+Bottom: 1bd17dcdb2e343f4dbb916d3f957e80d5a871447
+Top:    9a0ce0894a85394f8a809bbf367c27ad9ed0d2b4
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:18:08 +0100