diff options
author | bondus <liquidpontus@yahoo.se> | 2019-01-02 23:41:35 +0100 |
---|---|---|
committer | KevinOConnor <kevin@koconnor.net> | 2019-01-02 17:41:35 -0500 |
commit | f4d323adbce7b82f44d6813a0fea0f1537ae234f (patch) | |
tree | f2aecb782871ecef6b3b58d927c733b5180f7041 | |
parent | 1be24b8fc7a801d442eea6e2dd42ee6a7230ba37 (diff) | |
download | kutter-f4d323adbce7b82f44d6813a0fea0f1537ae234f.tar.gz kutter-f4d323adbce7b82f44d6813a0fea0f1537ae234f.tar.xz kutter-f4d323adbce7b82f44d6813a0fea0f1537ae234f.zip |
gcode: Minor change to make M220 command take effect immediately (#1000)
This makes M220 (change print speed) command effect the next move command (G0/G1).
Before it only made a differenc once a G0/G1 command with an F parameter was executed.
Signed-off-by: Pontus Borg <liquidpontus@yahoo.se>
-rw-r--r-- | klippy/gcode.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/klippy/gcode.py b/klippy/gcode.py index 06a2fd48..dcc88199 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -491,14 +491,14 @@ class GCodeParser: # value relative to base coordinate position self.last_position[3] = v + self.base_position[3] if 'F' in params: - speed = float(params['F']) * self.speed_factor + speed = float(params['F']) if speed <= 0.: raise error("Invalid speed in '%s'" % (params['#original'],)) self.speed = speed except ValueError as e: raise error("Unable to parse move '%s'" % (params['#original'],)) try: - self.move_with_transform(self.last_position, self.speed) + self.move_with_transform(self.last_position, self.speed * self.speed_factor) except homing.EndstopError as e: raise error(str(e)) def cmd_G4(self, params): |