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

refresh (create temporary patch)
---

diff --git a/meta b/meta
index ed6e329..a1a6fda 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 58cae614ef4c89fc316768e3e08372c633c513ab
-Head: 424b238970e0f8063a5020f1e5bb0ac974ad2ddb
+Previous: 8bd8169e8c3948f47fb22d055cbd8c596be8ea65
+Head: acda8db47d2559d5620fd8eeea284880d2719cb4
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -11,6 +11,7 @@ Applied:
   enable-eeprom-settings: 4562a2810820a07bd84b55496164b5f4f4858eaa
   eeprom-provide-smaller-code-fo: a18cc767374a4f34713ab94fc092449a1422a821
   homeaxis-function: 424b238970e0f8063a5020f1e5bb0ac974ad2ddb
+  refresh-temp: acda8db47d2559d5620fd8eeea284880d2719cb4
 Unapplied:
   m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493
 Hidden:
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..5f08578
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,44 @@
+Bottom: b6e4ac7744424e9e1ab8e763c88709291fcbf3b1
+Top:    064d2ebbfaedce0d6a0db10ec0861311bbfbc47e
+Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Date:   2012-08-10 17:49:22 +0100
+
+Refresh of homeaxis-function
+
+---
+
+diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
+index bb6c5ae..36118f8 100644
+--- a/Marlin/Marlin.pde
++++ b/Marlin/Marlin.pde
+@@ -582,7 +582,7 @@ static void homeaxis(int axis) {
+ #define HOMEAXIS_DO_BIT(LETTER) \
+   ((LETTER##_MIN_PIN > -1 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > -1 && LETTER##_HOME_DIR==1) ? 1 << LETTER##_AXIS : 0)
+ 
+-  static PROGMEM const unsigned char doaxis =
++  const unsigned char doaxis =
+     HOMEAXIS_DO_BIT(X) | 
+     HOMEAXIS_DO_BIT(Y) |
+     HOMEAXIS_DO_BIT(Z);
+@@ -590,18 +590,18 @@ 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 * XYZ_CONFIG(max_length,axis) * XYZ_CONFIG(home_dir,axis);
++    destination[axis] = 1.5 * max_length(axis) * 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] = -XYZ_CONFIG(home_retract_mm,axis) * XYZ_CONFIG(home_dir,axis);
++    destination[axis] = -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();
+    
+-    destination[axis] = 2*home_retract_mm[axis] * home_dir[axis];
++    destination[axis] = 2*home_retract_mm(axis) * home_dir(axis);
+     feedrate = homing_feedrate[axis]/2 ; 
+     plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
+     st_synchronize();