diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2021-01-08 12:07:45 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2021-01-08 12:07:45 -0500 |
| commit | ea85d419dea23cac464763c9b36e1b59c9074588 (patch) | |
| tree | 5671dd7cf1a2c2ec2a05a87c1f5337e280100185 /klippy/extras/gcode_move.py | |
| parent | c8434ec54b0517503af4aeee9016783d508118b0 (diff) | |
| download | kutter-ea85d419dea23cac464763c9b36e1b59c9074588.tar.gz kutter-ea85d419dea23cac464763c9b36e1b59c9074588.tar.xz kutter-ea85d419dea23cac464763c9b36e1b59c9074588.zip | |
gcode: Move definition of CommandError and Coord from homing.py to gcode.py
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/gcode_move.py')
| -rw-r--r-- | klippy/extras/gcode_move.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/klippy/extras/gcode_move.py b/klippy/extras/gcode_move.py index 08c926e9..4bdfdf8b 100644 --- a/klippy/extras/gcode_move.py +++ b/klippy/extras/gcode_move.py @@ -1,6 +1,6 @@ # G-Code G1 movement commands (and associated coordinate manipulation) # -# Copyright (C) 2016-2020 Kevin O'Connor <kevin@koconnor.net> +# Copyright (C) 2016-2021 Kevin O'Connor <kevin@koconnor.net> # # This file may be distributed under the terms of the GNU GPLv3 license. import logging @@ -34,6 +34,7 @@ class GCodeMove: gcode.register_command('G0', self.cmd_G1) gcode.register_command('M114', self.cmd_M114, True) gcode.register_command('GET_POSITION', self.cmd_GET_POSITION, True) + self.Coord = gcode.Coord # G-Code coordinate manipulation self.absolute_coord = self.absolute_extrude = True self.base_position = [0.0, 0.0, 0.0, 0.0] @@ -94,9 +95,9 @@ class GCodeMove: 'extrude_factor': self.extrude_factor, 'absolute_coordinates': self.absolute_coord, 'absolute_extrude': self.absolute_extrude, - 'homing_origin': homing.Coord(*self.homing_position), - 'position': homing.Coord(*self.last_position), - 'gcode_position': homing.Coord(*move_position), + 'homing_origin': self.Coord(*self.homing_position), + 'position': self.Coord(*self.last_position), + 'gcode_position': self.Coord(*move_position), } def reset_last_position(self): if self.is_printer_ready: |