From 1ab41cf41da9544046baf1db631cf7691ea65a88 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 26 May 2020 14:59:15 -0400 Subject: [PATCH] gcode: Make it clear that gcode.get_status() can be called without eventtime Make it clear that gcode.get_status() to be called without an eventtime by defaulting eventtime=None. Signed-off-by: Kevin O'Connor --- klippy/extras/gcode_arcs.py | 2 +- klippy/extras/tuning_tower.py | 2 +- klippy/gcode.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/klippy/extras/gcode_arcs.py b/klippy/extras/gcode_arcs.py index dd42017c..655b109c 100644 --- a/klippy/extras/gcode_arcs.py +++ b/klippy/extras/gcode_arcs.py @@ -22,7 +22,7 @@ class ArcSupport: self.gcode.register_command("G3", self.cmd_G2) def cmd_G2(self, gcmd): - gcodestatus = self.gcode.get_status(None) + gcodestatus = self.gcode.get_status() if not gcodestatus['absolute_coordinates']: raise self.gcode.error("G2/G3 does not support relative move mode") currentPos = gcodestatus['gcode_position'] diff --git a/klippy/extras/tuning_tower.py b/klippy/extras/tuning_tower.py index 5ff06086..dcdc67fe 100644 --- a/klippy/extras/tuning_tower.py +++ b/klippy/extras/tuning_tower.py @@ -58,7 +58,7 @@ class TuningTower: self.end_test() else: # Process update - z_offset = self.gcode.get_status(None)['base_zpos'] + z_offset = self.gcode.get_status()['base_zpos'] oldval = self.calc_value(self.last_z - z_offset) newval = self.calc_value(z - z_offset) self.last_z = z diff --git a/klippy/gcode.py b/klippy/gcode.py index 7225f753..1c3b2bcb 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -190,7 +190,7 @@ class GCodeParser: return self.speed / self.speed_factor def _get_gcode_speed_override(self): return self.speed_factor * 60. - def get_status(self, eventtime): + def get_status(self, eventtime=None): move_position = self._get_gcode_position() busy = self.is_processing_data return {