Squashed commit of the following: commit e3d668e0e54aceaf4a304f97485806bb2715e2bc Merge: 2dabfbf08 a5955157d Author: zkk <1007518571@qq.com> Date: Mon Mar 3 15:30:17 2025 +0800 Merge commit 'a5955157dbf3088822e82998511a001d11b7b113' into release commit a5955157dbf3088822e82998511a001d11b7b113 Author: ruipeng <1041589370@qq.com> Date: Wed Feb 26 16:34:11 2025 +0800 修复F430NX二喷头安全距离错误,导致二喷头左边界不正确问题 commit bc36acddfcb47c2b2c71fd9fc48dab9b60ea541c Author: ruipeng <1041589370@qq.com> Date: Wed Feb 26 16:29:01 2025 +0800 优化探针收起动作,先降热床再收起探针 commit 2685ec1db9ccd559374a1cbdb673567fc9f59689 Author: ruipeng <1041589370@qq.com> Date: Wed Feb 26 16:28:18 2025 +0800 修复全系取消打印时,z_offset保存不上的问题 commit 2dabfbf08816eafda51ba62b9a69d11801343952 Merge: fd1a6a37c aa375bcff Author: zkk <1007518571@qq.com> Date: Fri Feb 14 15:29:11 2025 +0800 Merge commit 'aa375bcff05744d5d2ab3fd352777abdfb59d35b' into release commit aa375bcff05744d5d2ab3fd352777abdfb59d35b Author: ruipeng <1041589370@qq.com> Date: Fri Feb 14 10:41:22 2025 +0800 全系调整关闭舵机的延时,防止探针刮平台 commit 90aab9ebdc41917ea9ffadd9c09767090c3f4feb Author: ruipeng <1041589370@qq.com> Date: Thu Feb 6 10:51:40 2025 +0800 修复F430NX二头打印完成,停靠到指定位置时报错的问题 commit 2e214ce02ce915cb782ae44df300c33ef8929249 Author: zkk <1007518571@qq.com> Date: Thu Feb 6 09:33:50 2025 +0800 修复零位舵机极小概率初始化角度不对问题 commit bda68396865757cdb5694b90f5268f6ace9ada7f Author: zkk <1007518571@qq.com> Date: Fri Jan 17 15:55:14 2025 +0800 修复设置舵机信号时长参数后,连续不停开关舵机 可能会造成出错的问题 commit fd1a6a37cc2149b4ff9f56609dc5f96d8882cb71 Merge: e2b26bb3f 440010b9c Author: zkk <1007518571@qq.com> Date: Fri Jan 17 14:44:27 2025 +0800 Merge commit '440010b9cbf57bf805ef93b43fc0947746235033' into release commit 440010b9cbf57bf805ef93b43fc0947746235033 Author: zkk <1007518571@qq.com> Date: Fri Jan 17 14:32:11 2025 +0800 增加舵机信号持续时间变量,优化零位舵机信号不持续发送 commit a15d96ff28c1f8e4a3a052f5ca9044d33d699900 Author: zkk <1007518571@qq.com> Date: Fri Jan 17 14:12:17 2025 +0800 优化外置驱动的支持 commit fe7244707827bc5da4b0ac22d8016c67cb0bf025 Merge: c7326be18 32fc128f9 Author: zkk <1007518571@qq.com> Date: Fri Jan 17 11:05:04 2025 +0800 Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipper into develop commit 32fc128f991b4a336793a451da30273652b827f7 Author: ruipeng <1041589370@qq.com> Date: Fri Jan 17 10:42:44 2025 +0800 修复F430NX停靠喷头与偏移值的计算逻辑 commit 75da8e8e634d4b65f1c8834421ae5638c7b479e0 Author: ruipeng <1041589370@qq.com> Date: Fri Jan 17 09:10:15 2025 +0800 修复V0版机型T_fan逻辑问题 commit e2b26bb3fe3992b5f4eb25bffe9ea82c450cde7a Merge: 3024b7666 c7326be18 Author: zkk <1007518571@qq.com> Date: Fri Jan 10 13:39:00 2025 +0800 Merge commit 'c7326be1837eda161c5a13cfd3d00ea74b7d4753' into release commit c7326be1837eda161c5a13cfd3d00ea74b7d4753 Merge: d0dcac451 9da7304dc Author: zkk <1007518571@qq.com> Date: Fri Jan 10 13:38:31 2025 +0800 Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipper into develop commit d0dcac45196e9012caea32ee8099ee266f5777a2 Author: zkk <1007518571@qq.com> Date: Fri Jan 10 10:56:34 2025 +0800 全系降低探测舵机的速度 commit 9da7304dc2911e3180e8fd92ef281dd9280ef289 Author: ruipeng <1041589370@qq.com> Date: Thu Jan 9 16:39:13 2025 +0800 修复F430NX在DUAL模式下,耗材触发提示不准确的问题 commit ea3e219f503c3086fd13ff5e68ee57bc49b1e354 Author: ruipeng <1041589370@qq.com> Date: Thu Jan 9 10:09:21 2025 +0800 1、修复F430NX断料自动切头时,喷头偏移值未应用的问题 2、修复喷头一停靠位置不对的问题 commit 3024b76663d614ef8da0d0d5fcd0add3cdca4d39 Merge: 03d11a16b dda0962b9 Author: zkk <1007518571@qq.com> Date: Tue Jan 7 17:21:40 2025 +0800 Merge commit 'dda0962b986d0c9d6a1a442f5c5ef63d151f5ef2' into release commit dda0962b986d0c9d6a1a442f5c5ef63d151f5ef2 Author: ruipeng <1041589370@qq.com> Date: Tue Jan 7 16:40:43 2025 +0800 修复F430NX回零后,切换喷头会报错的问题 commit 95d20c9b6357a444871ea9dce5f5ad35d74c1990 Author: ruipeng <1041589370@qq.com> Date: Tue Jan 7 16:33:54 2025 +0800 1、修复F430NX触发耗材检测,喷头超时冷却,手动设置温度并装载耗材后,恢复打印时二头温度不恢复的问题。 2、修改等待温度恢复的提示内容 commit 2c2d0c7be12d6c497a1a479ec3aa08499f6bba0f Author: ruipeng <1041589370@qq.com> Date: Tue Jan 7 16:33:31 2025 +0800 优化F430NX驱动散热风扇启停逻辑 commit 3e5c530975dfa058be7db31c15116d46e6aaad84 Author: ruipeng <1041589370@qq.com> Date: Tue Jan 7 13:56:48 2025 +0800 调整F30NX网床调平时探针提升的高度 规避offset过大时未移动床即触发的报错 commit c7cb4b97c26c14806b1bbc131510f792ab15b66a Author: ruipeng <1041589370@qq.com> Date: Thu Jan 2 17:57:20 2025 +0800 全系添加_CANCEL_PRINT_BASE宏支持 commit 03d11a16b3edc1f440251420b1105d20872ebdd7 Merge: e052ab095 ba4f343e9 Author: zkk <1007518571@qq.com> Date: Tue Dec 31 17:28:20 2024 +0800 Merge commit 'ba4f343e9430af5538610529dd400f1f954b0078' into release commit ba4f343e9430af5538610529dd400f1f954b0078 Author: ruipeng <1041589370@qq.com> Date: Tue Dec 31 17:25:28 2024 +0800 F430NX:Y驱动细分由128->64 commit e052ab0957f7991a78b90e9974ae07d60d266226 Merge: 25bc7c6d9 b2b98c057 Author: zkk <1007518571@qq.com> Date: Tue Dec 31 15:15:14 2024 +0800 Merge commit 'b2b98c057a7d23f9c8b0aec4c14844f7c24d6bde' into release commit b2b98c057a7d23f9c8b0aec4c14844f7c24d6bde Author: ruipeng <1041589370@qq.com> Date: Tue Dec 31 10:56:18 2024 +0800 F430NX状态灯功能 commit f3cdc1dd75d96f976502946e752e9f7831288469 Author: ruipeng <1041589370@qq.com> Date: Tue Dec 31 10:55:48 2024 +0800 全系支持PRINT_START,PRINT_END宏 commit ecbde51331316e6c454c09d03d93c3337ae17d8a Author: ruipeng <1041589370@qq.com> Date: Tue Dec 31 10:54:11 2024 +0800 F430NX二喷头静音阈值由200->300 commit 40985b8d9a7a8e26fb3c448f0794dab82d866382 Author: ruipeng <1041589370@qq.com> Date: Tue Dec 31 10:53:55 2024 +0800 f430NX增加驱动器散热风扇控制 commit 682e343d6176c1c0764a7befd12d7971374b2b29 Author: ruipeng <1041589370@qq.com> Date: Mon Dec 30 17:27:29 2024 +0800 修复必须回零后才能取消打印的问题 commit e941884b8ec1d5aec058a6fdc2a2aa94f40bf8b5 Author: ruipeng <1041589370@qq.com> Date: Mon Dec 30 16:29:08 2024 +0800 修复F430NX机型Y轴在零位时回零报错的问题 commit e2a9ff2bfe2f9d4971045ce6fbd6f9835cf6475a Author: ruipeng <1041589370@qq.com> Date: Mon Dec 30 13:36:54 2024 +0800 优化F430NX复制、镜像模式,解决坐标超范围问题 commit 4fe4b7f67dc4b09b67dfb930e3bae80a525e164f Author: ruipeng <1041589370@qq.com> Date: Mon Dec 30 13:32:25 2024 +0800 调整F430NX喷头二X电流,由1->1.5 commit f8f7aabbe226d987bea3ba9033569b12eb00f182 Author: zkk <1007518571@qq.com> Date: Fri Dec 27 17:15:17 2024 +0800 关闭F430NX热风校验功能 commit 7f532dc1019ad4ade1992c835b925f162c80ba1a Author: zkk <1007518571@qq.com> Date: Fri Dec 27 17:14:51 2024 +0800 删除旧的设置offset宏定义 commit 34b6971b41e0b6a7bce978901404cec1e80b17a4 Author: ruipeng <1041589370@qq.com> Date: Fri Dec 27 15:29:04 2024 +0800 修复自动切头开关逻辑,优化恢复打印弹窗内容 commit 765bc8dc22cad7f75f2d8d76f0add94dc0ab802a Author: ruipeng <1041589370@qq.com> Date: Thu Dec 26 11:41:34 2024 +0800 优化耗材检测弹窗内容及格式 commit 25bc7c6d9ee89e6cd4e326bb8497faf6a6256fcd Merge: 588ea4402 9b487abec Author: zkk <1007518571@qq.com> Date: Thu Dec 19 16:23:07 2024 +0800 Merge commit '9b487abec3449dea3673618c1a8b9e88f16b4c40' into release commit 9b487abec3449dea3673618c1a8b9e88f16b4c40 Author: ruipeng <1041589370@qq.com> Date: Thu Dec 19 16:03:04 2024 +0800 F430NX更换为闭环Y电机 commit 641f767175387cacf9820affd616dcdb017590b9 Author: ruipeng <1041589370@qq.com> Date: Thu Dec 19 10:42:11 2024 +0800 F430NX复制、镜像模式优化 commit ef148604da4f925305939e74cfb0edc7fbd261d1 Author: ruipeng <1041589370@qq.com> Date: Thu Dec 19 10:40:25 2024 +0800 自动切头功能 commit fa74a82184caa6a914a32578b31aeb21f8299c7c Merge: 9307b8957 93efb1abd Author: zkk <1007518571@qq.com> Date: Wed Dec 18 15:53:46 2024 +0800 Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipper into develop commit 9307b89570a63040259b457ef7ff8969b394b527 Author: zkk <1007518571@qq.com> Date: Wed Dec 18 15:49:41 2024 +0800 修复重启时候有概率出现温度数值异常的问题 commit 9925c7864471f1f9f7b1e22f45dc4d1421c1245a Author: zkk <1007518571@qq.com> Date: Tue Dec 17 15:55:28 2024 +0800 实现二喷头的偏移值校准功能 commit 93efb1abdea67a732b17351b8c31ae5387eaaf91 Author: ruipeng <1041589370@qq.com> Date: Fri Dec 13 09:55:41 2024 +0800 配置网床调平淡出高度 commit 30b77165a7bdae2cd338c283fbab3c8baa37c694 Author: ruipeng <1041589370@qq.com> Date: Thu Dec 12 14:03:30 2024 +0800 调整F430NX探测舵机角度,由90°->120° commit 588ea4402812b09100b2417b040d7daa2d2fbfaa Merge: 349f8f7a2 9be203c58 Author: zkk <1007518571@qq.com> Date: Thu Dec 12 10:39:56 2024 +0800 Merge commit '9be203c58f7c88e4f6963a1079d2dcfaa5401dde' into release commit 9be203c58f7c88e4f6963a1079d2dcfaa5401dde Author: ruipeng <1041589370@qq.com> Date: Wed Dec 11 15:24:05 2024 +0800 新增D600pro2、D1000的V0版机型 commit 349f8f7a249ac113700eed2b4a234473016d32c0 Merge: e554ddb83 401da556f Author: zkk <1007518571@qq.com> Date: Fri Nov 29 10:21:01 2024 +0800 Merge branch 'develop' into release commit 401da556f58df5e917a379dd54565ef5775f7ed2 Merge: 508378825 52ea64cf8 Author: zkk <1007518571@qq.com> Date: Fri Nov 29 10:12:48 2024 +0800 Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipper into develop commit 52ea64cf83535c84c378239b43a7f0a6a362a517 Author: ruipeng <1041589370@qq.com> Date: Thu Nov 28 10:55:09 2024 +0800 修复暂停掉温后,恢复时喷头温度不能恢复的问题 commit 508378825da2881043b88427a6df03230c9f66c0 Author: zkk <1007518571@qq.com> Date: Wed Nov 27 14:47:23 2024 +0800 D1000 z轴最大速度设置成7 commit 41c2cd39275dfecafd85a0cbe504f2f5f1cdeec6 Author: zkk <1007518571@qq.com> Date: Mon Nov 25 17:12:23 2024 +0800 优化热电偶最大报错次数 # Conflicts: # config/CreatBot_D1000_V0/base.cfg resolved by e3d668e0e54aceaf4a304f97485806bb2715e2bc version # config/CreatBot_D600Pro2_V0/base.cfg resolved by e3d668e0e54aceaf4a304f97485806bb2715e2bc version
585 lines
26 KiB
Python
585 lines
26 KiB
Python
# Z-Probe support
|
|
#
|
|
# Copyright (C) 2017-2024 Kevin O'Connor <kevin@koconnor.net>
|
|
#
|
|
# This file may be distributed under the terms of the GNU GPLv3 license.
|
|
import logging
|
|
import pins
|
|
from . import manual_probe
|
|
|
|
HINT_TIMEOUT = """
|
|
If the probe did not move far enough to trigger, then
|
|
consider reducing the Z axis minimum position so the probe
|
|
can travel further (the Z minimum position can be negative).
|
|
"""
|
|
|
|
# Calculate the average Z from a set of positions
|
|
def calc_probe_z_average(positions, method='average'):
|
|
if method != 'median':
|
|
# Use mean average
|
|
count = float(len(positions))
|
|
return [sum([pos[i] for pos in positions]) / count
|
|
for i in range(3)]
|
|
# Use median
|
|
z_sorted = sorted(positions, key=(lambda p: p[2]))
|
|
middle = len(positions) // 2
|
|
if (len(positions) & 1) == 1:
|
|
# odd number of samples
|
|
return z_sorted[middle]
|
|
# even number of samples
|
|
return calc_probe_z_average(z_sorted[middle-1:middle+1], 'average')
|
|
|
|
|
|
######################################################################
|
|
# Probe device implementation helpers
|
|
######################################################################
|
|
|
|
# Helper to implement common probing commands
|
|
class ProbeCommandHelper:
|
|
def __init__(self, config, probe, query_endstop=None):
|
|
self.printer = config.get_printer()
|
|
self.probe = probe
|
|
self.query_endstop = query_endstop
|
|
self.name = config.get_name()
|
|
gcode = self.printer.lookup_object('gcode')
|
|
# QUERY_PROBE command
|
|
self.last_state = False
|
|
gcode.register_command('QUERY_PROBE', self.cmd_QUERY_PROBE,
|
|
desc=self.cmd_QUERY_PROBE_help)
|
|
# PROBE command
|
|
self.last_z_result = 0.
|
|
gcode.register_command('PROBE', self.cmd_PROBE,
|
|
desc=self.cmd_PROBE_help)
|
|
# PROBE_CALIBRATE command
|
|
self.probe_calibrate_z = 0.
|
|
gcode.register_command('PROBE_CALIBRATE', self.cmd_PROBE_CALIBRATE,
|
|
desc=self.cmd_PROBE_CALIBRATE_help)
|
|
# Other commands
|
|
gcode.register_command('PROBE_ACCURACY', self.cmd_PROBE_ACCURACY,
|
|
desc=self.cmd_PROBE_ACCURACY_help)
|
|
gcode.register_command('Z_OFFSET_APPLY_PROBE',
|
|
self.cmd_Z_OFFSET_APPLY_PROBE,
|
|
desc=self.cmd_Z_OFFSET_APPLY_PROBE_help)
|
|
def _move(self, coord, speed):
|
|
self.printer.lookup_object('toolhead').manual_move(coord, speed)
|
|
def get_status(self, eventtime):
|
|
return {'name': self.name,
|
|
'last_query': self.last_state,
|
|
'last_z_result': self.last_z_result}
|
|
cmd_QUERY_PROBE_help = "Return the status of the z-probe"
|
|
def cmd_QUERY_PROBE(self, gcmd):
|
|
if self.query_endstop is None:
|
|
raise gcmd.error("Probe does not support QUERY_PROBE")
|
|
toolhead = self.printer.lookup_object('toolhead')
|
|
print_time = toolhead.get_last_move_time()
|
|
res = self.query_endstop(print_time)
|
|
self.last_state = res
|
|
gcmd.respond_info("probe: %s" % (["open", "TRIGGERED"][not not res],))
|
|
cmd_PROBE_help = "Probe Z-height at current XY position"
|
|
def cmd_PROBE(self, gcmd):
|
|
pos = run_single_probe(self.probe, gcmd)
|
|
gcmd.respond_info("Result is z=%.6f" % (pos[2],))
|
|
self.last_z_result = pos[2]
|
|
def probe_calibrate_finalize(self, kin_pos):
|
|
if kin_pos is None:
|
|
return
|
|
z_offset = self.probe_calibrate_z - kin_pos[2]
|
|
gcode = self.printer.lookup_object('gcode')
|
|
gcode.respond_info(
|
|
"%s: z_offset: %.3f\n"
|
|
"The SAVE_CONFIG command will update the printer config file\n"
|
|
"with the above and restart the printer." % (self.name, z_offset))
|
|
configfile = self.printer.lookup_object('configfile')
|
|
configfile.set(self.name, 'z_offset', "%.3f" % (z_offset,))
|
|
cmd_PROBE_CALIBRATE_help = "Calibrate the probe's z_offset"
|
|
def cmd_PROBE_CALIBRATE(self, gcmd):
|
|
manual_probe.verify_no_manual_probe(self.printer)
|
|
params = self.probe.get_probe_params(gcmd)
|
|
# Perform initial probe
|
|
curpos = run_single_probe(self.probe, gcmd)
|
|
# Move away from the bed
|
|
self.probe_calibrate_z = curpos[2]
|
|
curpos[2] += 5.
|
|
self._move(curpos, params['lift_speed'])
|
|
# Move the nozzle over the probe point
|
|
x_offset, y_offset, z_offset = self.probe.get_offsets()
|
|
curpos[0] += x_offset
|
|
curpos[1] += y_offset
|
|
self._move(curpos, params['probe_speed'])
|
|
# Start manual probe
|
|
manual_probe.ManualProbeHelper(self.printer, gcmd,
|
|
self.probe_calibrate_finalize)
|
|
cmd_PROBE_ACCURACY_help = "Probe Z-height accuracy at current XY position"
|
|
def cmd_PROBE_ACCURACY(self, gcmd):
|
|
params = self.probe.get_probe_params(gcmd)
|
|
sample_count = gcmd.get_int("SAMPLES", 10, minval=1)
|
|
toolhead = self.printer.lookup_object('toolhead')
|
|
pos = toolhead.get_position()
|
|
gcmd.respond_info("PROBE_ACCURACY at X:%.3f Y:%.3f Z:%.3f"
|
|
" (samples=%d retract=%.3f"
|
|
" speed=%.1f lift_speed=%.1f)\n"
|
|
% (pos[0], pos[1], pos[2],
|
|
sample_count, params['sample_retract_dist'],
|
|
params['probe_speed'], params['lift_speed']))
|
|
# Create dummy gcmd with SAMPLES=1
|
|
fo_params = dict(gcmd.get_command_parameters())
|
|
fo_params['SAMPLES'] = '1'
|
|
gcode = self.printer.lookup_object('gcode')
|
|
fo_gcmd = gcode.create_gcode_command("", "", fo_params)
|
|
# Probe bed sample_count times
|
|
probe_session = self.probe.start_probe_session(fo_gcmd)
|
|
probe_num = 0
|
|
while probe_num < sample_count:
|
|
# Probe position
|
|
probe_session.run_probe(fo_gcmd)
|
|
probe_num += 1
|
|
# Retract
|
|
pos = toolhead.get_position()
|
|
liftpos = [None, None, pos[2] + params['sample_retract_dist']]
|
|
self._move(liftpos, params['lift_speed'])
|
|
positions = probe_session.pull_probed_results()
|
|
probe_session.end_probe_session()
|
|
# Calculate maximum, minimum and average values
|
|
max_value = max([p[2] for p in positions])
|
|
min_value = min([p[2] for p in positions])
|
|
range_value = max_value - min_value
|
|
avg_value = calc_probe_z_average(positions, 'average')[2]
|
|
median = calc_probe_z_average(positions, 'median')[2]
|
|
# calculate the standard deviation
|
|
deviation_sum = 0
|
|
for i in range(len(positions)):
|
|
deviation_sum += pow(positions[i][2] - avg_value, 2.)
|
|
sigma = (deviation_sum / len(positions)) ** 0.5
|
|
# Show information
|
|
gcmd.respond_info(
|
|
"probe accuracy results: maximum %.6f, minimum %.6f, range %.6f, "
|
|
"average %.6f, median %.6f, standard deviation %.6f" % (
|
|
max_value, min_value, range_value, avg_value, median, sigma))
|
|
cmd_Z_OFFSET_APPLY_PROBE_help = "Adjust the probe's z_offset"
|
|
def cmd_Z_OFFSET_APPLY_PROBE(self, gcmd):
|
|
gcode_move = self.printer.lookup_object("gcode_move")
|
|
offset = gcode_move.get_status()['homing_origin'].z
|
|
if offset == 0:
|
|
gcmd.respond_info("Nothing to do: Z Offset is 0")
|
|
return
|
|
z_offset = self.probe.get_offsets()[2]
|
|
new_calibrate = z_offset - offset
|
|
gcmd.respond_info(
|
|
"%s: z_offset: %.3f\n"
|
|
"The SAVE_CONFIG command will update the printer config file\n"
|
|
"with the above and restart the printer."
|
|
% (self.name, new_calibrate))
|
|
configfile = self.printer.lookup_object('configfile')
|
|
configfile.set(self.name, 'z_offset', "%.3f" % (new_calibrate,))
|
|
|
|
# Homing via probe:z_virtual_endstop
|
|
class HomingViaProbeHelper:
|
|
def __init__(self, config, mcu_probe):
|
|
self.printer = config.get_printer()
|
|
self.mcu_probe = mcu_probe
|
|
self.multi_probe_pending = False
|
|
# Register z_virtual_endstop pin
|
|
self.printer.lookup_object('pins').register_chip('probe', self)
|
|
# Register event handlers
|
|
self.printer.register_event_handler('klippy:mcu_identify',
|
|
self._handle_mcu_identify)
|
|
self.printer.register_event_handler("homing:homing_move_begin",
|
|
self._handle_homing_move_begin)
|
|
self.printer.register_event_handler("homing:homing_move_end",
|
|
self._handle_homing_move_end)
|
|
self.printer.register_event_handler("homing:home_rails_begin",
|
|
self._handle_home_rails_begin)
|
|
self.printer.register_event_handler("homing:home_rails_end",
|
|
self._handle_home_rails_end)
|
|
self.printer.register_event_handler("gcode:command_error",
|
|
self._handle_command_error)
|
|
def _handle_mcu_identify(self):
|
|
kin = self.printer.lookup_object('toolhead').get_kinematics()
|
|
for stepper in kin.get_steppers():
|
|
if stepper.is_active_axis('z'):
|
|
self.mcu_probe.add_stepper(stepper)
|
|
def _handle_homing_move_begin(self, hmove):
|
|
if self.mcu_probe in hmove.get_mcu_endstops():
|
|
self.mcu_probe.probe_prepare(hmove)
|
|
def _handle_homing_move_end(self, hmove):
|
|
if self.mcu_probe in hmove.get_mcu_endstops():
|
|
self.mcu_probe.probe_finish(hmove)
|
|
def _handle_home_rails_begin(self, homing_state, rails):
|
|
endstops = [es for rail in rails for es, name in rail.get_endstops()]
|
|
if self.mcu_probe in endstops:
|
|
self.mcu_probe.multi_probe_begin()
|
|
self.multi_probe_pending = True
|
|
def _handle_home_rails_end(self, homing_state, rails):
|
|
endstops = [es for rail in rails for es, name in rail.get_endstops()]
|
|
if self.multi_probe_pending and self.mcu_probe in endstops:
|
|
self.multi_probe_pending = False
|
|
self.mcu_probe.multi_probe_end()
|
|
def _handle_command_error(self):
|
|
if self.multi_probe_pending:
|
|
self.multi_probe_pending = False
|
|
try:
|
|
self.mcu_probe.multi_probe_end()
|
|
except:
|
|
logging.exception("Homing multi-probe end")
|
|
def setup_pin(self, pin_type, pin_params):
|
|
if pin_type != 'endstop' or pin_params['pin'] != 'z_virtual_endstop':
|
|
raise pins.error("Probe virtual endstop only useful as endstop pin")
|
|
if pin_params['invert'] or pin_params['pullup']:
|
|
raise pins.error("Can not pullup/invert probe virtual endstop")
|
|
return self.mcu_probe
|
|
|
|
# Helper to track multiple probe attempts in a single command
|
|
class ProbeSessionHelper:
|
|
def __init__(self, config, mcu_probe):
|
|
self.printer = config.get_printer()
|
|
self.mcu_probe = mcu_probe
|
|
gcode = self.printer.lookup_object('gcode')
|
|
self.dummy_gcode_cmd = gcode.create_gcode_command("", "", {})
|
|
# Infer Z position to move to during a probe
|
|
if config.has_section('stepper_z'):
|
|
zconfig = config.getsection('stepper_z')
|
|
self.z_position = zconfig.getfloat('position_min', 0.,
|
|
note_valid=False)
|
|
else:
|
|
pconfig = config.getsection('printer')
|
|
self.z_position = pconfig.getfloat('minimum_z_position', 0.,
|
|
note_valid=False)
|
|
self.homing_helper = HomingViaProbeHelper(config, mcu_probe)
|
|
# Configurable probing speeds
|
|
self.speed = config.getfloat('speed', 5.0, above=0.)
|
|
self.lift_speed = config.getfloat('lift_speed', self.speed, above=0.)
|
|
# Multi-sample support (for improved accuracy)
|
|
self.sample_count = config.getint('samples', 1, minval=1)
|
|
self.sample_retract_dist = config.getfloat('sample_retract_dist', 2.,
|
|
above=0.)
|
|
atypes = {'median': 'median', 'average': 'average'}
|
|
self.samples_result = config.getchoice('samples_result', atypes,
|
|
'average')
|
|
self.samples_tolerance = config.getfloat('samples_tolerance', 0.100,
|
|
minval=0.)
|
|
self.samples_retries = config.getint('samples_tolerance_retries', 0,
|
|
minval=0)
|
|
# Session state
|
|
self.multi_probe_pending = False
|
|
self.results = []
|
|
# Register event handlers
|
|
self.printer.register_event_handler("gcode:command_error",
|
|
self._handle_command_error)
|
|
def _handle_command_error(self):
|
|
if self.multi_probe_pending:
|
|
try:
|
|
self.end_probe_session()
|
|
except:
|
|
logging.exception("Multi-probe end")
|
|
def _probe_state_error(self):
|
|
raise self.printer.command_error(
|
|
"Internal probe error - start/end probe session mismatch")
|
|
def start_probe_session(self, gcmd):
|
|
if self.multi_probe_pending:
|
|
self._probe_state_error()
|
|
self.mcu_probe.multi_probe_begin()
|
|
self.multi_probe_pending = True
|
|
self.results = []
|
|
return self
|
|
def end_probe_session(self):
|
|
if not self.multi_probe_pending:
|
|
self._probe_state_error()
|
|
self.results = []
|
|
self.multi_probe_pending = False
|
|
self.mcu_probe.multi_probe_end()
|
|
def get_probe_params(self, gcmd=None):
|
|
if gcmd is None:
|
|
gcmd = self.dummy_gcode_cmd
|
|
probe_speed = gcmd.get_float("PROBE_SPEED", self.speed, above=0.)
|
|
lift_speed = gcmd.get_float("LIFT_SPEED", self.lift_speed, above=0.)
|
|
samples = gcmd.get_int("SAMPLES", self.sample_count, minval=1)
|
|
sample_retract_dist = gcmd.get_float("SAMPLE_RETRACT_DIST",
|
|
self.sample_retract_dist, above=0.)
|
|
samples_tolerance = gcmd.get_float("SAMPLES_TOLERANCE",
|
|
self.samples_tolerance, minval=0.)
|
|
samples_retries = gcmd.get_int("SAMPLES_TOLERANCE_RETRIES",
|
|
self.samples_retries, minval=0)
|
|
samples_result = gcmd.get("SAMPLES_RESULT", self.samples_result)
|
|
return {'probe_speed': probe_speed,
|
|
'lift_speed': lift_speed,
|
|
'samples': samples,
|
|
'sample_retract_dist': sample_retract_dist,
|
|
'samples_tolerance': samples_tolerance,
|
|
'samples_tolerance_retries': samples_retries,
|
|
'samples_result': samples_result}
|
|
def _probe(self, speed):
|
|
toolhead = self.printer.lookup_object('toolhead')
|
|
curtime = self.printer.get_reactor().monotonic()
|
|
if 'z' not in toolhead.get_status(curtime)['homed_axes']:
|
|
raise self.printer.command_error("Must home before probe")
|
|
pos = toolhead.get_position()
|
|
pos[2] = self.z_position
|
|
try:
|
|
epos = self.mcu_probe.probing_move(pos, speed)
|
|
except self.printer.command_error as e:
|
|
reason = str(e)
|
|
if "Timeout during endstop homing" in reason:
|
|
reason += HINT_TIMEOUT
|
|
raise self.printer.command_error(reason)
|
|
# Allow axis_twist_compensation to update results
|
|
self.printer.send_event("probe:update_results", epos)
|
|
# Report results
|
|
gcode = self.printer.lookup_object('gcode')
|
|
gcode.respond_info("probe at %.3f,%.3f is z=%.6f"
|
|
% (epos[0], epos[1], epos[2]))
|
|
return epos[:3]
|
|
def run_probe(self, gcmd):
|
|
if not self.multi_probe_pending:
|
|
self._probe_state_error()
|
|
params = self.get_probe_params(gcmd)
|
|
toolhead = self.printer.lookup_object('toolhead')
|
|
probexy = toolhead.get_position()[:2]
|
|
retries = 0
|
|
positions = []
|
|
sample_count = params['samples']
|
|
while len(positions) < sample_count:
|
|
# Probe position
|
|
pos = self._probe(params['probe_speed'])
|
|
positions.append(pos)
|
|
# Check samples tolerance
|
|
z_positions = [p[2] for p in positions]
|
|
if max(z_positions)-min(z_positions) > params['samples_tolerance']:
|
|
if retries >= params['samples_tolerance_retries']:
|
|
raise gcmd.error("Probe samples exceed samples_tolerance")
|
|
gcmd.respond_info("Probe samples exceed tolerance. Retrying...")
|
|
retries += 1
|
|
positions = []
|
|
# Retract
|
|
if len(positions) < sample_count:
|
|
toolhead.manual_move(
|
|
probexy + [pos[2] + params['sample_retract_dist']],
|
|
params['lift_speed'])
|
|
# Calculate result
|
|
epos = calc_probe_z_average(positions, params['samples_result'])
|
|
self.results.append(epos)
|
|
def pull_probed_results(self):
|
|
res = self.results
|
|
self.results = []
|
|
return res
|
|
|
|
# Helper to read the xyz probe offsets from the config
|
|
class ProbeOffsetsHelper:
|
|
def __init__(self, config):
|
|
self.x_offset = config.getfloat('x_offset', 0.)
|
|
self.y_offset = config.getfloat('y_offset', 0.)
|
|
self.z_offset = config.getfloat('z_offset')
|
|
def get_offsets(self):
|
|
return self.x_offset, self.y_offset, self.z_offset
|
|
|
|
|
|
######################################################################
|
|
# Tools for utilizing the probe
|
|
######################################################################
|
|
|
|
# Helper code that can probe a series of points and report the
|
|
# position at each point.
|
|
class ProbePointsHelper:
|
|
def __init__(self, config, finalize_callback, default_points=None):
|
|
self.printer = config.get_printer()
|
|
self.finalize_callback = finalize_callback
|
|
self.probe_points = default_points
|
|
self.name = config.get_name()
|
|
self.gcode = self.printer.lookup_object('gcode')
|
|
# Read config settings
|
|
if default_points is None or config.get('points', None) is not None:
|
|
self.probe_points = config.getlists('points', seps=(',', '\n'),
|
|
parser=float, count=2)
|
|
def_move_z = config.getfloat('horizontal_move_z', 5.)
|
|
self.default_horizontal_move_z = def_move_z
|
|
self.speed = config.getfloat('speed', 50., above=0.)
|
|
self.use_offsets = False
|
|
# Internal probing state
|
|
self.lift_speed = self.speed
|
|
self.probe_offsets = (0., 0., 0.)
|
|
self.manual_results = []
|
|
def minimum_points(self,n):
|
|
if len(self.probe_points) < n:
|
|
raise self.printer.config_error(
|
|
"Need at least %d probe points for %s" % (n, self.name))
|
|
def update_probe_points(self, points, min_points):
|
|
self.probe_points = points
|
|
self.minimum_points(min_points)
|
|
def use_xy_offsets(self, use_offsets):
|
|
self.use_offsets = use_offsets
|
|
def get_lift_speed(self):
|
|
return self.lift_speed
|
|
def _move(self, coord, speed):
|
|
self.printer.lookup_object('toolhead').manual_move(coord, speed)
|
|
def _raise_tool(self, is_first=False):
|
|
speed = self.lift_speed
|
|
if is_first:
|
|
# Use full speed to first probe position
|
|
speed = self.speed
|
|
self._move([None, None, self.horizontal_move_z], speed)
|
|
def _invoke_callback(self, results):
|
|
# Flush lookahead queue
|
|
toolhead = self.printer.lookup_object('toolhead')
|
|
toolhead.get_last_move_time()
|
|
# Invoke callback
|
|
res = self.finalize_callback(self.probe_offsets, results)
|
|
return res != "retry"
|
|
def _move_next(self, probe_num):
|
|
# Move to next XY probe point
|
|
nextpos = list(self.probe_points[probe_num])
|
|
if self.use_offsets:
|
|
nextpos[0] -= self.probe_offsets[0]
|
|
nextpos[1] -= self.probe_offsets[1]
|
|
self._move(nextpos, self.speed)
|
|
def start_probe(self, gcmd):
|
|
manual_probe.verify_no_manual_probe(self.printer)
|
|
# Lookup objects
|
|
probe = self.printer.lookup_object('probe', None)
|
|
method = gcmd.get('METHOD', 'automatic').lower()
|
|
def_move_z = self.default_horizontal_move_z
|
|
self.horizontal_move_z = gcmd.get_float('HORIZONTAL_MOVE_Z',
|
|
def_move_z)
|
|
if probe is None or method == 'manual':
|
|
# Manual probe
|
|
self.lift_speed = self.speed
|
|
self.probe_offsets = (0., 0., 0.)
|
|
self.manual_results = []
|
|
self._manual_probe_start()
|
|
return
|
|
# Perform automatic probing
|
|
self.lift_speed = probe.get_probe_params(gcmd)['lift_speed']
|
|
self.probe_offsets = probe.get_offsets()
|
|
if self.horizontal_move_z < self.probe_offsets[2]:
|
|
raise gcmd.error("horizontal_move_z can't be less than"
|
|
" probe's z_offset")
|
|
probe_session = probe.start_probe_session(gcmd)
|
|
probe_num = 0
|
|
while 1:
|
|
self._raise_tool(not probe_num)
|
|
if probe_num >= len(self.probe_points):
|
|
results = probe_session.pull_probed_results()
|
|
done = self._invoke_callback(results)
|
|
if done:
|
|
break
|
|
# Caller wants a "retry" - restart probing
|
|
probe_num = 0
|
|
self._move_next(probe_num)
|
|
probe_session.run_probe(gcmd)
|
|
probe_num += 1
|
|
probe_session.end_probe_session()
|
|
def _manual_probe_start(self):
|
|
self._raise_tool(not self.manual_results)
|
|
if len(self.manual_results) >= len(self.probe_points):
|
|
done = self._invoke_callback(self.manual_results)
|
|
if done:
|
|
return
|
|
# Caller wants a "retry" - clear results and restart probing
|
|
self.manual_results = []
|
|
self._move_next(len(self.manual_results))
|
|
gcmd = self.gcode.create_gcode_command("", "", {})
|
|
manual_probe.ManualProbeHelper(self.printer, gcmd,
|
|
self._manual_probe_finalize)
|
|
def _manual_probe_finalize(self, kin_pos):
|
|
if kin_pos is None:
|
|
return
|
|
self.manual_results.append(kin_pos)
|
|
self._manual_probe_start()
|
|
|
|
# Helper to obtain a single probe measurement
|
|
def run_single_probe(probe, gcmd):
|
|
probe_session = probe.start_probe_session(gcmd)
|
|
probe_session.run_probe(gcmd)
|
|
pos = probe_session.pull_probed_results()[0]
|
|
probe_session.end_probe_session()
|
|
return pos
|
|
|
|
|
|
######################################################################
|
|
# Handle [probe] config
|
|
######################################################################
|
|
|
|
# Endstop wrapper that enables probe specific features
|
|
class ProbeEndstopWrapper:
|
|
def __init__(self, config):
|
|
self.printer = config.get_printer()
|
|
self.position_endstop = config.getfloat('z_offset')
|
|
self.stow_on_each_sample = config.getboolean(
|
|
'deactivate_on_each_sample', True)
|
|
gcode_macro = self.printer.load_object(config, 'gcode_macro')
|
|
self.activate_gcode = gcode_macro.load_template(
|
|
config, 'activate_gcode', '')
|
|
self.deactivate_gcode = gcode_macro.load_template(
|
|
config, 'deactivate_gcode', '')
|
|
# Create an "endstop" object to handle the probe pin
|
|
ppins = self.printer.lookup_object('pins')
|
|
self.mcu_endstop = ppins.setup_pin('endstop', config.get('pin'))
|
|
# Wrappers
|
|
self.get_mcu = self.mcu_endstop.get_mcu
|
|
self.add_stepper = self.mcu_endstop.add_stepper
|
|
self.get_steppers = self.mcu_endstop.get_steppers
|
|
self.home_start = self.mcu_endstop.home_start
|
|
self.home_wait = self.mcu_endstop.home_wait
|
|
self.query_endstop = self.mcu_endstop.query_endstop
|
|
self.probe_session = None
|
|
# multi probes state
|
|
self.multi = 'OFF'
|
|
def _raise_probe(self):
|
|
toolhead = self.printer.lookup_object('toolhead')
|
|
start_pos = toolhead.get_position()
|
|
self.deactivate_gcode.run_gcode_from_command()
|
|
if toolhead.get_position()[:3] != start_pos[:3]:
|
|
raise self.printer.command_error(
|
|
"Toolhead moved during probe deactivate_gcode script")
|
|
def _lower_probe(self):
|
|
toolhead = self.printer.lookup_object('toolhead')
|
|
start_pos = toolhead.get_position()
|
|
self.activate_gcode.run_gcode_from_command()
|
|
if toolhead.get_position()[:3] != start_pos[:3]:
|
|
raise self.printer.command_error(
|
|
"Toolhead moved during probe activate_gcode script")
|
|
def multi_probe_begin(self):
|
|
if self.stow_on_each_sample:
|
|
return
|
|
self.multi = 'FIRST'
|
|
def multi_probe_end(self):
|
|
if self.stow_on_each_sample:
|
|
return
|
|
toolhead = self.printer.lookup_object('toolhead')
|
|
toolhead.manual_move([None, None, toolhead.get_position()[2]+2.0], self.probe_session.lift_speed)
|
|
self._raise_probe()
|
|
self.multi = 'OFF'
|
|
def probing_move(self, pos, speed):
|
|
phoming = self.printer.lookup_object('homing')
|
|
return phoming.probing_move(self, pos, speed)
|
|
def probe_prepare(self, hmove):
|
|
if self.multi == 'OFF' or self.multi == 'FIRST':
|
|
self._lower_probe()
|
|
if self.multi == 'FIRST':
|
|
self.multi = 'ON'
|
|
def probe_finish(self, hmove):
|
|
if self.multi == 'OFF':
|
|
self._raise_probe()
|
|
def get_position_endstop(self):
|
|
return self.position_endstop
|
|
|
|
# Main external probe interface
|
|
class PrinterProbe:
|
|
def __init__(self, config):
|
|
self.printer = config.get_printer()
|
|
self.mcu_probe = ProbeEndstopWrapper(config)
|
|
self.cmd_helper = ProbeCommandHelper(config, self,
|
|
self.mcu_probe.query_endstop)
|
|
self.probe_offsets = ProbeOffsetsHelper(config)
|
|
self.probe_session = ProbeSessionHelper(config, self.mcu_probe)
|
|
self.mcu_probe.probe_session = self.probe_session
|
|
def get_probe_params(self, gcmd=None):
|
|
return self.probe_session.get_probe_params(gcmd)
|
|
def get_offsets(self):
|
|
return self.probe_offsets.get_offsets()
|
|
def get_status(self, eventtime):
|
|
return self.cmd_helper.get_status(eventtime)
|
|
def start_probe_session(self, gcmd):
|
|
return self.probe_session.start_probe_session(gcmd)
|
|
|
|
def load_config(config):
|
|
return PrinterProbe(config)
|