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

refresh
---

diff --git a/meta b/meta
index b89d2e1..27e9155 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: e899f75158ea664794ceb79e30aecd14c45b56cb
-Head: 00e1d995f16f47e2c77f794df9d5ceaeba04f414
+Previous: 2df7909926699f257bde5c5a324e4d616178818d
+Head: 73015e66f70d22ee87b866020ddf4c6adad83a0a
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -10,8 +10,7 @@ Applied:
   m206-always-use-homing-homeing: 31068042f1ce0c442be19a8055046f62716403b2
   enable-eeprom-settings: 4562a2810820a07bd84b55496164b5f4f4858eaa
   eeprom-provide-smaller-code-fo: a18cc767374a4f34713ab94fc092449a1422a821
-  homeaxis-function: 99e56a6974481a96cda947c6e441e2507294086f
-  refresh-temp: 00e1d995f16f47e2c77f794df9d5ceaeba04f414
+  homeaxis-function: 73015e66f70d22ee87b866020ddf4c6adad83a0a
 Unapplied:
   m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493
 Hidden:
diff --git a/patches/homeaxis-function b/patches/homeaxis-function
index 56929f9..94659fc 100644
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
 Bottom: da29116f21970312595da6db4896c228dace90f1
-Top:    064d2ebbfaedce0d6a0db10ec0861311bbfbc47e
+Top:    75d4a31db3e7cb32ded340b9de197cee58e943b7
 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 0355f93..36118f8 100644
+index 0355f93..fdb1b98 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -557,6 +557,7 @@ bool code_seen(char code)
@@ -36,7 +36,7 @@ index 0355f93..36118f8 100644
  
  static void axis_is_at_home(int axis) {
    current_position[axis] = base_home_pos(axis) + add_homeing[axis];
-@@ -574,32 +578,41 @@ static void axis_is_at_home(int axis) {
+@@ -574,32 +578,39 @@ static void axis_is_at_home(int axis) {
    max_pos[axis] =          base_max_pos(axis) + add_homeing[axis];
  }
  
@@ -66,15 +66,13 @@ index 0355f93..36118f8 100644
 -    feedrate = 0.0;\
 -    endstops_hit_on_purpose();\
 +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)
++#define HOMEAXIS_DO(LETTER) \
++  ((LETTER##_MIN_PIN > -1 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > -1 && LETTER##_HOME_DIR==1))
 +
-+  const unsigned char doaxis =
-+    HOMEAXIS_DO_BIT(X) | 
-+    HOMEAXIS_DO_BIT(Y) |
-+    HOMEAXIS_DO_BIT(Z);
-+
-+  if (doaxis & (1<<axis)) {
++  if (axis==X_AXIS ? HOMEAXIS_DO(X) :
++      axis==Y_AXIS ? HOMEAXIS_DO(Y) :
++      axis==Z_AXIS ? HOMEAXIS_DO(Z) :
++      0) {
 +    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);
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 6b922ac..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: 064d2ebbfaedce0d6a0db10ec0861311bbfbc47e
-Top:    75d4a31db3e7cb32ded340b9de197cee58e943b7
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-10 17:52:55 +0100
-
-Refresh of homeaxis-function
-
----
-
-diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 36118f8..fdb1b98 100644
---- a/Marlin/Marlin.pde
-+++ b/Marlin/Marlin.pde
-@@ -579,15 +579,13 @@ static void axis_is_at_home(int axis) {
- }
- 
- 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)
-+#define HOMEAXIS_DO(LETTER) \
-+  ((LETTER##_MIN_PIN > -1 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > -1 && LETTER##_HOME_DIR==1))
- 
--  const unsigned char doaxis =
--    HOMEAXIS_DO_BIT(X) | 
--    HOMEAXIS_DO_BIT(Y) |
--    HOMEAXIS_DO_BIT(Z);
--
--  if (doaxis & (1<<axis)) {
-+  if (axis==X_AXIS ? HOMEAXIS_DO(X) :
-+      axis==Y_AXIS ? HOMEAXIS_DO(Y) :
-+      axis==Z_AXIS ? HOMEAXIS_DO(Z) :
-+      0) {
-     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);