Merge pull request #10154 from thinkyhead/bf2_fewer_options
[2.0.x] Consolidate 3-point probing, auto delta probe radius
This commit is contained in:
Scott Lahteine
commit
2f192dbcd6
GPG key ID:
4AEE18F83AFDEB23
112 changed files with 1307 additions and 1839 deletions
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
@ -865,8 +859,7 @@
|
||||||
* With auto-retract enabled, all G1 E moves within the set range
|
* With auto-retract enabled, all G1 E moves within the set range
|
||||||
* will be converted to firmware-based retract/recover moves.
|
* will be converted to firmware-based retract/recover moves.
|
||||||
*
|
*
|
||||||
* Note: Be sure to turn off auto-retract during filament change.
|
* Be sure to turn off auto-retract during filament change.
|
||||||
* Note: Current Zlift reset by G28 or G28 Z.
|
|
||||||
*
|
*
|
||||||
* Note that M207 / M208 / M209 settings are saved to EEPROM.
|
* Note that M207 / M208 / M209 settings are saved to EEPROM.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -983,12 +983,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1011,17 +1010,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1034,13 +1022,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1061,6 +1042,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -1087,10 +1087,10 @@
|
||||||
//#define BACK_PROBE_BED_POSITION 190
|
//#define BACK_PROBE_BED_POSITION 190
|
||||||
|
|
||||||
// ANET A6 BLTOUCH right (39mm) to the nozzle
|
// ANET A6 BLTOUCH right (39mm) to the nozzle
|
||||||
#define LEFT_PROBE_BED_POSITION 36
|
//#define LEFT_PROBE_BED_POSITION 36
|
||||||
#define RIGHT_PROBE_BED_POSITION 190
|
//#define RIGHT_PROBE_BED_POSITION 190
|
||||||
#define FRONT_PROBE_BED_POSITION 20
|
//#define FRONT_PROBE_BED_POSITION 20
|
||||||
#define BACK_PROBE_BED_POSITION 190
|
//#define BACK_PROBE_BED_POSITION 190
|
||||||
|
|
||||||
// ANET A6 with new X-Axis and modded Y-Axis
|
// ANET A6 with new X-Axis and modded Y-Axis
|
||||||
//#define LEFT_PROBE_BED_POSITION 20
|
//#define LEFT_PROBE_BED_POSITION 20
|
||||||
|
|
@ -1104,7 +1104,6 @@
|
||||||
//#define FRONT_PROBE_BED_POSITION 20
|
//#define FRONT_PROBE_BED_POSITION 20
|
||||||
//#define BACK_PROBE_BED_POSITION 194
|
//#define BACK_PROBE_BED_POSITION 194
|
||||||
|
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
||||||
|
|
@ -1126,17 +1125,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1149,13 +1137,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1176,6 +1157,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
@ -1687,6 +1681,8 @@
|
||||||
// RepRapDiscount FULL GRAPHIC Smart Controller
|
// RepRapDiscount FULL GRAPHIC Smart Controller
|
||||||
// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
|
// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
|
||||||
//
|
//
|
||||||
|
// Note: Details on connecting to the Anet V1.0 controller are in the file pins_ANET_10.h
|
||||||
|
//
|
||||||
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -970,12 +970,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION 15
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION 190
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION 15
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION 170
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1002,12 +1001,12 @@
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
// 3 arbitrary points to probe.
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
// A simple cross-product is used to estimate the plane of the bed.
|
||||||
#define ABL_PROBE_PT_1_X 20
|
#define PROBE_PT_1_X 20
|
||||||
#define ABL_PROBE_PT_1_Y 160
|
#define PROBE_PT_1_Y 160
|
||||||
#define ABL_PROBE_PT_2_X 20
|
#define PROBE_PT_2_X 20
|
||||||
#define ABL_PROBE_PT_2_Y 10
|
#define PROBE_PT_2_Y 10
|
||||||
#define ABL_PROBE_PT_3_X 180
|
#define PROBE_PT_3_X 180
|
||||||
#define ABL_PROBE_PT_3_Y 10
|
#define PROBE_PT_3_Y 10
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
|
|
@ -1021,13 +1020,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1048,6 +1040,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
@ -1541,11 +1546,12 @@
|
||||||
//
|
//
|
||||||
//#define G3D_PANEL
|
//#define G3D_PANEL
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// RepRapDiscount FULL GRAPHIC Smart Controller
|
// RepRapDiscount FULL GRAPHIC Smart Controller
|
||||||
// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
|
// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
|
||||||
//
|
//
|
||||||
|
// Note: Details on connecting to the Anet V1.0 controller are in the file pins_ANET_10.h
|
||||||
|
//
|
||||||
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -565,7 +565,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
|
||||||
* Override with M92
|
* Override with M92
|
||||||
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
|
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_AXIS_STEPS_PER_UNIT { 100, 100, 400, 400 }
|
#define DEFAULT_AXIS_STEPS_PER_UNIT { 100, 100, 400, 400}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default Max Feed Rate (mm/s)
|
* Default Max Feed Rate (mm/s)
|
||||||
|
|
@ -810,7 +810,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
|
||||||
|
|
||||||
//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
|
//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
|
||||||
|
|
||||||
#define Z_HOMING_HEIGHT 10 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
|
#define Z_HOMING_HEIGHT 8 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
|
||||||
// Be sure you have this distance over your Z_MAX_POS in case.
|
// Be sure you have this distance over your Z_MAX_POS in case.
|
||||||
|
|
||||||
// Direction of endstops when homing; 1=MAX, -1=MIN
|
// Direction of endstops when homing; 1=MAX, -1=MIN
|
||||||
|
|
@ -963,12 +963,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION 15
|
||||||
#define RIGHT_PROBE_BED_POSITION 170
|
//#define RIGHT_PROBE_BED_POSITION 170
|
||||||
#define FRONT_PROBE_BED_POSITION 20
|
//#define FRONT_PROBE_BED_POSITION 20
|
||||||
#define BACK_PROBE_BED_POSITION 170
|
//#define BACK_PROBE_BED_POSITION 170
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -528,13 +528,13 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
|
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
|
||||||
#define X_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
const bool X_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
||||||
#define Y_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
const bool Y_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
||||||
#define Z_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
const bool Z_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
||||||
#define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
||||||
#define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
||||||
#define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
||||||
#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
|
const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
|
||||||
|
|
||||||
// Enable this feature if all enabled endstop pins are interrupt-capable.
|
// Enable this feature if all enabled endstop pins are interrupt-capable.
|
||||||
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
|
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
|
||||||
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION 15
|
||||||
#define RIGHT_PROBE_BED_POSITION 170
|
//#define RIGHT_PROBE_BED_POSITION 170
|
||||||
#define FRONT_PROBE_BED_POSITION 20
|
//#define FRONT_PROBE_BED_POSITION 20
|
||||||
#define BACK_PROBE_BED_POSITION 170
|
//#define BACK_PROBE_BED_POSITION 170
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -951,12 +951,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -979,17 +978,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1002,13 +990,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1029,6 +1010,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -159,7 +159,7 @@
|
||||||
#define EXTRUDERS 1
|
#define EXTRUDERS 1
|
||||||
|
|
||||||
// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
|
// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
|
||||||
|
|
||||||
// For Cyclops or any "multi-extruder" that shares a single nozzle.
|
// For Cyclops or any "multi-extruder" that shares a single nozzle.
|
||||||
//#define SINGLENOZZLE
|
//#define SINGLENOZZLE
|
||||||
|
|
@ -965,11 +965,10 @@
|
||||||
#define GRID_MAX_POINTS_Y 4
|
#define GRID_MAX_POINTS_Y 4
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION X_MIN_POS + (X_PROBE_OFFSET_FROM_EXTRUDER)
|
//#define LEFT_PROBE_BED_POSITION X_MIN_POS + (X_PROBE_OFFSET_FROM_EXTRUDER)
|
||||||
#define RIGHT_PROBE_BED_POSITION X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
|
//#define RIGHT_PROBE_BED_POSITION X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
|
||||||
#define FRONT_PROBE_BED_POSITION Y_MIN_POS + (Y_PROBE_OFFSET_FROM_EXTRUDER)
|
//#define FRONT_PROBE_BED_POSITION Y_MIN_POS + (Y_PROBE_OFFSET_FROM_EXTRUDER)
|
||||||
#define BACK_PROBE_BED_POSITION Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
|
//#define BACK_PROBE_BED_POSITION Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
|
||||||
|
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -996,12 +995,12 @@
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
// 3 arbitrary points to probe.
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
// A simple cross-product is used to estimate the plane of the bed.
|
||||||
#define ABL_PROBE_PT_1_X X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER
|
#define PROBE_PT_1_X X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER
|
||||||
#define ABL_PROBE_PT_1_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
|
#define PROBE_PT_1_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
|
||||||
#define ABL_PROBE_PT_2_X X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
|
#define PROBE_PT_2_X X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
|
||||||
#define ABL_PROBE_PT_2_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
|
#define PROBE_PT_2_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
|
||||||
#define ABL_PROBE_PT_3_X ((X_MIN_POS + X_MAX_POS) / 2)
|
#define PROBE_PT_3_X ((X_MIN_POS + X_MAX_POS) / 2)
|
||||||
#define ABL_PROBE_PT_3_Y Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
|
#define PROBE_PT_3_Y Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
|
|
@ -1015,13 +1014,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1042,6 +1034,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -951,12 +951,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -979,17 +978,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1002,13 +990,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1029,6 +1010,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -962,12 +962,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -990,17 +989,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1013,13 +1001,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1040,6 +1021,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -973,12 +973,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1001,17 +1000,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1024,14 +1012,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1052,6 +1032,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
@ -1416,13 +1409,13 @@
|
||||||
// This option overrides the default number of encoder pulses needed to
|
// This option overrides the default number of encoder pulses needed to
|
||||||
// produce one step. Should be increased for high-resolution encoders.
|
// produce one step. Should be increased for high-resolution encoders.
|
||||||
//
|
//
|
||||||
#define ENCODER_PULSES_PER_STEP 4
|
//#define ENCODER_PULSES_PER_STEP 4
|
||||||
|
|
||||||
//
|
//
|
||||||
// Use this option to override the number of step signals required to
|
// Use this option to override the number of step signals required to
|
||||||
// move between next/prev menu items.
|
// move between next/prev menu items.
|
||||||
//
|
//
|
||||||
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
//#define ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Encoder Direction Options
|
* Encoder Direction Options
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -948,7 +948,7 @@
|
||||||
/**
|
/**
|
||||||
* Enable the G26 Mesh Validation Pattern tool.
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
*/
|
*/
|
||||||
#define G26_MESH_VALIDATION
|
#define G26_MESH_VALIDATION // Enable G26 mesh validation
|
||||||
#if ENABLED(G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
||||||
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
||||||
|
|
@ -964,12 +964,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -992,17 +991,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1015,13 +1003,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1042,6 +1023,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -982,12 +982,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1010,17 +1009,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1033,13 +1021,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1060,6 +1041,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
@ -1424,13 +1418,13 @@
|
||||||
// This option overrides the default number of encoder pulses needed to
|
// This option overrides the default number of encoder pulses needed to
|
||||||
// produce one step. Should be increased for high-resolution encoders.
|
// produce one step. Should be increased for high-resolution encoders.
|
||||||
//
|
//
|
||||||
#define ENCODER_PULSES_PER_STEP 4
|
//#define ENCODER_PULSES_PER_STEP 4
|
||||||
|
|
||||||
//
|
//
|
||||||
// Use this option to override the number of step signals required to
|
// Use this option to override the number of step signals required to
|
||||||
// move between next/prev menu items.
|
// move between next/prev menu items.
|
||||||
//
|
//
|
||||||
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
//#define ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Encoder Direction Options
|
* Encoder Direction Options
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -967,12 +967,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -995,17 +994,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1018,13 +1006,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1045,6 +1026,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -957,7 +957,7 @@
|
||||||
/**
|
/**
|
||||||
* Enable the G26 Mesh Validation Pattern tool.
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
*/
|
*/
|
||||||
#define G26_MESH_VALIDATION
|
#define G26_MESH_VALIDATION // Enable G26 mesh validation
|
||||||
#if ENABLED(G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
||||||
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
||||||
|
|
@ -973,12 +973,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1001,17 +1000,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1024,13 +1012,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1051,6 +1032,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -945,12 +945,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -973,17 +972,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -996,13 +984,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1023,6 +1004,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -945,12 +945,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -973,17 +972,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -996,13 +984,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1023,6 +1004,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -133,8 +133,7 @@
|
||||||
// The following define selects which electronics board you have.
|
// The following define selects which electronics board you have.
|
||||||
// Please choose the name from boards.h that matches your setup
|
// Please choose the name from boards.h that matches your setup
|
||||||
#ifndef MOTHERBOARD
|
#ifndef MOTHERBOARD
|
||||||
//#define MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB // For people switching over to the Panucatt Re-ARM board
|
#define MOTHERBOARD BOARD_RAMPS_14_EFB
|
||||||
#define MOTHERBOARD BOARD_RAMPS_14_EFB // For unmodified printers using Atmega-2560 and RAMPS boards.
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Optional custom name for your RepStrap or other custom machine
|
// Optional custom name for your RepStrap or other custom machine
|
||||||
|
|
@ -728,10 +727,10 @@
|
||||||
*/
|
*/
|
||||||
#define X_PROBE_OFFSET_FROM_EXTRUDER 38 // X offset: -left +right [of the nozzle]
|
#define X_PROBE_OFFSET_FROM_EXTRUDER 38 // X offset: -left +right [of the nozzle]
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -7 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -7 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -10.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -10.30 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
// Certain types of probes need to stay away from edges
|
// Certain types of probes need to stay away from edges
|
||||||
#define MIN_PROBE_EDGE 10
|
#define MIN_PROBE_EDGE 0
|
||||||
|
|
||||||
// X and Y axis travel speed (mm/m) between probes
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 7500
|
#define XY_PROBE_SPEED 7500
|
||||||
|
|
@ -971,11 +970,10 @@
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 39
|
//#define LEFT_PROBE_BED_POSITION (X_MIN_POS + 33)
|
||||||
#define RIGHT_PROBE_BED_POSITION 170
|
//#define RIGHT_PROBE_BED_POSITION (X_MAX_POS - 37)
|
||||||
#define FRONT_PROBE_BED_POSITION 10
|
//#define FRONT_PROBE_BED_POSITION (Y_MIN_POS + 7)
|
||||||
#define BACK_PROBE_BED_POSITION 170
|
//#define BACK_PROBE_BED_POSITION (Y_MAX_POS - 12)
|
||||||
|
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1002,12 +1000,12 @@
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
// 3 arbitrary points to probe.
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
// A simple cross-product is used to estimate the plane of the bed.
|
||||||
#define ABL_PROBE_PT_1_X 39
|
#define PROBE_PT_1_X 39
|
||||||
#define ABL_PROBE_PT_1_Y 170
|
#define PROBE_PT_1_Y 170
|
||||||
#define ABL_PROBE_PT_2_X 39
|
#define PROBE_PT_2_X 39
|
||||||
#define ABL_PROBE_PT_2_Y 10
|
#define PROBE_PT_2_Y 10
|
||||||
#define ABL_PROBE_PT_3_X 170
|
#define PROBE_PT_3_X 170
|
||||||
#define ABL_PROBE_PT_3_Y 10
|
#define PROBE_PT_3_Y 10
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
|
|
@ -1021,17 +1019,17 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y 10
|
#define GRID_MAX_POINTS_Y 10
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 45 // Probing points for 3-Point leveling of the mesh
|
#define PROBE_PT_1_X 45 // Probing points for 3-Point leveling of the mesh
|
||||||
#define UBL_PROBE_PT_1_Y 170
|
#define PROBE_PT_1_Y 170
|
||||||
#define UBL_PROBE_PT_2_X 45
|
#define PROBE_PT_2_X 45
|
||||||
#define UBL_PROBE_PT_2_Y 25
|
#define PROBE_PT_2_Y 25
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 25
|
#define PROBE_PT_3_Y 25
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used
|
#define UBL_Z_RAISE_WHEN_OFF_MESH 2.50// When the nozzle is off the mesh, this value is used
|
||||||
// as the Z-Height correction value.
|
// as the Z-Height correction value.
|
||||||
|
|
||||||
#elif ENABLED(MESH_BED_LEVELING)
|
#elif ENABLED(MESH_BED_LEVELING)
|
||||||
|
|
@ -1048,6 +1046,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -978,12 +978,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1006,17 +1005,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1029,13 +1017,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1056,6 +1037,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
@ -1866,8 +1860,8 @@
|
||||||
*/
|
*/
|
||||||
#if ENABLED(ULTIMAKERCONTROLLER) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) || ENABLED(MKS_MINI_12864)
|
#if ENABLED(ULTIMAKERCONTROLLER) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) || ENABLED(MKS_MINI_12864)
|
||||||
#define SDSUPPORT // Force SD Card support on for these displays
|
#define SDSUPPORT // Force SD Card support on for these displays
|
||||||
#elif ENABLED(ULTRA_LCD) && ENABLED(DOGLCD) // No panel, just graphical LCD?
|
#else
|
||||||
#define LCD_WIDTH_OVERRIDE 20 // Default is 22. For this Geeetech use 20
|
#define LCD_WIDTH_OVERRIDE 20 // Default is 22. For this Geeetech use 20.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // CONFIGURATION_H
|
#endif // CONFIGURATION_H
|
||||||
|
|
|
||||||
|
|
@ -964,10 +964,10 @@
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -990,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1013,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1040,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -979,12 +979,11 @@
|
||||||
#define GRID_MAX_POINTS_X 4
|
#define GRID_MAX_POINTS_X 4
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 10
|
//#define LEFT_PROBE_BED_POSITION 10
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER - 14)
|
//#define RIGHT_PROBE_BED_POSITION (X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER - 14)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION 15
|
||||||
#define BACK_PROBE_BED_POSITION (Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER - 25)
|
//#define BACK_PROBE_BED_POSITION (Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER - 25)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1007,17 +1006,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1030,13 +1018,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1057,6 +1038,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -978,12 +978,11 @@
|
||||||
#define GRID_MAX_POINTS_X 4
|
#define GRID_MAX_POINTS_X 4
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 10
|
//#define LEFT_PROBE_BED_POSITION 10
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER - 14)
|
//#define RIGHT_PROBE_BED_POSITION (X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER - 14)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION 15
|
||||||
#define BACK_PROBE_BED_POSITION (Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER - 25)
|
//#define BACK_PROBE_BED_POSITION (Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER - 25)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1006,17 +1005,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1029,13 +1017,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1056,6 +1037,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -967,12 +967,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -995,17 +994,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1018,13 +1006,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1045,6 +1026,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
@ -1413,11 +1407,6 @@
|
||||||
*/
|
*/
|
||||||
//#define AUTO_REPORT_TEMPERATURES
|
//#define AUTO_REPORT_TEMPERATURES
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Auto-report SdCard status with M27 S<seconds>
|
|
||||||
*/
|
|
||||||
//#define AUTO_REPORT_SD_STATUS
|
|
||||||
/**
|
/**
|
||||||
* Include capabilities in M115 output
|
* Include capabilities in M115 output
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -959,7 +959,7 @@
|
||||||
/**
|
/**
|
||||||
* Enable the G26 Mesh Validation Pattern tool.
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
*/
|
*/
|
||||||
#define G26_MESH_VALIDATION
|
#define G26_MESH_VALIDATION // Enable G26 mesh validation
|
||||||
#if ENABLED(G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
||||||
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
||||||
|
|
@ -976,11 +976,10 @@
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION 15
|
||||||
#define RIGHT_PROBE_BED_POSITION 170
|
//#define RIGHT_PROBE_BED_POSITION 170
|
||||||
#define FRONT_PROBE_BED_POSITION 20
|
//#define FRONT_PROBE_BED_POSITION 20
|
||||||
#define BACK_PROBE_BED_POSITION 170
|
//#define BACK_PROBE_BED_POSITION 170
|
||||||
|
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1003,17 +1002,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1026,13 +1014,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1052,6 +1033,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -983,12 +983,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1011,17 +1010,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1034,13 +1022,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1061,6 +1042,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Malyan M150 Configuration
|
* Maylan M150 Configuration
|
||||||
* Non-Automatic Bed Level config by default
|
* Non-Automatic Bed Level config by default
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -778,8 +778,8 @@
|
||||||
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
|
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
|
||||||
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
|
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
|
||||||
*/
|
*/
|
||||||
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
|
//#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
|
||||||
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
|
//#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
|
||||||
//#define Z_AFTER_PROBING 5 // Z position after probing is done
|
//#define Z_AFTER_PROBING 5 // Z position after probing is done
|
||||||
|
|
||||||
// For M851 give a range for adjusting the Z probe offset
|
// For M851 give a range for adjusting the Z probe offset
|
||||||
|
|
@ -992,11 +992,10 @@
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 50
|
//#define LEFT_PROBE_BED_POSITION 50
|
||||||
#define RIGHT_PROBE_BED_POSITION 150
|
//#define RIGHT_PROBE_BED_POSITION 150
|
||||||
#define FRONT_PROBE_BED_POSITION 50
|
//#define FRONT_PROBE_BED_POSITION 50
|
||||||
#define BACK_PROBE_BED_POSITION 150
|
//#define BACK_PROBE_BED_POSITION 150
|
||||||
|
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1023,12 +1022,12 @@
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
// 3 arbitrary points to probe.
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
// A simple cross-product is used to estimate the plane of the bed.
|
||||||
#define ABL_PROBE_PT_1_X 50
|
#define PROBE_PT_1_X 50
|
||||||
#define ABL_PROBE_PT_1_Y 150
|
#define PROBE_PT_1_Y 150
|
||||||
#define ABL_PROBE_PT_2_X 50
|
#define PROBE_PT_2_X 50
|
||||||
#define ABL_PROBE_PT_2_Y 50
|
#define PROBE_PT_2_Y 50
|
||||||
#define ABL_PROBE_PT_3_X 150
|
#define PROBE_PT_3_X 150
|
||||||
#define ABL_PROBE_PT_3_Y 50
|
#define PROBE_PT_3_Y 50
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
|
|
@ -1042,13 +1041,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1069,6 +1061,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -962,12 +962,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -990,17 +989,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1013,13 +1001,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1040,6 +1021,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
@ -780,7 +774,7 @@
|
||||||
// The minimum pulse width (in µs) for stepping a stepper.
|
// The minimum pulse width (in µs) for stepping a stepper.
|
||||||
// Set this if you find stepping unreliable, or if using a very fast CPU.
|
// Set this if you find stepping unreliable, or if using a very fast CPU.
|
||||||
// 0 is OK for AVR, 0 is OK for A4989 drivers, 2 is needed for DRV8825 drivers
|
// 0 is OK for AVR, 0 is OK for A4989 drivers, 2 is needed for DRV8825 drivers
|
||||||
#define MINIMUM_STEPPER_PULSE 1 // (µs)
|
#define MINIMUM_STEPPER_PULSE 2 // (µs) DRV8825 on 32bit CPUs
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -967,12 +967,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -995,17 +994,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1018,13 +1006,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1045,6 +1026,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -967,12 +967,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -995,17 +994,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1018,13 +1006,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1045,6 +1026,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -964,11 +964,10 @@
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 32
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION 170
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 20
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION 170
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -745,12 +745,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -961,12 +961,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -989,17 +988,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1012,13 +1000,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1039,6 +1020,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -974,12 +974,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1002,17 +1001,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1025,13 +1013,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1052,6 +1033,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -966,12 +966,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -994,17 +993,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1017,13 +1005,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1044,6 +1025,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -994,12 +994,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1022,17 +1021,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1045,13 +1033,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1072,6 +1053,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -964,11 +964,10 @@
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 32
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION 210
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 10
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION 210
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -1019,12 +1019,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1047,17 +1046,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1070,13 +1058,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1097,6 +1078,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
@ -1461,13 +1455,13 @@
|
||||||
// This option overrides the default number of encoder pulses needed to
|
// This option overrides the default number of encoder pulses needed to
|
||||||
// produce one step. Should be increased for high-resolution encoders.
|
// produce one step. Should be increased for high-resolution encoders.
|
||||||
//
|
//
|
||||||
#define ENCODER_PULSES_PER_STEP 4
|
//#define ENCODER_PULSES_PER_STEP 4
|
||||||
|
|
||||||
//
|
//
|
||||||
// Use this option to override the number of step signals required to
|
// Use this option to override the number of step signals required to
|
||||||
// move between next/prev menu items.
|
// move between next/prev menu items.
|
||||||
//
|
//
|
||||||
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
//#define ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Encoder Direction Options
|
* Encoder Direction Options
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -365,7 +365,7 @@
|
||||||
#define PIDTEMP
|
#define PIDTEMP
|
||||||
#define BANG_MAX 255 // Limits current to nozzle while in bang-bang mode; 255=full current
|
#define BANG_MAX 255 // Limits current to nozzle while in bang-bang mode; 255=full current
|
||||||
#define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
|
#define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
|
||||||
#define PID_K1 0.95 // Smoothing factor within any PID loop
|
#define PID_K1 0.95 // Smoothing factor within the PID
|
||||||
#if ENABLED(PIDTEMP)
|
#if ENABLED(PIDTEMP)
|
||||||
//#define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result.
|
//#define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result.
|
||||||
//#define PID_DEBUG // Sends debug data to the serial port.
|
//#define PID_DEBUG // Sends debug data to the serial port.
|
||||||
|
|
@ -947,7 +947,7 @@
|
||||||
/**
|
/**
|
||||||
* Enable the G26 Mesh Validation Pattern tool.
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
*/
|
*/
|
||||||
#define G26_MESH_VALIDATION
|
#define G26_MESH_VALIDATION // Enable G26 mesh validation
|
||||||
#if ENABLED(G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
||||||
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
||||||
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION 15
|
||||||
#define RIGHT_PROBE_BED_POSITION 270
|
//#define RIGHT_PROBE_BED_POSITION 270
|
||||||
#define FRONT_PROBE_BED_POSITION 20
|
//#define FRONT_PROBE_BED_POSITION 20
|
||||||
#define BACK_PROBE_BED_POSITION 260
|
//#define BACK_PROBE_BED_POSITION 260
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -974,12 +974,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1002,17 +1001,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1025,13 +1013,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1052,6 +1033,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -993,12 +993,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1021,17 +1020,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1044,13 +1032,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1071,6 +1052,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -750,12 +750,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -973,12 +973,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1001,17 +1000,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1024,19 +1012,9 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
//#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used
|
|
||||||
// as the Z-Height correction value.
|
|
||||||
|
|
||||||
#elif ENABLED(MESH_BED_LEVELING)
|
#elif ENABLED(MESH_BED_LEVELING)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1051,6 +1029,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -739,12 +739,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -963,12 +963,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -991,17 +990,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1014,13 +1002,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1041,6 +1022,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -1095,11 +1095,10 @@
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
|
//#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1126,12 +1125,12 @@
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
// 3 arbitrary points to probe.
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
// A simple cross-product is used to estimate the plane of the bed.
|
||||||
#define ABL_PROBE_PT_1_X 15
|
//#define PROBE_PT_1_X 15
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
//#define PROBE_PT_1_Y 180
|
||||||
#define ABL_PROBE_PT_2_X 15
|
//#define PROBE_PT_2_X 15
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
//#define PROBE_PT_2_Y 20
|
||||||
#define ABL_PROBE_PT_3_X 170
|
//#define PROBE_PT_3_X 170
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
//#define PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
|
|
@ -1145,14 +1144,12 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define _PX(R,A) (R) * cos(RADIANS(A))
|
//#define PROBE_PT_1_X 15
|
||||||
#define _PY(R,A) (R) * sin(RADIANS(A))
|
//#define PROBE_PT_1_Y 180
|
||||||
#define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
|
//#define PROBE_PT_2_X 15
|
||||||
#define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
|
//#define PROBE_PT_2_Y 20
|
||||||
#define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
|
//#define PROBE_PT_3_X 170
|
||||||
#define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
|
//#define PROBE_PT_3_Y 20
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
@ -1174,6 +1171,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -739,12 +739,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -1095,11 +1095,10 @@
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
|
//#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1122,17 +1121,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1145,15 +1133,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define _PX(R,A) (R) * cos(RADIANS(A))
|
|
||||||
#define _PY(R,A) (R) * sin(RADIANS(A))
|
|
||||||
#define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
|
|
||||||
#define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1174,6 +1153,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -739,12 +739,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -1093,13 +1093,11 @@
|
||||||
#define GRID_MAX_POINTS_X 9
|
#define GRID_MAX_POINTS_X 9
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
|
//#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
|
||||||
#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1122,17 +1120,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1145,15 +1132,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define _PX(R,A) (R) * cos(RADIANS(A))
|
|
||||||
#define _PY(R,A) (R) * sin(RADIANS(A))
|
|
||||||
#define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
|
|
||||||
#define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1174,6 +1152,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -739,12 +739,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -1087,9 +1087,6 @@
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
|
@ -1099,11 +1096,11 @@
|
||||||
#define GRID_MAX_POINTS_X 9
|
#define GRID_MAX_POINTS_X 9
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE))
|
||||||
#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define RIGHT_PROBE_BED_POSITION DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE))
|
||||||
#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define BACK_PROBE_BED_POSITION DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1130,12 +1127,12 @@
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
// 3 arbitrary points to probe.
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
// A simple cross-product is used to estimate the plane of the bed.
|
||||||
#define ABL_PROBE_PT_1_X -116
|
#define PROBE_PT_1_X -116
|
||||||
#define ABL_PROBE_PT_1_Y -67.5
|
#define PROBE_PT_1_Y -67.5
|
||||||
#define ABL_PROBE_PT_2_X 116
|
#define PROBE_PT_2_X 116
|
||||||
#define ABL_PROBE_PT_2_Y -67.5
|
#define PROBE_PT_2_Y -67.5
|
||||||
#define ABL_PROBE_PT_3_X 0
|
#define PROBE_PT_3_X 0
|
||||||
#define ABL_PROBE_PT_3_Y 135
|
#define PROBE_PT_3_Y 135
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
|
|
@ -1149,15 +1146,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define _PX(R,A) (R) * cos(RADIANS(A))
|
|
||||||
#define _PY(R,A) (R) * sin(RADIANS(A))
|
|
||||||
#define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
|
|
||||||
#define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1178,6 +1166,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -1072,9 +1072,6 @@
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
|
@ -1084,11 +1081,11 @@
|
||||||
#define GRID_MAX_POINTS_X 9
|
#define GRID_MAX_POINTS_X 9
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE))
|
||||||
#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define RIGHT_PROBE_BED_POSITION DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE))
|
||||||
#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define BACK_PROBE_BED_POSITION DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1111,17 +1108,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1134,15 +1120,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define _PX(R,A) (R) * cos(RADIANS(A))
|
|
||||||
#define _PY(R,A) (R) * sin(RADIANS(A))
|
|
||||||
#define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
|
|
||||||
#define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1163,6 +1140,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -739,12 +739,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -1075,9 +1075,6 @@
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
|
@ -1087,11 +1084,11 @@
|
||||||
#define GRID_MAX_POINTS_X 9
|
#define GRID_MAX_POINTS_X 9
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE))
|
||||||
#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define RIGHT_PROBE_BED_POSITION DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE))
|
||||||
#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define BACK_PROBE_BED_POSITION DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1114,17 +1111,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1137,15 +1123,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define _PX(R,A) (R) * cos(RADIANS(A))
|
|
||||||
#define _PY(R,A) (R) * sin(RADIANS(A))
|
|
||||||
#define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
|
|
||||||
#define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1166,6 +1143,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -739,12 +739,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -684,7 +684,7 @@
|
||||||
*
|
*
|
||||||
* Enable this option for a probe connected to the Z Min endstop pin.
|
* Enable this option for a probe connected to the Z Min endstop pin.
|
||||||
*/
|
*/
|
||||||
//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Z_MIN_PROBE_ENDSTOP
|
* Z_MIN_PROBE_ENDSTOP
|
||||||
|
|
@ -705,7 +705,7 @@
|
||||||
* disastrous consequences. Use with caution and do your homework.
|
* disastrous consequences. Use with caution and do your homework.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#define Z_MIN_PROBE_ENDSTOP
|
//#define Z_MIN_PROBE_ENDSTOP
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Probe Type
|
* Probe Type
|
||||||
|
|
@ -1075,9 +1075,6 @@
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
|
@ -1087,11 +1084,11 @@
|
||||||
#define GRID_MAX_POINTS_X 7
|
#define GRID_MAX_POINTS_X 7
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE))
|
||||||
#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define RIGHT_PROBE_BED_POSITION DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE))
|
||||||
#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define BACK_PROBE_BED_POSITION DELTA_PRINTABLE_RADIUS -(MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1114,17 +1111,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1137,15 +1123,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define _PX(R,A) (R) * cos(RADIANS(A))
|
|
||||||
#define _PY(R,A) (R) * sin(RADIANS(A))
|
|
||||||
#define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
|
|
||||||
#define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1166,6 +1143,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -744,12 +744,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -1084,9 +1084,6 @@
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
|
@ -1096,11 +1093,11 @@
|
||||||
#define GRID_MAX_POINTS_X 5
|
#define GRID_MAX_POINTS_X 5
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
|
//#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS + MIN_PROBE_EDGE)
|
||||||
#define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
|
//#define RIGHT_PROBE_BED_POSITION DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION - (DELTA_PROBEABLE_RADIUS - 20)
|
//#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS + MIN_PROBE_EDGE)
|
||||||
#define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS - 40
|
//#define BACK_PROBE_BED_POSITION DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1123,17 +1120,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1146,15 +1132,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define _PX(R,A) (R) * cos(RADIANS(A))
|
|
||||||
#define _PY(R,A) (R) * sin(RADIANS(A))
|
|
||||||
#define UBL_PROBE_PT_1_X _PX(DELTA_PROBEABLE_RADIUS, 0) // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y _PY(DELTA_PROBEABLE_RADIUS, 0)
|
|
||||||
#define UBL_PROBE_PT_2_X _PX(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_2_Y _PY(DELTA_PROBEABLE_RADIUS, 120)
|
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1175,6 +1152,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -739,12 +739,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -977,12 +977,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -1005,17 +1004,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1028,12 +1016,12 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 53 // Probing points for 3-Point leveling of the mesh
|
#define PROBE_PT_1_X 53 // Probing points for 3-Point leveling of the mesh
|
||||||
#define UBL_PROBE_PT_1_Y 323
|
#define PROBE_PT_1_Y 323
|
||||||
#define UBL_PROBE_PT_2_X 53
|
#define PROBE_PT_2_X 53
|
||||||
#define UBL_PROBE_PT_2_Y 63
|
#define PROBE_PT_2_Y 63
|
||||||
#define UBL_PROBE_PT_3_X 348
|
#define PROBE_PT_3_X 348
|
||||||
#define UBL_PROBE_PT_3_Y 211
|
#define PROBE_PT_3_Y 211
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
@ -1055,6 +1043,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
@ -1099,8 +1100,8 @@
|
||||||
#define Z_SAFE_HOMING
|
#define Z_SAFE_HOMING
|
||||||
|
|
||||||
#if ENABLED(Z_SAFE_HOMING)
|
#if ENABLED(Z_SAFE_HOMING)
|
||||||
#define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2 - 4) // X point for Z homing when homing all axes (G28).
|
#define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2 - 8) // X point for Z homing when homing all axes (G28).
|
||||||
#define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2 + 4) // Y point for Z homing when homing all axes (G28).
|
#define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2 - 4) // Y point for Z homing when homing all axes (G28).
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Homing speeds (mm/m)
|
// Homing speeds (mm/m)
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -966,12 +966,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -994,17 +993,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1017,13 +1005,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1044,6 +1025,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -964,12 +964,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -992,17 +991,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1015,13 +1003,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1042,6 +1023,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -958,12 +958,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -986,17 +985,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1009,13 +997,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1036,6 +1017,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
|
||||||
|
|
@ -737,12 +737,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -507,7 +507,7 @@
|
||||||
#define USE_ZMAX_PLUG
|
#define USE_ZMAX_PLUG
|
||||||
|
|
||||||
// Enable pullup for all endstops to prevent a floating state
|
// Enable pullup for all endstops to prevent a floating state
|
||||||
#define ENDSTOPPULLUPS
|
//#define ENDSTOPPULLUPS
|
||||||
#if DISABLED(ENDSTOPPULLUPS)
|
#if DISABLED(ENDSTOPPULLUPS)
|
||||||
// Disable ENDSTOPPULLUPS to set pullups individually
|
// Disable ENDSTOPPULLUPS to set pullups individually
|
||||||
//#define ENDSTOPPULLUP_XMAX
|
//#define ENDSTOPPULLUP_XMAX
|
||||||
|
|
@ -968,12 +968,11 @@
|
||||||
#define GRID_MAX_POINTS_X 3
|
#define GRID_MAX_POINTS_X 3
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define LEFT_PROBE_BED_POSITION 15
|
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
|
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
#define FRONT_PROBE_BED_POSITION 15
|
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
|
||||||
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
|
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
|
||||||
|
|
||||||
// Probe along the Y axis, advancing X after each column
|
// Probe along the Y axis, advancing X after each column
|
||||||
//#define PROBE_Y_FIRST
|
//#define PROBE_Y_FIRST
|
||||||
|
|
@ -996,17 +995,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
|
||||||
#define ABL_PROBE_PT_1_X 15
|
|
||||||
#define ABL_PROBE_PT_1_Y 180
|
|
||||||
#define ABL_PROBE_PT_2_X 15
|
|
||||||
#define ABL_PROBE_PT_2_Y 20
|
|
||||||
#define ABL_PROBE_PT_3_X 170
|
|
||||||
#define ABL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
@ -1019,13 +1007,6 @@
|
||||||
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
|
||||||
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
|
||||||
|
|
||||||
#define UBL_PROBE_PT_1_X 39 // Probing points for 3-Point leveling of the mesh
|
|
||||||
#define UBL_PROBE_PT_1_Y 180
|
|
||||||
#define UBL_PROBE_PT_2_X 39
|
|
||||||
#define UBL_PROBE_PT_2_Y 20
|
|
||||||
#define UBL_PROBE_PT_3_X 180
|
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
|
||||||
|
|
||||||
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
||||||
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
||||||
|
|
||||||
|
|
@ -1046,6 +1027,19 @@
|
||||||
|
|
||||||
#endif // BED_LEVELING
|
#endif // BED_LEVELING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to probe for all 3-point Leveling procedures.
|
||||||
|
* Override if the automatically selected points are inadequate.
|
||||||
|
*/
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
//#define PROBE_PT_1_X 15
|
||||||
|
//#define PROBE_PT_1_Y 180
|
||||||
|
//#define PROBE_PT_2_X 15
|
||||||
|
//#define PROBE_PT_2_Y 20
|
||||||
|
//#define PROBE_PT_3_X 170
|
||||||
|
//#define PROBE_PT_3_Y 20
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the LCD controller for bed leveling
|
* Use the LCD controller for bed leveling
|
||||||
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
* Requires MESH_BED_LEVELING or PROBE_MANUALLY
|
||||||
|
|
@ -1410,13 +1404,13 @@
|
||||||
// This option overrides the default number of encoder pulses needed to
|
// This option overrides the default number of encoder pulses needed to
|
||||||
// produce one step. Should be increased for high-resolution encoders.
|
// produce one step. Should be increased for high-resolution encoders.
|
||||||
//
|
//
|
||||||
#define ENCODER_PULSES_PER_STEP 4
|
//#define ENCODER_PULSES_PER_STEP 4
|
||||||
|
|
||||||
//
|
//
|
||||||
// Use this option to override the number of step signals required to
|
// Use this option to override the number of step signals required to
|
||||||
// move between next/prev menu items.
|
// move between next/prev menu items.
|
||||||
//
|
//
|
||||||
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
//#define ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Encoder Direction Options
|
* Encoder Direction Options
|
||||||
|
|
|
||||||
|
|
@ -738,12 +738,6 @@
|
||||||
|
|
||||||
// @section leveling
|
// @section leveling
|
||||||
|
|
||||||
#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
|
|
||||||
#define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
|
|
||||||
#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Override the mesh area if the automatic (max) area is too large
|
// Override the mesh area if the automatic (max) area is too large
|
||||||
//#define MESH_MIN_X MESH_INSET
|
//#define MESH_MIN_X MESH_INSET
|
||||||
|
|
|
||||||
|
|
@ -146,10 +146,8 @@
|
||||||
* a subsequent G or T leveling operation for backward compatibility.
|
* a subsequent G or T leveling operation for backward compatibility.
|
||||||
*
|
*
|
||||||
* P1 Phase 1 Invalidate entire Mesh and continue with automatic generation of the Mesh data using
|
* P1 Phase 1 Invalidate entire Mesh and continue with automatic generation of the Mesh data using
|
||||||
* the Z-Probe. Usually the probe can't reach all areas that the nozzle can reach. On
|
* the Z-Probe. Usually the probe can't reach all areas that the nozzle can reach. For delta
|
||||||
* Cartesian printers, points within the X_PROBE_OFFSET_FROM_EXTRUDER and Y_PROBE_OFFSET_FROM_EXTRUDER
|
* printers only the areas where the probe and nozzle can both reach will be automatically probed.
|
||||||
* area cannot be automatically probed. For Delta printers the area in which DELTA_PROBEABLE_RADIUS
|
|
||||||
* and DELTA_PRINTABLE_RADIUS do not overlap will not be automatically probed.
|
|
||||||
*
|
*
|
||||||
* Unreachable points will be handled in Phase 2 and Phase 3.
|
* Unreachable points will be handled in Phase 2 and Phase 3.
|
||||||
*
|
*
|
||||||
|
|
@ -1521,46 +1519,46 @@
|
||||||
incremental_LSF_reset(&lsf_results);
|
incremental_LSF_reset(&lsf_results);
|
||||||
|
|
||||||
if (do_3_pt_leveling) {
|
if (do_3_pt_leveling) {
|
||||||
measured_z = probe_pt(UBL_PROBE_PT_1_X, UBL_PROBE_PT_1_Y, false, g29_verbose_level);
|
measured_z = probe_pt(PROBE_PT_1_X, PROBE_PT_1_Y, false, g29_verbose_level);
|
||||||
if (isnan(measured_z))
|
if (isnan(measured_z))
|
||||||
abort_flag = true;
|
abort_flag = true;
|
||||||
else {
|
else {
|
||||||
measured_z -= get_z_correction(UBL_PROBE_PT_1_X, UBL_PROBE_PT_1_Y);
|
measured_z -= get_z_correction(PROBE_PT_1_X, PROBE_PT_1_Y);
|
||||||
//z1 = measured_z;
|
//z1 = measured_z;
|
||||||
if (g29_verbose_level > 3) {
|
if (g29_verbose_level > 3) {
|
||||||
serial_spaces(16);
|
serial_spaces(16);
|
||||||
SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
|
SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
|
||||||
}
|
}
|
||||||
incremental_LSF(&lsf_results, UBL_PROBE_PT_1_X, UBL_PROBE_PT_1_Y, measured_z);
|
incremental_LSF(&lsf_results, PROBE_PT_1_X, PROBE_PT_1_Y, measured_z);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!abort_flag) {
|
if (!abort_flag) {
|
||||||
measured_z = probe_pt(UBL_PROBE_PT_2_X, UBL_PROBE_PT_2_Y, false, g29_verbose_level);
|
measured_z = probe_pt(PROBE_PT_2_X, PROBE_PT_2_Y, false, g29_verbose_level);
|
||||||
//z2 = measured_z;
|
//z2 = measured_z;
|
||||||
if (isnan(measured_z))
|
if (isnan(measured_z))
|
||||||
abort_flag = true;
|
abort_flag = true;
|
||||||
else {
|
else {
|
||||||
measured_z -= get_z_correction(UBL_PROBE_PT_2_X, UBL_PROBE_PT_2_Y);
|
measured_z -= get_z_correction(PROBE_PT_2_X, PROBE_PT_2_Y);
|
||||||
if (g29_verbose_level > 3) {
|
if (g29_verbose_level > 3) {
|
||||||
serial_spaces(16);
|
serial_spaces(16);
|
||||||
SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
|
SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
|
||||||
}
|
}
|
||||||
incremental_LSF(&lsf_results, UBL_PROBE_PT_2_X, UBL_PROBE_PT_2_Y, measured_z);
|
incremental_LSF(&lsf_results, PROBE_PT_2_X, PROBE_PT_2_Y, measured_z);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!abort_flag) {
|
if (!abort_flag) {
|
||||||
measured_z = probe_pt(UBL_PROBE_PT_3_X, UBL_PROBE_PT_3_Y, true, g29_verbose_level);
|
measured_z = probe_pt(PROBE_PT_3_X, PROBE_PT_3_Y, true, g29_verbose_level);
|
||||||
//z3 = measured_z;
|
//z3 = measured_z;
|
||||||
if (isnan(measured_z))
|
if (isnan(measured_z))
|
||||||
abort_flag = true;
|
abort_flag = true;
|
||||||
else {
|
else {
|
||||||
measured_z -= get_z_correction(UBL_PROBE_PT_3_X, UBL_PROBE_PT_3_Y);
|
measured_z -= get_z_correction(PROBE_PT_3_X, PROBE_PT_3_Y);
|
||||||
if (g29_verbose_level > 3) {
|
if (g29_verbose_level > 3) {
|
||||||
serial_spaces(16);
|
serial_spaces(16);
|
||||||
SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
|
SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
|
||||||
}
|
}
|
||||||
incremental_LSF(&lsf_results, UBL_PROBE_PT_3_X, UBL_PROBE_PT_3_Y, measured_z);
|
incremental_LSF(&lsf_results, PROBE_PT_3_X, PROBE_PT_3_Y, measured_z);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1707,29 +1705,29 @@
|
||||||
*/
|
*/
|
||||||
#if 0
|
#if 0
|
||||||
float t, t1, d;
|
float t, t1, d;
|
||||||
t = normal.x * (UBL_PROBE_PT_1_X) + normal.y * (UBL_PROBE_PT_1_Y);
|
t = normal.x * (PROBE_PT_1_X) + normal.y * (PROBE_PT_1_Y);
|
||||||
d = t + normal.z * z1;
|
d = t + normal.z * z1;
|
||||||
SERIAL_ECHOPGM("D from 1st point: ");
|
SERIAL_ECHOPGM("D from 1st point: ");
|
||||||
SERIAL_ECHO_F(d, 6);
|
SERIAL_ECHO_F(d, 6);
|
||||||
SERIAL_ECHOPGM(" Z error: ");
|
SERIAL_ECHOPGM(" Z error: ");
|
||||||
SERIAL_ECHO_F(normal.z*z1-get_z_correction(UBL_PROBE_PT_1_X, UBL_PROBE_PT_1_Y), 6);
|
SERIAL_ECHO_F(normal.z*z1-get_z_correction(PROBE_PT_1_X, PROBE_PT_1_Y), 6);
|
||||||
SERIAL_EOL();
|
SERIAL_EOL();
|
||||||
|
|
||||||
t = normal.x * (UBL_PROBE_PT_2_X) + normal.y * (UBL_PROBE_PT_2_Y);
|
t = normal.x * (PROBE_PT_2_X) + normal.y * (PROBE_PT_2_Y);
|
||||||
d = t + normal.z * z2;
|
d = t + normal.z * z2;
|
||||||
SERIAL_EOL();
|
SERIAL_EOL();
|
||||||
SERIAL_ECHOPGM("D from 2nd point: ");
|
SERIAL_ECHOPGM("D from 2nd point: ");
|
||||||
SERIAL_ECHO_F(d, 6);
|
SERIAL_ECHO_F(d, 6);
|
||||||
SERIAL_ECHOPGM(" Z error: ");
|
SERIAL_ECHOPGM(" Z error: ");
|
||||||
SERIAL_ECHO_F(normal.z*z2-get_z_correction(UBL_PROBE_PT_2_X, UBL_PROBE_PT_2_Y), 6);
|
SERIAL_ECHO_F(normal.z*z2-get_z_correction(PROBE_PT_2_X, PROBE_PT_2_Y), 6);
|
||||||
SERIAL_EOL();
|
SERIAL_EOL();
|
||||||
|
|
||||||
t = normal.x * (UBL_PROBE_PT_3_X) + normal.y * (UBL_PROBE_PT_3_Y);
|
t = normal.x * (PROBE_PT_3_X) + normal.y * (PROBE_PT_3_Y);
|
||||||
d = t + normal.z * z3;
|
d = t + normal.z * z3;
|
||||||
SERIAL_ECHOPGM("D from 3rd point: ");
|
SERIAL_ECHOPGM("D from 3rd point: ");
|
||||||
SERIAL_ECHO_F(d, 6);
|
SERIAL_ECHO_F(d, 6);
|
||||||
SERIAL_ECHOPGM(" Z error: ");
|
SERIAL_ECHOPGM(" Z error: ");
|
||||||
SERIAL_ECHO_F(normal.z*z3-get_z_correction(UBL_PROBE_PT_3_X, UBL_PROBE_PT_3_Y), 6);
|
SERIAL_ECHO_F(normal.z*z3-get_z_correction(PROBE_PT_3_X, PROBE_PT_3_Y), 6);
|
||||||
SERIAL_EOL();
|
SERIAL_EOL();
|
||||||
|
|
||||||
t = normal.x * (Z_SAFE_HOMING_X_POINT) + normal.y * (Z_SAFE_HOMING_Y_POINT);
|
t = normal.x * (Z_SAFE_HOMING_X_POINT) + normal.y * (Z_SAFE_HOMING_Y_POINT);
|
||||||
|
|
|
||||||
|
|
@ -235,9 +235,9 @@ void GcodeSuite::G29() {
|
||||||
|
|
||||||
// Probe at 3 arbitrary points
|
// Probe at 3 arbitrary points
|
||||||
ABL_VAR vector_3 points[3] = {
|
ABL_VAR vector_3 points[3] = {
|
||||||
vector_3(ABL_PROBE_PT_1_X, ABL_PROBE_PT_1_Y, 0),
|
vector_3(PROBE_PT_1_X, PROBE_PT_1_Y, 0),
|
||||||
vector_3(ABL_PROBE_PT_2_X, ABL_PROBE_PT_2_Y, 0),
|
vector_3(PROBE_PT_2_X, PROBE_PT_2_Y, 0),
|
||||||
vector_3(ABL_PROBE_PT_3_X, ABL_PROBE_PT_3_Y, 0)
|
vector_3(PROBE_PT_3_X, PROBE_PT_3_Y, 0)
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // AUTO_BED_LEVELING_3POINT
|
#endif // AUTO_BED_LEVELING_3POINT
|
||||||
|
|
|
||||||
|
|
@ -984,6 +984,20 @@
|
||||||
#endif
|
#endif
|
||||||
#endif // SKEW_CORRECTION
|
#endif // SKEW_CORRECTION
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set granular options based on the specific type of leveling
|
||||||
|
*/
|
||||||
|
#define UBL_SEGMENTED (ENABLED(AUTO_BED_LEVELING_UBL) && (ENABLED(DELTA)))
|
||||||
|
#define ABL_PLANAR (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_3POINT))
|
||||||
|
#define ABL_GRID (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
|
||||||
|
#define OLDSCHOOL_ABL (ABL_PLANAR || ABL_GRID)
|
||||||
|
#define HAS_ABL (OLDSCHOOL_ABL || ENABLED(AUTO_BED_LEVELING_UBL))
|
||||||
|
#define HAS_LEVELING (HAS_ABL || ENABLED(MESH_BED_LEVELING))
|
||||||
|
#define HAS_AUTOLEVEL (HAS_ABL && DISABLED(PROBE_MANUALLY))
|
||||||
|
#define HAS_MESH (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
|
||||||
|
#define PLANNER_LEVELING (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING) || UBL_SEGMENTED || ENABLED(SKEW_CORRECTION))
|
||||||
|
#define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Heater & Fan Pausing
|
* Heater & Fan Pausing
|
||||||
*/
|
*/
|
||||||
|
|
@ -1004,11 +1018,25 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Bed Probing rectangular bounds
|
||||||
|
* These can be further constrained in code for Delta and SCARA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef MIN_PROBE_EDGE
|
||||||
|
#define MIN_PROBE_EDGE 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(DELTA)
|
||||||
|
/**
|
||||||
* Delta radius/rod trimmers/angle trimmers
|
* Delta radius/rod trimmers/angle trimmers
|
||||||
*/
|
*/
|
||||||
#if ENABLED(DELTA)
|
#define _PROBE_RADIUS (DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
|
||||||
#ifndef DELTA_CALIBRATION_RADIUS
|
#ifndef DELTA_CALIBRATION_RADIUS
|
||||||
#define DELTA_CALIBRATION_RADIUS DELTA_PRINTABLE_RADIUS - 10
|
#ifdef X_PROBE_OFFSET_FROM_EXTRUDER
|
||||||
|
#define DELTA_CALIBRATION_RADIUS (DELTA_PRINTABLE_RADIUS - MAX3(abs(X_PROBE_OFFSET_FROM_EXTRUDER), abs(Y_PROBE_OFFSET_FROM_EXTRUDER), abs(MIN_PROBE_EDGE)))
|
||||||
|
#else
|
||||||
|
#define DELTA_CALIBRATION_RADIUS _PROBE_RADIUS
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#ifndef DELTA_ENDSTOP_ADJ
|
#ifndef DELTA_ENDSTOP_ADJ
|
||||||
#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
|
#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
|
||||||
|
|
@ -1022,59 +1050,36 @@
|
||||||
#ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER
|
#ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER
|
||||||
#define DELTA_DIAGONAL_ROD_TRIM_TOWER {0, 0, 0}
|
#define DELTA_DIAGONAL_ROD_TRIM_TOWER {0, 0, 0}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set granular options based on the specific type of leveling
|
|
||||||
*/
|
|
||||||
#define UBL_SEGMENTED (ENABLED(AUTO_BED_LEVELING_UBL) && (ENABLED(DELTA)))
|
|
||||||
#define ABL_PLANAR (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_3POINT))
|
|
||||||
#define ABL_GRID (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
|
|
||||||
#define OLDSCHOOL_ABL (ABL_PLANAR || ABL_GRID)
|
|
||||||
#define HAS_ABL (OLDSCHOOL_ABL || ENABLED(AUTO_BED_LEVELING_UBL))
|
|
||||||
#define HAS_LEVELING (HAS_ABL || ENABLED(MESH_BED_LEVELING))
|
|
||||||
#define HAS_AUTOLEVEL (HAS_ABL && DISABLED(PROBE_MANUALLY))
|
|
||||||
#define HAS_MESH (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
|
|
||||||
#define PLANNER_LEVELING (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING) || UBL_SEGMENTED || ENABLED(SKEW_CORRECTION))
|
|
||||||
#define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
|
|
||||||
#if HAS_PROBING_PROCEDURE
|
|
||||||
#define PROBE_BED_WIDTH abs(RIGHT_PROBE_BED_POSITION - (LEFT_PROBE_BED_POSITION))
|
|
||||||
#define PROBE_BED_HEIGHT abs(BACK_PROBE_BED_POSITION - (FRONT_PROBE_BED_POSITION))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(SEGMENT_LEVELED_MOVES) && !defined(LEVELED_SEGMENT_LENGTH)
|
|
||||||
#define LEVELED_SEGMENT_LENGTH 5
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Bed Probing rectangular bounds
|
|
||||||
* These can be further constrained in code for Delta and SCARA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef MIN_PROBE_EDGE
|
|
||||||
#define MIN_PROBE_EDGE 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(DELTA)
|
|
||||||
// Probing points may be verified at compile time within the radius
|
// Probing points may be verified at compile time within the radius
|
||||||
// using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!")
|
// using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!")
|
||||||
// so that may be added to SanityCheck.h in the future.
|
// so that may be added to SanityCheck.h in the future.
|
||||||
#define _MIN_PROBE_X (X_CENTER - (DELTA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
|
#define _MIN_PROBE_X (X_CENTER - (_PROBE_RADIUS))
|
||||||
#define _MIN_PROBE_Y (Y_CENTER - (DELTA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
|
#define _MIN_PROBE_Y (Y_CENTER - (_PROBE_RADIUS))
|
||||||
#define _MAX_PROBE_X (X_CENTER + DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
|
#define _MAX_PROBE_X (X_CENTER + _PROBE_RADIUS)
|
||||||
#define _MAX_PROBE_Y (Y_CENTER + DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
|
#define _MAX_PROBE_Y (Y_CENTER + _PROBE_RADIUS)
|
||||||
|
|
||||||
#elif IS_SCARA
|
#elif IS_SCARA
|
||||||
|
|
||||||
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
|
||||||
|
#define _PROBE_RADIUS (SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
|
||||||
#define _MIN_PROBE_X (X_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
|
#define _MIN_PROBE_X (X_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
|
||||||
#define _MIN_PROBE_Y (Y_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
|
#define _MIN_PROBE_Y (Y_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
|
||||||
#define _MAX_PROBE_X (X_CENTER + SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
|
#define _MAX_PROBE_X (X_CENTER + SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
|
||||||
#define _MAX_PROBE_Y (Y_CENTER + SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
|
#define _MAX_PROBE_Y (Y_CENTER + SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
// Boundaries for Cartesian probing based on bed limits
|
// Boundaries for Cartesian probing based on bed limits
|
||||||
#define _MIN_PROBE_X (max(X_MIN_BED + MIN_PROBE_EDGE, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
|
#define _MIN_PROBE_X (max(X_MIN_BED + MIN_PROBE_EDGE, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
|
||||||
#define _MIN_PROBE_Y (max(Y_MIN_BED + MIN_PROBE_EDGE, Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
#define _MIN_PROBE_Y (max(Y_MIN_BED + MIN_PROBE_EDGE, Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
||||||
#define _MAX_PROBE_X (min(X_MAX_BED - (MIN_PROBE_EDGE), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
|
#define _MAX_PROBE_X (min(X_MAX_BED - (MIN_PROBE_EDGE), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
|
||||||
#define _MAX_PROBE_Y (min(Y_MAX_BED - (MIN_PROBE_EDGE), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
#define _MAX_PROBE_Y (min(Y_MAX_BED - (MIN_PROBE_EDGE), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(SEGMENT_LEVELED_MOVES) && !defined(LEVELED_SEGMENT_LENGTH)
|
||||||
|
#define LEVELED_SEGMENT_LENGTH 5
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// These may be overridden in Configuration.h if a smaller area is desired
|
// These may be overridden in Configuration.h if a smaller area is desired
|
||||||
|
|
@ -1116,10 +1121,8 @@
|
||||||
#define _MESH_MAX_X (min(X_MAX_BED - (MESH_INSET), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
|
#define _MESH_MAX_X (min(X_MAX_BED - (MESH_INSET), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
|
||||||
#define _MESH_MAX_Y (min(Y_MAX_BED - (MESH_INSET), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
#define _MESH_MAX_Y (min(Y_MAX_BED - (MESH_INSET), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// These may be overridden in Configuration.h if a smaller area is desired
|
// These may be overridden in Configuration.h if a smaller area is desired
|
||||||
#ifndef MESH_MIN_X
|
#ifndef MESH_MIN_X
|
||||||
#define MESH_MIN_X _MESH_MIN_X
|
#define MESH_MIN_X _MESH_MIN_X
|
||||||
|
|
@ -1136,6 +1139,69 @@
|
||||||
|
|
||||||
#endif // MESH_BED_LEVELING || AUTO_BED_LEVELING_UBL
|
#endif // MESH_BED_LEVELING || AUTO_BED_LEVELING_UBL
|
||||||
|
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(AUTO_BED_LEVELING_3POINT)
|
||||||
|
#if IS_KINEMATIC
|
||||||
|
#define SIN0 0.0
|
||||||
|
#define SIN120 0.866025
|
||||||
|
#define SIN240 -0.866025
|
||||||
|
#define COS0 1.0
|
||||||
|
#define COS120 -0.5
|
||||||
|
#define COS240 -0.5
|
||||||
|
#ifndef PROBE_PT_1_X
|
||||||
|
#define PROBE_PT_1_X (X_CENTER + (_PROBE_RADIUS) * COS0)
|
||||||
|
#endif
|
||||||
|
#ifndef PROBE_PT_1_Y
|
||||||
|
#define PROBE_PT_1_Y (Y_CENTER + (_PROBE_RADIUS) * SIN0)
|
||||||
|
#endif
|
||||||
|
#ifndef PROBE_PT_2_X
|
||||||
|
#define PROBE_PT_2_X (X_CENTER + (_PROBE_RADIUS) * COS120)
|
||||||
|
#endif
|
||||||
|
#ifndef PROBE_PT_2_Y
|
||||||
|
#define PROBE_PT_2_Y (Y_CENTER + (_PROBE_RADIUS) * SIN120)
|
||||||
|
#endif
|
||||||
|
#ifndef PROBE_PT_3_X
|
||||||
|
#define PROBE_PT_3_X (X_CENTER + (_PROBE_RADIUS) * COS240)
|
||||||
|
#endif
|
||||||
|
#ifndef PROBE_PT_3_Y
|
||||||
|
#define PROBE_PT_3_Y (Y_CENTER + (_PROBE_RADIUS) * SIN240)
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
#ifndef PROBE_PT_1_X
|
||||||
|
#define PROBE_PT_1_X MIN_PROBE_X
|
||||||
|
#endif
|
||||||
|
#ifndef PROBE_PT_1_Y
|
||||||
|
#define PROBE_PT_1_Y MIN_PROBE_Y
|
||||||
|
#endif
|
||||||
|
#ifndef PROBE_PT_2_X
|
||||||
|
#define PROBE_PT_2_X MAX_PROBE_X
|
||||||
|
#endif
|
||||||
|
#ifndef PROBE_PT_2_Y
|
||||||
|
#define PROBE_PT_2_Y MIN_PROBE_Y
|
||||||
|
#endif
|
||||||
|
#ifndef PROBE_PT_3_X
|
||||||
|
#define PROBE_PT_3_X X_CENTER
|
||||||
|
#endif
|
||||||
|
#ifndef PROBE_PT_3_Y
|
||||||
|
#define PROBE_PT_3_Y MAX_PROBE_Y
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
#ifndef LEFT_PROBE_BED_POSITION
|
||||||
|
#define LEFT_PROBE_BED_POSITION MIN_PROBE_X
|
||||||
|
#endif
|
||||||
|
#ifndef RIGHT_PROBE_BED_POSITION
|
||||||
|
#define RIGHT_PROBE_BED_POSITION MAX_PROBE_X
|
||||||
|
#endif
|
||||||
|
#ifndef FRONT_PROBE_BED_POSITION
|
||||||
|
#define FRONT_PROBE_BED_POSITION MIN_PROBE_Y
|
||||||
|
#endif
|
||||||
|
#ifndef BACK_PROBE_BED_POSITION
|
||||||
|
#define BACK_PROBE_BED_POSITION MAX_PROBE_Y
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Buzzer/Speaker
|
* Buzzer/Speaker
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -227,10 +227,16 @@
|
||||||
#error "LIN_ADVANCE (1.5) no longer uses LIN_ADVANCE_E_D_RATIO. Check your configuration."
|
#error "LIN_ADVANCE (1.5) no longer uses LIN_ADVANCE_E_D_RATIO. Check your configuration."
|
||||||
#elif defined(NEOPIXEL_RGBW_LED)
|
#elif defined(NEOPIXEL_RGBW_LED)
|
||||||
#error "NEOPIXEL_RGBW_LED is now NEOPIXEL_LED. Please update your configuration."
|
#error "NEOPIXEL_RGBW_LED is now NEOPIXEL_LED. Please update your configuration."
|
||||||
|
#elif ENABLED(DELTA) && defined(DELTA_PROBEABLE_RADIUS)
|
||||||
|
#error "Remove DELTA_PROBEABLE_RADIUS and use MIN_PROBE_EDGE to inset the probe area instead."
|
||||||
#elif defined(UBL_MESH_INSET)
|
#elif defined(UBL_MESH_INSET)
|
||||||
#error "UBL_MESH_INSET is now just MESH_INSET. Please update your configuration."
|
#error "UBL_MESH_INSET is now just MESH_INSET. Please update your configuration."
|
||||||
#elif defined(UBL_MESH_MIN_X) || defined(UBL_MESH_MIN_Y) || defined(UBL_MESH_MAX_X) || defined(UBL_MESH_MAX_Y)
|
#elif defined(UBL_MESH_MIN_X) || defined(UBL_MESH_MIN_Y) || defined(UBL_MESH_MAX_X) || defined(UBL_MESH_MAX_Y)
|
||||||
#error "UBL_MESH_(MIN|MAX)_[XY] is now just MESH_(MIN|MAX)_[XY]. Please update your configuration."
|
#error "UBL_MESH_(MIN|MAX)_[XY] is now just MESH_(MIN|MAX)_[XY]. Please update your configuration."
|
||||||
|
#elif defined(ABL_PROBE_PT_1_X) || defined(ABL_PROBE_PT_1_Y) || defined(ABL_PROBE_PT_2_X) || defined(ABL_PROBE_PT_2_Y) || defined(ABL_PROBE_PT_3_X) || defined(ABL_PROBE_PT_3_Y)
|
||||||
|
#error "ABL_PROBE_PT_[123]_[XY] is now PROBE_PT_[123]_[XY]. Please update your configuration."
|
||||||
|
#elif defined(UBL_PROBE_PT_1_X) || defined(UBL_PROBE_PT_1_Y) || defined(UBL_PROBE_PT_2_X) || defined(UBL_PROBE_PT_2_Y) || defined(UBL_PROBE_PT_3_X) || defined(UBL_PROBE_PT_3_Y)
|
||||||
|
#error "UBL_PROBE_PT_[123]_[XY] is now PROBE_PT_[123]_[XY]. Please update your configuration."
|
||||||
#elif defined(ENABLE_MESH_EDIT_GFX_OVERLAY)
|
#elif defined(ENABLE_MESH_EDIT_GFX_OVERLAY)
|
||||||
#error "ENABLE_MESH_EDIT_GFX_OVERLAY is now MESH_EDIT_GFX_OVERLAY. Please update your configuration."
|
#error "ENABLE_MESH_EDIT_GFX_OVERLAY is now MESH_EDIT_GFX_OVERLAY. Please update your configuration."
|
||||||
#elif defined(BABYSTEP_ZPROBE_GFX_REVERSE)
|
#elif defined(BABYSTEP_ZPROBE_GFX_REVERSE)
|
||||||
|
|
@ -801,6 +807,15 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
|
||||||
* Bed Leveling Requirements
|
* Bed Leveling Requirements
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(AUTO_BED_LEVELING_3POINT)
|
||||||
|
static_assert(WITHIN(PROBE_PT_1_X, MIN_PROBE_X, MAX_PROBE_X), "PROBE_PT_1_X is outside the probe region.");
|
||||||
|
static_assert(WITHIN(PROBE_PT_2_X, MIN_PROBE_X, MAX_PROBE_X), "PROBE_PT_2_X is outside the probe region.");
|
||||||
|
static_assert(WITHIN(PROBE_PT_3_X, MIN_PROBE_X, MAX_PROBE_X), "PROBE_PT_3_X is outside the probe region.");
|
||||||
|
static_assert(WITHIN(PROBE_PT_1_Y, MIN_PROBE_Y, MAX_PROBE_Y), "PROBE_PT_1_Y is outside the probe region.");
|
||||||
|
static_assert(WITHIN(PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "PROBE_PT_2_Y is outside the probe region.");
|
||||||
|
static_assert(WITHIN(PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "PROBE_PT_3_Y is outside the probe region.");
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -818,13 +833,6 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
|
||||||
#error "GRID_MAX_POINTS_[XY] must be a whole number between 3 and 15."
|
#error "GRID_MAX_POINTS_[XY] must be a whole number between 3 and 15."
|
||||||
#elif DISABLED(RESTORE_LEVELING_AFTER_G28)
|
#elif DISABLED(RESTORE_LEVELING_AFTER_G28)
|
||||||
#error "AUTO_BED_LEVELING_UBL (<=1.1.8) always has RESTORE_LEVELING_AFTER_G28 enabled. To keep this behavior, #define RESTORE_LEVELING_AFTER_G28. To keep it disabled comment out this line in SanityCheck.h."
|
#error "AUTO_BED_LEVELING_UBL (<=1.1.8) always has RESTORE_LEVELING_AFTER_G28 enabled. To keep this behavior, #define RESTORE_LEVELING_AFTER_G28. To keep it disabled comment out this line in SanityCheck.h."
|
||||||
#else
|
|
||||||
static_assert(WITHIN(UBL_PROBE_PT_1_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_1_X is outside the probe region.");
|
|
||||||
static_assert(WITHIN(UBL_PROBE_PT_2_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_2_X is outside the probe region.");
|
|
||||||
static_assert(WITHIN(UBL_PROBE_PT_3_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_3_X is outside the probe region.");
|
|
||||||
static_assert(WITHIN(UBL_PROBE_PT_1_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_1_Y is outside the probe region.");
|
|
||||||
static_assert(WITHIN(UBL_PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_2_Y is outside the probe region.");
|
|
||||||
static_assert(WITHIN(UBL_PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_3_Y is outside the probe region.");
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif OLDSCHOOL_ABL
|
#elif OLDSCHOOL_ABL
|
||||||
|
|
@ -837,7 +845,7 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
|
||||||
* Delta and SCARA have limited bed leveling options
|
* Delta and SCARA have limited bed leveling options
|
||||||
*/
|
*/
|
||||||
#if IS_SCARA && DISABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if IS_SCARA && DISABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
#error "Only AUTO_BED_LEVELING_BILINEAR currently supports SCARA bed leveling."
|
#error "SCARA machines can only use the AUTO_BED_LEVELING_BILINEAR leveling option."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -852,15 +860,6 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
|
||||||
static_assert(FRONT_PROBE_BED_POSITION >= MIN_PROBE_Y, "FRONT_PROBE_BED_POSITION is outside the probe region.");
|
static_assert(FRONT_PROBE_BED_POSITION >= MIN_PROBE_Y, "FRONT_PROBE_BED_POSITION is outside the probe region.");
|
||||||
static_assert(BACK_PROBE_BED_POSITION <= MAX_PROBE_Y, "BACK_PROBE_BED_POSITION is outside the probe region.");
|
static_assert(BACK_PROBE_BED_POSITION <= MAX_PROBE_Y, "BACK_PROBE_BED_POSITION is outside the probe region.");
|
||||||
|
|
||||||
#else // AUTO_BED_LEVELING_3POINT
|
|
||||||
|
|
||||||
static_assert(WITHIN(ABL_PROBE_PT_1_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_1_X is outside the probe region.");
|
|
||||||
static_assert(WITHIN(ABL_PROBE_PT_2_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_2_X is outside the probe region.");
|
|
||||||
static_assert(WITHIN(ABL_PROBE_PT_3_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_3_X is outside the probe region.");
|
|
||||||
static_assert(WITHIN(ABL_PROBE_PT_1_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_1_Y is outside the probe region.");
|
|
||||||
static_assert(WITHIN(ABL_PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_2_Y is outside the probe region.");
|
|
||||||
static_assert(WITHIN(ABL_PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_3_Y is outside the probe region.");
|
|
||||||
|
|
||||||
#endif // AUTO_BED_LEVELING_3POINT
|
#endif // AUTO_BED_LEVELING_3POINT
|
||||||
|
|
||||||
#elif ENABLED(MESH_BED_LEVELING)
|
#elif ENABLED(MESH_BED_LEVELING)
|
||||||
|
|
|
||||||
Reference in a new issue