Skip to content

Add option to set the offsets via a custom macro #167

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
irrenhaus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add option to set the offsets via a custom macro #167

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
25 changes: 15 additions & 10 deletions z_calibration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ def __init__(self, config):
'before_switch_gcode',
'')
self.end_gcode = gcode_macro.load_template(config, 'end_gcode', '')
self.set_offset_macro = config.get('offset_macro', None)
self.query_endstops = self.printer.load_object(config,
'query_endstops')
self.printer.register_event_handler("klippy:connect",
Expand Down Expand Up @@ -456,16 +457,20 @@ def _add_probe_offset(self, site):
probe_site[1] -= probe_offsets[1]
return probe_site
def _set_new_gcode_offset(self, offset):
# reset gcode z offset to 0
gcmd_offset = self.gcode.create_gcode_command("SET_GCODE_OFFSET",
"SET_GCODE_OFFSET",
{'Z': 0.0})
self.gcode_move.cmd_SET_GCODE_OFFSET(gcmd_offset)
# set new gcode z offset
gcmd_offset = self.gcode.create_gcode_command("SET_GCODE_OFFSET",
"SET_GCODE_OFFSET",
{'Z_ADJUST': offset})
self.gcode_move.cmd_SET_GCODE_OFFSET(gcmd_offset)
if self.helper.set_offset_macro is not None:
self.gcmd.respond_info("%s: Using offset macro %s" % (self.gcmd.get_command(), self.helper.set_offset_macro))
self.gcode.run_script_from_command("{} Z={}".format(self.helper.set_offset_macro, offset))
else:
# reset gcode z offset to 0
gcmd_offset = self.gcode.create_gcode_command("SET_GCODE_OFFSET",
"SET_GCODE_OFFSET",
{'Z': 0.0})
self.gcode_move.cmd_SET_GCODE_OFFSET(gcmd_offset)
# set new gcode z offset
gcmd_offset = self.gcode.create_gcode_command("SET_GCODE_OFFSET",
"SET_GCODE_OFFSET",
{'Z_ADJUST': offset})
self.gcode_move.cmd_SET_GCODE_OFFSET(gcmd_offset)
def calibrate_z(self, switch_offset, nozzle_site, switch_site, bed_site):
# execute start gcode
self.helper.start_gcode.run_gcode_from_command()
Expand Down