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

diff --git a/meta b/meta
index 129eab02f8a5abc36f2c63a903ab371b6828a5d3..db351c7aad5ad1c556618bb6ea90ec0799036691 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: 675443f124907762a88cade10754662cc7326a43
-Head: 41901733783d11dd7fe80267e1c8effa1aa69800
+Previous: 83cbef95d904b065e1c40743674ad3cc188ac010
+Head: 75ebcde7d776353cd625fb68535736e374f0e90f
 Applied:
   marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
   add-to-marlin-gitignore: 83dcad520f19d2ea6f1164b9c04e1430b679b3e2
   makefile-support-v-1: 3f7781d27a680fa4faeb5d7f38250e4877632ce3
   m206-always-use-homing-homeing: 41901733783d11dd7fe80267e1c8effa1aa69800
+  refresh-temp: 75ebcde7d776353cd625fb68535736e374f0e90f
 Unapplied:
   eeprom-provide-smaller-code-fo: 908bebda77f754b762a36f96bc7d938aca4935ba
   m206-save-values-in-eeprom: bbde4ea454248ef02e59183cab6992c5d4331d8c
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..d6a226e
--- /dev/null
@@ -0,0 +1,26 @@
+Bottom: 8b41053f51ee51e0877345a8761e69d6bef34c39
+Top:    380e228cc8d44c90824ca19a55702fc1c536ad59
+Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Date:   2012-08-09 18:11:22 +0100
+
+Refresh of m206-always-use-homing-homeing
+
+---
+
+diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
+index 4abd98b..8248132 100644
+--- a/Marlin/Marlin.pde
++++ b/Marlin/Marlin.pde
+@@ -1560,9 +1560,9 @@ void prepare_move()
+   }
+   if (max_software_endstops) {
+-    if (destination[X_AXIS] > X_MAX_POS) destination[X_AXIS] = X_MAX_POS;
+-    if (destination[Y_AXIS] > Y_MAX_POS) destination[Y_AXIS] = Y_MAX_POS;
+-    if (destination[Z_AXIS] > Z_MAX_POS) destination[Z_AXIS] = Z_MAX_POS;
++    if (destination[X_AXIS] > max_pos[0]) destination[X_AXIS] = max_pos[0];
++    if (destination[Y_AXIS] > max_pos[1]) destination[Y_AXIS] = max_pos[1];
++    if (destination[Z_AXIS] > max_pos[2]) destination[Z_AXIS] = max_pos[2];
+   }
+   previous_millis_cmd = millis();  
+   plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate*feedmultiply/60/100.0, active_extruder);