Skip to content

Add support for dockable_probe and do some cleanup #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Luro02 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for dockable_probe and do some cleanup #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 36 additions & 22 deletions probe_accuracy_test_suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ def __init__(self, printer):
self.isKlippain = False
self.isTap = False
self.isBeacon = False
self.isKlickyKalico = False

self._detect()

Expand All @@ -66,9 +67,13 @@ def is_present(self):
or self.isKlippain
or self.isTap
or self.isBeacon
or self.isKlickyKalico
)

def lock(self, lock = True):
if self.isKlickyKalico:
self.printer.gcode("SET_DOCKABLE_PROBE AUTO_ATTACH_DETACH=0")
self.printer.gcode("ATTACH_PROBE")
if self.isKlicky:
self.printer.gcode("ATTACH_PROBE_LOCK")
if self.isKlippain:
Expand All @@ -78,6 +83,9 @@ def lock(self, lock = True):
self.printer.gcode("ACTIVATE_PROBE")

def unlock(self, unlock = False):
if self.isKlickyKalico:
self.printer.gcode("SET_DOCKABLE_PROBE AUTO_ATTACH_DETACH=1")
self.printer.gcode("DETACH_PROBE")
if self.isKlicky:
self.printer.gcode("DOCK_PROBE_UNLOCK")
elif self.isKlippain:
Expand All @@ -86,13 +94,13 @@ def unlock(self, unlock = False):
else:
self.printer.gcode("DEACTIVATE_PROBE")

def check_error(msg):
def check_error(self, msg):
klicky_macro_issue = " ".join([
"!! Error evaluating 'gcode_macro PROBE_ACCURACY:gcode':",
"CommandError:",
"Must perform PROBE_ACCURACY with the probe above the BED!"
])
if klicky_macro_issue == msgs:
if klicky_macro_issue == msg:
print("This issue can be fixed by updating klicky-macros.cfg")
print(
"Reference: https://github.com/jlas1/Klicky-Probe/commit/31a481c843567233c807bb310b6f0e83d60b4fca"
Expand Down Expand Up @@ -125,6 +133,14 @@ def _detect(self):
except:
pass

try:
self.printer.config["dockable_probe"]
self.isKlickyKalico = True
print(f"{ CLEAR_LINE }Probe type: Klicky with Kalico detected")
return
except:
pass

try:
backlash_comp = self.printer.config["idm"].get("backlash_comp", 0)
#print(backlash_comp)
Expand Down Expand Up @@ -152,7 +168,7 @@ def _detect(self):
endstop_pin = self.printer.config["stepper_z"]["endstop_pin"]
#print(endstop_pin)

if re.search("probe:\s*z_virtual_endstop", 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:
Expand Down Expand Up @@ -299,7 +315,7 @@ def _move_to_safe_z(self):
"gcode_macro _USER_VARIABLES",
"probe_min_z_travel"
)
elif self.probe.isTap:
elif self.probe.isTap or self.probe.isKlickyKalico:
self.safe_z = (
self.settings
.get("safe_z_home", {})
Expand Down Expand Up @@ -349,23 +365,18 @@ def _get_bed_corners(self) -> List:
# #print(f"{corners_list}")
# except:
# pass
try:
x_offset = self.config["probe"].get("x_offset", 0)
y_offset = self.config["probe"].get("y_offset", 0)
except:
try:
x_offset = self.config["idm"].get("x_offset", 0)
y_offset = self.config["idm"].get("y_offset", 0)
except:
try:
x_offset = self.config["cartographer"].get("x_offset", 0)
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)
except:
pass

x_offset = None
y_offset = None

for section in ["probe", "idm", "cartographer", "beacon", "dockable_probe"]:
if section in self.config:
x_offset = self.config[section].get("x_offset", 0)
y_offset = self.config[section].get("y_offset", 0)
break

if x_offset is None or y_offset is None:
raise ValueError("Could not find x_offset or y_offset in config")


# print(f"x_offset{x_offset}\ny_offset{y_offset}")
Expand Down Expand Up @@ -700,7 +711,10 @@ def _test_probe(
try:
printer_config_drop_first = self.printer.config["probe"].get("drop_first_result")
except:
printer_config_drop_first = False
try:
printer_config_drop_first = self.printer.config["dockable_probe"].get("drop_first_result")
except:
printer_config_drop_first = False

if (
printer_config_drop_first # self.printer.config["probe"].get("drop_first_result") == "True"
Expand Down