3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

toolhead: Don't report an error if request too high in SET_VELOCITY_LIMIT 

If a requested value is higher than the configured maximum, then just
limit the value to the configured maximum instead of raising an error.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-01-04 12:35:42 -05:00
parent 7fe14f05e6
commit a2f0c36e7d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
klippy/toolhead.py
View File

@ -436,20 +436,18 @@ class ToolHead:
def cmd_SET_VELOCITY_LIMIT(self, params):
print_time = self.get_last_move_time()
gcode = self.printer.lookup_object('gcode')
max_velocity = gcode.get_float(
'VELOCITY', params, self.max_velocity,
above=0., maxval=self.config_max_velocity)
max_accel = gcode.get_float(
'ACCEL', params, self.max_accel,
above=0., maxval=self.config_max_accel)
max_velocity = gcode.get_float('VELOCITY', params, self.max_velocity,
above=0.)
max_accel = gcode.get_float('ACCEL', params, self.max_accel, above=0.)
square_corner_velocity = gcode.get_float(
'SQUARE_CORNER_VELOCITY', params, self.square_corner_velocity,
minval=0., maxval=self.config_square_corner_velocity)
minval=0.)
self.requested_accel_to_decel = gcode.get_float(
'ACCEL_TO_DECEL', params, self.requested_accel_to_decel, above=0.)
self.max_velocity = max_velocity
self.max_accel = max_accel
self.square_corner_velocity = square_corner_velocity
self.max_velocity = min(max_velocity, self.config_max_velocity)
self.max_accel = min(max_accel, self.config_max_accel)
self.square_corner_velocity = min(square_corner_velocity,
self.config_square_corner_velocity)
self._calc_junction_deviation()
msg = ("max_velocity: %.6f\n"
"max_accel: %.6f\n"