Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions probe_accuracy_test_suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,22 @@ def _detect(self):
self.isBeacon = True
print(f"{ CLEAR_LINE }Probe type: Cartographer probe detected")
except:


try:
endstop_pin = self.printer.config["stepper_z"]["endstop_pin"]
#print(endstop_pin)

if re.search("probe:\s*z_virtual_endstop", endstop_pin):
self.isTap = True
print(f"{ CLEAR_LINE }Probe type: Tap mode detected")
backlash_comp = self.printer.config["scanner"].get("backlash_comp", 0)
#print(backlash_comp)
if backlash_comp:
self.isBeacon = True
print(f"{ CLEAR_LINE }Probe type: Cartographer probe detected")
except:
pass
try:
endstop_pin = self.printer.config["stepper_z"]["endstop_pin"]
#print(endstop_pin)

if re.search("probe:\s*z_virtual_endstop", endstop_pin):
self.isTap = True
print(f"{ CLEAR_LINE }Probe type: Tap mode detected")
except:
pass


class Printer:
Expand Down Expand Up @@ -362,9 +367,13 @@ def _get_bed_corners(self) -> List:
y_offset = self.config["cartographer"].get("y_offset", 0)
except:
try:
x_offset = self.config["beacon"].get("x_offset", 0)
y_offset = self.config["beacon"].get("y_offset", 0)
x_offset = self.config["scanner"].get("x_offset", 0)
y_offset = self.config["scanner"].get("y_offset", 0)
except:
try:
x_offset = self.config["beacon"].get("x_offset", 0)
y_offset = self.config["beacon"].get("y_offset", 0)
except:
pass


Expand Down Expand Up @@ -649,7 +658,7 @@ def _test_probe(
if speed:
gcode_cmd += f" PROBE_SPEED={ speed }"
elif self.speed:
gcode_cmd += f" PROBE_SPEED={ self.speed }"
gcode_cmd += f" PROBE_SPEED={ self.speed[0] }"
self.printer.gcode(gcode_cmd)

raw = self.printer.get_gcode_store(count = 1000)
Expand Down