pop

diff --git a/meta b/meta
index 9a1e87aeb1f115098886eb39c9715709708bc1e6..81942306fec9c2bedc4db68c4f8d3e93196403fa 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 5f3196769f30fabadbd546e40fd52815a79520a4
-Head: dcb84ce5f56d58178c15475b0611e12bfa121805
+Previous: 303061bd4aad189938b3a756a3eba98efaec7f4d
+Head: e5e85eec1259f4132edf1a7a7fed165b08787167
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -10,7 +10,7 @@ Applied:
   m206-always-use-homing-homeing: ef16d2c9bd8d55b96310ef873aad725f7974f968
   enable-eeprom-settings: 8daa65176ac195afeaad4a06c00a97dfff5951fe
   eeprom-provide-smaller-code-fo: dcb84ce5f56d58178c15475b0611e12bfa121805
+  homeaxis-function: e5e85eec1259f4132edf1a7a7fed165b08787167
 Unapplied:
-  homeaxis-function: 566437da4b8a0825c7d7b4152fc5245725e67860
   m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493
 Hidden:

diff --git a/patches/homeaxis-function b/patches/homeaxis-function
index 5edd4e679381368639c97545391137dfd2126f2b..13eb4b564b4af2b9f55333f47db59442d97f810c 100644 (file)
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
-Bottom: 36e31553d776fe0068394d49b207ca63596f8dbb
-Top:    f0a5e1cb6d70e55257bd772f9de3281e051bfae9
+Bottom: d71f3b37e4db1c3205d924c9ac6d7db9c438baa6
+Top:    5b63d3f0e8ea3e9716f33f1f484e948ed713723f
 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 a854714..38ad8f6 100644
+index 54441ea..63501a8 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
-@@ -559,6 +559,9 @@ static const PROGMEM type array##_P[3] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG };
+@@ -565,6 +565,9 @@ DEFINE_PGM_READ_ANY(float,       float);
  XYZ_CONSTS_FROM_CONFIG(float, base_min_pos,    MIN_POS);
  XYZ_CONSTS_FROM_CONFIG(float, base_max_pos,    MAX_POS);
  XYZ_CONSTS_FROM_CONFIG(float, base_home_pos,   HOME_POS);
@@ -27,9 +27,9 @@ index a854714..38ad8f6 100644
 +XYZ_CONSTS_FROM_CONFIG(signed char, home_dir,  HOME_DIR);
  
  static void axis_is_at_home(int axis) {
-   current_position[axis] = XYZ_CONFIG(float, base_home_pos,axis) + add_homeing[axis];
-@@ -566,32 +569,41 @@ static void axis_is_at_home(int axis) {
-   max_pos[axis] = XYZ_CONFIG(float, base_max_pos, axis) + add_homeing[axis];
+   current_position[axis] = XYZ_CONFIG(base_home_pos, axis) + add_homeing[axis];
+@@ -572,32 +575,41 @@ static void axis_is_at_home(int axis) {
+   max_pos[axis] =          XYZ_CONFIG(base_max_pos, axis) + add_homeing[axis];
  }
  
 -#define HOMEAXIS(LETTER) \