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

refresh
---

diff --git a/meta b/meta
index 069e221..0e0c611 100644
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 292ae7b052f505bcef146dfbc33d3e863fca84b2
-Head: df25b3f1b179ea807df6f3bcfec671688a02d648
+Previous: fdf56d1eecf00a368d35c4ec5264f600041908cf
+Head: 4ca745180d445e62051d87a9ca0b7daecddcdc86
 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
+  m206-always-use-homing-homeing: 4ca745180d445e62051d87a9ca0b7daecddcdc86
 Unapplied:
   eeprom-provide-smaller-code-fo: 908bebda77f754b762a36f96bc7d938aca4935ba
   m206-save-values-in-eeprom: bbde4ea454248ef02e59183cab6992c5d4331d8c
diff --git a/patches/m206-always-use-homing-homeing b/patches/m206-always-use-homing-homeing
index 2ab9ac6..458a4a2 100644
--- a/patches/m206-always-use-homing-homeing
+++ b/patches/m206-always-use-homing-homeing
@@ -1,5 +1,5 @@
 Bottom: 8e78a1676c97946f40c2ebb968bada04f6bac87a
-Top:    b4fe7d5f00950cb7cf3ab1852f1b9bf14f73bb3d
+Top:    c0a7e719fd15d0dc282dd2ab568458d732ca3e7a
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:12:14 +0100
 
@@ -64,7 +64,7 @@ index 75b57d0..11e1afa 100644
  
  // Handling multiple extruders pins
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index d471d49..f270440 100644
+index d471d49..e980174 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -143,6 +143,7 @@ volatile bool feedmultiplychanged=false;
@@ -120,18 +120,18 @@ index d471d49..f270440 100644
 -    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 (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] > 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];
++    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];
    }
  }
  
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index c4e63ac..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,34 +0,0 @@
-Bottom: b4fe7d5f00950cb7cf3ab1852f1b9bf14f73bb3d
-Top:    c0a7e719fd15d0dc282dd2ab568458d732ca3e7a
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-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];
-   }
- }