thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Use HOMING_FEEDRATE_Z for Z_PROBE_SPEED_FAST

Scott Lahteine 9 years ago
parent
09a3cc33e6
commit
4a6ed5e221
22 changed files with 22 additions and 22 deletions
Split View Show Diff Stats
  1. 1
    1
      Marlin/Configuration.h
  2. 1
    1
      Marlin/example_configurations/Cartesio/Configuration.h
  3. 1
    1
      Marlin/example_configurations/Felix/Configuration.h
  4. 1
    1
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  5. 1
    1
      Marlin/example_configurations/Hephestos/Configuration.h
  6. 1
    1
      Marlin/example_configurations/Hephestos_2/Configuration.h
  7. 1
    1
      Marlin/example_configurations/K8200/Configuration.h
  8. 1
    1
      Marlin/example_configurations/K8400/Configuration.h
  9. 1
    1
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  10. 1
    1
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  11. 1
    1
      Marlin/example_configurations/RigidBot/Configuration.h
  12. 1
    1
      Marlin/example_configurations/SCARA/Configuration.h
  13. 1
    1
      Marlin/example_configurations/TAZ4/Configuration.h
  14. 1
    1
      Marlin/example_configurations/WITBOX/Configuration.h
  15. 1
    1
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  16. 1
    1
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  17. 1
    1
      Marlin/example_configurations/delta/generic/Configuration.h
  18. 1
    1
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  19. 1
    1
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  20. 1
    1
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  21. 1
    1
      Marlin/example_configurations/makibox/Configuration.h
  22. 1
    1
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 1
- 1
Marlin/Configuration.h View File 

@@ -500,7 +500,7 @@
500 500 
 // X and Y axis travel speed (mm/m) between probes
501 501 
 #define XY_PROBE_SPEED 8000
502 502 
 // Speed for the first approach when probing
503 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
503 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
504 504 
 // Speed for the second approach when probing
505 505 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
506 506

+ 1
- 1
Marlin/example_configurations/Cartesio/Configuration.h View File 

@@ -500,7 +500,7 @@
500 500 
 // X and Y axis travel speed (mm/m) between probes
501 501 
 #define XY_PROBE_SPEED 8000
502 502 
 // Speed for the first approach when probing
503 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
503 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
504 504 
 // Speed for the second approach when probing
505 505 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
506 506

+ 1
- 1
Marlin/example_configurations/Felix/Configuration.h View File 

@@ -482,7 +482,7 @@
482 482 
 // X and Y axis travel speed (mm/m) between probes
483 483 
 #define XY_PROBE_SPEED 8000
484 484 
 // Speed for the first approach when probing
485 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
485 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
486 486 
 // Speed for the second approach when probing
487 487 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
488 488

+ 1
- 1
Marlin/example_configurations/Felix/DUAL/Configuration.h View File 

@@ -480,7 +480,7 @@
480 480 
 // X and Y axis travel speed (mm/m) between probes
481 481 
 #define XY_PROBE_SPEED 8000
482 482 
 // Speed for the first approach when probing
483 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
483 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
484 484 
 // Speed for the second approach when probing
485 485 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
486 486

+ 1
- 1
Marlin/example_configurations/Hephestos/Configuration.h View File 

@@ -492,7 +492,7 @@
492 492 
 // X and Y axis travel speed (mm/m) between probes
493 493 
 #define XY_PROBE_SPEED 8000
494 494 
 // Speed for the first approach when probing
495 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
495 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
496 496 
 // Speed for the second approach when probing
497 497 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
498 498

+ 1
- 1
Marlin/example_configurations/Hephestos_2/Configuration.h View File 

@@ -494,7 +494,7 @@
494 494 
 // X and Y axis travel speed (mm/m) between probes
495 495 
 #define XY_PROBE_SPEED 8000
496 496 
 // Speed for the first approach when probing
497 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
497 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
498 498 
 // Speed for the second approach when probing
499 499 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
500 500

+ 1
- 1
Marlin/example_configurations/K8200/Configuration.h View File 

@@ -517,7 +517,7 @@
517 517 
 // X and Y axis travel speed (mm/m) between probes
518 518 
 #define XY_PROBE_SPEED 8000
519 519 
 // Speed for the first approach when probing
520 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
520 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
521 521 
 // Speed for the second approach when probing
522 522 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
523 523

+ 1
- 1
Marlin/example_configurations/K8400/Configuration.h View File 

@@ -500,7 +500,7 @@
500 500 
 // X and Y axis travel speed (mm/m) between probes
501 501 
 #define XY_PROBE_SPEED 8000
502 502 
 // Speed for the first approach when probing
503 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
503 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
504 504 
 // Speed for the second approach when probing
505 505 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
506 506

+ 1
- 1
Marlin/example_configurations/K8400/Dual-head/Configuration.h View File 

@@ -500,7 +500,7 @@
500 500 
 // X and Y axis travel speed (mm/m) between probes
501 501 
 #define XY_PROBE_SPEED 8000
502 502 
 // Speed for the first approach when probing
503 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
503 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
504 504 
 // Speed for the second approach when probing
505 505 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
506 506

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

@@ -500,7 +500,7 @@
500 500 
 // X and Y axis travel speed (mm/m) between probes
501 501 
 #define XY_PROBE_SPEED 8000
502 502 
 // Speed for the first approach when probing
503 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
503 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
504 504 
 // Speed for the second approach when probing
505 505 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
506 506

+ 1
- 1
Marlin/example_configurations/RigidBot/Configuration.h View File 

@@ -497,7 +497,7 @@
497 497 
 // X and Y axis travel speed (mm/m) between probes
498 498 
 #define XY_PROBE_SPEED 8000
499 499 
 // Speed for the first approach when probing
500 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
500 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
501 501 
 // Speed for the second approach when probing
502 502 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
503 503

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration.h View File 

@@ -508,7 +508,7 @@
508 508 
 // X and Y axis travel speed (mm/m) between probes
509 509 
 #define XY_PROBE_SPEED 8000
510 510 
 // Speed for the first approach when probing
511 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
511 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
512 512 
 // Speed for the second approach when probing
513 513 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
514 514

+ 1
- 1
Marlin/example_configurations/TAZ4/Configuration.h View File 

@@ -521,7 +521,7 @@
521 521 
 // X and Y axis travel speed (mm/m) between probes
522 522 
 #define XY_PROBE_SPEED 8000
523 523 
 // Speed for the first approach when probing
524 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
524 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
525 525 
 // Speed for the second approach when probing
526 526 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
527 527

+ 1
- 1
Marlin/example_configurations/WITBOX/Configuration.h View File 

@@ -492,7 +492,7 @@
492 492 
 // X and Y axis travel speed (mm/m) between probes
493 493 
 #define XY_PROBE_SPEED 8000
494 494 
 // Speed for the first approach when probing
495 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
495 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
496 496 
 // Speed for the second approach when probing
497 497 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
498 498

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

@@ -500,7 +500,7 @@
500 500 
 // X and Y axis travel speed (mm/m) between probes
501 501 
 #define XY_PROBE_SPEED 8000
502 502 
 // Speed for the first approach when probing
503 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
503 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
504 504 
 // Speed for the second approach when probing
505 505 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
506 506

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

@@ -542,7 +542,7 @@
542 542 
 // X and Y axis travel speed (mm/m) between probes
543 543 
 #define XY_PROBE_SPEED 4000
544 544 
 // Speed for the first approach when probing
545 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
545 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
546 546 
 // Speed for the second approach when probing
547 547 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
548 548

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

@@ -542,7 +542,7 @@
542 542 
 // X and Y axis travel speed (mm/m) between probes
543 543 
 #define XY_PROBE_SPEED 4000
544 544 
 // Speed for the first approach when probing
545 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
545 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
546 546 
 // Speed for the second approach when probing
547 547 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
548 548

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

@@ -542,7 +542,7 @@
542 542 
 // X and Y axis travel speed (mm/m) between probes
543 543 
 #define XY_PROBE_SPEED 4000
544 544 
 // Speed for the first approach when probing
545 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
545 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
546 546 
 // Speed for the second approach when probing
547 547 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
548 548

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

@@ -533,7 +533,7 @@
533 533 
 // X and Y axis travel speed (mm/m) between probes
534 534 
 #define XY_PROBE_SPEED 8000
535 535 
 // Speed for the first approach when probing
536 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
536 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
537 537 
 // Speed for the second approach when probing
538 538 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
539 539

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

@@ -540,7 +540,7 @@
540 540 
 // X and Y axis travel speed (mm/m) between probes
541 541 
 #define XY_PROBE_SPEED 8000
542 542 
 // Speed for the first approach when probing
543 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
543 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
544 544 
 // Speed for the second approach when probing
545 545 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
546 546

+ 1
- 1
Marlin/example_configurations/makibox/Configuration.h View File 

@@ -503,7 +503,7 @@
503 503 
 // X and Y axis travel speed (mm/m) between probes
504 504 
 #define XY_PROBE_SPEED 8000
505 505 
 // Speed for the first approach when probing
506 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
506 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
507 507 
 // Speed for the second approach when probing
508 508 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
509 509

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

@@ -490,7 +490,7 @@
490 490 
 // X and Y axis travel speed (mm/m) between probes
491 491 
 #define XY_PROBE_SPEED 8000
492 492 
 // Speed for the first approach when probing
493 
-#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS])
493 
+#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
494 494 
 // Speed for the second approach when probing
495 495 
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
496 496

Write Preview
Loading…
Cancel
Save