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

Unify Delta XYZ homing rates 

As noted in #130 allen key probe stow rate is based on homing rates,
but homing rates were left out of most delta configs. This unifies the
XYZ homing rates and applies the unified rates to allen key movements.
Scott Lahteine 9 years ago
parent
7c72b57313
commit
8b3d63c423
4 changed files with 70 additions and 66 deletions
Unified View Show Diff Stats
  1. 19
    17
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  2. 19
    17
      Marlin/example_configurations/delta/generic/Configuration.h
  3. 14
    12
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  4. 18
    20
      Marlin/example_configurations/delta/kossel_pro/Configuration.h

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

560 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30
 560 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30
561 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
 561 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
562 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100
 562 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100
563 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
563 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
564 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0
 564 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0
565 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
 565 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
566 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100
 566 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100
567 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
567 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
568
568
569 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
 569 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
570 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
 570 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
571 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
 571 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
572 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
572 
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
573 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
 573 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
574 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
 574 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
575 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
 575 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
576 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_X/10)
576 
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
577 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
 577 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
578 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
 578 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
579 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
 579 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
580 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_X
580 
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
581
581
582 
     // Kossel Mini
 582 
     // Kossel Mini
583 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
 583 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
584 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
 584 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
585 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
 585 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
586 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_X/10)
586 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
587 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
 587 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
588 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
 588 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
589 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 589 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
590 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
590 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
591
591
592 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
 592 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
593 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
 593 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
594 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
 594 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
595 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
595 
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
596 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
 596 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
597 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
 597 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
598 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
 598 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
599 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/10)
599 
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
600 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
 600 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
601 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
 601 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
602 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
 602 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
603 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
603 
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
604
604
605 
     // Kossel Pro
 605 
     // Kossel Pro
606 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
 606 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
607 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
 607 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
608 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
 608 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
609 
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
609 
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
610 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
 610 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
611 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
 611 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
612 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 612 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
613 
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_X
613 
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_XYZ
614 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
 614 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
615 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
 615 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
616 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
 616 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
617 
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_X/2)
617 
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
618
618
619 
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
 619 
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
620 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
 620 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
621 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
 621 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
622 
-    #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
622 
+    #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
623 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
 623 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
624 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
 624 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
625 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
 625 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
626 
-    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/2)
626 
+    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
627 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
 627 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
628 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
 628 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
629 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
 629 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
630 
-    #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
630 
+    #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
631 
   #endif
 631 
   #endif
632
632
633 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
 633 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
702 
  */
 702 
  */
703
703
704 
 // delta homing speeds must be the same on xyz
 704 
 // delta homing speeds must be the same on xyz
705 
-#define HOMING_FEEDRATE {200*30, 200*30, 200*30, 0}  // set the homing speeds (mm/min)
705 
+#define HOMING_FEEDRATE_XYZ (200*30)
706 
+#define HOMING_FEEDRATE_E 0
707 
+#define HOMING_FEEDRATE { HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_E }
706
708
707 
 // default settings
 709 
 // default settings
708 
 // delta speeds must be the same on xyz
 710 
 // delta speeds must be the same on xyz

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

561 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
 561 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
562 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
 562 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
563 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
 563 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
564 
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
564 
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
565 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
 565 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
566 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
 566 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
567 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 567 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
568 
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
568 
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
569
569
570 
     #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
 570 
     #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
571 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
 571 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
572 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
 572 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
573 
-    #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
573 
+    #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
574 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
 574 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
575 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
 575 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
576 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
 576 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
577 
-    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_X/10)
577 
+    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
578 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
 578 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
579 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
 579 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
580 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
 580 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
581 
-    #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_X
581 
+    #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
582
582
583 
     // Kossel Mini
 583 
     // Kossel Mini
584 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
 584 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
585 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
 585 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
586 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
 586 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
587 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_X/10)
587 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
588 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
 588 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
589 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
 589 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
590 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 590 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
591 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
591 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
592
592
593 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
 593 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
594 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
 594 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
595 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
 595 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
596 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
596 
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
597 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
 597 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
598 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
 598 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
599 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
 599 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
600 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/10)
600 
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
601 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
 601 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
602 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
 602 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
603 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
 603 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
604 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
604 
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
605
605
606 
     // Kossel Pro
 606 
     // Kossel Pro
607 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
 607 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
608 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
 608 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
609 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
 609 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
610 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
610 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
611 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
 611 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
612 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
 612 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
613 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 613 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
614 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_X
614 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_XYZ
615 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
 615 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
616 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
 616 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
617 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
 617 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
618 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_X/2)
618 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
619
619
620 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
 620 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
621 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
 621 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
622 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
 622 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
623 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
623 
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
624 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
 624 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
625 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
 625 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
626 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
 626 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
627 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/2)
627 
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
628 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
 628 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
629 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
 629 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
630 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
 630 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
631 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
631 
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
632 
   #endif
 632 
   #endif
633
633
634 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
 634 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
703 
  */
 703 
  */
704
704
705 
 // delta homing speeds must be the same on xyz
 705 
 // delta homing speeds must be the same on xyz
706 
-#define HOMING_FEEDRATE {200*60, 200*60, 200*60, 0}  // set the homing speeds (mm/min)
706 
+#define HOMING_FEEDRATE_XYZ (200*60)
707 
+#define HOMING_FEEDRATE_E 0
708 
+#define HOMING_FEEDRATE { HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_E }
707
709
708 
 // default settings
 710 
 // default settings
709 
 // delta speeds must be the same on xyz
 711 
 // delta speeds must be the same on xyz

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

561 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
 561 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
562 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
 562 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
563 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
 563 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
564 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
564 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
565 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
 565 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
566 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
 566 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
567 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 567 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
568 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
568 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
569
569
570 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
 570 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
571 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
 571 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
572 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
 572 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
573 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
573 
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
574 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
 574 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
575 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
 575 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
576 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
 576 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
577 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_X/10)
577 
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
578 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
 578 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
579 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
 579 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
580 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
 580 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
581 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_X
581 
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
582
582
583 
     // Kossel Mini
 583 
     // Kossel Mini
584 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
 584 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
611 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
 611 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
612 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
 612 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
613 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
 613 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
614 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
614 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
615 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
 615 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
616 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
 616 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
617 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 617 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
618 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_X
618 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_XYZ
619 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
 619 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
620 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
 620 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
621 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
 621 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
622 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_X/2)
622 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
623
623
624 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
 624 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
625 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
 625 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
626 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
 626 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
627 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
627 
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
628 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
 628 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
629 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
 629 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
630 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
 630 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
631 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/2)
631 
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
632 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
 632 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
633 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
 633 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
634 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
 634 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
635 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
635 
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
636 
   #endif
 636 
   #endif
637
637
638 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
 638 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
707 
  */
 707 
  */
708
708
709 
 // delta homing speeds must be the same on xyz
 709 
 // delta homing speeds must be the same on xyz
710 
-#define HOMING_FEEDRATE {200*60, 200*60, 200*60, 0}  // set the homing speeds (mm/min)
710 
+#define HOMING_FEEDRATE_XYZ (200*60)
711 
+#define HOMING_FEEDRATE_E 0
712 
+#define HOMING_FEEDRATE { HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_E }
711
713
712 
 // default settings
 714 
 // default settings
713 
 // delta speeds must be the same on xyz
 715 
 // delta speeds must be the same on xyz

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

550 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
 550 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
551 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
 551 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
552 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
 552 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
553 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
553 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
554 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
 554 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
555 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
 555 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
556 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 556 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
557 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
557 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
558
558
559 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
 559 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
560 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
 560 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
561 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
 561 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
562 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
562 
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
563 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
 563 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
564 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
 564 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
565 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
 565 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
566 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_X/10)
566 
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
567 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
 567 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
568 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
 568 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
569 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
 569 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
570 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_X
570 
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
571
571
572 
     // Kossel Mini
 572 
     // Kossel Mini
573 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
 573 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
574 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
 574 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
575 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
 575 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
576 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_X/10)
576 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
577 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
 577 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
578 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
 578 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
579 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 579 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
580 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
580 
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
581
581
582 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
 582 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
583 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
 583 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
584 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
 584 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
585 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
585 
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
586 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
 586 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
587 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
 587 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
588 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
 588 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
589 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/10)
589 
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
590 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
 590 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
591 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
 591 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
592 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
 592 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
593 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
593 
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
594
594
595 
     // Kossel Pro
 595 
     // Kossel Pro
596 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
 596 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
597 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
 597 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
598 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
 598 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
599 
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
599 
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
600 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
 600 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
601 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
 601 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
602 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 602 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
603 
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_X
603 
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_XYZ
604 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
 604 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
605 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
 605 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
606 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
 606 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
607 
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_X/2)
607 
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
608
608
609 
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
 609 
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
610 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
 610 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
611 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
 611 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
612 
-    #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
612 
+    #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
613 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
 613 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
614 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
 614 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
615 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
 615 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
616 
-    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/2)
616 
+    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
617 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
 617 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
618 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
 618 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
619 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
 619 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
620 
-    #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
620 
+    #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
621 
   #endif
 621 
   #endif
622
622
623 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
 623 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
692 
  */
 692 
  */
693
693
694 
 // delta homing speeds must be the same on xyz
 694 
 // delta homing speeds must be the same on xyz
695 
-#define HOMING_FEEDRATE_X (200*60)
696 
-#define HOMING_FEEDRATE_Y (200*60)
697 
-#define HOMING_FEEDRATE_Z (200*60)
695 
+#define HOMING_FEEDRATE_XYZ (200*60)
698 
 #define HOMING_FEEDRATE_E 0
 696 
 #define HOMING_FEEDRATE_E 0
699 
-#define HOMING_FEEDRATE {HOMING_FEEDRATE_X,HOMING_FEEDRATE_Y,HOMING_FEEDRATE_Z,HOMING_FEEDRATE_E}
697 
+#define HOMING_FEEDRATE { HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_E }
700
698
701 
 #define XYZ_FULL_STEPS_PER_ROTATION 200
 699 
 #define XYZ_FULL_STEPS_PER_ROTATION 200
702 
 #define XYZ_MICROSTEPS 32
 700 
 #define XYZ_MICROSTEPS 32

Write Preview
Loading…
Cancel
Save