Skip to content

Commit 3b6ac0d

Browse files
committed
ABL Bilinear and activated Z-probing
1 parent ffab812 commit 3b6ac0d

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

Marlin/Configuration.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@
664664
#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
665665
#define Y_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
666666
#define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
667-
#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe.
667+
#define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe.
668668

669669
/**
670670
* Stepper Drivers
@@ -748,7 +748,7 @@
748748
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
749749
*/
750750
//@ keep speed reasonable
751-
#define DEFAULT_MAX_FEEDRATE { 200, 200, 4, 75 }
751+
#define DEFAULT_MAX_FEEDRATE { 200, 200, 10, 75 }
752752

753753
/**
754754
* Default Max Acceleration (change/s) change = mm/s
@@ -861,14 +861,14 @@
861861
* or (with LCD_BED_LEVELING) the LCD controller.
862862
*/
863863
//@
864-
#define PROBE_MANUALLY
864+
//#define PROBE_MANUALLY
865865
//#define MANUAL_PROBE_START_Z 0
866866

867867
/**
868868
* A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
869869
* (e.g., an inductive probe or a nozzle-based probe-switch.)
870870
*/
871-
//#define FIX_MOUNTED_PROBE
871+
#define FIX_MOUNTED_PROBE
872872

873873
/**
874874
* Z Servo Probe, such as an endstop switch on a rotating arm.
@@ -936,7 +936,7 @@
936936
*
937937
* Specify a Probe position as { X, Y, Z }
938938
*/
939-
#define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 }
939+
#define NOZZLE_TO_PROBE_OFFSET { 15, -46, 0 }
940940

941941
// Certain types of probes need to stay away from edges
942942
#define MIN_PROBE_EDGE 10
@@ -960,7 +960,7 @@
960960
* A total of 2 does fast/slow probes with a weighted average.
961961
* A total of 3 or more adds more slow probes, taking the average.
962962
*/
963-
//#define MULTIPLE_PROBING 2
963+
#define MULTIPLE_PROBING 3
964964
//#define EXTRA_PROBING 1
965965

966966
/**
@@ -977,10 +977,10 @@
977977
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
978978
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
979979
*/
980-
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
981-
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
982-
#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes
983-
//#define Z_AFTER_PROBING 5 // Z position after probing is done
980+
#define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow
981+
#define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points
982+
#define Z_CLEARANCE_MULTI_PROBE 2 // Z Clearance between multiple probes
983+
#define Z_AFTER_PROBING 5 // Z position after probing is done
984984

985985
#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping
986986

@@ -1187,9 +1187,9 @@
11871187
*/
11881188
//#define AUTO_BED_LEVELING_3POINT
11891189
//#define AUTO_BED_LEVELING_LINEAR
1190-
//#define AUTO_BED_LEVELING_BILINEAR
1190+
#define AUTO_BED_LEVELING_BILINEAR
11911191
//#define AUTO_BED_LEVELING_UBL
1192-
#define MESH_BED_LEVELING
1192+
//#define MESH_BED_LEVELING
11931193

11941194
/**
11951195
* Normally G28 leaves leveling disabled on completion. Enable
@@ -1244,7 +1244,7 @@
12441244

12451245
// Beyond the probed grid, continue the implied tilt?
12461246
// Default is to maintain the height of the nearest edge.
1247-
//#define EXTRAPOLATE_BEYOND_GRID
1247+
#define EXTRAPOLATE_BEYOND_GRID
12481248

12491249
//
12501250
// Experimental Subdivision of the grid by Catmull-Rom method.
@@ -1342,11 +1342,11 @@
13421342
// - Move the Z probe (or nozzle) to a defined XY point before Z Homing when homing all axes (G28).
13431343
// - Prevent Z homing when the Z probe is outside bed area.
13441344
//
1345-
//#define Z_SAFE_HOMING
1345+
#define Z_SAFE_HOMING
13461346

13471347
#if ENABLED(Z_SAFE_HOMING)
1348-
#define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28).
1349-
#define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28).
1348+
#define Z_SAFE_HOMING_X_POINT (46) // X point for Z homing when homing all axes (G28).
1349+
#define Z_SAFE_HOMING_Y_POINT (100) // Y point for Z homing when homing all axes (G28).
13501350
#endif
13511351

13521352
// Homing speeds (mm/m)

0 commit comments

Comments
 (0)