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/tuning_tower.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/tuning_tower.py')
| -rw-r--r-- | klippy/extras/tuning_tower.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/klippy/extras/tuning_tower.py b/klippy/extras/tuning_tower.py index 87a0093d..e16192d5 100644 --- a/klippy/extras/tuning_tower.py +++ b/klippy/extras/tuning_tower.py @@ -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): |