Bring some configs up to date
This commit is contained in:
		| @@ -999,10 +999,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 190 |   //#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 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 | ||||||
| @@ -1025,17 +1025,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 PROBE_PT_1_X 20 |  | ||||||
|   #define PROBE_PT_1_Y 160 |  | ||||||
|   #define PROBE_PT_2_X 20 |  | ||||||
|   #define PROBE_PT_2_Y 10 |  | ||||||
|   #define PROBE_PT_3_X 180 |  | ||||||
|   #define PROBE_PT_3_Y 10 |  | ||||||
|  |  | ||||||
| #elif ENABLED(AUTO_BED_LEVELING_UBL) | #elif ENABLED(AUTO_BED_LEVELING_UBL) | ||||||
|  |  | ||||||
|   //=========================================================================== |   //=========================================================================== | ||||||
| @@ -1073,12 +1062,12 @@ | |||||||
|  * Override if the automatically selected points are inadequate. |  * Override if the automatically selected points are inadequate. | ||||||
|  */ |  */ | ||||||
| #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) | #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) | ||||||
|   //#define PROBE_PT_1_X 15 |   #define PROBE_PT_1_X 20 | ||||||
|   //#define PROBE_PT_1_Y 180 |   #define PROBE_PT_1_Y 160 | ||||||
|   //#define PROBE_PT_2_X 15 |   #define PROBE_PT_2_X 20 | ||||||
|   //#define PROBE_PT_2_Y 20 |   #define PROBE_PT_2_Y 10 | ||||||
|   //#define PROBE_PT_3_X 170 |   #define PROBE_PT_3_X 180 | ||||||
|   //#define PROBE_PT_3_Y 20 |   #define PROBE_PT_3_Y 10 | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -998,10 +998,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 (X_MIN_POS + 33) |   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE | ||||||
|   //#define RIGHT_PROBE_BED_POSITION (X_MAX_POS - 37) |   //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE) | ||||||
|   //#define FRONT_PROBE_BED_POSITION (Y_MIN_POS + 7) |   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE | ||||||
|   //#define BACK_PROBE_BED_POSITION (Y_MAX_POS - 12) |   //#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 | ||||||
| @@ -1024,17 +1024,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 PROBE_PT_1_X 39 |  | ||||||
|   #define PROBE_PT_1_Y 170 |  | ||||||
|   #define PROBE_PT_2_X 39 |  | ||||||
|   #define PROBE_PT_2_Y 10 |  | ||||||
|   #define PROBE_PT_3_X 170 |  | ||||||
|   #define PROBE_PT_3_Y 10 |  | ||||||
|  |  | ||||||
| #elif ENABLED(AUTO_BED_LEVELING_UBL) | #elif ENABLED(AUTO_BED_LEVELING_UBL) | ||||||
|  |  | ||||||
|   //=========================================================================== |   //=========================================================================== | ||||||
| @@ -1045,14 +1034,7 @@ | |||||||
|  |  | ||||||
|   #define MESH_INSET 0              // Set Mesh bounds as an inset region of the bed |   #define MESH_INSET 0              // Set Mesh bounds as an inset region of the bed | ||||||
|   #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 GRID_MAX_POINTS_X | ||||||
|  |  | ||||||
|   #define PROBE_PT_1_X 45       // Probing points for 3-Point leveling of the mesh |  | ||||||
|   #define PROBE_PT_1_Y 170 |  | ||||||
|   #define PROBE_PT_2_X 45 |  | ||||||
|   #define PROBE_PT_2_Y 25 |  | ||||||
|   #define PROBE_PT_3_X 180 |  | ||||||
|   #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 | ||||||
| @@ -1079,12 +1061,12 @@ | |||||||
|  * Override if the automatically selected points are inadequate. |  * Override if the automatically selected points are inadequate. | ||||||
|  */ |  */ | ||||||
| #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) | #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) | ||||||
|   //#define PROBE_PT_1_X 15 |   #define PROBE_PT_1_X 45 | ||||||
|   //#define PROBE_PT_1_Y 180 |   #define PROBE_PT_1_Y 170 | ||||||
|   //#define PROBE_PT_2_X 15 |   #define PROBE_PT_2_X 45 | ||||||
|   //#define PROBE_PT_2_Y 20 |   #define PROBE_PT_2_Y 25 | ||||||
|   //#define PROBE_PT_3_X 170 |   #define PROBE_PT_3_X 180 | ||||||
|   //#define PROBE_PT_3_Y 20 |   #define PROBE_PT_3_Y 25 | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -796,7 +796,7 @@ | |||||||
| #define BEZIER_CURVE_SUPPORT | #define BEZIER_CURVE_SUPPORT | ||||||
|  |  | ||||||
| // G38.2 and G38.3 Probe Target | // G38.2 and G38.3 Probe Target | ||||||
| // Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch | // Set MULTIPLE_PROBING if you want G38 to double touch | ||||||
| //#define G38_PROBE_TARGET | //#define G38_PROBE_TARGET | ||||||
| #if ENABLED(G38_PROBE_TARGET) | #if ENABLED(G38_PROBE_TARGET) | ||||||
|   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move) |   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move) | ||||||
|   | |||||||
| @@ -1046,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 PROBE_PT_1_X 50 |  | ||||||
|   #define PROBE_PT_1_Y 150 |  | ||||||
|   #define PROBE_PT_2_X 50 |  | ||||||
|   #define PROBE_PT_2_Y 50 |  | ||||||
|   #define PROBE_PT_3_X 150 |  | ||||||
|   #define PROBE_PT_3_Y 50 |  | ||||||
|  |  | ||||||
| #elif ENABLED(AUTO_BED_LEVELING_UBL) | #elif ENABLED(AUTO_BED_LEVELING_UBL) | ||||||
|  |  | ||||||
|   //=========================================================================== |   //=========================================================================== | ||||||
| @@ -1094,12 +1083,12 @@ | |||||||
|  * Override if the automatically selected points are inadequate. |  * Override if the automatically selected points are inadequate. | ||||||
|  */ |  */ | ||||||
| #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) | #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) | ||||||
|   //#define PROBE_PT_1_X 15 |   #define PROBE_PT_1_X 50 | ||||||
|   //#define PROBE_PT_1_Y 180 |   #define PROBE_PT_1_Y 150 | ||||||
|   //#define PROBE_PT_2_X 15 |   #define PROBE_PT_2_X 50 | ||||||
|   //#define PROBE_PT_2_Y 20 |   #define PROBE_PT_2_Y 50 | ||||||
|   //#define PROBE_PT_3_X 170 |   #define PROBE_PT_3_X 150 | ||||||
|   //#define PROBE_PT_3_Y 20 |   #define PROBE_PT_3_Y 50 | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -1355,11 +1355,11 @@ | |||||||
|  * |  * | ||||||
|  * Select the language to display on the LCD. These languages are available: |  * Select the language to display on the LCD. These languages are available: | ||||||
|  * |  * | ||||||
|  *    en, an, bg, ca, cn, cz, cz_utf8, de, el, el-gr, es, es_utf8, eu, fi, fr, fr_utf8, |  *    en, an, bg, ca, cn, cz, de, el, el-gr, es, eu, fi, fr, | ||||||
|  *    gl, hr, it, kana, kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, sk_utf8, |  *    gl, hr, it, jp-kana, nl, pl, pt, pt-br, ru, sk, | ||||||
|  *    tr, uk, zh_CN, zh_TW, test |  *    tr, uk, zh_CN, zh_TW, test | ||||||
|  * |  * | ||||||
|  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'cz_utf8':'Czech (UTF8)', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'es_utf8':'Spanish (UTF8)', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'fr_utf8':'French (UTF8)', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'sk_utf8':'Slovak (UTF8)', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Taiwan)', test':'TEST' } |  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'jp-kana':'Japanese', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'ru':'Russian', 'sk':'Slovak', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)', test':'TEST' } | ||||||
|  */ |  */ | ||||||
| #define LCD_LANGUAGE en | #define LCD_LANGUAGE en | ||||||
|  |  | ||||||
|   | |||||||
| @@ -617,7 +617,6 @@ | |||||||
| #define DEFAULT_ZJERK                  0.3 | #define DEFAULT_ZJERK                  0.3 | ||||||
| #define DEFAULT_EJERK                  5.0 | #define DEFAULT_EJERK                  5.0 | ||||||
|  |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Realtime Jerk Control |  * Realtime Jerk Control | ||||||
|  * |  * | ||||||
|   | |||||||
| @@ -366,7 +366,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 the PID | #define PID_K1 0.95      // Smoothing factor within any PID loop | ||||||
| #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. | ||||||
| @@ -975,7 +975,7 @@ | |||||||
|   /** |   /** | ||||||
|    * Enable the G26 Mesh Validation Pattern tool. |    * Enable the G26 Mesh Validation Pattern tool. | ||||||
|    */ |    */ | ||||||
|   #define G26_MESH_VALIDATION   // Enable G26 mesh validation |   #define 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. | ||||||
|   | |||||||
| @@ -1112,8 +1112,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_MIN_POS + X_MAX_POS) / 2)    // X point for Z homing when homing all axis (G28). |   #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2)    // X point for Z homing when homing all axes (G28). | ||||||
|   #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28). |   #define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2)    // Y point for Z homing when homing all axes (G28). | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| // Homing speeds (mm/m) | // Homing speeds (mm/m) | ||||||
|   | |||||||
| @@ -916,7 +916,7 @@ | |||||||
| //=========================================================================== | //=========================================================================== | ||||||
| //=============================== Bed Leveling ============================== | //=============================== Bed Leveling ============================== | ||||||
| //=========================================================================== | //=========================================================================== | ||||||
| // @section bedlevel | // @section calibrate | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Choose one of the options below to enable G29 Bed Leveling. The parameters |  * Choose one of the options below to enable G29 Bed Leveling. The parameters | ||||||
| @@ -1043,6 +1043,9 @@ | |||||||
|   #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) | ||||||
|  |  | ||||||
|   //=========================================================================== |   //=========================================================================== | ||||||
|   | |||||||
| @@ -871,8 +871,7 @@ | |||||||
|   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED |   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED | ||||||
|  |  | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20 |   #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20 | ||||||
|   // Move the probe into position |   #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 |  | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0 |   #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0 | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0 |   #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0 | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE XY_PROBE_SPEED |   #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE XY_PROBE_SPEED | ||||||
|   | |||||||
| @@ -871,8 +871,7 @@ | |||||||
|   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED |   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED | ||||||
|  |  | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20 |   #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20 | ||||||
|   // Move the probe into position |   #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 |  | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0 |   #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0 | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0 |   #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0 | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE XY_PROBE_SPEED |   #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE XY_PROBE_SPEED | ||||||
| @@ -1120,6 +1119,7 @@ | |||||||
| #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR) | #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR) | ||||||
|  |  | ||||||
|   // Set the number of grid points per dimension. |   // Set the number of grid points per dimension. | ||||||
|  |   // Works best with 5 or more points in each dimension. | ||||||
|   #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 | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1153,17 +1153,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 PROBE_PT_1_X -116 |  | ||||||
|   #define PROBE_PT_1_Y -67.5 |  | ||||||
|   #define PROBE_PT_2_X 116 |  | ||||||
|   #define PROBE_PT_2_Y -67.5 |  | ||||||
|   #define PROBE_PT_3_X 0 |  | ||||||
|   #define PROBE_PT_3_Y 135 |  | ||||||
|  |  | ||||||
| #elif ENABLED(AUTO_BED_LEVELING_UBL) | #elif ENABLED(AUTO_BED_LEVELING_UBL) | ||||||
|  |  | ||||||
|   //=========================================================================== |   //=========================================================================== | ||||||
| @@ -1201,12 +1190,12 @@ | |||||||
|  * Override if the automatically selected points are inadequate. |  * Override if the automatically selected points are inadequate. | ||||||
|  */ |  */ | ||||||
| #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) | #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) | ||||||
|   //#define PROBE_PT_1_X 15 |   #define PROBE_PT_1_X -116 | ||||||
|   //#define PROBE_PT_1_Y 180 |   #define PROBE_PT_1_Y -67.5 | ||||||
|   //#define PROBE_PT_2_X 15 |   #define PROBE_PT_2_X 116 | ||||||
|   //#define PROBE_PT_2_Y 20 |   #define PROBE_PT_2_Y -67.5 | ||||||
|   //#define PROBE_PT_3_X 170 |   #define PROBE_PT_3_X 0 | ||||||
|   //#define PROBE_PT_3_Y 20 |   #define PROBE_PT_3_Y 135 | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -861,8 +861,7 @@ | |||||||
|   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED |   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED | ||||||
|  |  | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20 |   #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20 | ||||||
|   // Move the probe into position |   #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 |  | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0 |   #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0 | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0 |   #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0 | ||||||
|   #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE XY_PROBE_SPEED |   #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE XY_PROBE_SPEED | ||||||
|   | |||||||
| @@ -1044,13 +1044,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 PROBE_PT_1_X 53       // Probing points for 3-Point leveling of the mesh |  | ||||||
|   #define PROBE_PT_1_Y 323 |  | ||||||
|   #define PROBE_PT_2_X 53 |  | ||||||
|   #define PROBE_PT_2_Y 63 |  | ||||||
|   #define PROBE_PT_3_X 348 |  | ||||||
|   #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 | ||||||
|  |  | ||||||
| @@ -1076,12 +1069,12 @@ | |||||||
|  * Override if the automatically selected points are inadequate. |  * Override if the automatically selected points are inadequate. | ||||||
|  */ |  */ | ||||||
| #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) | #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) | ||||||
|   //#define PROBE_PT_1_X 15 |   #define PROBE_PT_1_X 53 | ||||||
|   //#define PROBE_PT_1_Y 180 |   #define PROBE_PT_1_Y 323 | ||||||
|   //#define PROBE_PT_2_X 15 |   #define PROBE_PT_2_X 53 | ||||||
|   //#define PROBE_PT_2_Y 20 |   #define PROBE_PT_2_Y 63 | ||||||
|   //#define PROBE_PT_3_X 170 |   #define PROBE_PT_3_X 348 | ||||||
|   //#define PROBE_PT_3_Y 20 |   #define PROBE_PT_3_Y 211 | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -606,7 +606,7 @@ | |||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Default Jerk (mm/s) |  * Default Jerk (mm/s) | ||||||
|  * Override with M205 X Y Z EM |  * Override with M205 X Y Z E | ||||||
|  * |  * | ||||||
|  * "Jerk" specifies the minimum speed change that requires acceleration. |  * "Jerk" specifies the minimum speed change that requires acceleration. | ||||||
|  * When changing speed and direction, if the difference is less than the |  * When changing speed and direction, if the difference is less than the | ||||||
| @@ -711,6 +711,7 @@ | |||||||
|   //#define WAIT_FOR_BED_HEATER     // Wait for bed to heat back up between probes (to improve accuracy) |   //#define WAIT_FOR_BED_HEATER     // Wait for bed to heat back up between probes (to improve accuracy) | ||||||
| #endif | #endif | ||||||
| //#define PROBING_FANS_OFF          // Turn fans off when probing | //#define PROBING_FANS_OFF          // Turn fans off when probing | ||||||
|  | //#define DELAY_BEFORE_PROBING 200  // (ms) To prevent vibrations from triggering piezo sensors | ||||||
|  |  | ||||||
| // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) | // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) | ||||||
| //#define SOLENOID_PROBE | //#define SOLENOID_PROBE | ||||||
| @@ -1209,7 +1210,7 @@ | |||||||
| // | // | ||||||
| // M100 Free Memory Watcher | // M100 Free Memory Watcher | ||||||
| // | // | ||||||
| //#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose | //#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage | ||||||
|  |  | ||||||
| // | // | ||||||
| // G20/G21 Inch mode support | // G20/G21 Inch mode support | ||||||
|   | |||||||
| @@ -951,7 +951,6 @@ | |||||||
|                                                   //   For Bowden, the full length of the tube and nozzle. |                                                   //   For Bowden, the full length of the tube and nozzle. | ||||||
|                                                   //   For direct drive, the full length of the nozzle. |                                                   //   For direct drive, the full length of the nozzle. | ||||||
|   //#define ADVANCED_PAUSE_CONTINUOUS_PURGE       // Purge continuously up to the purge length until interrupted. |   //#define ADVANCED_PAUSE_CONTINUOUS_PURGE       // Purge continuously up to the purge length until interrupted. | ||||||
|   //#define ADVANCED_PAUSE_CONTINUOUS_PURGE       // Purge continuously up to the purge length until interrupted. |  | ||||||
|   #define ADVANCED_PAUSE_PURGE_FEEDRATE        3  // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate. |   #define ADVANCED_PAUSE_PURGE_FEEDRATE        3  // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate. | ||||||
|   #define ADVANCED_PAUSE_PURGE_LENGTH         50  // (mm) Length to extrude after loading. |   #define ADVANCED_PAUSE_PURGE_LENGTH         50  // (mm) Length to extrude after loading. | ||||||
|                                                   //   Set to 0 for manual extrusion. |                                                   //   Set to 0 for manual extrusion. | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user