From 179a56ce9206b5e6e37ea39306f8652829fd4e1a Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 31 Aug 2025 12:17:37 -0400 Subject: [PATCH] gcode_move: Fix M114 when extra axes are defined Commit d40fd219 added support for defining extra axes, however that change could break the M114 command. Update the code to fix M114. Signed-off-by: Kevin O'Connor --- klippy/extras/gcode_move.py | 4 ++-- test/klippy/manual_stepper.test | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/klippy/extras/gcode_move.py b/klippy/extras/gcode_move.py index 94a0ce42..655b8108 100644 --- a/klippy/extras/gcode_move.py +++ b/klippy/extras/gcode_move.py @@ -92,7 +92,7 @@ class GCodeMove: def _get_gcode_position(self): p = [lp - bp for lp, bp in zip(self.last_position, self.base_position)] p[3] /= self.extrude_factor - return p + return p[:4] def _get_gcode_speed(self): return self.speed / self.speed_factor def _get_gcode_speed_override(self): @@ -107,7 +107,7 @@ class GCodeMove: 'absolute_extrude': self.absolute_extrude, 'homing_origin': self.Coord(*self.homing_position[:4]), 'position': self.Coord(*self.last_position[:4]), - 'gcode_position': self.Coord(*move_position[:4]), + 'gcode_position': self.Coord(*move_position), } def reset_last_position(self): if self.is_printer_ready: diff --git a/test/klippy/manual_stepper.test b/test/klippy/manual_stepper.test index 6ab45c2d..12726411 100644 --- a/test/klippy/manual_stepper.test +++ b/test/klippy/manual_stepper.test @@ -33,6 +33,10 @@ G28 G1 X20 Y20 Z10 G1 A10 X22 +# Verify position query commands work with extra axis +GET_POSITION +M114 + # Test unregistering MANUAL_STEPPER STEPPER=basic_stepper GCODE_AXIS= G1 X15