manual_probe: Verify no XY moves since start of manual probe

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-05-31 09:05:12 -04:00
parent c54b8da530
commit 02eeb72713
1 changed files with 4 additions and 2 deletions

View File

@ -71,7 +71,7 @@ class ManualProbeHelper:
self.gcode.respond_info(
"Starting manual Z probe. Use TESTZ to adjust position.\n"
"Finish with ACCEPT or ABORT command.")
self.start_z_position = self.toolhead.get_position()[2]
self.start_position = self.toolhead.get_position()
self.report_z_status()
def get_kinematics_pos(self):
toolhead_pos = self.toolhead.get_position()
@ -116,7 +116,9 @@ class ManualProbeHelper:
prev_str, z_pos, next_str))
cmd_ACCEPT_help = "Accept the current Z position"
def cmd_ACCEPT(self, params):
if self.toolhead.get_position()[2] >= self.start_z_position:
pos = self.toolhead.get_position()
start_pos = self.start_position
if pos[:2] != start_pos[:2] or pos[2] >= start_pos[2]:
self.gcode.respond_info(
"Manual probe failed! Use TESTZ commands to position the\n"
"nozzle prior to running ACCEPT.")