From 9813e656fc2097bedd00bebdb6451501dc60786d Mon Sep 17 00:00:00 2001 From: Laurent Haond Date: Sun, 18 May 2025 17:09:57 +0200 Subject: [PATCH 1/2] fix compatibility with recent cartographer config section that is now named [scanner] --- probe_accuracy_test_suite.py | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/probe_accuracy_test_suite.py b/probe_accuracy_test_suite.py index 79defc6..b261a09 100644 --- a/probe_accuracy_test_suite.py +++ b/probe_accuracy_test_suite.py @@ -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: @@ -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 From c315ccb51ed9c768ed9df17c0c3f41ea868cec7b Mon Sep 17 00:00:00 2001 From: Laurent Haond Date: Mon, 19 May 2025 12:58:03 +0200 Subject: [PATCH 2/2] fix speed option --- probe_accuracy_test_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/probe_accuracy_test_suite.py b/probe_accuracy_test_suite.py index b261a09..7688513 100644 --- a/probe_accuracy_test_suite.py +++ b/probe_accuracy_test_suite.py @@ -658,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)