Skip to content

Fix bilinear ABL grid_start probe/nozzle coordinate mixup #28380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PenguinAkiko wants to merge 1 commit into
base: bugfix-2.1.x
Choose a base branch
from
+10 −3
Open

Fix bilinear ABL grid_start probe/nozzle coordinate mixup #28380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/gcode/bedlevel/M420.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void GcodeSuite::M420() {
start.set(x_min, y_min);
spacing.set((x_max - x_min) / (GRID_MAX_CELLS_X),
(y_max - y_min) / (GRID_MAX_CELLS_Y));
bedlevel.set_grid(spacing, start);
bedlevel.set_grid(spacing, Probe::convert_to_nozzle_xy(start));
#endif
GRID_LOOP(x, y) {
bedlevel.z_values[x][y] = 0.001 * random(-200, 200);
Expand Down
6 changes: 4 additions & 2 deletions Marlin/src/gcode/bedlevel/abl/G29.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,9 @@ G29_TYPE GcodeSuite::G29() {
#endif

#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
if (!abl.dryrun && (abl.gridSpacing != bedlevel.grid_spacing || abl.probe_position_lf != bedlevel.grid_start)) {
// Convert the probe-space grid origin to the motion/nozzle coordinate
const xy_pos_t grid_start = Probe::convert_to_nozzle_xy(abl.probe_position_lf);
if (!abl.dryrun && (abl.gridSpacing != bedlevel.grid_spacing || grid_start != bedlevel.grid_start)) {
reset_bed_level(); // Reset grid to 0.0 or "not probed". (Also disables ABL)
abl.reenable = false; // Can't re-enable (on error) until the new grid is written
}
Expand Down Expand Up @@ -883,7 +885,7 @@ G29_TYPE GcodeSuite::G29() {
if (abl.dryrun)
bedlevel.print_leveling_grid(&abl.z_values);
else {
bedlevel.set_grid(abl.gridSpacing, abl.probe_position_lf);
bedlevel.set_grid(abl.gridSpacing, Probe::convert_to_nozzle_xy(abl.probe_position_lf));
COPY(bedlevel.z_values, abl.z_values);
TERN_(IS_KINEMATIC, bedlevel.extrapolate_unprobed_bed_level());
bedlevel.refresh_bed_level();
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/module/probe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,11 @@ class Probe {
static constexpr xy_pos_t offset_xy = xy_pos_t({ 0, 0 }); // See #16767
#endif

// Convert a probe-space XY point to the active nozzle's motion-space coordinates.
static xy_pos_t convert_to_nozzle_xy(const xy_pos_t &probe_xy) {
return probe_xy - DIFF_TERN(HAS_HOTEND_OFFSET, offset_xy, xy_pos_t(motion.active_hotend_offset()));
}

static bool deploy(const bool no_return=false) { return set_deployed(true, no_return); }
static bool stow(const bool no_return=false) { return set_deployed(false, no_return); }

Expand Down
Loading