aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2018-09-26 11:51:29 -0400
committerKevinOConnor <kevin@koconnor.net>2018-10-01 11:12:30 -0400
commitcb3fede19a289319cf52343491b8ae5f10f983d8 (patch)
tree6e9cfde369b0fe5518e10e526d953ae0b823e0fd /klippy/extras
parent8e7eac9b08a6ae3ecf94919faca02a9df5e10551 (diff)
downloadkutter-cb3fede19a289319cf52343491b8ae5f10f983d8.tar.gz
kutter-cb3fede19a289319cf52343491b8ae5f10f983d8.tar.xz
kutter-cb3fede19a289319cf52343491b8ae5f10f983d8.zip
probe: Move move_next() method within ProbePointsHelper class
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras')
-rw-r--r--klippy/extras/probe.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py
index 2900a884..6b6cb538 100644
--- a/klippy/extras/probe.py
+++ b/klippy/extras/probe.py
@@ -199,6 +199,18 @@ class ProbePointsHelper:
except homing.EndstopError as e:
self.finalize(False)
raise self.gcode.error(str(e))
+ def move_next(self):
+ x, y = self.probe_points[len(self.results)/self.samples]
+ curpos = self.toolhead.get_position()
+ curpos[0] = x
+ curpos[1] = y
+ curpos[2] = self.horizontal_move_z
+ try:
+ self.toolhead.move(curpos, self.speed)
+ except homing.EndstopError as e:
+ self.finalize(False)
+ raise self.gcode.error(str(e))
+ self.gcode.reset_last_position()
def probe_point(self):
for i in range(self.samples):
self.gcode.run_script_from_command("PROBE")
@@ -228,18 +240,6 @@ class ProbePointsHelper:
except:
self.finalize(False)
raise
- def move_next(self):
- x, y = self.probe_points[len(self.results)/self.samples]
- curpos = self.toolhead.get_position()
- curpos[0] = x
- curpos[1] = y
- curpos[2] = self.horizontal_move_z
- try:
- self.toolhead.move(curpos, self.speed)
- except homing.EndstopError as e:
- self.finalize(False)
- raise self.gcode.error(str(e))
- self.gcode.reset_last_position()
cmd_NEXT_help = "Move to the next XY position to probe"
def cmd_NEXT(self, params):
if self.probe is None: