From: Ian Jackson Date: Thu, 9 Aug 2012 17:46:42 +0000 (+0100) Subject: refresh (create temporary patch) X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6e4243eb88937e52bbaef7905afa8ee8ebfe655d;p=marlin.git refresh (create temporary patch) --- diff --git a/meta b/meta index 1e2db31..069e221 100644 --- a/meta +++ b/meta @@ -1,12 +1,13 @@ Version: 1 -Previous: b2880178b26b7eb989ed03555c8d3f41c76630a3 -Head: 3a7ef8a08b64d12be35f7e6aa9a72f82fe0db4d5 +Previous: 292ae7b052f505bcef146dfbc33d3e863fca84b2 +Head: df25b3f1b179ea807df6f3bcfec671688a02d648 Applied: marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133 add-to-marlin-gitignore: 83dcad520f19d2ea6f1164b9c04e1430b679b3e2 makefile-support-v-1: 3f7781d27a680fa4faeb5d7f38250e4877632ce3 motion-control-max-min: 44befa5f783994f92f7c6fd39b7f581cf174d9d4 m206-always-use-homing-homeing: 3a7ef8a08b64d12be35f7e6aa9a72f82fe0db4d5 + refresh-temp: df25b3f1b179ea807df6f3bcfec671688a02d648 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 index 0000000..c4e63ac --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,34 @@ +Bottom: b4fe7d5f00950cb7cf3ab1852f1b9bf14f73bb3d +Top: c0a7e719fd15d0dc282dd2ab568458d732ca3e7a +Author: Ian Jackson +Date: 2012-08-09 18:46:42 +0100 + +Refresh of m206-always-use-homing-homeing + +--- + +diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde +index f270440..e980174 100644 +--- a/Marlin/Marlin.pde ++++ b/Marlin/Marlin.pde +@@ -1554,15 +1554,15 @@ void get_arc_coordinates() + void clamp_to_software_endstops(float target[3]) + { + if (min_software_endstops) { +- if (destination[X_AXIS] < min_pos[0]) destination[X_AXIS] = min_pos[0]; +- if (destination[Y_AXIS] < min_pos[1]) destination[Y_AXIS] = min_pos[1]; +- if (destination[Z_AXIS] < min_pos[2]) destination[Z_AXIS] = min_pos[2]; ++ if (destination[X_AXIS] < min_pos[X_AXIS]) destination[X_AXIS] = min_pos[X_AXIS]; ++ if (destination[Y_AXIS] < min_pos[Y_AXIS]) destination[Y_AXIS] = min_pos[Y_AXIS]; ++ if (destination[Z_AXIS] < min_pos[Z_AXIS]) destination[Z_AXIS] = min_pos[Z_AXIS]; + } + + if (max_software_endstops) { +- 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]; ++ if (destination[X_AXIS] > max_pos[X_AXIS]) destination[X_AXIS] = max_pos[X_AXIS]; ++ if (destination[Y_AXIS] > max_pos[Y_AXIS]) destination[Y_AXIS] = max_pos[Y_AXIS]; ++ if (destination[Z_AXIS] > max_pos[Z_AXIS]) destination[Z_AXIS] = max_pos[Z_AXIS]; + } + }