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 8 years ago
parent
7c72b57313
commit
8b3d63c423
4 changed files with 70 additions and 66 deletions
Split 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,74 +560,74 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
560 560 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30
561 561 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
562 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 564 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0
565 565 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
566 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 569 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
570 570 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
571 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 573 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
574 574 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
575 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 577 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
578 578 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
579 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 582 
     // Kossel Mini
583 583 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
584 584 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
585 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 587 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
588 588 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
589 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 592 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
593 593 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
594 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 596 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
597 597 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
598 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 600 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
601 601 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
602 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 605 
     // Kossel Pro
606 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 607 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
608 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 610 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
611 611 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
612 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 614 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
615 615 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
616 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 619 
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
620 620 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
621 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 623 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
624 624 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
625 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 627 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
628 628 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
629 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 631 
   #endif
632 632
633 633 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
 
@@ -702,7 +702,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
702 702 
  */
703 703
704 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 709 
 // default settings
708 710 
 // delta speeds must be the same on xyz

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

@@ -561,74 +561,74 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
561 561 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
562 562 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
563 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 565 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
566 566 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
567 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 570 
     #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
571 571 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
572 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 574 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
575 575 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
576 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 578 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
579 579 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
580 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 583 
     // Kossel Mini
584 584 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
585 585 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
586 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 588 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
589 589 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
590 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 593 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
594 594 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
595 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 597 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
598 598 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
599 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 601 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
602 602 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
603 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 606 
     // Kossel Pro
607 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 608 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
609 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 611 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
612 612 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
613 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 615 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
616 616 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
617 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 620 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
621 621 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
622 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 624 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
625 625 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
626 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 628 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
629 629 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
630 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 632 
   #endif
633 633
634 634 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
 
@@ -703,7 +703,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
703 703 
  */
704 704
705 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 710 
 // default settings
709 711 
 // delta speeds must be the same on xyz

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

@@ -561,24 +561,24 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
561 561 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
562 562 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
563 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 565 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
566 566 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
567 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 570 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
571 571 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
572 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 574 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
575 575 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
576 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 578 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
579 579 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
580 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 583 
     // Kossel Mini
584 584 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
 
@@ -611,28 +611,28 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
611 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 612 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
613 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 615 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
616 616 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
617 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 619 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
620 620 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
621 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 624 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
625 625 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
626 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 628 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
629 629 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
630 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 632 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
633 633 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
634 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 636 
   #endif
637 637
638 638 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
 
@@ -707,7 +707,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
707 707 
  */
708 708
709 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 714 
 // default settings
713 715 
 // delta speeds must be the same on xyz

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

@@ -550,74 +550,74 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
550 550 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
551 551 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
552 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 554 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
555 555 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
556 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 559 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
560 560 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
561 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 563 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
564 564 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
565 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 567 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
568 568 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
569 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 572 
     // Kossel Mini
573 573 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
574 574 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
575 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 577 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
578 578 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
579 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 582 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
583 583 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
584 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 586 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
587 587 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
588 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 590 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
591 591 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
592 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 595 
     // Kossel Pro
596 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 597 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
598 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 600 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
601 601 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
602 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 604 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
605 605 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
606 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 609 
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
610 610 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
611 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 613 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
614 614 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
615 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 617 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
618 618 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
619 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 621 
   #endif
622 622
623 623 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
 
@@ -692,11 +692,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
692 692 
  */
693 693
694 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 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 699 
 #define XYZ_FULL_STEPS_PER_ROTATION 200
702 700 
 #define XYZ_MICROSTEPS 32

Write Preview
Loading…
Cancel
Save