From 1acaaa98c21af0a2a2cff725365dfda0ff4b7204 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 29 Oct 2019 12:44:39 -0400 Subject: 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 --- klippy/kinematics/extruder.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'klippy/kinematics/extruder.py') 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): -- cgit v1.2.3-70-g09d2