From 75183bfb86c7003d3bac0116dba7765e4a4ab241 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 24 Aug 2021 12:34:00 -0400 Subject: [PATCH] Revert "toolhead: change SET_VELOCITY_LIMIT respond behavior" This reverts commit 9f75e348b06f494c0aa4181867b92013f72a9278. Signed-off-by: Kevin O'Connor --- klippy/toolhead.py | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/klippy/toolhead.py b/klippy/toolhead.py index 6d787b3dc..155848be9 100644 --- a/klippy/toolhead.py +++ b/klippy/toolhead.py @@ -553,37 +553,25 @@ class ToolHead: cmd_SET_VELOCITY_LIMIT_help = "Set printer velocity limits" def cmd_SET_VELOCITY_LIMIT(self, gcmd): print_time = self.get_last_move_time() - max_velocity = gcmd.get_float('VELOCITY', None, above=0.) - max_accel = gcmd.get_float('ACCEL', None, above=0.) + max_velocity = gcmd.get_float('VELOCITY', self.max_velocity, above=0.) + max_accel = gcmd.get_float('ACCEL', self.max_accel, above=0.) square_corner_velocity = gcmd.get_float( - 'SQUARE_CORNER_VELOCITY', None, minval=0.) - requested_accel_to_decel = gcmd.get_float( - 'ACCEL_TO_DECEL', None, above=0.) + 'SQUARE_CORNER_VELOCITY', self.square_corner_velocity, minval=0.) + self.requested_accel_to_decel = gcmd.get_float( + 'ACCEL_TO_DECEL', self.requested_accel_to_decel, above=0.) self.max_velocity = max_velocity self.max_accel = max_accel self.square_corner_velocity = square_corner_velocity - if max_velocity is not None: - self.max_velocity = max_velocity - if max_accel is not None: - self.max_accel = max_accel - if square_corner_velocity is not None: - self.square_corner_velocity = square_corner_velocity - if requested_accel_to_decel is not None: - self.requested_accel_to_decel = requested_accel_to_decel self._calc_junction_deviation() msg = ("max_velocity: %.6f\n" "max_accel: %.6f\n" "max_accel_to_decel: %.6f\n" - "square_corner_velocity: %.6f" % ( + "square_corner_velocity: %.6f"% ( self.max_velocity, self.max_accel, self.requested_accel_to_decel, self.square_corner_velocity)) self.printer.set_rollover_info("toolhead", "toolhead: %s" % (msg,)) - if (max_velocity is None and - max_accel is None and - square_corner_velocity is None and - requested_accel_to_decel is None): - gcmd.respond_info(msg, log=False) + gcmd.respond_info(msg, log=False) def cmd_M204(self, gcmd): # Use S for accel accel = gcmd.get_float('S', None, above=0.)