chiark / gitweb /
refresh (create temporary patch)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 10 Aug 2012 16:26:46 +0000 (17:26 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 10 Aug 2012 16:26:46 +0000 (17:26 +0100)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index 95efc226f8f7e360a12305439694421d7c75ce58..85a08c83f3b9762a5092e2e2dbcd571042f643d4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 0ca9acbf22e7de2baab209db761628b8c1c15dbd
-Head: 3455f9baf8039a65591e71254a0926e3c44dfe0a
+Previous: 8cdbccde2a605844bc85c67a06080a3c26111d9c
+Head: d54b461dee2597e0e644d209ee32ffd744f4ada2
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -11,6 +11,7 @@ Applied:
   enable-eeprom-settings: 90e370bcce40d48795f310379a556beda3c0b294
   eeprom-provide-smaller-code-fo: 0fbea35eb16f424788f2eb30d8a49dd3808f7a73
   homeaxis-function: 3455f9baf8039a65591e71254a0926e3c44dfe0a
+  refresh-temp: d54b461dee2597e0e644d209ee32ffd744f4ada2
 Unapplied:
   m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493
 Hidden:
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..e5cd037
--- /dev/null
@@ -0,0 +1,29 @@
+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();