From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 10 Aug 2012 16:26:46 +0000 (+0100)
Subject: refresh
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d96a2b4ffbf20c8937960e2fdc3aee21bb962308;p=marlin.git

refresh
---

diff --git a/meta b/meta
index 85a08c8..2122259 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 8cdbccde2a605844bc85c67a06080a3c26111d9c
-Head: d54b461dee2597e0e644d209ee32ffd744f4ada2
+Previous: 4e80d49ec896d465651ae40bb316d30410d17b97
+Head: 566437da4b8a0825c7d7b4152fc5245725e67860
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -10,8 +10,7 @@ Applied:
   m206-always-use-homing-homeing: 72e895deb734e65f156210332af659bcf42ea5f1
   enable-eeprom-settings: 90e370bcce40d48795f310379a556beda3c0b294
   eeprom-provide-smaller-code-fo: 0fbea35eb16f424788f2eb30d8a49dd3808f7a73
-  homeaxis-function: 3455f9baf8039a65591e71254a0926e3c44dfe0a
-  refresh-temp: d54b461dee2597e0e644d209ee32ffd744f4ada2
+  homeaxis-function: 566437da4b8a0825c7d7b4152fc5245725e67860
 Unapplied:
   m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493
 Hidden:
diff --git a/patches/homeaxis-function b/patches/homeaxis-function
index b7999f4..5edd4e6 100644
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
 Bottom: 36e31553d776fe0068394d49b207ca63596f8dbb
-Top:    8b7597d0f1ac793cc0fe323614e4d4e5fabead5b
+Top:    f0a5e1cb6d70e55257bd772f9de3281e051bfae9
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:30:34 +0100
 
@@ -15,7 +15,7 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 ---
 
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index a854714..c6dadfc 100644
+index a854714..38ad8f6 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -559,6 +559,9 @@ static const PROGMEM type array##_P[3] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG };
@@ -69,14 +69,14 @@ index a854714..c6dadfc 100644
 +  if (doaxis & (1<<axis)) {
 +    current_position[axis] = 0;
 +    plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
-+    destination[axis] = 1.5 * max_length[axis] * home_dir[axis];
++    destination[axis] = 1.5 * XYZ_CONFIG(float,max_length,axis) * XYZ_CONFIG(byte,home_dir,axis);
 +    feedrate = homing_feedrate[axis];
 +    plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
 +    st_synchronize();
 +   
 +    current_position[axis] = 0;
 +    plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
-+    destination[axis] = -home_retract_mm[axis] * home_dir[axis];
++    destination[axis] = -XYZ_CONFIG(float,home_retract_mm,axis) * home_dir[axis];
 +    plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
 +    st_synchronize();
 +   
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index e5cd037..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: 8b7597d0f1ac793cc0fe323614e4d4e5fabead5b
-Top:    f0a5e1cb6d70e55257bd772f9de3281e051bfae9
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-10 17:26:46 +0100
-
-Refresh of homeaxis-function
-
----
-
-diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index c6dadfc..38ad8f6 100644
---- a/Marlin/Marlin.pde
-+++ b/Marlin/Marlin.pde
-@@ -581,14 +581,14 @@ static void homeaxis(int axis) {
-   if (doaxis & (1<<axis)) {
-     current_position[axis] = 0;
-     plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
--    destination[axis] = 1.5 * max_length[axis] * home_dir[axis];
-+    destination[axis] = 1.5 * XYZ_CONFIG(float,max_length,axis) * XYZ_CONFIG(byte,home_dir,axis);
-     feedrate = homing_feedrate[axis];
-     plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
-     st_synchronize();
-    
-     current_position[axis] = 0;
-     plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
--    destination[axis] = -home_retract_mm[axis] * home_dir[axis];
-+    destination[axis] = -XYZ_CONFIG(float,home_retract_mm,axis) * home_dir[axis];
-     plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
-     st_synchronize();