diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-08-05 11:43:45 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-08-20 21:03:22 -0400 |
| commit | 4c5e93d51dca2393946a67646499fef5fdd034b0 (patch) | |
| tree | 5450c95a3aa8fe5554dad97df2adf9b2b05c1a64 /klippy/extras/gcode_arcs.py | |
| parent | cd7c1b8e68d8234524149c62e8ea2ad0bda07d2f (diff) | |
| download | kutter-4c5e93d51dca2393946a67646499fef5fdd034b0.tar.gz kutter-4c5e93d51dca2393946a67646499fef5fdd034b0.tar.xz kutter-4c5e93d51dca2393946a67646499fef5fdd034b0.zip | |
gcode: Split G0/G1 command handling to new gcode_move class
Split up the main GCodeParser class into GCodeDispatch and GCodeMove
classes. The GCodeMove class is now available using the "gcode_move"
printer object name. This split simplifies the gcode.py code.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/gcode_arcs.py')
| -rw-r--r-- | klippy/extras/gcode_arcs.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/klippy/extras/gcode_arcs.py b/klippy/extras/gcode_arcs.py index 13a02697..ad973562 100644 --- a/klippy/extras/gcode_arcs.py +++ b/klippy/extras/gcode_arcs.py @@ -17,14 +17,15 @@ class ArcSupport: self.printer = config.get_printer() self.mm_per_arc_segment = config.getfloat('resolution', 1., above=0.0) + self.gcode_move = self.printer.lookup_object('gcode_move') self.gcode = self.printer.lookup_object('gcode') self.gcode.register_command("G2", self.cmd_G2) self.gcode.register_command("G3", self.cmd_G2) def cmd_G2(self, gcmd): - gcodestatus = self.gcode.get_status() + gcodestatus = self.gcode_move.get_status() if not gcodestatus['absolute_coordinates']: - raise self.gcode.error("G2/G3 does not support relative move mode") + raise gcmd.error("G2/G3 does not support relative move mode") currentPos = gcodestatus['gcode_position'] # Parse parameters @@ -60,7 +61,7 @@ class ArcSupport: if asF is not None: g1_params['F'] = asF g1_gcmd = self.gcode.create_gcode_command("G1", "G1", g1_params) - self.gcode.cmd_G1(g1_gcmd) + self.gcode_move.cmd_G1(g1_gcmd) # function planArc() originates from marlin plan_arc() # https://github.com/MarlinFirmware/Marlin |