Browse Source

Use Z_HOME_DIR over axis_home_dir where we can

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

+ 6
- 6
Marlin/Marlin_main.cpp View File

@@ -2437,8 +2437,8 @@ static void homeaxis(AxisEnum axis) {
2437 2437
     home_dir(axis);
2438 2438
 
2439 2439
   // Homing Z towards the bed? Deploy the Z probe or endstop.
2440
-  #if HAS_BED_PROBE && DISABLED(Z_MIN_PROBE_ENDSTOP)
2441
-    if (axis == Z_AXIS && axis_home_dir < 0) {
2440
+  #if HAS_BED_PROBE && Z_HOME_DIR < 0 && DISABLED(Z_MIN_PROBE_ENDSTOP)
2441
+    if (axis == Z_AXIS) {
2442 2442
       #if ENABLED(DEBUG_LEVELING_FEATURE)
2443 2443
         if (DEBUGGING(LEVELING)) SERIAL_ECHOPGM("> ");
2444 2444
       #endif
@@ -2499,7 +2499,7 @@ static void homeaxis(AxisEnum axis) {
2499 2499
 
2500 2500
   #if ENABLED(DELTA)
2501 2501
     // retrace by the amount specified in endstop_adj
2502
-    if (endstop_adj[axis] * axis_home_dir < 0) {
2502
+    if (endstop_adj[axis] * Z_HOME_DIR < 0) {
2503 2503
       #if ENABLED(DEBUG_LEVELING_FEATURE)
2504 2504
         if (DEBUGGING(LEVELING)) {
2505 2505
           SERIAL_ECHOPAIR("> endstop_adj = ", endstop_adj[axis]);
@@ -2525,8 +2525,8 @@ static void homeaxis(AxisEnum axis) {
2525 2525
   axis_homed[axis] = true;
2526 2526
 
2527 2527
   // Put away the Z probe
2528
-  #if HAS_BED_PROBE && DISABLED(Z_MIN_PROBE_ENDSTOP)
2529
-    if (axis == Z_AXIS && axis_home_dir < 0) {
2528
+  #if HAS_BED_PROBE && Z_HOME_DIR < 0 && DISABLED(Z_MIN_PROBE_ENDSTOP)
2529
+    if (axis == Z_AXIS) {
2530 2530
       #if ENABLED(DEBUG_LEVELING_FEATURE)
2531 2531
         if (DEBUGGING(LEVELING)) SERIAL_ECHOPGM("> ");
2532 2532
       #endif
@@ -3636,7 +3636,7 @@ inline void gcode_G28() {
3636 3636
       #endif // !DELTA
3637 3637
 
3638 3638
       int probePointCounter = 0;
3639
-      bool zig = (auto_bed_leveling_grid_points & 1) ? true : false; //always end at [RIGHT_PROBE_BED_POSITION, BACK_PROBE_BED_POSITION]
3639
+      bool zig = auto_bed_leveling_grid_points & 1; //always end at [RIGHT_PROBE_BED_POSITION, BACK_PROBE_BED_POSITION]
3640 3640
 
3641 3641
       for (int yCount = 0; yCount < auto_bed_leveling_grid_points; yCount++) {
3642 3642
         float yBase = front_probe_bed_position + yGridSpacing * yCount,

Loading…
Cancel
Save