From ea85d419dea23cac464763c9b36e1b59c9074588 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 8 Jan 2021 12:07:45 -0500 Subject: gcode: Move definition of CommandError and Coord from homing.py to gcode.py Signed-off-by: Kevin O'Connor --- klippy/gcode.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'klippy/gcode.py') diff --git a/klippy/gcode.py b/klippy/gcode.py index f34b9ea2..dc83d2b0 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -1,13 +1,17 @@ # Parse gcode commands # -# Copyright (C) 2016-2020 Kevin O'Connor +# Copyright (C) 2016-2021 Kevin O'Connor # # This file may be distributed under the terms of the GNU GPLv3 license. import os, re, logging, collections, shlex -import homing + +class CommandError(Exception): + pass + +Coord = collections.namedtuple('Coord', ('x', 'y', 'z', 'e')) class GCodeCommand: - error = homing.CommandError + error = CommandError def __init__(self, gcode, command, commandline, params, need_ack): self._command = command self._commandline = commandline @@ -68,7 +72,8 @@ class GCodeCommand: # Parse and dispatch G-Code commands class GCodeDispatch: - error = homing.CommandError + error = CommandError + Coord = Coord def __init__(self, printer): self.printer = printer self.is_fileinput = not not printer.get_start_args().get("debuginput") -- cgit v1.2.3-70-g09d2