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

refresh (create temporary patch)
---

diff --git a/meta b/meta
index 8194230..6019f6c 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 303061bd4aad189938b3a756a3eba98efaec7f4d
-Head: e5e85eec1259f4132edf1a7a7fed165b08787167
+Previous: 0a1239b71e0240d307336162055064b9c27ab58c
+Head: 9181b5e7aa1f54d7589cda0c4aa996b447971822
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -11,6 +11,7 @@ Applied:
   enable-eeprom-settings: 8daa65176ac195afeaad4a06c00a97dfff5951fe
   eeprom-provide-smaller-code-fo: dcb84ce5f56d58178c15475b0611e12bfa121805
   homeaxis-function: e5e85eec1259f4132edf1a7a7fed165b08787167
+  refresh-temp: 9181b5e7aa1f54d7589cda0c4aa996b447971822
 Unapplied:
   m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493
 Hidden:
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..da368a1
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,37 @@
+Bottom: 5b63d3f0e8ea3e9716f33f1f484e948ed713723f
+Top:    5fa5beaa03b93876dd6ab612fe616ff24197e851
+Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Date:   2012-08-10 17:34:47 +0100
+
+Refresh of homeaxis-function
+
+---
+
+diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
+index 63501a8..32c6ec8 100644
+--- a/Marlin/Marlin.pde
++++ b/Marlin/Marlin.pde
+@@ -561,6 +561,7 @@ bool code_seen(char code)
+ static const PROGMEM type array##_P[3] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG };
+ 
+ DEFINE_PGM_READ_ANY(float,       float);
++DEFINE_PGM_READ_ANY(signed char, byte);
+ 
+ XYZ_CONSTS_FROM_CONFIG(float, base_min_pos,    MIN_POS);
+ XYZ_CONSTS_FROM_CONFIG(float, base_max_pos,    MAX_POS);
+@@ -587,14 +588,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 * XYZ_CONFIG(float,max_length,axis) * XYZ_CONFIG(byte,home_dir,axis);
++    destination[axis] = 1.5 * XYZ_CONFIG(max_length,axis) * XYZ_CONFIG(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(float,home_retract_mm,axis) * home_dir[axis];
++    destination[axis] = -XYZ_CONFIG(home_retract_mm,axis) * XYZ_CONFIG(home_dir,axis);
+     plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
+     st_synchronize();