From 19f0f07d76b99b4fde3bc052e3fbd43d45613720 Mon Sep 17 00:00:00 2001
From: ThomasToka <117008525+ThomasToka@users.noreply.github.com>
Date: Tue, 24 Feb 2026 10:45:45 +0100
Subject: [PATCH] upstream merge fix

this fixes the missing changes from #27866 Motion encapsulation
---
 Marlin/src/gcode/bedlevel/abl/M421.cpp | 4 ++--
 Marlin/src/gcode/bedlevel/ubl/M421.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/M421.cpp b/Marlin/src/gcode/bedlevel/abl/M421.cpp
index 1b5dcaf88f..5b7a0b925b 100644
--- a/Marlin/src/gcode/bedlevel/abl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/M421.cpp
@@ -130,12 +130,12 @@ void GcodeSuite::M421() {
     }
     if (parser.seen('L')) {
       // Left margin: X_MIN_POS + probe_offset must reach >= 0, but min 10
-      bedlevel.margin_l = safe_margin(parser.value_int(), constrain(((TERN(HAS_HOME_OFFSET, home_offset.x, X_MIN_POS) - ceilf(fabs(probe.offset_xy.x))) <= 0 ? 10 : (TERN(HAS_HOME_OFFSET, home_offset.x, X_MIN_POS) - ceilf(fabs(probe.offset_xy.x)))), 10, X_BED_SIZE), 'L');
+      bedlevel.margin_l = safe_margin(parser.value_int(), constrain(((TERN(HAS_HOME_OFFSET, motion.home_offset.x, X_MIN_POS) - ceilf(fabs(probe.offset_xy.x))) <= 0 ? 10 : (TERN(HAS_HOME_OFFSET, motion.home_offset.x, X_MIN_POS) - ceilf(fabs(probe.offset_xy.x)))), 10, X_BED_SIZE), 'L');
       did_something = true;
     }
     if (parser.seen('F')) {
       // Front margin: Y_MIN_POS + probe_offset must reach >= 0, but min 10
-      bedlevel.margin_f = safe_margin(parser.value_int(), constrain(((TERN(HAS_HOME_OFFSET, home_offset.y, Y_MIN_POS) - ceilf(fabs(probe.offset_xy.y))) <= 0 ? 10 : (TERN(HAS_HOME_OFFSET, home_offset.y, Y_MIN_POS) - ceilf(fabs(probe.offset_xy.y)))), 10, Y_BED_SIZE), 'F');
+      bedlevel.margin_f = safe_margin(parser.value_int(), constrain(((TERN(HAS_HOME_OFFSET, motion.home_offset.y, Y_MIN_POS) - ceilf(fabs(probe.offset_xy.y))) <= 0 ? 10 : (TERN(HAS_HOME_OFFSET, motion.home_offset.y, Y_MIN_POS) - ceilf(fabs(probe.offset_xy.y)))), 10, Y_BED_SIZE), 'F');
       did_something = true;
     }
     if (parser.seen('R')) {
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index 9eef0d26b9..b546c3531b 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -74,7 +74,7 @@ void GcodeSuite::M421() {
              hasQ = !hasZ && parser.seen('Q');
 
   const bool mesh_command = hasZ || hasQ || hasN;
-  if (hasC) ij = bedlevel.find_closest_mesh_point_of_type(CLOSEST, current_position);
+  if (hasC) ij = bedlevel.find_closest_mesh_point_of_type(CLOSEST, motion.position);
   bool did_something = false;
   // Mesh point modification
   if (mesh_command) {
@@ -135,12 +135,12 @@ void GcodeSuite::M421() {
     }
     if (parser.seen('L')) {
       // Left margin: X_MIN_POS + probe_offset must reach >= 0, but min 10
-      bedlevel.margin_l = safe_margin(parser.value_int(), constrain(_MAX(10, TERN(HAS_HOME_OFFSET, home_offset.x, X_MIN_POS) - ceilf(fabs(probe.offset_xy.x))), 10, X_BED_SIZE), 'L');
+      bedlevel.margin_l = safe_margin(parser.value_int(), constrain(_MAX(10, TERN(HAS_HOME_OFFSET, motion.home_offset.x, X_MIN_POS) - ceilf(fabs(probe.offset_xy.x))), 10, X_BED_SIZE), 'L');
       did_something = true;
     }
     if (parser.seen('F')) {
       // Front margin: Y_MIN_POS + probe_offset must reach >= 0, but min 10
-      bedlevel.margin_f = safe_margin(parser.value_int(), constrain(_MAX(10, TERN(HAS_HOME_OFFSET, home_offset.y, Y_MIN_POS) - ceilf(fabs(probe.offset_xy.y))), 10, Y_BED_SIZE), 'F');
+      bedlevel.margin_f = safe_margin(parser.value_int(), constrain(_MAX(10, TERN(HAS_HOME_OFFSET, motion.home_offset.y, Y_MIN_POS) - ceilf(fabs(probe.offset_xy.y))), 10, Y_BED_SIZE), 'F');
       did_something = true;
     }
     if (parser.seen('R')) {