diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2018-07-13 10:52:40 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2018-07-13 11:37:20 -0400 |
| commit | b9885965195d1e25cbfec887e5794c59f775f897 (patch) | |
| tree | caba24431d1d44b24c11a8cf5907463b51a91114 /klippy/kinematics/cartesian.py | |
| parent | 8faab46ed2fc05495e63bbca8fe3dfa6828f7db3 (diff) | |
| download | kutter-b9885965195d1e25cbfec887e5794c59f775f897.tar.gz kutter-b9885965195d1e25cbfec887e5794c59f775f897.tar.xz kutter-b9885965195d1e25cbfec887e5794c59f775f897.zip | |
toolhead: Fill cmove in toolhead instead of in each kinematic class
This simplifies the kinematic classes.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/kinematics/cartesian.py')
| -rw-r--r-- | klippy/kinematics/cartesian.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/klippy/kinematics/cartesian.py b/klippy/kinematics/cartesian.py index 22ee5b98..6c10984c 100644 --- a/klippy/kinematics/cartesian.py +++ b/klippy/kinematics/cartesian.py @@ -20,8 +20,6 @@ class CartKinematics: self.limits = [(1.0, -1.0)] * 3 # Setup iterative solver ffi_main, ffi_lib = chelper.get_ffi() - self.cmove = ffi_main.gc(ffi_lib.move_alloc(), ffi_lib.free) - self.move_fill = ffi_lib.move_fill for axis, rail in zip('xyz', self.rails): rail.setup_cartesian_itersolve(axis) # Setup stepper max halt velocity @@ -141,15 +139,9 @@ class CartKinematics: def move(self, print_time, move): if self.need_motor_enable: self._check_motor_enable(print_time, move) - self.move_fill( - self.cmove, print_time, - move.accel_t, move.cruise_t, move.decel_t, - move.start_pos[0], move.start_pos[1], move.start_pos[2], - move.axes_d[0], move.axes_d[1], move.axes_d[2], - move.start_v, move.cruise_v, move.accel) for i, rail in enumerate(self.rails): if move.axes_d[i]: - rail.step_itersolve(self.cmove) + rail.step_itersolve(move.cmove) # Dual carriage support def _activate_carriage(self, carriage): toolhead = self.printer.lookup_object('toolhead') |