From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 9 Aug 2012 17:15:51 +0000 (+0100)
Subject: refresh
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a3322dadfd99cd963afa4f463c56017e1e2cc193;p=marlin.git

refresh
---

diff --git a/meta b/meta
index 442638f..fe17289 100644
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: c5ea78fb538672ec8e624ec81ea1ffe0075b3542
-Head: 5f910ec921400b18e6caca1dfc88aa338a14861f
+Previous: 551d47dfed93fe49644c1d7285728fa0494f3b49
+Head: 858be0694a9217288dc360e4dd238295d2a748b7
 Applied:
   marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
   add-to-marlin-gitignore: 83dcad520f19d2ea6f1164b9c04e1430b679b3e2
   makefile-support-v-1: 3f7781d27a680fa4faeb5d7f38250e4877632ce3
-  motion-control-max-min: 456350b64daecdfc92549f7e9fb8b9ad01da35dc
-  refresh-temp: 5f910ec921400b18e6caca1dfc88aa338a14861f
+  motion-control-max-min: 858be0694a9217288dc360e4dd238295d2a748b7
 Unapplied:
   m206-always-use-homing-homeing: de0f25662682c874c516c412c8154840f50a236c
   eeprom-provide-smaller-code-fo: 908bebda77f754b762a36f96bc7d938aca4935ba
diff --git a/patches/motion-control-max-min b/patches/motion-control-max-min
index 7bb1a2a..d0c1516 100644
--- a/patches/motion-control-max-min
+++ b/patches/motion-control-max-min
@@ -1,5 +1,5 @@
 Bottom: eb35f0d7db096a862ee737a5537019f96d6e6f16
-Top:    eb35f0d7db096a862ee737a5537019f96d6e6f16
+Top:    f59c4f0f543cd186ce17875c743486d2e74e4c3f
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-09 18:15:32 +0100
 
@@ -14,4 +14,28 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 
 ---
 
-
+diff --git a/Marlin/motion_control.cpp b/Marlin/motion_control.cpp
+index f11d8c8..a10d73f 100644
+--- a/Marlin/motion_control.cpp
++++ b/Marlin/motion_control.cpp
+@@ -126,15 +126,15 @@ void mc_arc(float *position, float *target, float *offset, uint8_t axis_0, uint8
+     arc_target[E_AXIS] += extruder_per_segment;
+ 
+     if (min_software_endstops) {
+-      if (arc_target[X_AXIS] < X_HOME_POS) arc_target[X_AXIS] = X_HOME_POS;
+-      if (arc_target[Y_AXIS] < Y_HOME_POS) arc_target[Y_AXIS] = Y_HOME_POS;
+-      if (arc_target[Z_AXIS] < Z_HOME_POS) arc_target[Z_AXIS] = Z_HOME_POS;
++      if (arc_target[X_AXIS] < X_MIN_POS) arc_target[X_AXIS] = X_MIN_POS;
++      if (arc_target[Y_AXIS] < Y_MIN_POS) arc_target[Y_AXIS] = Y_MIN_POS;
++      if (arc_target[Z_AXIS] < Z_MIN_POS) arc_target[Z_AXIS] = Z_MIN_POS;
+     }
+ 
+     if (max_software_endstops) {
+-      if (arc_target[X_AXIS] > X_MAX_LENGTH) arc_target[X_AXIS] = X_MAX_LENGTH;
+-      if (arc_target[Y_AXIS] > Y_MAX_LENGTH) arc_target[Y_AXIS] = Y_MAX_LENGTH;
+-      if (arc_target[Z_AXIS] > Z_MAX_LENGTH) arc_target[Z_AXIS] = Z_MAX_LENGTH;
++      if (arc_target[X_AXIS] > X_MAX_POS) arc_target[X_AXIS] = X_MAX_POS;
++      if (arc_target[Y_AXIS] > Y_MAX_POS) arc_target[Y_AXIS] = Y_MAX_POS;
++      if (arc_target[Z_AXIS] > Z_MAX_POS) arc_target[Z_AXIS] = Z_MAX_POS;
+     }
+     plan_buffer_line(arc_target[X_AXIS], arc_target[Y_AXIS], arc_target[Z_AXIS], arc_target[E_AXIS], feed_rate, extruder);
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 6c75fe1..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,34 +0,0 @@
-Bottom: eb35f0d7db096a862ee737a5537019f96d6e6f16
-Top:    f59c4f0f543cd186ce17875c743486d2e74e4c3f
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-09 18:15:51 +0100
-
-Refresh of motion-control-max-min
-
----
-
-diff --git a/Marlin/motion_control.cpp b/Marlin/motion_control.cpp
-index f11d8c8..a10d73f 100644
---- a/Marlin/motion_control.cpp
-+++ b/Marlin/motion_control.cpp
-@@ -126,15 +126,15 @@ void mc_arc(float *position, float *target, float *offset, uint8_t axis_0, uint8
-     arc_target[E_AXIS] += extruder_per_segment;
- 
-     if (min_software_endstops) {
--      if (arc_target[X_AXIS] < X_HOME_POS) arc_target[X_AXIS] = X_HOME_POS;
--      if (arc_target[Y_AXIS] < Y_HOME_POS) arc_target[Y_AXIS] = Y_HOME_POS;
--      if (arc_target[Z_AXIS] < Z_HOME_POS) arc_target[Z_AXIS] = Z_HOME_POS;
-+      if (arc_target[X_AXIS] < X_MIN_POS) arc_target[X_AXIS] = X_MIN_POS;
-+      if (arc_target[Y_AXIS] < Y_MIN_POS) arc_target[Y_AXIS] = Y_MIN_POS;
-+      if (arc_target[Z_AXIS] < Z_MIN_POS) arc_target[Z_AXIS] = Z_MIN_POS;
-     }
- 
-     if (max_software_endstops) {
--      if (arc_target[X_AXIS] > X_MAX_LENGTH) arc_target[X_AXIS] = X_MAX_LENGTH;
--      if (arc_target[Y_AXIS] > Y_MAX_LENGTH) arc_target[Y_AXIS] = Y_MAX_LENGTH;
--      if (arc_target[Z_AXIS] > Z_MAX_LENGTH) arc_target[Z_AXIS] = Z_MAX_LENGTH;
-+      if (arc_target[X_AXIS] > X_MAX_POS) arc_target[X_AXIS] = X_MAX_POS;
-+      if (arc_target[Y_AXIS] > Y_MAX_POS) arc_target[Y_AXIS] = Y_MAX_POS;
-+      if (arc_target[Z_AXIS] > Z_MAX_POS) arc_target[Z_AXIS] = Z_MAX_POS;
-     }
-     plan_buffer_line(arc_target[X_AXIS], arc_target[Y_AXIS], arc_target[Z_AXIS], arc_target[E_AXIS], feed_rate, extruder);