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

refresh (create temporary patch)
---

diff --git a/meta b/meta
index d340a43..1e74d46 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 0aeb7a581b62a60f7a89bc9aafe67969450d4c4a
-Head: 3f9a5d25a80a146ed3fd8e8c0e5ff7e686d9e5c9
+Previous: 73bedfe2105db70ca92757709a308941f09e3f10
+Head: 59f3789d35ffe70460f1f9ad974dc15b119f90b6
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -8,6 +8,7 @@ Applied:
   makefile-avr-size: b1f12330781628c6463068489f7f052bf791bf0e
   motion-control-max-min: fef5e25d43e7d8429283b9e34205172aaa3a6a2f
   m206-always-use-homing-homeing: 3f9a5d25a80a146ed3fd8e8c0e5ff7e686d9e5c9
+  refresh-temp: 59f3789d35ffe70460f1f9ad974dc15b119f90b6
 Unapplied:
   eeprom-provide-smaller-code-fo: e8dc1bb8684120aa0cd81ed49eb995d25ef674a7
   homeaxis-function: 656f93b5d2604b6c81d80dea3f7f9a5d23d0dd5a
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..3839af2
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,38 @@
+Bottom: ad98c0229e8c7036d7c4e6d12cdf7a7e26176d84
+Top:    d755416e1e02ccf9a60164760460cedc7a2fa44a
+Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Date:   2012-08-10 17:07:00 +0100
+
+Refresh of m206-always-use-homing-homeing
+
+---
+
+diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
+index 05e7d5a..5b00f9c 100644
+--- a/Marlin/Marlin.pde
++++ b/Marlin/Marlin.pde
+@@ -545,14 +545,18 @@ bool code_seen(char code)
+   return (strchr_pointer != NULL);  //Return True if a character was found
+ }
+ 
+-static const PROGMEM float base_min_pos[3] = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS };
+-static const PROGMEM float base_max_pos[3] = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS };
+-static const PROGMEM float base_home_pos[3] = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS };
++#define XYZ_CONFIG(type,array,axis) (pgm_read_##type##_near(&array##_P[(axis)]))
++#define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \
++static const PROGMEM type array##_P[3] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG };
++
++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);
+ 
+ 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];
+-  max_pos[axis] = base_max_pos[axis] + add_homeing[axis];
++  current_position[axis] = XYZ_CONFIG(float, base_home_pos,axis) + add_homeing[axis];
++  min_pos[axis] = XYZ_CONFIG(float, base_min_pos, axis) + add_homeing[axis];
++  max_pos[axis] = XYZ_CONFIG(float, base_max_pos, axis) + add_homeing[axis];
+ }
+ 
+ #define HOMEAXIS(LETTER) \