From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2012 00:34:59 +0000 (+0100)
Subject: refresh
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=76de61b23c5c72f53bef5529da0271aa4ad30b19;p=marlin.git

refresh
---

diff --git a/meta b/meta
index 04b0d7a..28a0095 100644
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 84b7d51b41c336ffb9c9fe2967a1ae3af1331e62
-Head: 4cc9736a15a6a8b24a0e327127072d0e2cb8654d
+Previous: ea1aabcb0b0937a636aa0976b626550dd1bcc479
+Head: faccb358508d49d0bef35dc0521043f04508bcc3
 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
+  motion-control-max-min: faccb358508d49d0bef35dc0521043f04508bcc3
 Unapplied:
   m206-always-use-homing-homeing: a5faa9495a530dd8b3e87e6051c4ca6102939650
   eeprom-provide-smaller-code-fo: d351b9f64286d75dd4ebd4b09ed00ef31008364b
diff --git a/patches/motion-control-max-min b/patches/motion-control-max-min
index 3a8aeb6..9395c13 100644
--- a/patches/motion-control-max-min
+++ b/patches/motion-control-max-min
@@ -1,5 +1,5 @@
 Bottom: 4fa736aa57e0b7f1687af78e8c0f83fa18dc2549
-Top:    ff33f6a6b492d6f370c84bddac52ac277dbd0fd9
+Top:    681cec9bc49d48ceecfc6d5e9eff1c4f7f623fc6
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-09 18:15:32 +0100
 
@@ -30,10 +30,10 @@ index 4123634..75b57d0 100644
  #ifdef FAST_PWM_FAN
  void setPwmFrequency(uint8_t pin, int val);
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index f38920b..d471d49 100644
+index f38920b..5268a3d 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
-@@ -1541,7 +1541,7 @@ void get_arc_coordinates()
+@@ -1541,19 +1541,25 @@ void get_arc_coordinates()
     }
  }
  
@@ -41,10 +41,21 @@ index f38920b..d471d49 100644
 +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;
-@@ -1554,6 +1554,12 @@ void prepare_move()
-     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] < 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;
    }
 +}
 +
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index c664a91..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,34 +0,0 @@
-Bottom: ff33f6a6b492d6f370c84bddac52ac277dbd0fd9
-Top:    681cec9bc49d48ceecfc6d5e9eff1c4f7f623fc6
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-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;
-   }
- }