3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-03-06 10:04:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

only MBL, UBL

Browse source
This commit is contained in:
Scott Lahteine 2026-02-28 02:36:47 -06:00
parent 3de0cb5c59
commit 1de2eb2999
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Marlin/src/lcd/extui/ui_api.cpp
View file

@ -881,21 +881,26 @@ namespace ExtUI {
}
void moveToMeshPoint(const xy_uint8_t &pos, const float z) {
REMEMBER(fr, motion.feedrate_mm_s);
const float x_target = mesh_min.x + pos.x * (MESH_X_DIST),
y_target = mesh_min.y + pos.y * (MESH_Y_DIST);
if (x_target != motion.position.x || y_target != motion.position.y) {
// If moving across bed, raise nozzle to safe height over bed
motion.feedrate_mm_s = z_probe_fast_mm_s;
motion.destination.set(motion.position.x, motion.position.y, Z_TWEEN_SAFE_CLEARANCE);
#if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
REMEMBER(fr, motion.feedrate_mm_s);
const float x_target = mesh_min.x + pos.x * (MESH_X_DIST),
y_target = mesh_min.y + pos.y * (MESH_Y_DIST);
if (x_target != motion.position.x || y_target != motion.position.y) {
// If moving across bed, raise nozzle to safe height over bed
motion.feedrate_mm_s = motion.z_probe_fast_mm_s;
motion.destination.set(motion.position.x, motion.position.y, Z_TWEEN_SAFE_CLEARANCE);
motion.prepare_line_to_destination();
if (XY_PROBE_FEEDRATE_MM_S) motion.feedrate_mm_s = XY_PROBE_FEEDRATE_MM_S;
motion.destination.set(x_target, y_target);
motion.prepare_line_to_destination();
}
motion.feedrate_mm_s = motion.z_probe_fast_mm_s;
motion.destination.z = z;
motion.prepare_line_to_destination();
if (XY_PROBE_FEEDRATE_MM_S) motion.feedrate_mm_s = XY_PROBE_FEEDRATE_MM_S;
motion.destination.set(x_target, y_target);
motion.prepare_line_to_destination();
}
motion.feedrate_mm_s = z_probe_fast_mm_s;
motion.destination.z = z;
motion.prepare_line_to_destination();
#else
UNUSED(pos);
UNUSED(z);
#endif
}
#endif // HAS_MESH