diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2017-04-06 11:09:08 -0400 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2017-04-07 15:05:41 -0400 |
commit | b915a2ad7d6eec6f7ef31fc5f13397029b927351 (patch) | |
tree | 9372685cbd4c1a601598c6bb6ca99e956243a1b3 /klippy/mcu.py | |
parent | 85ed5cef7fe483d921b1081b4664c35ad4e64967 (diff) | |
download | kutter-b915a2ad7d6eec6f7ef31fc5f13397029b927351.tar.gz kutter-b915a2ad7d6eec6f7ef31fc5f13397029b927351.tar.xz kutter-b915a2ad7d6eec6f7ef31fc5f13397029b927351.zip |
delta: Make it clear that a "virtual tower" is created
The delta code calculates a "virtual tower" along the line of
movement. Rework the variable names and comments to make it clear
that this is occurring.
It is not necessary to pass the start_pos variable to the C code as it
is simple to update the start_pos at the start of each movement.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/mcu.py')
-rw-r--r-- | klippy/mcu.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py index d28d21f1..5b12e83f 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -128,16 +128,14 @@ class MCU_stepper: if count == STEPCOMPRESS_ERROR_RET: raise error("Internal error in stepcompress") self._commanded_pos += count - def step_delta(self, mcu_time, start_pos, dist, start_v, accel - , height_base, closestxy_d, closest_height2, movez_r): + def step_delta(self, mcu_time, dist, start_v, accel + , height_base, startxy_d, arm_d, movez_r): inv_step_dist = self._inv_step_dist height = self._commanded_pos - height_base * inv_step_dist count = self._ffi_lib.stepcompress_push_delta( - self._stepqueue, mcu_time * self._mcu_freq, - -start_pos * inv_step_dist, dist * inv_step_dist, + self._stepqueue, mcu_time * self._mcu_freq, dist * inv_step_dist, start_v * self._velocity_factor, accel * self._accel_factor, - height, closestxy_d * inv_step_dist, - closest_height2 * inv_step_dist**2, movez_r) + height, startxy_d * inv_step_dist, arm_d * inv_step_dist, movez_r) if count == STEPCOMPRESS_ERROR_RET: raise error("Internal error in stepcompress") self._commanded_pos += count |