From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 8 Aug 2012 17:56:52 +0000 (+0100)
Subject: pop
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=717cb9361e5bfeb7b65fd2a82e79b9d0c5457547;p=marlin.git

pop
---

diff --git a/meta b/meta
index 198d36f..2c59f85 100644
--- a/meta
+++ b/meta
@@ -1,14 +1,14 @@
 Version: 1
-Previous: f88495a20bede155f4e6b9ccef2b4bee59f05cb2
-Head: 41901733783d11dd7fe80267e1c8effa1aa69800
+Previous: 34c5b6117657eee83385544d6731233062b56287
+Head: 48f1b27f67cb5a1b59e72d4ab9c5bfe05c88870d
 Applied:
   marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
   add-to-marlin-gitignore: 83dcad520f19d2ea6f1164b9c04e1430b679b3e2
   makefile-support-v-1: 3f7781d27a680fa4faeb5d7f38250e4877632ce3
   m206-always-use-homing-homeing: 41901733783d11dd7fe80267e1c8effa1aa69800
+  eeprom-provide-smaller-code-fo: 908bebda77f754b762a36f96bc7d938aca4935ba
+  m206-save-values-in-eeprom: bbde4ea454248ef02e59183cab6992c5d4331d8c
+  homeaxis-function: 48f1b27f67cb5a1b59e72d4ab9c5bfe05c88870d
 Unapplied:
-  eeprom-provide-smaller-code-fo: f581408bb7e043193e0a8f9a78e8ded4798edf2b
-  m206-save-values-in-eeprom: 00b6f3342f0b13a7393158546b6f175c013d7fe5
-  homeaxis-function: 53e34ab95eb991a87f1666b3e3602727dcdfc21c
 Hidden:
   enable-eeprom-settings: d8e404a6e1984efdaa7ede947fed09a0bcf9051c
diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo
index 7292b96..1355bd2 100644
--- a/patches/eeprom-provide-smaller-code-fo
+++ b/patches/eeprom-provide-smaller-code-fo
@@ -1,5 +1,5 @@
-Bottom: d0d5d048fda009daef93f44a721dcee568ca2308
-Top:    bd7c45b0676ae22ec36730816239c35e97599e9f
+Bottom: 8b41053f51ee51e0877345a8761e69d6bef34c39
+Top:    a1b9333f4fba2ff334edb9f004c26c404c06a7f6
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-04 16:13:25 +0100
 
@@ -36,7 +36,7 @@ index c8115af..a78d2ee 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 6158eec..1dec2b8 100644
+index 4abd98b..5af15f0 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -202,6 +202,13 @@ bool Stopped=false;
diff --git a/patches/homeaxis-function b/patches/homeaxis-function
index d63f36e..7ff39b4 100644
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
-Bottom: 65b65493818ae0e7effd88b9cd1b596276f15041
-Top:    9f97c472025a65792c7e4dbf067f02ef8f535ad4
+Bottom: d0b029a8140f01e21d7551a3244bc0dfc44861e3
+Top:    d4c7ea1a64c2179833d726dac6e9a76d170ff23b
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:30:34 +0100
 
@@ -15,10 +15,10 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 ---
 
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 1dec2b8..50abc18 100644
+index 5af15f0..d481aae 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
-@@ -551,40 +551,55 @@ bool code_seen(char code)
+@@ -551,8 +551,14 @@ bool code_seen(char code)
    return (strchr_pointer != NULL);  //Return True if a character was found
  }
  
@@ -35,7 +35,8 @@ index 1dec2b8..50abc18 100644
  
  static void axis_is_at_home(int axis) {
    current_position[axis] = base_home_pos[axis] + add_homeing[axis];
-   min_pos[axis] = base_min_pos[axis] + add_homeing[axis];
+@@ -560,32 +566,41 @@ static void axis_is_at_home(int axis) {
+   if (add_homeing[axis] < 0) min_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 b78ef3e..e5b75a9 100644
--- a/patches/m206-save-values-in-eeprom
+++ b/patches/m206-save-values-in-eeprom
@@ -1,5 +1,5 @@
-Bottom: bd7c45b0676ae22ec36730816239c35e97599e9f
-Top:    65b65493818ae0e7effd88b9cd1b596276f15041
+Bottom: a1b9333f4fba2ff334edb9f004c26c404c06a7f6
+Top:    d0b029a8140f01e21d7551a3244bc0dfc44861e3
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:18:08 +0100