refresh

diff --git a/meta b/meta
index db351c7aad5ad1c556618bb6ea90ec0799036691..161bcd6907bd1abf629e93f2961559e88f8ce354 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 83cbef95d904b065e1c40743674ad3cc188ac010
-Head: 75ebcde7d776353cd625fb68535736e374f0e90f
+Previous: df0acdea3de29aab4a1cbd508de814ff4098b475
+Head: de0f25662682c874c516c412c8154840f50a236c
 Applied:
   marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
   add-to-marlin-gitignore: 83dcad520f19d2ea6f1164b9c04e1430b679b3e2
   makefile-support-v-1: 3f7781d27a680fa4faeb5d7f38250e4877632ce3
-  m206-always-use-homing-homeing: 41901733783d11dd7fe80267e1c8effa1aa69800
-  refresh-temp: 75ebcde7d776353cd625fb68535736e374f0e90f
+  m206-always-use-homing-homeing: de0f25662682c874c516c412c8154840f50a236c
 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 1000cb5ffb67863946a9d539d5d7e65f24ff7a3e..2d7e97f869d4dd2bcce77694e6cb29c23b0ed194 100644 (file)
--- a/patches/m206-always-use-homing-homeing
+++ b/patches/m206-always-use-homing-homeing
@@ -1,5 +1,5 @@
 Bottom: eb35f0d7db096a862ee737a5537019f96d6e6f16
-Top:    8b41053f51ee51e0877345a8761e69d6bef34c39
+Top:    380e228cc8d44c90824ca19a55702fc1c536ad59
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:12:14 +0100
 
@@ -64,7 +64,7 @@ index 4123634..c8115af 100644
  
  // Handling multiple extruders pins
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index f38920b..4abd98b 100644
+index f38920b..8248132 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -143,6 +143,7 @@ volatile bool feedmultiplychanged=false;
@@ -113,7 +113,7 @@ index f38920b..4abd98b 100644
          plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
          destination[X_AXIS] = current_position[X_AXIS];
          destination[Y_AXIS] = current_position[Y_AXIS];
-@@ -1544,9 +1554,9 @@ void get_arc_coordinates()
+@@ -1544,15 +1554,15 @@ void get_arc_coordinates()
  void prepare_move()
  {
    if (min_software_endstops) {
@@ -126,6 +126,15 @@ index f38920b..4abd98b 100644
    }
  
    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];
+   }
+   previous_millis_cmd = millis();  
+   plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate*feedmultiply/60/100.0, active_extruder);
 diff --git a/Marlin/motion_control.cpp b/Marlin/motion_control.cpp
 index f11d8c8..450924a 100644
 --- a/Marlin/motion_control.cpp

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d6a226e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 8b41053f51ee51e0877345a8761e69d6bef34c39
-Top:    380e228cc8d44c90824ca19a55702fc1c536ad59
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-09 18:11:22 +0100
-
-Refresh of m206-always-use-homing-homeing
-
----
-
-diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 4abd98b..8248132 100644
---- a/Marlin/Marlin.pde
-+++ b/Marlin/Marlin.pde
-@@ -1560,9 +1560,9 @@ void prepare_move()
-   }
- 
-   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];
-   }
-   previous_millis_cmd = millis();  
-   plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate*feedmultiply/60/100.0, active_extruder);