aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/klippy.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2017-09-03 15:17:02 -0400
committerKevin O'Connor <kevin@koconnor.net>2017-09-03 15:45:04 -0400
commit7a81bfc4a4651c913add10e34e7431513cf8a5f5 (patch)
tree7f3a40804dd52154d864cc71e7a120cddecf4725 /klippy/klippy.py
parent0d13834293d0b5db2fc3407bd603dbfaa691402d (diff)
downloadkutter-7a81bfc4a4651c913add10e34e7431513cf8a5f5.tar.gz
kutter-7a81bfc4a4651c913add10e34e7431513cf8a5f5.tar.xz
kutter-7a81bfc4a4651c913add10e34e7431513cf8a5f5.zip
toolhead: Eliminate set_max_jerk() from kinematic classes
Allow the kinematic classes to query the max velocity, max accel, and max halt velocity from the toolhead class instead of having the toolhead class call into the kinematic classes with those values. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/klippy.py')
-rw-r--r--klippy/klippy.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/klippy/klippy.py b/klippy/klippy.py
index 21b7597f..ae4ea656 100644
--- a/klippy/klippy.py
+++ b/klippy/klippy.py
@@ -6,7 +6,7 @@
# This file may be distributed under the terms of the GNU GPLv3 license.
import sys, optparse, ConfigParser, logging, time, threading
import util, reactor, queuelogger, msgproto, gcode
-import pins, mcu, chipmisc, extruder, fan, heater, toolhead
+import pins, mcu, chipmisc, toolhead, extruder, fan, heater
message_ready = "Printer is ready"
@@ -172,7 +172,7 @@ class Printer:
ConfigLogger(self.fileconfig, self.bglogger)
# Create printer components
config = ConfigWrapper(self, 'printer')
- for m in [pins, mcu, chipmisc, extruder, fan, heater, toolhead]:
+ for m in [pins, mcu, chipmisc, toolhead, extruder, fan, heater]:
m.add_printer_objects(self, config)
self.mcu = self.objects['mcu']
# Validate that there are no undefined parameters in the config file