h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gcode: Split G0/G1 command handling to new gcode_move class

Browse Source 
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>
This commit is contained in:
Kevin O'Connor
2020-08-05 11:43:45 -04:00
parent cd7c1b8e68
commit 4c5e93d51d
15 changed files with 219 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
klippy/extras/tuning_tower.py
View File

@@ -15,6 +15,7 @@ class TuningTower:
self.last_z = self.start = self.factor = self.band = 0.
self.last_command_value = None
self.command_fmt = ""
self.gcode_move = self.printer.lookup_object("gcode_move")
# Register command
self.gcode = self.printer.lookup_object("gcode")
self.gcode.register_command("TUNING_TOWER", self.cmd_TUNING_TOWER,
@@ -34,7 +35,8 @@ class TuningTower:
self.command_fmt = "%s %s%%.9f" % (command, parameter)
else:
self.command_fmt = "%s %s=%%.9f" % (command, parameter)
self.normal_transform = self.gcode.set_move_transform(self, force=True)
nt = self.gcode_move.set_move_transform(self, force=True)
self.normal_transform = nt
self.last_z = -99999999.9
self.last_command_value = None
self.get_position()
@@ -59,7 +61,7 @@ class TuningTower:
self.end_test()
else:
# Process update
gcode_z = self.gcode.get_status()['gcode_position'].z
gcode_z = self.gcode_move.get_status()['gcode_position'].z
newval = self.calc_value(gcode_z)
self.last_z = z
if newval != self.last_command_value:
@@ -71,7 +73,7 @@ class TuningTower:
normal_transform.move(newpos, speed)
def end_test(self):
self.gcode.respond_info("Ending tuning test mode")
self.gcode.set_move_transform(self.normal_transform, force=True)
self.gcode_move.set_move_transform(self.normal_transform, force=True)
self.normal_transform = None
def load_config(config):