chiark / gitweb /
refresh (create temporary patch)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 18:54:45 +0000 (19:54 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 18:54:45 +0000 (19:54 +0100)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index a5db4dcac83d7d299fbf5eaa1811e2da74230f3e..03c4ba5a936fd744f30ddaa4f196f04ddbc51610 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 46b5b77799b31d44cd6d0cbd6975233a70356024
-Head: 965d378ed7d5793305f1d4fda8d4c39a386660cb
+Previous: ed5bd360c8309422cb348084f8184f69aef020bf
+Head: f378c618e94a886db0864170e79f5fb0b98e8bb4
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -8,6 +8,7 @@ Applied:
   makefile-avr-size: 560fd88074327c52739beb389cd339c78f009adf
   motion-control-max-min: 33f9aa6d9952e7f643bb2f7eba39f7bd1a765f86
   m206-always-use-homing-homeing: 965d378ed7d5793305f1d4fda8d4c39a386660cb
+  refresh-temp: f378c618e94a886db0864170e79f5fb0b98e8bb4
 Unapplied:
   eeprom-provide-smaller-code-fo: 7efd5690d57a016afbe296adc23a652966703635
   m206-save-values-in-eeprom: 59c1673d4b5d6cf92e3cd9d164a88222fe658d69
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..806d427
--- /dev/null
@@ -0,0 +1,26 @@
+Bottom: c2feea4afd56caea863e82cd486423f93f510614
+Top:    ad98c0229e8c7036d7c4e6d12cdf7a7e26176d84
+Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Date:   2012-08-09 19:54:45 +0100
+
+Refresh of m206-always-use-homing-homeing
+
+---
+
+diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
+index be91124..05e7d5a 100644
+--- a/Marlin/Marlin.pde
++++ b/Marlin/Marlin.pde
+@@ -551,10 +551,8 @@ static const PROGMEM float base_home_pos[3] = { X_HOME_POS, Y_HOME_POS, Z_HOME_P
+ 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];
+-  max_pos[axis] = base_max_pos[axis];
+-  if (add_homeing[axis] < 0) min_pos[axis] += add_homeing[axis];
+-  else max_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];
+ }
+ #define HOMEAXIS(LETTER) \