From 2cd3c7d46c99ed9da1d8526530c094be30297b34 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2012 01:34:58 +0100 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index d282639..04b0d7a 100644 --- a/meta +++ b/meta @@ -1,12 +1,13 @@ Version: 1 -Previous: 139f00f8e4ab8ee30879bd74784bfac9c59b2a3d -Head: 38d204a76f0eb63507865f203ec9638a411904dc +Previous: 84b7d51b41c336ffb9c9fe2967a1ae3af1331e62 +Head: 4cc9736a15a6a8b24a0e327127072d0e2cb8654d Applied: marlin-pde-include-comment-for: a873541ef6b23100dc6dec15e6195e87cef6fce5 add-to-marlin-gitignore: 71404eef293f1c93ba081a458120b45e5a48f566 makefile-support-v-1: 0c35facc946fda47b18b3d28b7d9e832b6c41ae6 makefile-avr-size: 3f15b7c7b863abfa2c6cb157a7f220ab9627d776 motion-control-max-min: 38d204a76f0eb63507865f203ec9638a411904dc + refresh-temp: 4cc9736a15a6a8b24a0e327127072d0e2cb8654d Unapplied: m206-always-use-homing-homeing: a5faa9495a530dd8b3e87e6051c4ca6102939650 eeprom-provide-smaller-code-fo: d351b9f64286d75dd4ebd4b09ed00ef31008364b diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 0000000..c664a91 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,34 @@ +Bottom: ff33f6a6b492d6f370c84bddac52ac277dbd0fd9 +Top: 681cec9bc49d48ceecfc6d5e9eff1c4f7f623fc6 +Author: Ian Jackson +Date: 2012-08-11 01:34:58 +0100 + +Refresh of motion-control-max-min + +--- + +diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde +index d471d49..5268a3d 100644 +--- a/Marlin/Marlin.pde ++++ b/Marlin/Marlin.pde +@@ -1544,15 +1544,15 @@ void get_arc_coordinates() + void clamp_to_software_endstops(float target[3]) + { + if (min_software_endstops) { +- if (destination[X_AXIS] < X_MIN_POS) destination[X_AXIS] = X_MIN_POS; +- if (destination[Y_AXIS] < Y_MIN_POS) destination[Y_AXIS] = Y_MIN_POS; +- if (destination[Z_AXIS] < Z_MIN_POS) destination[Z_AXIS] = Z_MIN_POS; ++ if (target[X_AXIS] < X_MIN_POS) target[X_AXIS] = X_MIN_POS; ++ if (target[Y_AXIS] < Y_MIN_POS) target[Y_AXIS] = Y_MIN_POS; ++ if (target[Z_AXIS] < Z_MIN_POS) target[Z_AXIS] = Z_MIN_POS; + } + + 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 (target[X_AXIS] > X_MAX_POS) target[X_AXIS] = X_MAX_POS; ++ if (target[Y_AXIS] > Y_MAX_POS) target[Y_AXIS] = Y_MAX_POS; ++ if (target[Z_AXIS] > Z_MAX_POS) target[Z_AXIS] = Z_MAX_POS; + } + } -- 2.30.2