aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras/gcode_arcs.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2022-12-11 20:59:02 -0500
committerKevin O'Connor <kevin@koconnor.net>2022-12-11 20:59:02 -0500
commitba365aff96542925a7431dbaf49c3af699dc77de (patch)
tree41860ad9bb3e233ff7cb0717403c179a740d594a /klippy/extras/gcode_arcs.py
parent0c5c87d7c08c2b8aa2f248d81dd1003c5c7d5a7c (diff)
downloadkutter-ba365aff96542925a7431dbaf49c3af699dc77de.tar.gz
kutter-ba365aff96542925a7431dbaf49c3af699dc77de.tar.xz
kutter-ba365aff96542925a7431dbaf49c3af699dc77de.zip
gcode_arcs: No need to import gcode module to access Coord()
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/gcode_arcs.py')
-rw-r--r--klippy/extras/gcode_arcs.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/klippy/extras/gcode_arcs.py b/klippy/extras/gcode_arcs.py
index eac89050..7707cd66 100644
--- a/klippy/extras/gcode_arcs.py
+++ b/klippy/extras/gcode_arcs.py
@@ -7,7 +7,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import math
-from gcode import Coord
+
# Coordinates created by this are converted into G1 commands.
#
# supports XY, XZ & YZ planes with remaining axis as helical
@@ -39,6 +39,8 @@ class ArcSupport:
self.gcode.register_command("G18", self.cmd_G18)
self.gcode.register_command("G19", self.cmd_G19)
+ self.Coord = self.gcode.Coord
+
# backwards compatibility, prior implementation only supported XY
self.plane = ARC_PLANE_X_Y
@@ -64,10 +66,10 @@ class ArcSupport:
currentPos = gcodestatus['gcode_position']
# Parse parameters
- asTarget = Coord(x=gcmd.get_float("X", currentPos[0]),
- y=gcmd.get_float("Y", currentPos[1]),
- z=gcmd.get_float("Z", currentPos[2]),
- e=None)
+ asTarget = self.Coord(x=gcmd.get_float("X", currentPos[0]),
+ y=gcmd.get_float("Y", currentPos[1]),
+ z=gcmd.get_float("Z", currentPos[2]),
+ e=None)
if gcmd.get_float("R", None) is not None:
raise gcmd.error("G2/G3 does not support R moves")
@@ -170,7 +172,7 @@ class ArcSupport:
c[alpha_axis] = center_P + r_P
c[beta_axis] = center_Q + r_Q
c[helical_axis] = currentPos[helical_axis] + dist_Helical
- coords.append(Coord(*c))
+ coords.append(self.Coord(*c))
coords.append(targetPos)
return coords