Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

toolhead: change SET_VELOCITY_LIMIT respond behavior 

Returns only the current values if no new ones have been passed.

Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
stefand 2021-08-24 12:52:13 +02:00 committed by KevinOConnor
parent d759b4e532
commit 9f75e348b0
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
klippy/toolhead.py
View File

@ -553,25 +553,37 @@ class ToolHead:
cmd_SET_VELOCITY_LIMIT_help = "Set printer velocity limits" cmd_SET_VELOCITY_LIMIT_help = "Set printer velocity limits"
def cmd_SET_VELOCITY_LIMIT(self, gcmd): def cmd_SET_VELOCITY_LIMIT(self, gcmd):
print_time = self.get_last_move_time() print_time = self.get_last_move_time()
max_velocity = gcmd.get_float('VELOCITY', self.max_velocity, above=0.) max_velocity = gcmd.get_float('VELOCITY', None, above=0.)
max_accel = gcmd.get_float('ACCEL', self.max_accel, above=0.) max_accel = gcmd.get_float('ACCEL', None, above=0.)
square_corner_velocity = gcmd.get_float( square_corner_velocity = gcmd.get_float(
'SQUARE_CORNER_VELOCITY', self.square_corner_velocity, minval=0.) 'SQUARE_CORNER_VELOCITY', None, minval=0.)
self.requested_accel_to_decel = gcmd.get_float( requested_accel_to_decel = gcmd.get_float(
'ACCEL_TO_DECEL', self.requested_accel_to_decel, above=0.) 'ACCEL_TO_DECEL', None, above=0.)
self.max_velocity = max_velocity self.max_velocity = max_velocity
self.max_accel = max_accel self.max_accel = max_accel
self.square_corner_velocity = square_corner_velocity 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() self._calc_junction_deviation()
msg = ("max_velocity: %.6f\n" msg = ("max_velocity: %.6f\n"
"max_accel: %.6f\n" "max_accel: %.6f\n"
"max_accel_to_decel: %.6f\n" "max_accel_to_decel: %.6f\n"
"square_corner_velocity: %.6f"% ( "square_corner_velocity: %.6f" % (
self.max_velocity, self.max_accel, self.max_velocity, self.max_accel,
self.requested_accel_to_decel, self.requested_accel_to_decel,
self.square_corner_velocity)) self.square_corner_velocity))
self.printer.set_rollover_info("toolhead", "toolhead: %s" % (msg,)) self.printer.set_rollover_info("toolhead", "toolhead: %s" % (msg,))
gcmd.respond_info(msg, log=False) 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)
def cmd_M204(self, gcmd): def cmd_M204(self, gcmd):
# Use S for accel # Use S for accel
accel = gcmd.get_float('S', None, above=0.) accel = gcmd.get_float('S', None, above=0.)