|
@@ -512,7 +512,7 @@
|
512
|
512
|
z2 -= ubl.get_z_correction(LOGICAL_X_POSITION(UBL_PROBE_PT_2_X), LOGICAL_Y_POSITION(UBL_PROBE_PT_2_Y)) /* + zprobe_zoffset */ ;
|
513
|
513
|
z3 -= ubl.get_z_correction(LOGICAL_X_POSITION(UBL_PROBE_PT_3_X), LOGICAL_Y_POSITION(UBL_PROBE_PT_3_Y)) /* + zprobe_zoffset */ ;
|
514
|
514
|
|
515
|
|
- do_blocking_move_to_xy((X_MAX_POS - (X_MIN_POS)) / 2.0, (Y_MAX_POS - (Y_MIN_POS)) / 2.0);
|
|
515
|
+ do_blocking_move_to_xy(0.5 * (UBL_MESH_MAX_X - (UBL_MESH_MIN_X)), 0.5 * (UBL_MESH_MAX_Y - (UBL_MESH_MIN_Y)));
|
516
|
516
|
ubl.tilt_mesh_based_on_3pts(z1, z2, z3);
|
517
|
517
|
ubl.restore_ubl_active_state_and_leave();
|
518
|
518
|
}
|
|
@@ -751,8 +751,8 @@
|
751
|
751
|
ubl.restore_ubl_active_state_and_leave();
|
752
|
752
|
|
753
|
753
|
do_blocking_move_to_xy(
|
754
|
|
- constrain(lx - (X_PROBE_OFFSET_FROM_EXTRUDER), X_MIN_POS, X_MAX_POS),
|
755
|
|
- constrain(ly - (Y_PROBE_OFFSET_FROM_EXTRUDER), Y_MIN_POS, Y_MAX_POS)
|
|
754
|
+ constrain(lx - (X_PROBE_OFFSET_FROM_EXTRUDER), UBL_MESH_MIN_X, UBL_MESH_MAX_X),
|
|
755
|
+ constrain(ly - (Y_PROBE_OFFSET_FROM_EXTRUDER), UBL_MESH_MIN_Y, UBL_MESH_MAX_Y)
|
756
|
756
|
);
|
757
|
757
|
}
|
758
|
758
|
|
|
@@ -1056,12 +1056,12 @@
|
1056
|
1056
|
err_flag = true;
|
1057
|
1057
|
}
|
1058
|
1058
|
|
1059
|
|
- if (!WITHIN(RAW_X_POSITION(x_pos), X_MIN_POS, X_MAX_POS)) {
|
|
1059
|
+ if (!WITHIN(RAW_X_POSITION(x_pos), UBL_MESH_MIN_X, UBL_MESH_MAX_X)) {
|
1060
|
1060
|
SERIAL_PROTOCOLLNPGM("Invalid X location specified.\n");
|
1061
|
1061
|
err_flag = true;
|
1062
|
1062
|
}
|
1063
|
1063
|
|
1064
|
|
- if (!WITHIN(RAW_Y_POSITION(y_pos), Y_MIN_POS, Y_MAX_POS)) {
|
|
1064
|
+ if (!WITHIN(RAW_Y_POSITION(y_pos), UBL_MESH_MIN_Y, UBL_MESH_MAX_Y)) {
|
1065
|
1065
|
SERIAL_PROTOCOLLNPGM("Invalid Y location specified.\n");
|
1066
|
1066
|
err_flag = true;
|
1067
|
1067
|
}
|
|
@@ -1432,7 +1432,7 @@
|
1432
|
1432
|
rawy = pgm_read_float(&ubl.mesh_index_to_ypos[location.y_index]);
|
1433
|
1433
|
|
1434
|
1434
|
// TODO: Change to use `position_is_reachable` (for SCARA-compatibility)
|
1435
|
|
- if (!WITHIN(rawx, X_MIN_POS, X_MAX_POS) || !WITHIN(rawy, Y_MIN_POS, Y_MAX_POS)) { // In theory, we don't need this check.
|
|
1435
|
+ if (!WITHIN(rawx, UBL_MESH_MIN_X, UBL_MESH_MAX_X) || !WITHIN(rawy, UBL_MESH_MIN_Y, UBL_MESH_MAX_Y)) { // In theory, we don't need this check.
|
1436
|
1436
|
SERIAL_ERROR_START;
|
1437
|
1437
|
SERIAL_ERRORLNPGM("Attempt to edit off the bed."); // This really can't happen, but do the check for now
|
1438
|
1438
|
ubl.has_control_of_lcd_panel = false;
|