|
@@ -55,45 +55,18 @@
|
55
|
55
|
*/
|
56
|
56
|
|
57
|
57
|
//===========================================================================
|
58
|
|
-//============================= SCARA Printer ===============================
|
|
58
|
+//============================= DELTA Printer ===============================
|
59
|
59
|
//===========================================================================
|
60
|
|
-
|
61
|
|
-/**
|
62
|
|
- * MORGAN_SCARA was developed by QHARLEY in South Africa in 2012-2013.
|
63
|
|
- * Implemented and slightly reworked by JCERNY in June, 2014.
|
64
|
|
- */
|
65
|
|
-
|
66
|
|
-// Specify the specific SCARA model
|
67
|
|
-#define MORGAN_SCARA
|
68
|
|
-
|
69
|
|
-#if ENABLED(MORGAN_SCARA)
|
70
|
|
-
|
71
|
|
- //#define DEBUG_SCARA_KINEMATICS
|
72
|
|
- #define SCARA_FEEDRATE_SCALING // Convert XY feedrate from mm/s to degrees/s on the fly
|
73
|
|
-
|
74
|
|
- // If movement is choppy try lowering this value
|
75
|
|
- #define SCARA_SEGMENTS_PER_SECOND 200
|
76
|
|
-
|
77
|
|
- // Length of inner and outer support arms. Measure arm lengths precisely.
|
78
|
|
- #define SCARA_LINKAGE_1 150 //mm
|
79
|
|
- #define SCARA_LINKAGE_2 150 //mm
|
80
|
|
-
|
81
|
|
- // SCARA tower offset (position of Tower relative to bed zero position)
|
82
|
|
- // This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
|
83
|
|
- #define SCARA_OFFSET_X 100 //mm
|
84
|
|
- #define SCARA_OFFSET_Y -56 //mm
|
85
|
|
-
|
86
|
|
- // Radius around the center where the arm cannot reach
|
87
|
|
- #define MIDDLE_DEAD_ZONE_R 0 //mm
|
88
|
|
-
|
89
|
|
- #define THETA_HOMING_OFFSET 0 //calculatated from Calibration Guide and command M360 / M114 see picture in http://reprap.harleystudio.co.za/?page_id=1073
|
90
|
|
- #define PSI_HOMING_OFFSET 0 //calculatated from Calibration Guide and command M364 / M114 see picture in http://reprap.harleystudio.co.za/?page_id=1073
|
91
|
|
-
|
92
|
|
-#endif
|
|
60
|
+// For a Delta printer start with one of the configuration files in the
|
|
61
|
+// config/examples/delta directory and customize for your machine.
|
|
62
|
+//
|
93
|
63
|
|
94
|
64
|
//===========================================================================
|
95
|
|
-//==================== END ==== SCARA Printer ==== END ======================
|
|
65
|
+//============================= SCARA Printer ===============================
|
96
|
66
|
//===========================================================================
|
|
67
|
+// For a SCARA printer start with the configuration files in
|
|
68
|
+// config/examples/SCARA and customize for your machine.
|
|
69
|
+//
|
97
|
70
|
|
98
|
71
|
// @section info
|
99
|
72
|
|
|
@@ -160,7 +133,7 @@
|
160
|
133
|
#endif
|
161
|
134
|
|
162
|
135
|
// Name displayed in the LCD "Ready" message and Info menu
|
163
|
|
-#define CUSTOM_MACHINE_NAME "SCARA"
|
|
136
|
+//#define CUSTOM_MACHINE_NAME "3D Printer"
|
164
|
137
|
|
165
|
138
|
// Printer's unique ID, used by some programs to differentiate between machines.
|
166
|
139
|
// Choose your own or use a service like http://www.uuidgenerator.net/version4
|
|
@@ -347,7 +320,7 @@
|
347
|
320
|
* Enable and connect the power supply to the PS_ON_PIN.
|
348
|
321
|
* Specify whether the power supply is active HIGH or active LOW.
|
349
|
322
|
*/
|
350
|
|
-#define PSU_CONTROL
|
|
323
|
+//#define PSU_CONTROL
|
351
|
324
|
//#define PSU_NAME "Power Supply"
|
352
|
325
|
|
353
|
326
|
#if ENABLED(PSU_CONTROL)
|
|
@@ -436,7 +409,7 @@
|
436
|
409
|
#define TEMP_SENSOR_3 0
|
437
|
410
|
#define TEMP_SENSOR_4 0
|
438
|
411
|
#define TEMP_SENSOR_5 0
|
439
|
|
-#define TEMP_SENSOR_BED 1
|
|
412
|
+#define TEMP_SENSOR_BED 0
|
440
|
413
|
#define TEMP_SENSOR_CHAMBER 0
|
441
|
414
|
|
442
|
415
|
// Dummy thermistor constant temperature readings, for use with 998 and 999
|
|
@@ -448,11 +421,11 @@
|
448
|
421
|
//#define TEMP_SENSOR_1_AS_REDUNDANT
|
449
|
422
|
#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
|
450
|
423
|
|
451
|
|
-#define TEMP_RESIDENCY_TIME 3 // (seconds) Time to wait for hotend to "settle" in M109
|
452
|
|
-#define TEMP_HYSTERESIS 2 // (°C) Temperature proximity considered "close enough" to the target
|
453
|
|
-#define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
|
|
424
|
+#define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109
|
|
425
|
+#define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
|
|
426
|
+#define TEMP_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
|
454
|
427
|
|
455
|
|
-#define TEMP_BED_RESIDENCY_TIME 0 // (seconds) Time to wait for bed to "settle" in M190
|
|
428
|
+#define TEMP_BED_RESIDENCY_TIME 10 // (seconds) Time to wait for bed to "settle" in M190
|
456
|
429
|
#define TEMP_BED_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
|
457
|
430
|
#define TEMP_BED_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
|
458
|
431
|
|
|
@@ -495,13 +468,25 @@
|
495
|
468
|
//#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
|
496
|
469
|
//#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
|
497
|
470
|
// Set/get with gcode: M301 E[extruder number, 0-2]
|
498
|
|
- #define PID_FUNCTIONAL_RANGE 20 // If the temperature difference between the target temperature and the actual temperature
|
|
471
|
+ #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
|
499
|
472
|
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
|
500
|
473
|
|
501
|
|
- // Merlin Hotend: From Autotune
|
502
|
|
- #define DEFAULT_Kp 24.5
|
503
|
|
- #define DEFAULT_Ki 1.72
|
504
|
|
- #define DEFAULT_Kd 87.73
|
|
474
|
+ // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
|
|
475
|
+
|
|
476
|
+ // Ultimaker
|
|
477
|
+ #define DEFAULT_Kp 22.2
|
|
478
|
+ #define DEFAULT_Ki 1.08
|
|
479
|
+ #define DEFAULT_Kd 114
|
|
480
|
+
|
|
481
|
+ // MakerGear
|
|
482
|
+ //#define DEFAULT_Kp 7.0
|
|
483
|
+ //#define DEFAULT_Ki 0.1
|
|
484
|
+ //#define DEFAULT_Kd 12
|
|
485
|
+
|
|
486
|
+ // Mendel Parts V9 on 12V
|
|
487
|
+ //#define DEFAULT_Kp 63.0
|
|
488
|
+ //#define DEFAULT_Ki 2.25
|
|
489
|
+ //#define DEFAULT_Kd 440
|
505
|
490
|
|
506
|
491
|
#endif // PIDTEMP
|
507
|
492
|
|
|
@@ -522,7 +507,7 @@
|
522
|
507
|
* heater. If your configuration is significantly different than this and you don't understand
|
523
|
508
|
* the issues involved, don't use bed PID until someone else verifies that your hardware works.
|
524
|
509
|
*/
|
525
|
|
-#define PIDTEMPBED
|
|
510
|
+//#define PIDTEMPBED
|
526
|
511
|
|
527
|
512
|
//#define BED_LIMIT_SWITCHING
|
528
|
513
|
|
|
@@ -538,11 +523,17 @@
|
538
|
523
|
//#define MIN_BED_POWER 0
|
539
|
524
|
//#define PID_BED_DEBUG // Sends debug data to the serial port.
|
540
|
525
|
|
541
|
|
- //12v Heatbed Mk3 12V in parallel
|
|
526
|
+ //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
|
|
527
|
+ //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
|
|
528
|
+ #define DEFAULT_bedKp 10.00
|
|
529
|
+ #define DEFAULT_bedKi .023
|
|
530
|
+ #define DEFAULT_bedKd 305.4
|
|
531
|
+
|
|
532
|
+ //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
|
542
|
533
|
//from pidautotune
|
543
|
|
- #define DEFAULT_bedKp 630.14
|
544
|
|
- #define DEFAULT_bedKi 121.71
|
545
|
|
- #define DEFAULT_bedKd 815.64
|
|
534
|
+ //#define DEFAULT_bedKp 97.1
|
|
535
|
+ //#define DEFAULT_bedKi 1.41
|
|
536
|
+ //#define DEFAULT_bedKd 1675.16
|
546
|
537
|
|
547
|
538
|
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
|
548
|
539
|
#endif // PIDTEMPBED
|
|
@@ -611,23 +602,23 @@
|
611
|
602
|
// Specify here all the endstop connectors that are connected to any endstop or probe.
|
612
|
603
|
// Almost all printers will be using one per axis. Probes will use one or more of the
|
613
|
604
|
// extra connectors. Leave undefined any used for non-endstop and non-probe purposes.
|
614
|
|
-//#define USE_XMIN_PLUG
|
615
|
|
-//#define USE_YMIN_PLUG
|
|
605
|
+#define USE_XMIN_PLUG
|
|
606
|
+#define USE_YMIN_PLUG
|
616
|
607
|
#define USE_ZMIN_PLUG
|
617
|
|
-#define USE_XMAX_PLUG
|
618
|
|
-#define USE_YMAX_PLUG
|
|
608
|
+//#define USE_XMAX_PLUG
|
|
609
|
+//#define USE_YMAX_PLUG
|
619
|
610
|
//#define USE_ZMAX_PLUG
|
620
|
611
|
|
621
|
612
|
// Enable pullup for all endstops to prevent a floating state
|
622
|
|
-//#define ENDSTOPPULLUPS
|
|
613
|
+#define ENDSTOPPULLUPS
|
623
|
614
|
#if DISABLED(ENDSTOPPULLUPS)
|
624
|
615
|
// Disable ENDSTOPPULLUPS to set pullups individually
|
625
|
|
- #define ENDSTOPPULLUP_XMAX
|
626
|
|
- #define ENDSTOPPULLUP_YMAX
|
627
|
|
- //#define ENDSTOPPULLUP_ZMAX // open pin, inverted
|
628
|
|
- //#define ENDSTOPPULLUP_XMIN // open pin, inverted
|
629
|
|
- //#define ENDSTOPPULLUP_YMIN // open pin, inverted
|
630
|
|
- #define ENDSTOPPULLUP_ZMIN
|
|
616
|
+ //#define ENDSTOPPULLUP_XMAX
|
|
617
|
+ //#define ENDSTOPPULLUP_YMAX
|
|
618
|
+ //#define ENDSTOPPULLUP_ZMAX
|
|
619
|
+ //#define ENDSTOPPULLUP_XMIN
|
|
620
|
+ //#define ENDSTOPPULLUP_YMIN
|
|
621
|
+ //#define ENDSTOPPULLUP_ZMIN
|
631
|
622
|
//#define ENDSTOPPULLUP_ZMIN_PROBE
|
632
|
623
|
#endif
|
633
|
624
|
|
|
@@ -645,13 +636,13 @@
|
645
|
636
|
#endif
|
646
|
637
|
|
647
|
638
|
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
|
648
|
|
-#define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
|
649
|
|
-#define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
|
650
|
|
-#define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
|
651
|
|
-#define X_MAX_ENDSTOP_INVERTING false
|
652
|
|
-#define Y_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
|
653
|
|
-#define Z_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
|
654
|
|
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe.
|
|
639
|
+#define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
|
640
|
+#define Y_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
|
641
|
+#define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
|
642
|
+#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
|
643
|
+#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
|
644
|
+#define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
|
645
|
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe.
|
655
|
646
|
|
656
|
647
|
/**
|
657
|
648
|
* Stepper Drivers
|
|
@@ -668,14 +659,14 @@
|
668
|
659
|
* TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
|
669
|
660
|
* :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
|
670
|
661
|
*/
|
671
|
|
-#define X_DRIVER_TYPE TMC2209
|
672
|
|
-#define Y_DRIVER_TYPE TMC2130
|
673
|
|
-#define Z_DRIVER_TYPE TMC2130
|
|
662
|
+//#define X_DRIVER_TYPE A4988
|
|
663
|
+//#define Y_DRIVER_TYPE A4988
|
|
664
|
+//#define Z_DRIVER_TYPE A4988
|
674
|
665
|
//#define X2_DRIVER_TYPE A4988
|
675
|
666
|
//#define Y2_DRIVER_TYPE A4988
|
676
|
667
|
//#define Z2_DRIVER_TYPE A4988
|
677
|
668
|
//#define Z3_DRIVER_TYPE A4988
|
678
|
|
-#define E0_DRIVER_TYPE TMC2660
|
|
669
|
+//#define E0_DRIVER_TYPE A4988
|
679
|
670
|
//#define E1_DRIVER_TYPE A4988
|
680
|
671
|
//#define E2_DRIVER_TYPE A4988
|
681
|
672
|
//#define E3_DRIVER_TYPE A4988
|
|
@@ -725,14 +716,14 @@
|
725
|
716
|
* Override with M92
|
726
|
717
|
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
|
727
|
718
|
*/
|
728
|
|
-#define DEFAULT_AXIS_STEPS_PER_UNIT { 103.69, 106.65, 200/1.25, 1000 } // default steps per unit for SCARA
|
|
719
|
+#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 }
|
729
|
720
|
|
730
|
721
|
/**
|
731
|
722
|
* Default Max Feed Rate (mm/s)
|
732
|
723
|
* Override with M203
|
733
|
724
|
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
|
734
|
725
|
*/
|
735
|
|
-#define DEFAULT_MAX_FEEDRATE { 300, 300, 30, 25 }
|
|
726
|
+#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 }
|
736
|
727
|
|
737
|
728
|
//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
|
738
|
729
|
#if ENABLED(LIMITED_MAX_FR_EDITING)
|
|
@@ -745,7 +736,7 @@
|
745
|
736
|
* Override with M201
|
746
|
737
|
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
|
747
|
738
|
*/
|
748
|
|
-#define DEFAULT_MAX_ACCELERATION { 300, 300, 20, 1000 }
|
|
739
|
+#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 }
|
749
|
740
|
|
750
|
741
|
//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
|
751
|
742
|
#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
|
|
@@ -760,9 +751,9 @@
|
760
|
751
|
* M204 R Retract Acceleration
|
761
|
752
|
* M204 T Travel Acceleration
|
762
|
753
|
*/
|
763
|
|
-#define DEFAULT_ACCELERATION 400 // X, Y, Z and E acceleration for printing moves
|
764
|
|
-#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
|
765
|
|
-#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves
|
|
754
|
+#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves
|
|
755
|
+#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
|
|
756
|
+#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
|
766
|
757
|
|
767
|
758
|
/**
|
768
|
759
|
* Default Jerk limits (mm/s)
|
|
@@ -772,10 +763,10 @@
|
772
|
763
|
* When changing speed and direction, if the difference is less than the
|
773
|
764
|
* value set here, it may happen instantaneously.
|
774
|
765
|
*/
|
775
|
|
-#define CLASSIC_JERK
|
|
766
|
+//#define CLASSIC_JERK
|
776
|
767
|
#if ENABLED(CLASSIC_JERK)
|
777
|
|
- #define DEFAULT_XJERK 5.0
|
778
|
|
- #define DEFAULT_YJERK 5.0
|
|
768
|
+ #define DEFAULT_XJERK 10.0
|
|
769
|
+ #define DEFAULT_YJERK 10.0
|
779
|
770
|
#define DEFAULT_ZJERK 0.3
|
780
|
771
|
|
781
|
772
|
//#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
|
|
@@ -784,7 +775,7 @@
|
784
|
775
|
#endif
|
785
|
776
|
#endif
|
786
|
777
|
|
787
|
|
-#define DEFAULT_EJERK 3.0 // May be used by Linear Advance
|
|
778
|
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
|
788
|
779
|
|
789
|
780
|
/**
|
790
|
781
|
* Junction Deviation Factor
|
|
@@ -860,7 +851,7 @@
|
860
|
851
|
* A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
|
861
|
852
|
* (e.g., an inductive probe or a nozzle-based probe-switch.)
|
862
|
853
|
*/
|
863
|
|
-#define FIX_MOUNTED_PROBE
|
|
854
|
+//#define FIX_MOUNTED_PROBE
|
864
|
855
|
|
865
|
856
|
/**
|
866
|
857
|
* Z Servo Probe, such as an endstop switch on a rotating arm.
|
|
@@ -928,7 +919,7 @@
|
928
|
919
|
*
|
929
|
920
|
* Specify a Probe position as { X, Y, Z }
|
930
|
921
|
*/
|
931
|
|
-#define NOZZLE_TO_PROBE_OFFSET { -25, -29, -12.35 }
|
|
922
|
+#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
|
932
|
923
|
|
933
|
924
|
// Certain types of probes need to stay away from edges
|
934
|
925
|
#define MIN_PROBE_EDGE 10
|
|
@@ -968,7 +959,7 @@
|
968
|
959
|
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
|
969
|
960
|
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
|
970
|
961
|
*/
|
971
|
|
-#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
|
|
962
|
+#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
|
972
|
963
|
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
|
973
|
964
|
#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes
|
974
|
965
|
//#define Z_AFTER_PROBING 5 // Z position after probing is done
|
|
@@ -983,7 +974,7 @@
|
983
|
974
|
//#define Z_MIN_PROBE_REPEATABILITY_TEST
|
984
|
975
|
|
985
|
976
|
// Before deploy/stow pause for user confirmation
|
986
|
|
-#define PAUSE_BEFORE_DEPLOY_STOW
|
|
977
|
+//#define PAUSE_BEFORE_DEPLOY_STOW
|
987
|
978
|
#if ENABLED(PAUSE_BEFORE_DEPLOY_STOW)
|
988
|
979
|
//#define PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED // For Manual Deploy Allenkey Probe
|
989
|
980
|
#endif
|
|
@@ -1028,8 +1019,8 @@
|
1028
|
1019
|
|
1029
|
1020
|
// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
|
1030
|
1021
|
#define INVERT_X_DIR false
|
1031
|
|
-#define INVERT_Y_DIR false
|
1032
|
|
-#define INVERT_Z_DIR true
|
|
1022
|
+#define INVERT_Y_DIR true
|
|
1023
|
+#define INVERT_Z_DIR false
|
1033
|
1024
|
|
1034
|
1025
|
// @section extruder
|
1035
|
1026
|
|
|
@@ -1052,8 +1043,8 @@
|
1052
|
1043
|
|
1053
|
1044
|
// Direction of endstops when homing; 1=MAX, -1=MIN
|
1054
|
1045
|
// :[-1,1]
|
1055
|
|
-#define X_HOME_DIR 1
|
1056
|
|
-#define Y_HOME_DIR 1
|
|
1046
|
+#define X_HOME_DIR -1
|
|
1047
|
+#define Y_HOME_DIR -1
|
1057
|
1048
|
#define Z_HOME_DIR -1
|
1058
|
1049
|
|
1059
|
1050
|
// @section machine
|
|
@@ -1065,10 +1056,10 @@
|
1065
|
1056
|
// Travel limits (mm) after homing, corresponding to endstop positions.
|
1066
|
1057
|
#define X_MIN_POS 0
|
1067
|
1058
|
#define Y_MIN_POS 0
|
1068
|
|
-#define Z_MIN_POS MANUAL_Z_HOME_POS
|
|
1059
|
+#define Z_MIN_POS 0
|
1069
|
1060
|
#define X_MAX_POS X_BED_SIZE
|
1070
|
1061
|
#define Y_MAX_POS Y_BED_SIZE
|
1071
|
|
-#define Z_MAX_POS 225
|
|
1062
|
+#define Z_MAX_POS 200
|
1072
|
1063
|
|
1073
|
1064
|
/**
|
1074
|
1065
|
* Software Endstops
|
|
@@ -1171,7 +1162,7 @@
|
1171
|
1162
|
*/
|
1172
|
1163
|
//#define AUTO_BED_LEVELING_3POINT
|
1173
|
1164
|
//#define AUTO_BED_LEVELING_LINEAR
|
1174
|
|
-#define AUTO_BED_LEVELING_BILINEAR
|
|
1165
|
+//#define AUTO_BED_LEVELING_BILINEAR
|
1175
|
1166
|
//#define AUTO_BED_LEVELING_UBL
|
1176
|
1167
|
//#define MESH_BED_LEVELING
|
1177
|
1168
|
|
|
@@ -1309,9 +1300,9 @@
|
1309
|
1300
|
|
1310
|
1301
|
// Manually set the home position. Leave these undefined for automatic settings.
|
1311
|
1302
|
// For DELTA this is the top-center of the Cartesian print volume.
|
1312
|
|
-#define MANUAL_X_HOME_POS -22
|
1313
|
|
-#define MANUAL_Y_HOME_POS -52
|
1314
|
|
-#define MANUAL_Z_HOME_POS 0.1
|
|
1303
|
+//#define MANUAL_X_HOME_POS 0
|
|
1304
|
+//#define MANUAL_Y_HOME_POS 0
|
|
1305
|
+//#define MANUAL_Z_HOME_POS 0
|
1315
|
1306
|
|
1316
|
1307
|
// Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
|
1317
|
1308
|
//
|
|
@@ -1330,8 +1321,8 @@
|
1330
|
1321
|
#endif
|
1331
|
1322
|
|
1332
|
1323
|
// Homing speeds (mm/m)
|
1333
|
|
-#define HOMING_FEEDRATE_XY (40*60)
|
1334
|
|
-#define HOMING_FEEDRATE_Z (10*60)
|
|
1324
|
+#define HOMING_FEEDRATE_XY (50*60)
|
|
1325
|
+#define HOMING_FEEDRATE_Z (4*60)
|
1335
|
1326
|
|
1336
|
1327
|
// Validate that endstops are triggered on homing moves
|
1337
|
1328
|
#define VALIDATE_HOMING_ENDSTOPS
|
|
@@ -1408,7 +1399,7 @@
|
1408
|
1399
|
* M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
|
1409
|
1400
|
* M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
|
1410
|
1401
|
*/
|
1411
|
|
-#define EEPROM_SETTINGS // Persistent storage with M500 and M501
|
|
1402
|
+//#define EEPROM_SETTINGS // Persistent storage with M500 and M501
|
1412
|
1403
|
//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release!
|
1413
|
1404
|
#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
|
1414
|
1405
|
#if ENABLED(EEPROM_SETTINGS)
|
|
@@ -1446,12 +1437,12 @@
|
1446
|
1437
|
#define PREHEAT_1_LABEL "PLA"
|
1447
|
1438
|
#define PREHEAT_1_TEMP_HOTEND 180
|
1448
|
1439
|
#define PREHEAT_1_TEMP_BED 70
|
1449
|
|
-#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
|
|
1440
|
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
|
1450
|
1441
|
|
1451
|
1442
|
#define PREHEAT_2_LABEL "ABS"
|
1452
|
1443
|
#define PREHEAT_2_TEMP_HOTEND 240
|
1453
|
|
-#define PREHEAT_2_TEMP_BED 100
|
1454
|
|
-#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
|
|
1444
|
+#define PREHEAT_2_TEMP_BED 110
|
|
1445
|
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
|
1455
|
1446
|
|
1456
|
1447
|
/**
|
1457
|
1448
|
* Nozzle Park
|
|
@@ -1747,7 +1738,7 @@
|
1747
|
1738
|
//
|
1748
|
1739
|
// ULTIMAKER Controller.
|
1749
|
1740
|
//
|
1750
|
|
-#define ULTIMAKERCONTROLLER
|
|
1741
|
+//#define ULTIMAKERCONTROLLER
|
1751
|
1742
|
|
1752
|
1743
|
//
|
1753
|
1744
|
// ULTIPANEL as seen on Thingiverse.
|