|
@@ -64,36 +64,6 @@
|
64
|
64
|
// example_configurations/delta directory.
|
65
|
65
|
//
|
66
|
66
|
|
67
|
|
-#define DELTA
|
68
|
|
-#if ENABLED(DELTA)
|
69
|
|
-
|
70
|
|
- // Make delta curves from many straight lines (linear interpolation).
|
71
|
|
- // This is a trade-off between visible corners (not enough segments)
|
72
|
|
- // and processor overload (too many expensive sqrt calls).
|
73
|
|
- #define DELTA_SEGMENTS_PER_SECOND 160
|
74
|
|
-
|
75
|
|
- // NOTE NB all values for DELTA_* values MUST be floating point, so always have a decimal point in them
|
76
|
|
-
|
77
|
|
- // Center-to-center distance of the holes in the diagonal push rods.
|
78
|
|
- #define DELTA_DIAGONAL_ROD 317.3 + 2.5 // mm
|
79
|
|
-
|
80
|
|
- // Horizontal offset from middle of printer to smooth rod center.
|
81
|
|
- #define DELTA_SMOOTH_ROD_OFFSET 220.1 // mm
|
82
|
|
-
|
83
|
|
- // Horizontal offset of the universal joints on the end effector.
|
84
|
|
- #define DELTA_EFFECTOR_OFFSET 24.0 // mm
|
85
|
|
-
|
86
|
|
- // Horizontal offset of the universal joints on the carriages.
|
87
|
|
- #define DELTA_CARRIAGE_OFFSET 22.0 // mm
|
88
|
|
-
|
89
|
|
- // Horizontal distance bridged by diagonal push rods when effector is centered.
|
90
|
|
- #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET + 1)
|
91
|
|
-
|
92
|
|
- // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
|
93
|
|
- #define DELTA_PRINTABLE_RADIUS 140.0
|
94
|
|
-
|
95
|
|
-#endif
|
96
|
|
-
|
97
|
67
|
// @section info
|
98
|
68
|
|
99
|
69
|
#if ENABLED(USE_AUTOMATIC_VERSIONING)
|
|
@@ -376,6 +346,48 @@
|
376
|
346
|
// Uncomment this option to enable CoreXZ kinematics
|
377
|
347
|
//#define COREXZ
|
378
|
348
|
|
|
349
|
+//===========================================================================
|
|
350
|
+//============================== Delta Settings =============================
|
|
351
|
+//===========================================================================
|
|
352
|
+// Enable DELTA kinematics and most of the default configuration for Deltas
|
|
353
|
+#define DELTA
|
|
354
|
+
|
|
355
|
+#if ENABLED(DELTA)
|
|
356
|
+
|
|
357
|
+ // Make delta curves from many straight lines (linear interpolation).
|
|
358
|
+ // This is a trade-off between visible corners (not enough segments)
|
|
359
|
+ // and processor overload (too many expensive sqrt calls).
|
|
360
|
+ #define DELTA_SEGMENTS_PER_SECOND 160
|
|
361
|
+
|
|
362
|
+ // NOTE NB all values for DELTA_* values MUST be floating point, so always have a decimal point in them
|
|
363
|
+
|
|
364
|
+ // Center-to-center distance of the holes in the diagonal push rods.
|
|
365
|
+ #define DELTA_DIAGONAL_ROD 317.3 + 2.5 // mm
|
|
366
|
+
|
|
367
|
+ // Horizontal offset from middle of printer to smooth rod center.
|
|
368
|
+ #define DELTA_SMOOTH_ROD_OFFSET 220.1 // mm
|
|
369
|
+
|
|
370
|
+ // Horizontal offset of the universal joints on the end effector.
|
|
371
|
+ #define DELTA_EFFECTOR_OFFSET 24.0 // mm
|
|
372
|
+
|
|
373
|
+ // Horizontal offset of the universal joints on the carriages.
|
|
374
|
+ #define DELTA_CARRIAGE_OFFSET 22.0 // mm
|
|
375
|
+
|
|
376
|
+ // Horizontal distance bridged by diagonal push rods when effector is centered.
|
|
377
|
+ #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-(DELTA_EFFECTOR_OFFSET)-(DELTA_CARRIAGE_OFFSET) + 1)
|
|
378
|
+
|
|
379
|
+ // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
|
|
380
|
+ #define DELTA_PRINTABLE_RADIUS 140.0
|
|
381
|
+
|
|
382
|
+ // Delta calibration menu
|
|
383
|
+ // uncomment to add three points calibration menu option.
|
|
384
|
+ // See http://minow.blogspot.com/index.html#4918805519571907051
|
|
385
|
+ // If needed, adjust the X, Y, Z calibration coordinates
|
|
386
|
+ // in ultralcd.cpp@lcd_delta_calibrate_menu()
|
|
387
|
+ //#define DELTA_CALIBRATION_MENU
|
|
388
|
+
|
|
389
|
+#endif
|
|
390
|
+
|
379
|
391
|
// Enable this option for Toshiba steppers
|
380
|
392
|
//#define CONFIG_STEPPERS_TOSHIBA
|
381
|
393
|
|
|
@@ -452,11 +464,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
452
|
464
|
// Setting the wrong pin may have unexpected and potentially disastrous consequences.
|
453
|
465
|
// Use with caution and do your homework.
|
454
|
466
|
//
|
455
|
|
-//#define Z_MIN_PROBE_ENDSTOP
|
|
467
|
+#define Z_MIN_PROBE_ENDSTOP
|
456
|
468
|
|
457
|
469
|
// Enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use the Z_MIN_PIN for your Z_MIN_PROBE.
|
458
|
470
|
// The Z_MIN_PIN will then be used for both Z-homing and probing.
|
459
|
|
-#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
|
471
|
+//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
460
|
472
|
|
461
|
473
|
// To use a probe you must enable one of the two options above!
|
462
|
474
|
|
|
@@ -489,7 +501,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
489
|
501
|
// @section machine
|
490
|
502
|
|
491
|
503
|
// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
|
492
|
|
-#define INVERT_X_DIR false
|
|
504
|
+#define INVERT_X_DIR false // DELTA does not invert
|
493
|
505
|
#define INVERT_Y_DIR false
|
494
|
506
|
#define INVERT_Z_DIR false
|
495
|
507
|
|
|
@@ -502,13 +514,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
502
|
514
|
#define INVERT_E3_DIR false
|
503
|
515
|
|
504
|
516
|
// @section homing
|
505
|
|
-//#define MIN_Z_HEIGHT_FOR_HOMING 7 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
|
|
517
|
+//#define MIN_Z_HEIGHT_FOR_HOMING 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
|
506
|
518
|
// Be sure you have this distance over your Z_MAX_POS in case.
|
507
|
519
|
|
508
|
520
|
// ENDSTOP SETTINGS:
|
509
|
521
|
// Sets direction of endstops when homing; 1=MAX, -1=MIN
|
510
|
522
|
// :[-1,1]
|
511
|
|
-#define X_HOME_DIR 1
|
|
523
|
+#define X_HOME_DIR 1 // deltas always home to max
|
512
|
524
|
#define Y_HOME_DIR 1
|
513
|
525
|
#define Z_HOME_DIR 1
|
514
|
526
|
|
|
@@ -518,8 +530,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
518
|
530
|
// @section machine
|
519
|
531
|
|
520
|
532
|
// Travel limits after homing (units are in mm)
|
521
|
|
-#define X_MIN_POS -DELTA_PRINTABLE_RADIUS
|
522
|
|
-#define Y_MIN_POS -DELTA_PRINTABLE_RADIUS
|
|
533
|
+#define X_MIN_POS -(DELTA_PRINTABLE_RADIUS)
|
|
534
|
+#define Y_MIN_POS -(DELTA_PRINTABLE_RADIUS)
|
523
|
535
|
#define Z_MIN_POS 0
|
524
|
536
|
#define X_MAX_POS DELTA_PRINTABLE_RADIUS
|
525
|
537
|
#define Y_MAX_POS DELTA_PRINTABLE_RADIUS
|
|
@@ -586,23 +598,24 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
586
|
598
|
|
587
|
599
|
// Enable this to sample the bed in a grid (least squares solution).
|
588
|
600
|
// Note: this feature generates 10KB extra code size.
|
589
|
|
- #define AUTO_BED_LEVELING_GRID
|
|
601
|
+ #define AUTO_BED_LEVELING_GRID // Deltas only support grid mode.
|
590
|
602
|
|
591
|
603
|
#if ENABLED(AUTO_BED_LEVELING_GRID)
|
592
|
604
|
|
|
605
|
+ // Set the rectangle in which to probe
|
593
|
606
|
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
594
|
|
- #define LEFT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
|
|
607
|
+ #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
595
|
608
|
#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
596
|
|
- #define FRONT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
|
597
|
|
- #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
|
609
|
+ #define FRONT_PROBE_BED_POSITION - (DELTA_PROBEABLE_RADIUS - 20)
|
|
610
|
+ #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS - 40
|
598
|
611
|
|
599
|
|
- #define MIN_PROBE_EDGE 20 // The Z probe minimum square sides can be no smaller than this.
|
|
612
|
+ #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
|
600
|
613
|
|
601
|
614
|
// Non-linear bed leveling will be used.
|
602
|
615
|
// Compensate by interpolating between the nearest four Z probe values for each point.
|
603
|
616
|
// Useful for deltas where the print surface may appear like a bowl or dome shape.
|
604
|
617
|
// Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
|
605
|
|
- #define AUTO_BED_LEVELING_GRID_POINTS 7
|
|
618
|
+ #define AUTO_BED_LEVELING_GRID_POINTS 5
|
606
|
619
|
|
607
|
620
|
#else // !AUTO_BED_LEVELING_GRID
|
608
|
621
|
|
|
@@ -634,19 +647,18 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
634
|
647
|
// | |
|
635
|
648
|
// O-- FRONT --+
|
636
|
649
|
// (0,0)
|
637
|
|
- #define X_PROBE_OFFSET_FROM_EXTRUDER 0.0 // X offset: -left +right [of the nozzle]
|
638
|
|
- #define Y_PROBE_OFFSET_FROM_EXTRUDER 0.0 // Y offset: -front +behind [the nozzle]
|
639
|
|
- #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.3 // Z offset: -below +above [the nozzle]
|
|
650
|
+ #define X_PROBE_OFFSET_FROM_EXTRUDER 0.0 // Z probe to nozzle X offset: -left +right
|
|
651
|
+ #define Y_PROBE_OFFSET_FROM_EXTRUDER 0.0 // Z probe to nozzle Y offset: -front +behind
|
|
652
|
+ #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.3 // Z probe to nozzle Z offset: -below (always!)
|
640
|
653
|
|
641
|
|
- #define XY_TRAVEL_SPEED 7000 // X and Y axis travel speed between probes, in mm/min.
|
|
654
|
+ #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min.
|
642
|
655
|
|
643
|
656
|
#define Z_RAISE_BEFORE_PROBING 20 // How much the Z axis will be raised before traveling to the first probing point.
|
644
|
|
- #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points.
|
|
657
|
+ #define Z_RAISE_BETWEEN_PROBINGS 10 // How much the Z axis will be raised when traveling from between next probing points.
|
645
|
658
|
#define Z_RAISE_AFTER_PROBING 20 // How much the Z axis will be raised after the last probing point.
|
646
|
659
|
|
647
|
|
- #define Z_PROBE_END_SCRIPT "G1 Z20 X0 Y0 F7000"
|
648
|
|
-//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
|
649
|
|
- // Useful to retract a deployable Z probe.
|
|
660
|
+ //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
|
|
661
|
+ // Useful to retract a deployable Z probe.
|
650
|
662
|
|
651
|
663
|
// Probes are sensors/switches that need to be activated before they can be used
|
652
|
664
|
// and deactivated after their use.
|
|
@@ -654,7 +666,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
654
|
666
|
|
655
|
667
|
// A fix mounted probe, like the normal inductive probe, must be deactivated to go below Z_PROBE_OFFSET_FROM_EXTRUDER
|
656
|
668
|
// when the hardware endstops are active.
|
657
|
|
- //#define FIX_MOUNTED_PROBE
|
|
669
|
+ #define FIX_MOUNTED_PROBE
|
658
|
670
|
|
659
|
671
|
// A Servo Probe can be defined in the servo section below.
|
660
|
672
|
|
|
@@ -668,10 +680,91 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
668
|
680
|
// For example any setup that uses the nozzle itself as a probe.
|
669
|
681
|
//#define MECHANICAL_PROBE
|
670
|
682
|
|
|
683
|
+ // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
|
|
684
|
+ // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
|
|
685
|
+ //#define Z_PROBE_ALLEN_KEY
|
|
686
|
+
|
|
687
|
+ #if ENABLED(Z_PROBE_ALLEN_KEY)
|
|
688
|
+ // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29,
|
|
689
|
+ // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe.
|
|
690
|
+
|
|
691
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
|
|
692
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
|
|
693
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
|
|
694
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
|
|
695
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
|
|
696
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
|
|
697
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
|
|
698
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
|
|
699
|
+
|
|
700
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
|
|
701
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
|
|
702
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
|
|
703
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
|
|
704
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
|
|
705
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
|
|
706
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
|
|
707
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
|
|
708
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
|
|
709
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
|
|
710
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
|
|
711
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
|
|
712
|
+
|
|
713
|
+ // Kossel Mini
|
|
714
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
|
|
715
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
|
|
716
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
|
|
717
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
|
|
718
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
|
|
719
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
|
|
720
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
|
|
721
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
|
|
722
|
+
|
|
723
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
|
|
724
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
|
|
725
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
|
|
726
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
|
|
727
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
|
|
728
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
|
|
729
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
|
|
730
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
|
|
731
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
|
|
732
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
|
|
733
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
|
|
734
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
|
|
735
|
+
|
|
736
|
+ // Kossel Pro
|
|
737
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
|
|
738
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
|
|
739
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
|
|
740
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
|
|
741
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
|
|
742
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
|
|
743
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
|
|
744
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_XYZ
|
|
745
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
|
|
746
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
|
|
747
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
|
|
748
|
+ //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
|
|
749
|
+
|
|
750
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
|
|
751
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
|
|
752
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
|
|
753
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
|
|
754
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
|
|
755
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
|
|
756
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
|
|
757
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
|
|
758
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0 // return to 0,0,100
|
|
759
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
|
|
760
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
|
|
761
|
+ //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
|
|
762
|
+ #endif
|
|
763
|
+
|
671
|
764
|
// If you've enabled AUTO_BED_LEVELING_FEATURE and are using the Z Probe for Z Homing,
|
672
|
765
|
// it is highly recommended you leave Z_SAFE_HOMING enabled!
|
673
|
766
|
|
674
|
|
- #define Z_SAFE_HOMING // Use the z-min-probe for homing to z-min - not the z-min-endstop.
|
|
767
|
+ // #define Z_SAFE_HOMING // Use the z-min-probe for homing to z-min - not the z-min-endstop.
|
675
|
768
|
// This feature is meant to avoid Z homing with Z probe outside the bed area.
|
676
|
769
|
// When defined, it will:
|
677
|
770
|
// - Allow Z homing only after X and Y homing AND stepper drivers still enabled.
|
|
@@ -700,7 +793,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
700
|
793
|
#if ENABLED(MANUAL_HOME_POSITIONS)
|
701
|
794
|
#define MANUAL_X_HOME_POS 0
|
702
|
795
|
#define MANUAL_Y_HOME_POS 0
|
703
|
|
- #define MANUAL_Z_HOME_POS 386.5 // For delta: Distance between nozzle and print surface after homing.
|
|
796
|
+ #define MANUAL_Z_HOME_POS 381.4 // For delta: Distance between nozzle and print surface after homing.
|
704
|
797
|
#endif
|
705
|
798
|
|
706
|
799
|
// @section movement
|
|
@@ -709,18 +802,23 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
709
|
802
|
* MOVEMENT SETTINGS
|
710
|
803
|
*/
|
711
|
804
|
|
712
|
|
-#define HOMING_FEEDRATE {60*60, 60*60, 60*60, 0} // set the homing speeds (mm/min)
|
|
805
|
+// delta homing speeds must be the same on xyz
|
|
806
|
+#define HOMING_FEEDRATE_XYZ (60*60)
|
|
807
|
+#define HOMING_FEEDRATE_E 0
|
|
808
|
+#define HOMING_FEEDRATE { HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_E }
|
713
|
809
|
|
714
|
|
-// default settings
|
|
810
|
+// variables to calculate steps
|
715
|
811
|
#define XYZ_FULL_STEPS_PER_ROTATION 200
|
716
|
812
|
#define XYZ_MICROSTEPS 16
|
717
|
813
|
#define XYZ_BELT_PITCH 2
|
718
|
814
|
#define XYZ_PULLEY_TEETH 16
|
719
|
|
-#define XYZ_STEPS ((XYZ_FULL_STEPS_PER_ROTATION) * (XYZ_MICROSTEPS) / double(XYZ_BELT_PITCH) / double(XYZ_PULLEY_TEETH))
|
|
815
|
+
|
|
816
|
+// delta speeds must be the same on xyz
|
|
817
|
+#define XYZ_STEPS (XYZ_FULL_STEPS_PER_ROTATION * XYZ_MICROSTEPS / double(XYZ_BELT_PITCH) / double(XYZ_PULLEY_TEETH))
|
720
|
818
|
|
721
|
819
|
#define DEFAULT_AXIS_STEPS_PER_UNIT {XYZ_STEPS, XYZ_STEPS, XYZ_STEPS, 158} // default steps per unit for PowerWasp
|
722
|
|
-#define DEFAULT_MAX_FEEDRATE {200, 200, 200, 200} // (mm/sec)
|
723
|
|
-#define DEFAULT_MAX_ACCELERATION {9000,9000,9000,9000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
|
|
820
|
+#define DEFAULT_MAX_FEEDRATE {200, 200, 200, 25} // (mm/sec)
|
|
821
|
+#define DEFAULT_MAX_ACCELERATION {9000,9000,9000,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
|
724
|
822
|
|
725
|
823
|
#define DEFAULT_ACCELERATION 2000 // X, Y, Z and E acceleration in mm/s^2 for printing moves
|
726
|
824
|
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts
|
|
@@ -786,11 +884,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
786
|
884
|
// Preheat Constants
|
787
|
885
|
#define PLA_PREHEAT_HOTEND_TEMP 180
|
788
|
886
|
#define PLA_PREHEAT_HPB_TEMP 70
|
789
|
|
-#define PLA_PREHEAT_FAN_SPEED 100 // Insert Value between 0 and 255
|
|
887
|
+#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
|
790
|
888
|
|
791
|
889
|
#define ABS_PREHEAT_HOTEND_TEMP 240
|
792
|
|
-#define ABS_PREHEAT_HPB_TEMP 110
|
793
|
|
-#define ABS_PREHEAT_FAN_SPEED 100 // Insert Value between 0 and 255
|
|
890
|
+#define ABS_PREHEAT_HPB_TEMP 100
|
|
891
|
+#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
|
794
|
892
|
|
795
|
893
|
//=============================================================================
|
796
|
894
|
//============================= LCD and SD support ============================
|
|
@@ -1151,8 +1249,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
|
1151
|
1249
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
1152
|
1250
|
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
1153
|
1251
|
|
1154
|
|
- #define MEASURED_UPPER_LIMIT 2.00 //upper limit factor used for sensor reading validation in mm
|
1155
|
|
- #define MEASURED_LOWER_LIMIT 1.60 //lower limit factor for sensor reading validation in mm
|
|
1252
|
+ #define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
|
1253
|
+ #define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
1156
|
1254
|
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
1157
|
1255
|
|
1158
|
1256
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|