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

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);