diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-10-29 12:44:39 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-11-06 15:51:51 -0500 |
| commit | 1acaaa98c21af0a2a2cff725365dfda0ff4b7204 (patch) | |
| tree | 601ce8a29fb24f7b4b83368c120c386563d2ff1b /klippy/kinematics/extruder.py | |
| parent | 797dcfcb1218194077d37dd53575c19c4af710c5 (diff) | |
| download | kutter-1acaaa98c21af0a2a2cff725365dfda0ff4b7204.tar.gz kutter-1acaaa98c21af0a2a2cff725365dfda0ff4b7204.tar.xz kutter-1acaaa98c21af0a2a2cff725365dfda0ff4b7204.zip | |
trapq: Remove move_fill()
Now that all callers use the trapq system to queue moves, it is no
longer necessary to individually allocate and fill a 'struct move'.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/kinematics/extruder.py')
| -rw-r--r-- | klippy/kinematics/extruder.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/klippy/kinematics/extruder.py b/klippy/kinematics/extruder.py index a9215688..6b9245d4 100644 --- a/klippy/kinematics/extruder.py +++ b/klippy/kinematics/extruder.py @@ -53,10 +53,8 @@ class PrinterExtruder: self.extrude_pos = 0. # Setup iterative solver ffi_main, ffi_lib = chelper.get_ffi() - self.cmove = ffi_main.gc(ffi_lib.move_alloc(), ffi_lib.free) - self.extruder_move_fill = ffi_lib.extruder_move_fill + self.extruder_add_move = ffi_lib.extruder_add_move self.trapq = ffi_main.gc(ffi_lib.trapq_alloc(), ffi_lib.trapq_free) - self.trapq_add_move = ffi_lib.trapq_add_move self.trapq_free_moves = ffi_lib.trapq_free_moves self.stepper.setup_itersolve('extruder_stepper_alloc') self.stepper.set_trapq(self.trapq) @@ -205,10 +203,9 @@ class PrinterExtruder: extra_decel_v = extra_decel_d / decel_t # Generate steps - self.extruder_move_fill( - self.cmove, print_time, accel_t, cruise_t, decel_t, start_pos, + self.extruder_add_move( + self.trapq, print_time, accel_t, cruise_t, decel_t, start_pos, start_v, cruise_v, accel, extra_accel_v, extra_decel_v) - self.trapq_add_move(self.trapq, self.cmove) self.extrude_pos = start_pos + axis_d cmd_SET_PRESSURE_ADVANCE_help = "Set pressure advance parameters" def cmd_default_SET_PRESSURE_ADVANCE(self, params): |