Browse Source

Additional delta config updates

Scott Lahteine 9 years ago
parent
commit
f2558b1f2c

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

376
   #define DELTA_CARRIAGE_OFFSET 20.0 // mm
376
   #define DELTA_CARRIAGE_OFFSET 20.0 // mm
377
 
377
 
378
   // Horizontal distance bridged by diagonal push rods when effector is centered.
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
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
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
   // Delta calibration menu
384
   // Delta calibration menu
385
   // uncomment to add three points calibration menu option.
385
   // uncomment to add three points calibration menu option.
532
 // @section machine
532
 // @section machine
533
 
533
 
534
 // Travel limits after homing (units are in mm)
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
 #define Z_MIN_POS 0
537
 #define Z_MIN_POS 0
538
 #define X_MAX_POS DELTA_PRINTABLE_RADIUS
538
 #define X_MAX_POS DELTA_PRINTABLE_RADIUS
539
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
539
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
606
 
606
 
607
     // Set the rectangle in which to probe.
607
     // Set the rectangle in which to probe.
608
     #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
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
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
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
     #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
612
     #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
613
 
613
 
614
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
614
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
697
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
697
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
698
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
698
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
699
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
702
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
703
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
703
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
706
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
706
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
707
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
707
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
708
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
710
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
711
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
711
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
712
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
712
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
716
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
716
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
717
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
717
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
718
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
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
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
720
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
721
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
721
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
722
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
725
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
726
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
726
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
729
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
729
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
730
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
730
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
731
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
733
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
734
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
734
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
735
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
735
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
747
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
747
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
748
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
748
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
749
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
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
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
752
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
753
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
753
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
756
     #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
756
     #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
757
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
757
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
758
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
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
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
760
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
761
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
761
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
762
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
762
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0

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

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

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

376
   #define DELTA_CARRIAGE_OFFSET 19.5 // mm
376
   #define DELTA_CARRIAGE_OFFSET 19.5 // mm
377
 
377
 
378
   // Horizontal distance bridged by diagonal push rods when effector is centered.
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
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
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
   // Delta calibration menu
384
   // Delta calibration menu
385
   // uncomment to add three points calibration menu option.
385
   // uncomment to add three points calibration menu option.
532
 // @section machine
532
 // @section machine
533
 
533
 
534
 // Travel limits after homing (units are in mm)
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
 #define Z_MIN_POS 0
537
 #define Z_MIN_POS 0
538
 #define X_MAX_POS DELTA_PRINTABLE_RADIUS
538
 #define X_MAX_POS DELTA_PRINTABLE_RADIUS
539
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
539
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
606
 
606
 
607
     // Set the rectangle in which to probe
607
     // Set the rectangle in which to probe
608
     #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
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
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
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
     #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
612
     #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
613
 
613
 
614
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
614
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
697
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
697
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
698
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
698
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
699
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
702
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
703
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
703
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
706
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
706
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
707
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
707
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
708
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
710
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
711
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
711
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
712
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
712
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
751
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
751
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
752
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
752
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
753
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
756
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
757
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
757
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
760
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
760
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
761
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
761
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
762
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
764
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
765
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
765
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
766
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
766
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0

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

365
   #define DELTA_CARRIAGE_OFFSET 30.0 // mm
365
   #define DELTA_CARRIAGE_OFFSET 30.0 // mm
366
 
366
 
367
   // Horizontal distance bridged by diagonal push rods when effector is centered.
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
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
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
   // Delta calibration menu
373
   // Delta calibration menu
374
   // uncomment to add three points calibration menu option.
374
   // uncomment to add three points calibration menu option.
521
 // @section machine
521
 // @section machine
522
 
522
 
523
 // Travel limits after homing (units are in mm)
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
 #define Z_MIN_POS 0
526
 #define Z_MIN_POS 0
527
 #define X_MAX_POS DELTA_PRINTABLE_RADIUS
527
 #define X_MAX_POS DELTA_PRINTABLE_RADIUS
528
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
528
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
595
 
595
 
596
     // Set the rectangle in which to probe
596
     // Set the rectangle in which to probe
597
     #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS-25)
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
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
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
     #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
601
     #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
602
 
602
 
603
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
603
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
688
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
688
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
689
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
689
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
690
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
693
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
694
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
694
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
697
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
697
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
698
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
698
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
699
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
701
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
702
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
702
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
703
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
703
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
707
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
707
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
708
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
708
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
709
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
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
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
711
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
712
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
712
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
713
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
716
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
717
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
717
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
720
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
720
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
721
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
721
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
722
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
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
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
724
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
725
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
725
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
726
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
726
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
738
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
738
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
739
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
739
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
740
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z Z_PROBE_ALLEN_KEY_DEPLOY_2_Z
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
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
743
     #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
744
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -125.00
744
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -125.00
747
     #define Z_PROBE_ALLEN_KEY_STOW_2_X Z_PROBE_ALLEN_KEY_STOW_1_X // move down to retract probe
747
     #define Z_PROBE_ALLEN_KEY_STOW_2_X Z_PROBE_ALLEN_KEY_STOW_1_X // move down to retract probe
748
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y Z_PROBE_ALLEN_KEY_STOW_1_Y
748
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y Z_PROBE_ALLEN_KEY_STOW_1_Y
749
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 0.0
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
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
751
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
752
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
752
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
753
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
753
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0

Loading…
Cancel
Save