Browse Source

Fixup axis_is_at_home a little

Scott Lahteine 10 years ago
parent
commit
64268f3312
1 changed files with 6 additions and 9 deletions
  1. 6
    9
      Marlin/Marlin_main.cpp

+ 6
- 9
Marlin/Marlin_main.cpp View File

990
   #endif
990
   #endif
991
 
991
 
992
   #ifdef SCARA
992
   #ifdef SCARA
993
-    float homeposition[3];
994
    
993
    
995
-    if (axis < 2) {
994
+    if (axis == X_AXIS || axis == Y_AXIS) {
996
 
995
 
996
+      float homeposition[3];
997
       for (int i = 0; i < 3; i++) homeposition[i] = base_home_pos(i);
997
       for (int i = 0; i < 3; i++) homeposition[i] = base_home_pos(i);
998
 
998
 
999
       // SERIAL_ECHOPGM("homeposition[x]= "); SERIAL_ECHO(homeposition[0]);
999
       // SERIAL_ECHOPGM("homeposition[x]= "); SERIAL_ECHO(homeposition[0]);
1023
       // inverse kinematic transform.
1023
       // inverse kinematic transform.
1024
       min_pos[axis] = base_min_pos(axis); // + (delta[axis] - base_home_pos(axis));
1024
       min_pos[axis] = base_min_pos(axis); // + (delta[axis] - base_home_pos(axis));
1025
       max_pos[axis] = base_max_pos(axis); // + (delta[axis] - base_home_pos(axis));
1025
       max_pos[axis] = base_max_pos(axis); // + (delta[axis] - base_home_pos(axis));
1026
-    } 
1027
-    else {
1028
-      current_position[axis] = base_home_pos(axis) + home_offset[axis];
1029
-      min_pos[axis] = base_min_pos(axis) + home_offset[axis];
1030
-      max_pos[axis] = base_max_pos(axis) + home_offset[axis];
1031
     }
1026
     }
1032
-  #else
1027
+    else
1028
+  #endif
1029
+  {
1033
     current_position[axis] = base_home_pos(axis) + home_offset[axis];
1030
     current_position[axis] = base_home_pos(axis) + home_offset[axis];
1034
     min_pos[axis] = base_min_pos(axis) + home_offset[axis];
1031
     min_pos[axis] = base_min_pos(axis) + home_offset[axis];
1035
     max_pos[axis] = base_max_pos(axis) + home_offset[axis];
1032
     max_pos[axis] = base_max_pos(axis) + home_offset[axis];
1036
-  #endif
1033
+  }
1037
 }
1034
 }
1038
 
1035
 
1039
 /**
1036
 /**

Loading…
Cancel
Save