Browse Source

Z_RAISE_BEFORE_HOMING -> MIN_Z_HEIGHT_FOR_HOMING

rebased
corrected spelling
changed to #elif for error

Still with MIN_Z_HEIGHT_FOR_HOMING but con be done with (folder wide) search-replace when we have a better name.
AnHardt 8 years ago
parent
commit
fd5414c6ea

+ 2
- 3
Marlin/Configuration.h View File

@@ -378,6 +378,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
378 378
 #define INVERT_E3_DIR false
379 379
 
380 380
 // @section homing
381
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
382
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
381 383
 
382 384
 // ENDSTOP SETTINGS:
383 385
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -509,9 +511,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
509 511
   #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Z offset: -front [of the nozzle] +behind
510 512
   #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below [the nozzle] (always negative!)
511 513
 
512
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
513
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
514
-
515 514
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
516 515
 
517 516
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 19
- 50
Marlin/Marlin_main.cpp View File

@@ -2268,7 +2268,7 @@ inline void gcode_G28() {
2268 2268
 
2269 2269
   setup_for_endstop_move();
2270 2270
 
2271
-  set_destination_to_current();
2271
+  set_destination_to_current(); // Directly after a reset this is all 0. Later we get a hint if we have to raise z or not.
2272 2272
 
2273 2273
   feedrate = 0.0;
2274 2274
 
@@ -2311,50 +2311,40 @@ inline void gcode_G28() {
2311 2311
 
2312 2312
     home_all_axis = (!homeX && !homeY && !homeZ) || (homeX && homeY && homeZ);
2313 2313
 
2314
-    if (home_all_axis || homeZ) {
2315
-
2316
-      #if Z_HOME_DIR > 0  // If homing away from BED do Z first
2314
+    #if Z_HOME_DIR > 0  // If homing away from BED do Z first
2317 2315
 
2316
+      if (home_all_axis || homeZ) {
2318 2317
         HOMEAXIS(Z);
2319 2318
         #if ENABLED(DEBUG_LEVELING_FEATURE)
2320 2319
           if (marlin_debug_flags & DEBUG_LEVELING) {
2321 2320
             print_xyz("> HOMEAXIS(Z) > current_position", current_position);
2322 2321
           }
2323 2322
         #endif
2323
+      }
2324 2324
 
2325
-      #elif defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0
2326
-
2327
-        // Consider the current Z-position as zero
2328
-        // !!WARNING!! If the machine has no physical z-max endstops then we
2329
-        // can move the axis more than it can physically travel.
2330
-        current_position[Z_AXIS] = 0;
2331
-        sync_plan_position();
2332
-
2333
-        // (Does this need to be "negative home direction?" Why not just use Z_RAISE_BEFORE_HOMING?)
2334
-        destination[Z_AXIS] = -Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS);
2335
-        feedrate = max_feedrate[Z_AXIS] * 60;
2325
+    #elif defined(MIN_Z_HEIGHT_FOR_HOMING) && MIN_Z_HEIGHT_FOR_HOMING > 0
2336 2326
 
2327
+      // Raise Z before homing any other axes and z is not already high enough (never lower z)
2328
+      if (current_position[Z_AXIS] <= MIN_Z_HEIGHT_FOR_HOMING) {
2329
+        destination[Z_AXIS] = MIN_Z_HEIGHT_FOR_HOMING;
2330
+        feedrate = max_feedrate[Z_AXIS] * 60;  // feedrate (mm/m) = max_feedrate (mm/s)
2337 2331
         #if ENABLED(DEBUG_LEVELING_FEATURE)
2338 2332
           if (marlin_debug_flags & DEBUG_LEVELING) {
2339
-            SERIAL_ECHOPAIR("Raise Z (before homing) by ", (float)Z_RAISE_BEFORE_HOMING);
2333
+            SERIAL_ECHOPAIR("Raise Z (before homing) to ", (float)MIN_Z_HEIGHT_FOR_HOMING);
2340 2334
             SERIAL_EOL;
2341 2335
             print_xyz("> (home_all_axis || homeZ) > current_position", current_position);
2342 2336
             print_xyz("> (home_all_axis || homeZ) > destination", destination);
2343 2337
           }
2344 2338
         #endif
2345
-
2346
-        // Raise Z-axis by Z_RAISE_BEFORE_HOMING before homing any other axis
2347 2339
         line_to_destination();
2348 2340
         st_synchronize();
2349 2341
 
2350 2342
         // Update the current Z position even if it currently not real from Z-home
2351 2343
         // otherwise each call to line_to_destination() will want to move Z-axis
2352
-        // by Z_RAISE_BEFORE_HOMING.
2344
+        // by MIN_Z_HEIGHT_FOR_HOMING.
2353 2345
         current_position[Z_AXIS] = destination[Z_AXIS];
2354
-
2355
-      #endif
2356
-
2357
-    } // home_all_axis || homeZ
2346
+      }
2347
+    #endif
2358 2348
 
2359 2349
     #if ENABLED(QUICK_HOME)
2360 2350
 
@@ -2468,19 +2458,18 @@ inline void gcode_G28() {
2468 2458
 
2469 2459
           if (home_all_axis) {
2470 2460
 
2471
-            // At this point we already have Z at Z_RAISE_BEFORE_HOMING height
2461
+            // At this point we already have Z at MIN_Z_HEIGHT_FOR_HOMING height
2472 2462
             // No need to move Z any more as this height should already be safe
2473
-            // enough to reach Z_SAFE_HOMING XY positions; just make sure the
2474
-            // planner is in sync.
2463
+            // enough to reach Z_SAFE_HOMING XY positions.
2464
+            // Just make sure the planner is in sync.
2475 2465
             sync_plan_position();
2476 2466
 
2477 2467
             //
2478 2468
             // Set the Z probe (or just the nozzle) destination to the safe homing point
2479 2469
             //
2480
-            // NOTE: If current_position[X_AXIS] or current_position[Y_AXIS] were set above
2481
-            // then this may not work as expected.
2482 2470
             destination[X_AXIS] = round(Z_SAFE_HOMING_X_POINT - X_PROBE_OFFSET_FROM_EXTRUDER);
2483 2471
             destination[Y_AXIS] = round(Z_SAFE_HOMING_Y_POINT - Y_PROBE_OFFSET_FROM_EXTRUDER);
2472
+            destination[Z_AXIS] = current_position[Z_AXIS]; //z is already at the right height
2484 2473
             feedrate = XY_TRAVEL_SPEED;
2485 2474
 
2486 2475
             #if ENABLED(DEBUG_LEVELING_FEATURE)
@@ -2494,8 +2483,8 @@ inline void gcode_G28() {
2494 2483
             line_to_destination();
2495 2484
             st_synchronize();
2496 2485
 
2497
-            // Update the current positions for XY, Z is still at
2498
-            // Z_RAISE_BEFORE_HOMING height, no changes there.
2486
+            // Update the current positions for XY, Z is still at least at
2487
+            // MIN_Z_HEIGHT_FOR_HOMING height, no changes there.
2499 2488
             current_position[X_AXIS] = destination[X_AXIS];
2500 2489
             current_position[Y_AXIS] = destination[Y_AXIS];
2501 2490
 
@@ -2515,26 +2504,6 @@ inline void gcode_G28() {
2515 2504
                   && cpx <= X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER
2516 2505
                   && cpy >= Y_MIN_POS - Y_PROBE_OFFSET_FROM_EXTRUDER
2517 2506
                   && cpy <= Y_MAX_POS - Y_PROBE_OFFSET_FROM_EXTRUDER) {
2518
-                // Set the plan current position to X, Y, 0
2519
-                current_position[Z_AXIS] = 0;
2520
-                plan_set_position(cpx, cpy, 0, current_position[E_AXIS]); // = sync_plan_position
2521
-
2522
-                // Set Z destination away from bed and raise the axis
2523
-                // NOTE: This should always just be Z_RAISE_BEFORE_HOMING unless...???
2524
-                destination[Z_AXIS] = -Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS);
2525
-                feedrate = max_feedrate[Z_AXIS] * 60;  // feedrate (mm/m) = max_feedrate (mm/s)
2526
-
2527
-                #if ENABLED(DEBUG_LEVELING_FEATURE)
2528
-                  if (marlin_debug_flags & DEBUG_LEVELING) {
2529
-                    SERIAL_ECHOPAIR("Raise Z (before homing) by ", (float)Z_RAISE_BEFORE_HOMING);
2530
-                    SERIAL_EOL;
2531
-                    print_xyz("> homeZ > current_position", current_position);
2532
-                    print_xyz("> homeZ > destination", destination);
2533
-                  }
2534
-                #endif
2535
-
2536
-                line_to_destination();
2537
-                st_synchronize();
2538 2507
 
2539 2508
                 // Home the Z axis
2540 2509
                 HOMEAXIS(Z);

+ 2
- 0
Marlin/SanityCheck.h View File

@@ -368,6 +368,8 @@
368 368
   #error SDSLOW deprecated - set SPI_SPEED to SPI_HALF_SPEED instead
369 369
 #elif defined(SDEXTRASLOW)
370 370
   #error SDEXTRASLOW deprecated - set SPI_SPEED to SPI_QUARTER_SPEED instead
371
+#elif defined(Z_RAISE_BEFORE_HOMING)
372
+  #error Z_RAISE_BEFORE_HOMING is deprecated. Use MIN_Z_HEIGHT_FOR_HOMING instead.
371 373
 #endif
372 374
 
373 375
 #endif //SANITYCHECK_H

+ 2
- 3
Marlin/example_configurations/Felix/Configuration.h View File

@@ -360,6 +360,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
360 360
 #define INVERT_E3_DIR false
361 361
 
362 362
 // @section homing
363
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
364
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
363 365
 
364 366
 // ENDSTOP SETTINGS:
365 367
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -491,9 +493,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
491 493
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
492 494
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
493 495
 
494
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
495
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
496
-
497 496
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
498 497
 
499 498
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

@@ -357,6 +357,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
357 357
 #define INVERT_E3_DIR false
358 358
 
359 359
 // @section homing
360
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
361
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
360 362
 
361 363
 // ENDSTOP SETTINGS:
362 364
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -488,9 +490,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
488 490
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
489 491
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
490 492
 
491
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
492
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
493
-
494 493
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
495 494
 
496 495
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/Hephestos/Configuration.h View File

@@ -370,6 +370,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
370 370
 #define INVERT_E3_DIR false
371 371
 
372 372
 // @section homing
373
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
374
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
373 375
 
374 376
 // ENDSTOP SETTINGS:
375 377
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -501,9 +503,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
501 503
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
502 504
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
503 505
 
504
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
505
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
506
-
507 506
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
508 507
 
509 508
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/Hephestos_2/Configuration.h View File

@@ -373,6 +373,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
373 373
 #define INVERT_E3_DIR false
374 374
 
375 375
 // @section homing
376
+//#define MIN_Z_HEIGHT_FOR_HOMING 5 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
377
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
376 378
 
377 379
 // ENDSTOP SETTINGS:
378 380
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -504,9 +506,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
504 506
   #define Y_PROBE_OFFSET_FROM_EXTRUDER 15  // Z probe to nozzle Y offset: -front +behind
505 507
   #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z probe to nozzle Z offset: -below (always!)
506 508
 
507
-  #define Z_RAISE_BEFORE_HOMING 5       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
508
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
509
-
510 509
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
511 510
 
512 511
   #define Z_RAISE_BEFORE_PROBING 5    // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/K8200/Configuration.h View File

@@ -393,6 +393,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
393 393
 #define INVERT_E3_DIR true
394 394
 
395 395
 // @section homing
396
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
397
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
396 398
 
397 399
 // ENDSTOP SETTINGS:
398 400
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -524,9 +526,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
524 526
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
525 527
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
526 528
 
527
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
528
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
529
-
530 529
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
531 530
 
532 531
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

@@ -378,6 +378,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
378 378
 #define INVERT_E3_DIR false
379 379
 
380 380
 // @section homing
381
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
382
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
381 383
 
382 384
 // ENDSTOP SETTINGS:
383 385
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -509,9 +511,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
509 511
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
510 512
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
511 513
 
512
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
513
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
514
-
515 514
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
516 515
 
517 516
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/RigidBot/Configuration.h View File

@@ -372,6 +372,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
372 372
 #define INVERT_E3_DIR false
373 373
 
374 374
 // @section homing
375
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
376
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
375 377
 
376 378
 // ENDSTOP SETTINGS:
377 379
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -503,9 +505,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
503 505
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
504 506
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
505 507
 
506
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
507
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
508
-
509 508
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
510 509
 
511 510
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/SCARA/Configuration.h View File

@@ -386,6 +386,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
386 386
 #define INVERT_E3_DIR false
387 387
 
388 388
 // @section homing
389
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
390
+                                      // Be sure you have this distance over your Z_MAX_POS in case.
389 391
 
390 392
 // ENDSTOP SETTINGS:
391 393
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -517,9 +519,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
517 519
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
518 520
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
519 521
 
520
-  //#define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
521
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
522
-
523 522
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
524 523
 
525 524
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/TAZ4/Configuration.h View File

@@ -398,6 +398,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
398 398
 #define INVERT_E3_DIR true
399 399
 
400 400
 // @section homing
401
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
402
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
401 403
 
402 404
 // ENDSTOP SETTINGS:
403 405
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -529,9 +531,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
529 531
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
530 532
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
531 533
 
532
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
533
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
534
-
535 534
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
536 535
 
537 536
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/WITBOX/Configuration.h View File

@@ -370,6 +370,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
370 370
 #define INVERT_E3_DIR false
371 371
 
372 372
 // @section homing
373
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
374
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
373 375
 
374 376
 // ENDSTOP SETTINGS:
375 377
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -501,9 +503,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
501 503
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
502 504
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
503 505
 
504
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
505
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
506
-
507 506
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
508 507
 
509 508
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

@@ -378,6 +378,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
378 378
 #define INVERT_E3_DIR false
379 379
 
380 380
 // @section homing
381
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
382
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
381 383
 
382 384
 // ENDSTOP SETTINGS:
383 385
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -509,9 +511,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
509 511
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
510 512
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
511 513
 
512
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
513
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
514
-
515 514
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
516 515
 
517 516
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

@@ -413,6 +413,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
413 413
 #define INVERT_E3_DIR false
414 414
 
415 415
 // @section homing
416
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
417
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
416 418
 
417 419
 // ENDSTOP SETTINGS:
418 420
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -548,9 +550,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
548 550
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Z offset: -front [of the nozzle] +behind
549 551
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below [the nozzle] (always negative!)
550 552
 
551
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
552
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
553
-
554 553
   #define XY_TRAVEL_SPEED 4000         // X and Y axis travel speed between probes, in mm/min.
555 554
 
556 555
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/delta/generic/Configuration.h View File

@@ -413,6 +413,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
413 413
 #define INVERT_E3_DIR false
414 414
 
415 415
 // @section homing
416
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
417
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
416 418
 
417 419
 // ENDSTOP SETTINGS:
418 420
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -548,9 +550,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
548 550
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Z probe to nozzle Y offset: -front +behind
549 551
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z probe to nozzle Z offset: -below (always!)
550 552
 
551
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
552
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
553
-
554 553
   #define XY_TRAVEL_SPEED 4000         // X and Y axis travel speed between probes, in mm/min.
555 554
 
556 555
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

@@ -413,6 +413,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
413 413
 #define INVERT_E3_DIR false
414 414
 
415 415
 // @section homing
416
+//#define MIN_Z_HEIGHT_FOR_HOMING 15// (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
417
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
416 418
 
417 419
 // ENDSTOP SETTINGS:
418 420
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -548,9 +550,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
548 550
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Z offset: -front [of the nozzle] +behind
549 551
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below [the nozzle] (always negative!)
550 552
 
551
-  #define Z_RAISE_BEFORE_HOMING 15      // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
552
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
553
-
554 553
   #define XY_TRAVEL_SPEED 4000         // X and Y axis travel speed between probes, in mm/min.
555 554
 
556 555
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

@@ -400,6 +400,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
400 400
 #define INVERT_E3_DIR false
401 401
 
402 402
 // @section homing
403
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
404
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
403 405
 
404 406
 // ENDSTOP SETTINGS:
405 407
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -537,9 +539,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
537 539
   // not giving someone a head crash. Use something like G29 Z-0.2 to adjust as needed.
538 540
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -17.25  // Increase this if the first layer is too thin (remember: it's a negative number so increase means closer to zero).
539 541
 
540
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
541
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
542
-
543 542
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
544 543
 
545 544
   #define Z_RAISE_BEFORE_PROBING 100  // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

@@ -406,6 +406,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
406 406
 #define INVERT_E3_DIR false
407 407
 
408 408
 // @section homing
409
+//#define MIN_Z_HEIGHT_FOR_HOMING 7 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
410
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
409 411
 
410 412
 // ENDSTOP SETTINGS:
411 413
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -540,9 +542,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
540 542
   #define Y_PROBE_OFFSET_FROM_EXTRUDER 0.0     // Z offset: -front [of the nozzle] +behind
541 543
   #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.3     // Z offset: -below [the nozzle] (always negative!)
542 544
 
543
-  #define Z_RAISE_BEFORE_HOMING 7       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
544
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
545
-
546 545
   #define XY_TRAVEL_SPEED 7000         // X and Y axis travel speed between probes, in mm/min.
547 546
 
548 547
   #define Z_RAISE_BEFORE_PROBING 20   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/makibox/Configuration.h View File

@@ -381,6 +381,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
381 381
 #define INVERT_E3_DIR false
382 382
 
383 383
 // @section homing
384
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
385
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
384 386
 
385 387
 // ENDSTOP SETTINGS:
386 388
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -512,9 +514,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
512 514
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
513 515
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
514 516
 
515
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
516
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
517
-
518 517
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
519 518
 
520 519
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

+ 2
- 3
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

@@ -368,6 +368,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
368 368
 #define INVERT_E3_DIR false
369 369
 
370 370
 // @section homing
371
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
372
+                                    // Be sure you have this distance over your Z_MAX_POS in case.
371 373
 
372 374
 // ENDSTOP SETTINGS:
373 375
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -499,9 +501,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
499 501
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Z offset: -front [of the nozzle] +behind
500 502
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below [the nozzle] (always negative!)
501 503
 
502
-  #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
503
-                                        // Be sure you have this distance over your Z_MAX_POS in case.
504
-
505 504
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
506 505
 
507 506
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.

Loading…
Cancel
Save