From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 10 Aug 2012 16:41:14 +0000 (+0100)
Subject: pop
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b8f5f825a2ddd55e17183bf2766da49bc7c5182c;p=marlin.git

pop
---

diff --git a/meta b/meta
index e3b4ffb..ed6e329 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: c072e81f210a50a592e672ff3f8ffefb589e23c9
-Head: a18cc767374a4f34713ab94fc092449a1422a821
+Previous: 58cae614ef4c89fc316768e3e08372c633c513ab
+Head: 424b238970e0f8063a5020f1e5bb0ac974ad2ddb
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -10,7 +10,7 @@ Applied:
   m206-always-use-homing-homeing: 31068042f1ce0c442be19a8055046f62716403b2
   enable-eeprom-settings: 4562a2810820a07bd84b55496164b5f4f4858eaa
   eeprom-provide-smaller-code-fo: a18cc767374a4f34713ab94fc092449a1422a821
+  homeaxis-function: 424b238970e0f8063a5020f1e5bb0ac974ad2ddb
 Unapplied:
-  homeaxis-function: 95a1ce0f13945575656e4fbc0c81f0b03c41ac1a
   m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493
 Hidden:
diff --git a/patches/homeaxis-function b/patches/homeaxis-function
index db884d5..f5a18ac 100644
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
-Bottom: d71f3b37e4db1c3205d924c9ac6d7db9c438baa6
-Top:    5fa5beaa03b93876dd6ab612fe616ff24197e851
+Bottom: da29116f21970312595da6db4896c228dace90f1
+Top:    b6e4ac7744424e9e1ab8e763c88709291fcbf3b1
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:30:34 +0100
 
@@ -15,15 +15,18 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 ---
 
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 54441ea..32c6ec8 100644
+index 0355f93..bb6c5ae 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
-@@ -561,10 +561,14 @@ bool code_seen(char code)
- static const PROGMEM type array##_P[3] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG };
+@@ -557,6 +557,7 @@ bool code_seen(char code)
+ 	{ return pgm_read_##reader##_near(p); }
  
  DEFINE_PGM_READ_ANY(float,       float);
 +DEFINE_PGM_READ_ANY(signed char, byte);
  
+ #define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG)	\
+ static const PROGMEM type array##_P[3] =		\
+@@ -567,6 +568,9 @@ static inline type array(int axis)			\
  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);
@@ -32,9 +35,9 @@ index 54441ea..32c6ec8 100644
 +XYZ_CONSTS_FROM_CONFIG(signed char, home_dir,  HOME_DIR);
  
  static void axis_is_at_home(int axis) {
-   current_position[axis] = XYZ_CONFIG(base_home_pos, axis) + add_homeing[axis];
-@@ -572,32 +576,41 @@ static void axis_is_at_home(int axis) {
-   max_pos[axis] =          XYZ_CONFIG(base_max_pos, axis) + add_homeing[axis];
+   current_position[axis] = base_home_pos(axis) + add_homeing[axis];
+@@ -574,32 +578,41 @@ static void axis_is_at_home(int axis) {
+   max_pos[axis] =          base_max_pos(axis) + add_homeing[axis];
  }
  
 -#define HOMEAXIS(LETTER) \