|
@@ -476,7 +476,7 @@
|
476
|
476
|
#define USE_ZMIN_PLUG
|
477
|
477
|
//#define USE_XMAX_PLUG
|
478
|
478
|
//#define USE_YMAX_PLUG
|
479
|
|
-//#define USE_ZMAX_PLUG
|
|
479
|
+#define USE_ZMAX_PLUG
|
480
|
480
|
|
481
|
481
|
// coarse Endstop Settings
|
482
|
482
|
#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
|
|
@@ -499,7 +499,7 @@
|
499
|
499
|
#define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
500
|
500
|
#define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
501
|
501
|
#define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
502
|
|
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
|
|
502
|
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe.
|
503
|
503
|
|
504
|
504
|
// Enable this feature if all enabled endstop pins are interrupt-capable.
|
505
|
505
|
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
|
|
@@ -530,7 +530,7 @@
|
530
|
530
|
* Override with M92
|
531
|
531
|
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
|
532
|
532
|
*/
|
533
|
|
-#define DEFAULT_AXIS_STEPS_PER_UNIT { 80.10, 80.10, 400, 99.0 }
|
|
533
|
+#define DEFAULT_AXIS_STEPS_PER_UNIT { 80.10, 80.10, 400, 103.66 }
|
534
|
534
|
|
535
|
535
|
/**
|
536
|
536
|
* Default Max Feed Rate (mm/s)
|
|
@@ -586,7 +586,7 @@
|
586
|
586
|
*
|
587
|
587
|
* Enable this option for a probe connected to the Z Min endstop pin.
|
588
|
588
|
*/
|
589
|
|
-#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
|
589
|
+//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
590
|
590
|
|
591
|
591
|
/**
|
592
|
592
|
* Z_MIN_PROBE_ENDSTOP
|
|
@@ -607,7 +607,8 @@
|
607
|
607
|
* disastrous consequences. Use with caution and do your homework.
|
608
|
608
|
*
|
609
|
609
|
*/
|
610
|
|
-//#define Z_MIN_PROBE_ENDSTOP
|
|
610
|
+#define Z_MIN_PROBE_ENDSTOP
|
|
611
|
+#define Z_MIN_PROBE_PIN Z_MAX_PIN
|
611
|
612
|
|
612
|
613
|
/**
|
613
|
614
|
* Probe Type
|
|
@@ -627,7 +628,7 @@
|
627
|
628
|
* A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
|
628
|
629
|
* (e.g., an inductive probe or a nozzle-based probe-switch.)
|
629
|
630
|
*/
|
630
|
|
-//#define FIX_MOUNTED_PROBE
|
|
631
|
+#define FIX_MOUNTED_PROBE
|
631
|
632
|
|
632
|
633
|
/**
|
633
|
634
|
* Z Servo Probe, such as an endstop switch on a rotating arm.
|
|
@@ -684,12 +685,12 @@
|
684
|
685
|
* O-- FRONT --+
|
685
|
686
|
* (0,0)
|
686
|
687
|
*/
|
687
|
|
-#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle]
|
688
|
|
-#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
|
689
|
|
-#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
|
688
|
+#define X_PROBE_OFFSET_FROM_EXTRUDER -37 // X offset: -left +right [of the nozzle]
|
|
689
|
+#define Y_PROBE_OFFSET_FROM_EXTRUDER 2 // Y offset: -front +behind [the nozzle]
|
|
690
|
+#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.04 // Z offset: -below +above [the nozzle]
|
690
|
691
|
|
691
|
692
|
// X and Y axis travel speed (mm/m) between probes
|
692
|
|
-#define XY_PROBE_SPEED 8000
|
|
693
|
+#define XY_PROBE_SPEED (100 * 60)
|
693
|
694
|
|
694
|
695
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
695
|
696
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
|
@@ -722,7 +723,7 @@
|
722
|
723
|
#define Z_PROBE_OFFSET_RANGE_MAX 20
|
723
|
724
|
|
724
|
725
|
// Enable the M48 repeatability test to test probe accuracy
|
725
|
|
-//#define Z_MIN_PROBE_REPEATABILITY_TEST
|
|
726
|
+#define Z_MIN_PROBE_REPEATABILITY_TEST
|
726
|
727
|
|
727
|
728
|
// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
|
728
|
729
|
// :{ 0:'Low', 1:'High' }
|
|
@@ -779,16 +780,16 @@
|
779
|
780
|
// @section machine
|
780
|
781
|
|
781
|
782
|
// The size of the print bed
|
782
|
|
-#define X_BED_SIZE 190
|
783
|
|
-#define Y_BED_SIZE 200
|
|
783
|
+#define X_BED_SIZE 195
|
|
784
|
+#define Y_BED_SIZE 183
|
784
|
785
|
|
785
|
786
|
// Travel limits (mm) after homing, corresponding to endstop positions.
|
786
|
|
-#define X_MIN_POS -5
|
|
787
|
+#define X_MIN_POS 0
|
787
|
788
|
#define Y_MIN_POS -10
|
788
|
789
|
#define Z_MIN_POS 0
|
789
|
790
|
#define X_MAX_POS X_BED_SIZE
|
790
|
791
|
#define Y_MAX_POS Y_BED_SIZE
|
791
|
|
-#define Z_MAX_POS 200
|
|
792
|
+#define Z_MAX_POS 165
|
792
|
793
|
|
793
|
794
|
// If enabled, axes won't move below MIN_POS in response to movement commands.
|
794
|
795
|
#define MIN_SOFTWARE_ENDSTOPS
|
|
@@ -855,7 +856,7 @@
|
855
|
856
|
*/
|
856
|
857
|
//#define AUTO_BED_LEVELING_3POINT
|
857
|
858
|
//#define AUTO_BED_LEVELING_LINEAR
|
858
|
|
-//#define AUTO_BED_LEVELING_BILINEAR
|
|
859
|
+#define AUTO_BED_LEVELING_BILINEAR
|
859
|
860
|
//#define AUTO_BED_LEVELING_UBL
|
860
|
861
|
//#define MESH_BED_LEVELING
|
861
|
862
|
|
|
@@ -876,14 +877,17 @@
|
876
|
877
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
877
|
878
|
|
878
|
879
|
// Set the number of grid points per dimension.
|
879
|
|
- #define GRID_MAX_POINTS_X 3
|
|
880
|
+ #define GRID_MAX_POINTS_X 4
|
880
|
881
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
881
|
882
|
|
|
883
|
+ #define BED_LEVEL_OFF_X 10
|
|
884
|
+ #define BED_LEVEL_OFF_Y 40
|
|
885
|
+
|
882
|
886
|
// Set the boundaries for probing (where the probe can reach).
|
883
|
|
- #define LEFT_PROBE_BED_POSITION 15
|
884
|
|
- #define RIGHT_PROBE_BED_POSITION 170
|
885
|
|
- #define FRONT_PROBE_BED_POSITION 20
|
886
|
|
- #define BACK_PROBE_BED_POSITION 170
|
|
887
|
+ #define LEFT_PROBE_BED_POSITION (BED_LEVEL_OFF_X - X_PROBE_OFFSET_FROM_EXTRUDER)
|
|
888
|
+ #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE + X_PROBE_OFFSET_FROM_EXTRUDER - BED_LEVEL_OFF_X)
|
|
889
|
+ #define FRONT_PROBE_BED_POSITION (BED_LEVEL_OFF_Y - Y_PROBE_OFFSET_FROM_EXTRUDER)
|
|
890
|
+ #define BACK_PROBE_BED_POSITION (Y_BED_SIZE + Y_PROBE_OFFSET_FROM_EXTRUDER - BED_LEVEL_OFF_Y)
|
887
|
891
|
|
888
|
892
|
// The Z probe minimum outer margin (to validate G29 parameters).
|
889
|
893
|
#define MIN_PROBE_EDGE 10
|
|
@@ -895,13 +899,13 @@
|
895
|
899
|
|
896
|
900
|
// Beyond the probed grid, continue the implied tilt?
|
897
|
901
|
// Default is to maintain the height of the nearest edge.
|
898
|
|
- //#define EXTRAPOLATE_BEYOND_GRID
|
|
902
|
+ #define EXTRAPOLATE_BEYOND_GRID
|
899
|
903
|
|
900
|
904
|
//
|
901
|
905
|
// Experimental Subdivision of the grid by Catmull-Rom method.
|
902
|
906
|
// Synthesizes intermediate points to produce a more detailed mesh.
|
903
|
907
|
//
|
904
|
|
- //#define ABL_BILINEAR_SUBDIVISION
|
|
908
|
+ #define ABL_BILINEAR_SUBDIVISION
|
905
|
909
|
#if ENABLED(ABL_BILINEAR_SUBDIVISION)
|
906
|
910
|
// Number of subdivisions between probe points
|
907
|
911
|
#define BILINEAR_SUBDIVISIONS 3
|
|
@@ -1686,7 +1690,7 @@
|
1686
|
1690
|
*/
|
1687
|
1691
|
//#define FILAMENT_WIDTH_SENSOR
|
1688
|
1692
|
|
1689
|
|
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
|
1693
|
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
1690
|
1694
|
|
1691
|
1695
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
1692
|
1696
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|