Bladeren bron

Additional delta config updates

Scott Lahteine 8 jaren geleden
bovenliggende
commit
f2558b1f2c

+ 13
- 13
Marlin/example_configurations/delta/biv2.5/Configuration.h Bestand weergeven

@@ -376,10 +376,10 @@
376 376
   #define DELTA_CARRIAGE_OFFSET 20.0 // mm
377 377
 
378 378
   // Horizontal distance bridged by diagonal push rods when effector is centered.
379
-  #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
379
+  #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-(DELTA_EFFECTOR_OFFSET)-(DELTA_CARRIAGE_OFFSET))
380 380
 
381 381
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
382
-  #define DELTA_PRINTABLE_RADIUS 160
382
+  #define DELTA_PRINTABLE_RADIUS 160.0
383 383
 
384 384
   // Delta calibration menu
385 385
   // uncomment to add three points calibration menu option.
@@ -532,8 +532,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
532 532
 // @section machine
533 533
 
534 534
 // Travel limits after homing (units are in mm)
535
-#define X_MIN_POS -DELTA_PRINTABLE_RADIUS
536
-#define Y_MIN_POS -DELTA_PRINTABLE_RADIUS
535
+#define X_MIN_POS -(DELTA_PRINTABLE_RADIUS)
536
+#define Y_MIN_POS -(DELTA_PRINTABLE_RADIUS)
537 537
 #define Z_MIN_POS 0
538 538
 #define X_MAX_POS DELTA_PRINTABLE_RADIUS
539 539
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
@@ -606,9 +606,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
606 606
 
607 607
     // Set the rectangle in which to probe.
608 608
     #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
609
-    #define LEFT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
609
+    #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
610 610
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
611
-    #define FRONT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
611
+    #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
612 612
     #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
613 613
 
614 614
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
@@ -697,7 +697,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
697 697
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
698 698
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
699 699
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
700
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
700
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
701 701
 
702 702
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
703 703
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
@@ -706,7 +706,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
706 706
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
707 707
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
708 708
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
709
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
709
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
710 710
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
711 711
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
712 712
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
@@ -716,11 +716,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
716 716
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
717 717
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
718 718
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
719
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
719
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
720 720
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
721 721
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
722 722
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
723
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
723
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
724 724
 
725 725
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
726 726
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
@@ -729,7 +729,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
729 729
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
730 730
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
731 731
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
732
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
732
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
733 733
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
734 734
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
735 735
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
@@ -747,7 +747,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
747 747
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
748 748
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
749 749
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
750
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
750
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
751 751
 
752 752
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
753 753
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
@@ -756,7 +756,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
756 756
     #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
757 757
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
758 758
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
759
-    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
759
+    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
760 760
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
761 761
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
762 762
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0

+ 12
- 12
Marlin/example_configurations/delta/generic/Configuration.h Bestand weergeven

@@ -376,7 +376,7 @@
376 376
   #define DELTA_CARRIAGE_OFFSET 18.0 // mm
377 377
 
378 378
   // Horizontal distance bridged by diagonal push rods when effector is centered.
379
-  #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
379
+  #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-(DELTA_EFFECTOR_OFFSET)-(DELTA_CARRIAGE_OFFSET))
380 380
 
381 381
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
382 382
   #define DELTA_PRINTABLE_RADIUS 140.0
@@ -532,8 +532,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
532 532
 // @section machine
533 533
 
534 534
 // Travel limits after homing (units are in mm)
535
-#define X_MIN_POS -DELTA_PRINTABLE_RADIUS
536
-#define Y_MIN_POS -DELTA_PRINTABLE_RADIUS
535
+#define X_MIN_POS -(DELTA_PRINTABLE_RADIUS)
536
+#define Y_MIN_POS -(DELTA_PRINTABLE_RADIUS)
537 537
 #define Z_MIN_POS 0
538 538
 #define X_MAX_POS DELTA_PRINTABLE_RADIUS
539 539
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
@@ -606,9 +606,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
606 606
 
607 607
     // Set the rectangle in which to probe
608 608
     #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
609
-    #define LEFT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
609
+    #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
610 610
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
611
-    #define FRONT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
611
+    #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
612 612
     #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
613 613
 
614 614
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
@@ -697,7 +697,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
697 697
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
698 698
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
699 699
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
700
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
700
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
701 701
 
702 702
     #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
703 703
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
@@ -706,7 +706,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
706 706
     #define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
707 707
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
708 708
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
709
-    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
709
+    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
710 710
     #define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
711 711
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
712 712
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
@@ -716,11 +716,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
716 716
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
717 717
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
718 718
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
719
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
719
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
720 720
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
721 721
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
722 722
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
723
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
723
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
724 724
 
725 725
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
726 726
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
@@ -729,7 +729,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
729 729
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
730 730
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
731 731
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
732
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
732
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
733 733
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
734 734
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
735 735
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
@@ -747,7 +747,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
747 747
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
748 748
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
749 749
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
750
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
750
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
751 751
 
752 752
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
753 753
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
@@ -756,7 +756,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
756 756
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
757 757
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
758 758
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
759
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
759
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
760 760
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
761 761
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
762 762
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0

+ 10
- 10
Marlin/example_configurations/delta/kossel_mini/Configuration.h Bestand weergeven

@@ -376,10 +376,10 @@
376 376
   #define DELTA_CARRIAGE_OFFSET 19.5 // mm
377 377
 
378 378
   // Horizontal distance bridged by diagonal push rods when effector is centered.
379
-  #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
379
+  #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-(DELTA_EFFECTOR_OFFSET)-(DELTA_CARRIAGE_OFFSET))
380 380
 
381 381
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
382
-  #define DELTA_PRINTABLE_RADIUS 90
382
+  #define DELTA_PRINTABLE_RADIUS 90.0
383 383
 
384 384
   // Delta calibration menu
385 385
   // uncomment to add three points calibration menu option.
@@ -532,8 +532,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
532 532
 // @section machine
533 533
 
534 534
 // Travel limits after homing (units are in mm)
535
-#define X_MIN_POS -DELTA_PRINTABLE_RADIUS
536
-#define Y_MIN_POS -DELTA_PRINTABLE_RADIUS
535
+#define X_MIN_POS -(DELTA_PRINTABLE_RADIUS)
536
+#define Y_MIN_POS -(DELTA_PRINTABLE_RADIUS)
537 537
 #define Z_MIN_POS 0
538 538
 #define X_MAX_POS DELTA_PRINTABLE_RADIUS
539 539
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
@@ -606,9 +606,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
606 606
 
607 607
     // Set the rectangle in which to probe
608 608
     #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
609
-    #define LEFT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
609
+    #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
610 610
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
611
-    #define FRONT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
611
+    #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
612 612
     #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
613 613
 
614 614
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
@@ -697,7 +697,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
697 697
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
698 698
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
699 699
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
700
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
700
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
701 701
 
702 702
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
703 703
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
@@ -706,7 +706,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
706 706
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
707 707
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
708 708
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
709
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
709
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
710 710
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
711 711
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
712 712
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
@@ -751,7 +751,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
751 751
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
752 752
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
753 753
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
754
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
754
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
755 755
 
756 756
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
757 757
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
@@ -760,7 +760,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
760 760
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
761 761
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
762 762
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
763
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
763
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
764 764
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
765 765
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
766 766
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0

+ 13
- 13
Marlin/example_configurations/delta/kossel_pro/Configuration.h Bestand weergeven

@@ -365,10 +365,10 @@
365 365
   #define DELTA_CARRIAGE_OFFSET 30.0 // mm
366 366
 
367 367
   // Horizontal distance bridged by diagonal push rods when effector is centered.
368
-  #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
368
+  #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-(DELTA_EFFECTOR_OFFSET)-(DELTA_CARRIAGE_OFFSET))
369 369
 
370 370
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
371
-  #define DELTA_PRINTABLE_RADIUS 127
371
+  #define DELTA_PRINTABLE_RADIUS 127.0
372 372
 
373 373
   // Delta calibration menu
374 374
   // uncomment to add three points calibration menu option.
@@ -521,8 +521,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
521 521
 // @section machine
522 522
 
523 523
 // Travel limits after homing (units are in mm)
524
-#define X_MIN_POS -DELTA_PRINTABLE_RADIUS
525
-#define Y_MIN_POS -DELTA_PRINTABLE_RADIUS
524
+#define X_MIN_POS -(DELTA_PRINTABLE_RADIUS)
525
+#define Y_MIN_POS -(DELTA_PRINTABLE_RADIUS)
526 526
 #define Z_MIN_POS 0
527 527
 #define X_MAX_POS DELTA_PRINTABLE_RADIUS
528 528
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
@@ -595,9 +595,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
595 595
 
596 596
     // Set the rectangle in which to probe
597 597
     #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS-25)
598
-    #define LEFT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
598
+    #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
599 599
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
600
-    #define FRONT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
600
+    #define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
601 601
     #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
602 602
 
603 603
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
@@ -688,7 +688,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
688 688
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
689 689
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
690 690
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
691
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
691
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
692 692
 
693 693
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
694 694
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
@@ -697,7 +697,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
697 697
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
698 698
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
699 699
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
700
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
700
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
701 701
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
702 702
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
703 703
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
@@ -707,11 +707,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
707 707
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
708 708
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
709 709
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
710
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
710
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
711 711
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
712 712
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
713 713
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
714
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
714
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
715 715
 
716 716
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
717 717
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
@@ -720,7 +720,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
720 720
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
721 721
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
722 722
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
723
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/10)
723
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
724 724
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
725 725
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
726 726
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
@@ -738,7 +738,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
738 738
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
739 739
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
740 740
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z Z_PROBE_ALLEN_KEY_DEPLOY_2_Z
741
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
741
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
742 742
 
743 743
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
744 744
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -125.00
@@ -747,7 +747,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
747 747
     #define Z_PROBE_ALLEN_KEY_STOW_2_X Z_PROBE_ALLEN_KEY_STOW_1_X // move down to retract probe
748 748
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y Z_PROBE_ALLEN_KEY_STOW_1_Y
749 749
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 0.0
750
-    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/2)
750
+    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
751 751
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
752 752
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
753 753
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0

Laden…
Annuleren
Opslaan