andreil/klipper
1
0
Fork 0
mirror of https://github.com/andreili/klipper.git synced 2025-08-23 19:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

stepper: Fix broken manual_stepper rail naming (#6929)

Browse Source 
The naming got broken during refactoring for generic_cartesian.

Signed-off-by: Dmitry Butyugin <dmbutyugin@google.com>
This commit is contained in:
Dmitry Butyugin 2025-05-11 02:10:54 +02:00 committed by GitHub
parent 6f87a4e685
commit 8627c94d6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
klippy/kinematics/generic_cartesian.py
View File

@ -38,7 +38,7 @@ class MainCarriage:
self.axis_name = axis
self.dual_carriage = None
def get_name(self):
return self.rail.get_name()
return self.rail.get_name(short=True)
def get_axis(self):
return self.axis
def get_rail(self):
@ -86,7 +86,7 @@ class DualCarriage:
self.primary_carriage.get_axis_name())
self.safe_dist = config.getfloat('safe_distance', None, minval=0.)
def get_name(self):
return self.rail.get_name()
return self.rail.get_name(short=True)
def get_axis(self):
return self.primary_carriage.get_axis()
def get_rail(self):

2
klippy/kinematics/idex_modes.py
View File

@ -26,7 +26,7 @@ class DualCarriages:
DualCarriagesRail(c, primary_rails[i], axes[i], active=False)
for i, c in enumerate(dual_rails)]
self.dc_rails = collections.OrderedDict(
[(c.rail.get_name(), c)
[(c.rail.get_name(short=True), c)
for c in self.primary_rails + self.dual_rails])
self.saved_states = {}
self.safe_dist = {}

10
klippy/stepper.py
View File

@ -323,7 +323,7 @@ class GenericPrinterRail:
default_position_endstop=None, units_in_radians=False):
self.stepper_units_in_radians = units_in_radians
self.printer = config.get_printer()
self.name = config.get_name().split()[-1]
self.name = config.get_name()
self.steppers = []
self.endstops = []
self.endstop_map = {}
@ -380,9 +380,11 @@ class GenericPrinterRail:
"Invalid homing_positive_dir / position_endstop in '%s'"
% (config.get_name(),))
def get_name(self, short=False):
if short and self.name.startswith('stepper'):
# Skip an extra symbol after 'stepper'
return self.name[8:]
if short:
if self.name.startswith('stepper'):
# Skip an extra symbol after 'stepper'
return self.name[8:]
return self.name.split()[-1]
return self.name
def get_range(self):
return self.position_min, self.position_max