From 89ffbbed4c6ca172f0038a274143fc152c2a22a2 Mon Sep 17 00:00:00 2001 From: Dmitry Butyugin Date: Wed, 7 May 2025 20:03:48 +0200 Subject: [PATCH] dual_carriage: Fixed broken safe_distance parameter Signed-off-by: Dmitry Butyugin --- klippy/kinematics/cartesian.py | 3 ++- klippy/kinematics/hybrid_corexy.py | 3 ++- klippy/kinematics/hybrid_corexz.py | 3 ++- test/klippy/dual_carriage.cfg | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/klippy/kinematics/cartesian.py b/klippy/kinematics/cartesian.py index 0524469a..f9030275 100644 --- a/klippy/kinematics/cartesian.py +++ b/klippy/kinematics/cartesian.py @@ -32,7 +32,8 @@ class CartKinematics: self.dc_module = idex_modes.DualCarriages( self.printer, [self.rails[self.dual_carriage_axis]], [self.rails[3]], axes=[self.dual_carriage_axis], - safe_dist=config.getfloat('safe_distance', None, minval=0.)) + safe_dist=dc_config.getfloat( + 'safe_distance', None, minval=0.)) for s in self.get_steppers(): s.set_trapq(toolhead.get_trapq()) toolhead.register_step_generator(s.generate_steps) diff --git a/klippy/kinematics/hybrid_corexy.py b/klippy/kinematics/hybrid_corexy.py index 7bffdc0f..fd2621d5 100644 --- a/klippy/kinematics/hybrid_corexy.py +++ b/klippy/kinematics/hybrid_corexy.py @@ -35,7 +35,8 @@ class HybridCoreXYKinematics: self.rails[3].setup_itersolve('corexy_stepper_alloc', b'+') self.dc_module = idex_modes.DualCarriages( self.printer, [self.rails[0]], [self.rails[3]], axes=[0], - safe_dist=config.getfloat('safe_distance', None, minval=0.)) + safe_dist=dc_config.getfloat( + 'safe_distance', None, minval=0.)) for s in self.get_steppers(): s.set_trapq(toolhead.get_trapq()) toolhead.register_step_generator(s.generate_steps) diff --git a/klippy/kinematics/hybrid_corexz.py b/klippy/kinematics/hybrid_corexz.py index 6399f236..b9699982 100644 --- a/klippy/kinematics/hybrid_corexz.py +++ b/klippy/kinematics/hybrid_corexz.py @@ -35,7 +35,8 @@ class HybridCoreXZKinematics: self.rails[3].setup_itersolve('corexz_stepper_alloc', b'+') self.dc_module = idex_modes.DualCarriages( self.printer, [self.rails[0]], [self.rails[3]], axes=[0], - safe_dist=config.getfloat('safe_distance', None, minval=0.)) + safe_dist=dc_config.getfloat( + 'safe_distance', None, minval=0.)) for s in self.get_steppers(): s.set_trapq(toolhead.get_trapq()) toolhead.register_step_generator(s.generate_steps) diff --git a/test/klippy/dual_carriage.cfg b/test/klippy/dual_carriage.cfg index 93c57444..46edb00a 100644 --- a/test/klippy/dual_carriage.cfg +++ b/test/klippy/dual_carriage.cfg @@ -12,6 +12,7 @@ homing_speed: 50 [dual_carriage] axis: x +safe_distance: 50 step_pin: PH1 dir_pin: PH0 enable_pin: !PA1