Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b16961dba3 | ||
|
|
13e49e43c7 |
No files matched your search
@@ -49,6 +49,7 @@ everything below, grouped by topic. Comment out what you do not use there.
|
|||||||
| `stealthburner_leds.cfg` | Stealthburner logo status (`_STATUS STATE=...`: heating and print progress as a filling logo, paused, error flash from `_ERROR`, part ready once the bed is cool, dim when idle and nobody is near) and the nozzle light | `led_effect`, `neopixel:bt_logo` and `rainbow_turtle` from AFC |
|
| `stealthburner_leds.cfg` | Stealthburner logo status (`_STATUS STATE=...`: heating and print progress as a filling logo, paused, error flash from `_ERROR`, part ready once the bed is cool, dim when idle and nobody is near) and the nozzle light | `led_effect`, `neopixel:bt_logo` and `rainbow_turtle` from AFC |
|
||||||
| **sensors/** | | |
|
| **sensors/** | | |
|
||||||
| `motion_sensor.cfg` | PIR motion sensor: case light and nozzle LEDs on while someone is near (timeout from the last motion), `CASELIGHT MODE=AUTO\|ON\|OFF`; runs outside the G-code queue, so the lights also react during heat waits and AFC loads | `extras/motion_lights.py`, sensor on a pin, `[output_pin caselight]`, `leds/stealthburner_leds.cfg` |
|
| `motion_sensor.cfg` | PIR motion sensor: case light and nozzle LEDs on while someone is near (timeout from the last motion), `CASELIGHT MODE=AUTO\|ON\|OFF`; runs outside the G-code queue, so the lights also react during heat waits and AFC loads | `extras/motion_lights.py`, sensor on a pin, `[output_pin caselight]`, `leds/stealthburner_leds.cfg` |
|
||||||
|
| `touch_compare.cfg` | `[bdp_touch]`, `TOUCH_COMPARE [N=10] [X] [Y] [TEMP=150]`: nozzle to 150C, `HOME`, then N pairs of a Beacon contact probe and a bd_pressure touch at one spot; reports mean, spread and range of each and of the difference | `extras/bdp_touch.py` + bd_pressure load-check firmware, Beacon |
|
||||||
|
|
||||||
### Klipper modules (`extras/`)
|
### Klipper modules (`extras/`)
|
||||||
|
|
||||||
@@ -58,6 +59,7 @@ everything below, grouped by topic. Comment out what you do not use there.
|
|||||||
| `bdwidth_status.py` | exposes bdwidth's motion counter and width to macros (`present: False` with neutral values when no bdwidth is configured, so the macros also work without it), and keeps a USB dropout of bdwidth (port: usb) from shutting down Klipper: the read is retried every 10 s and the port reopened |
|
| `bdwidth_status.py` | exposes bdwidth's motion counter and width to macros (`present: False` with neutral values when no bdwidth is configured, so the macros also work without it), and keeps a USB dropout of bdwidth (port: usb) from shutting down Klipper: the read is retried every 10 s and the port reopened |
|
||||||
| `bdpressure_check.py` | bd_pressure load check (`BDP_CHECK_START/STOP/QUERY`). Needs the load-check firmware from the bd_pressure `load-check-extension` branch; on stock firmware it reports "not available" and does nothing. Also reports how many readings the last `PA_CALIBRATE` got (`pa_points`, `pa_distinct`), used to reject runs with a silent or stuck sensor. |
|
| `bdpressure_check.py` | bd_pressure load check (`BDP_CHECK_START/STOP/QUERY`). Needs the load-check firmware from the bd_pressure `load-check-extension` branch; on stock firmware it reports "not available" and does nothing. Also reports how many readings the last `PA_CALIBRATE` got (`pa_points`, `pa_distinct`), used to reject runs with a silent or stuck sensor. |
|
||||||
| `bdp_guard.py` | nozzle collision guard: while armed (`BDP_GUARD_ARM/DISARM/QUERY`) reads the bd_pressure force every 20 ms over I2C and, in stop mode, shuts Klipper down when it stays above the threshold. Reports reads, peak and errors per phase in the console and klippy.log. When it arms and finds the sensor still in PA mode (an emergency stop during `PA_CALIBRATE`; `FIRMWARE_RESTART` does not reset the sensor), it switches it to probe mode and takes a new zero first. Puts a lock on the sensor's I2C connection that `bdpressure.py` and `bdpressure_check.py` also go through (Klipper allows one I2C request at a time per device). Needs the load-check firmware. |
|
| `bdp_guard.py` | nozzle collision guard: while armed (`BDP_GUARD_ARM/DISARM/QUERY`) reads the bd_pressure force every 20 ms over I2C and, in stop mode, shuts Klipper down when it stays above the threshold. Reports reads, peak and errors per phase in the console and klippy.log. When it arms and finds the sensor still in PA mode (an emergency stop during `PA_CALIBRATE`; `FIRMWARE_RESTART` does not reset the sensor), it switches it to probe mode and takes a new zero first. Puts a lock on the sensor's I2C connection that `bdpressure.py` and `bdpressure_check.py` also go through (Klipper allows one I2C request at a time per device). Needs the load-check firmware. |
|
||||||
|
| `bdp_touch.py` | `BDP_TOUCH`: lowers the nozzle in 0.005 mm steps and reads the bd_pressure force after each step (its endstop output is not wired), up to a force limit (default 80) or 0.4 mm below the start, then lifts back; reports the height where the force reaches the threshold and the zero-force height from a line fit, and logs the whole curve to klippy.log. `_TOUCH_COMPARE`: alternates that with Beacon's contact probe. Refuses while the bdp_guard is armed or the sensor is in PA mode. Needs the load-check firmware. |
|
||||||
|
|
||||||
### Scripts (`scripts/`)
|
### Scripts (`scripts/`)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,265 @@
|
|||||||
|
# Nozzle touch with bd_pressure, and a comparison with Beacon contact.
|
||||||
|
#
|
||||||
|
# The bd_pressure endstop output is not wired, so it cannot stop a homing
|
||||||
|
# move. BDP_TOUCH instead lowers the nozzle in small steps and reads the
|
||||||
|
# force (chk_delta, register 64-65 of the load-check firmware) after each
|
||||||
|
# step, until the force reaches STOP or Z reaches the floor. From the
|
||||||
|
# curve it reports two touch heights:
|
||||||
|
# threshold z: where the force first reaches THRESHOLD (interpolated
|
||||||
|
# between the two steps around it), like an endstop would
|
||||||
|
# fit z: where a straight line through the readings at or above
|
||||||
|
# THRESHOLD reaches the no-contact level (the mean of the
|
||||||
|
# readings before the descent): the zero-force touch point
|
||||||
|
# Z is the toolhead Z (the frame of the last Z homing).
|
||||||
|
#
|
||||||
|
# TOUCH_COMPARE alternates Beacon's contact probe (PROBE_METHOD=contact,
|
||||||
|
# one sample) and BDP_TOUCH at the current X/Y, N times, and reports the
|
||||||
|
# mean and spread of each and of the per-pair difference. Run it through
|
||||||
|
# the TOUCH_COMPARE macro (macros/sensors/touch_compare.cfg), which heats
|
||||||
|
# the nozzle and homes first.
|
||||||
|
#
|
||||||
|
# Safety: the force only goes to STOP (default 80; a light finger push on
|
||||||
|
# the nozzle is about 41, a purge 64-246), the descent ends at FLOOR below
|
||||||
|
# the start, and the nozzle always goes back up to the start height, also
|
||||||
|
# after an error. It refuses to run while the bdp_guard is armed (in stop
|
||||||
|
# mode the touch would shut Klipper down) or while the sensor is in PA mode.
|
||||||
|
#
|
||||||
|
# Install: copy to ~/klipper/klippy/extras/bdp_touch.py (install.sh links
|
||||||
|
# it) and add
|
||||||
|
#
|
||||||
|
# [bdp_touch]
|
||||||
|
# sensor: bd_pa # name after "bdpressure" in [bdpressure bd_pa]
|
||||||
|
#
|
||||||
|
# Commands:
|
||||||
|
# BDP_TOUCH [THRESHOLD=15] [STOP=80] [STEP=0.005] [FLOOR=0.4] [SETTLE=0.05]
|
||||||
|
# [READS=3]
|
||||||
|
# touch at the current X/Y, starting at the current Z
|
||||||
|
# _TOUCH_COMPARE [N=10] [START=0.1] [THRESHOLD=..] [STOP=..] [STEP=..]
|
||||||
|
# the comparison loop; START is the BDP_TOUCH start height above the
|
||||||
|
# Beacon contact result of the same pair
|
||||||
|
#
|
||||||
|
# Every touch writes its whole curve to klippy.log ("bdp_touch: curve"),
|
||||||
|
# so it can be analysed later.
|
||||||
|
#
|
||||||
|
# Status (printer.bdp_touch): threshold_z, fit_z, peak, noise, slope
|
||||||
|
# (force per 0.01 mm), points, of the last BDP_TOUCH
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import math
|
||||||
|
|
||||||
|
REG_MODE = 48 # status_clk: 7 = PA mode, 2 = probe (endstop) mode
|
||||||
|
REG_RESET_PROBE = 52 # write 1 = take the current reading as zero
|
||||||
|
MODE_PA = 7
|
||||||
|
REG_EXT = 54 # extension marker 0xBD + version
|
||||||
|
REG_DELTA = 64 # chk_delta, int16 little-endian
|
||||||
|
EXT_MAGIC = 0xBD
|
||||||
|
STEP_SPEED = 2. # mm/s for the small Z steps
|
||||||
|
LIFT_SPEED = 5.
|
||||||
|
|
||||||
|
|
||||||
|
def _stats(values):
|
||||||
|
n = len(values)
|
||||||
|
mean = sum(values) / n
|
||||||
|
std = math.sqrt(sum((v - mean) ** 2 for v in values) / n)
|
||||||
|
return mean, std, max(values) - min(values)
|
||||||
|
|
||||||
|
|
||||||
|
class BDPTouch:
|
||||||
|
def __init__(self, config):
|
||||||
|
self.printer = config.get_printer()
|
||||||
|
self.reactor = self.printer.get_reactor()
|
||||||
|
self.sensor_name = 'bdpressure ' + config.get('sensor', 'bd_pa')
|
||||||
|
self.sensor = None
|
||||||
|
self.toolhead = None
|
||||||
|
self.last = {'threshold_z': None, 'fit_z': None, 'peak': 0,
|
||||||
|
'noise': 0., 'slope': None, 'points': 0}
|
||||||
|
self.printer.register_event_handler('klippy:connect',
|
||||||
|
self._handle_connect)
|
||||||
|
gcode = self.printer.lookup_object('gcode')
|
||||||
|
self.gcode = gcode
|
||||||
|
gcode.register_command('BDP_TOUCH', self.cmd_BDP_TOUCH,
|
||||||
|
desc="Touch the bed with the nozzle and "
|
||||||
|
"measure it with bd_pressure")
|
||||||
|
gcode.register_command('_TOUCH_COMPARE', self.cmd_TOUCH_COMPARE,
|
||||||
|
desc="Compare Beacon contact and bd_pressure "
|
||||||
|
"touches (use the TOUCH_COMPARE macro)")
|
||||||
|
|
||||||
|
def _handle_connect(self):
|
||||||
|
self.sensor = self.printer.lookup_object(self.sensor_name, None)
|
||||||
|
self.toolhead = self.printer.lookup_object('toolhead')
|
||||||
|
|
||||||
|
# Looked up at every use: bdp_guard puts a locked wrapper on the sensor
|
||||||
|
@property
|
||||||
|
def i2c(self):
|
||||||
|
return getattr(self.sensor, 'i2c', None)
|
||||||
|
|
||||||
|
def _check_ready(self, gcmd):
|
||||||
|
if self.i2c is None:
|
||||||
|
raise gcmd.error("BDP_TOUCH: no [%s]" % self.sensor_name)
|
||||||
|
status = self.toolhead.get_status(self.reactor.monotonic())
|
||||||
|
if 'z' not in status['homed_axes']:
|
||||||
|
raise gcmd.error("BDP_TOUCH: home Z first")
|
||||||
|
guard = self.printer.lookup_object('bdp_guard', None)
|
||||||
|
if guard is not None and guard.timer is not None:
|
||||||
|
raise gcmd.error("BDP_TOUCH: the bdp_guard is armed "
|
||||||
|
"(BDP_GUARD_DISARM first)")
|
||||||
|
if getattr(self.sensor, 'last_state', 0):
|
||||||
|
raise gcmd.error("BDP_TOUCH: a bd_pressure calibration runs")
|
||||||
|
ext = bytearray(self.i2c.i2c_read([REG_EXT], 2)['response'])
|
||||||
|
if len(ext) != 2 or ext[0] != EXT_MAGIC:
|
||||||
|
raise gcmd.error("BDP_TOUCH: bd_pressure load-check firmware "
|
||||||
|
"not found")
|
||||||
|
mode = bytearray(self.i2c.i2c_read([REG_MODE], 1)['response'])
|
||||||
|
if len(mode) == 1 and mode[0] == MODE_PA:
|
||||||
|
raise gcmd.error("BDP_TOUCH: bd_pressure is in PA mode "
|
||||||
|
"(home Z once to switch it back)")
|
||||||
|
|
||||||
|
def _read_delta(self, reads):
|
||||||
|
total = 0
|
||||||
|
for i in range(reads):
|
||||||
|
data = bytearray(self.i2c.i2c_read([REG_DELTA], 2)['response'])
|
||||||
|
if len(data) != 2:
|
||||||
|
raise self.printer.command_error("BDP_TOUCH: short read")
|
||||||
|
d = data[0] | (data[1] << 8)
|
||||||
|
total += d - 0x10000 if d & 0x8000 else d
|
||||||
|
return total / float(reads)
|
||||||
|
|
||||||
|
def _move_z(self, z, speed):
|
||||||
|
self.toolhead.manual_move([None, None, z], speed)
|
||||||
|
self.toolhead.wait_moves()
|
||||||
|
|
||||||
|
def touch(self, gcmd, threshold, stop, step, floor, settle, reads):
|
||||||
|
"""Lower the nozzle from the current Z; returns the result dict."""
|
||||||
|
self._check_ready(gcmd)
|
||||||
|
self.toolhead.wait_moves()
|
||||||
|
start = self.toolhead.get_position()[2]
|
||||||
|
# New zero with the nozzle free, then the no-contact level and noise
|
||||||
|
self.i2c.i2c_write([REG_RESET_PROBE, 1])
|
||||||
|
self.reactor.pause(self.reactor.monotonic() + 0.3)
|
||||||
|
base = []
|
||||||
|
for i in range(10):
|
||||||
|
base.append(self._read_delta(1))
|
||||||
|
self.reactor.pause(self.reactor.monotonic() + 0.01)
|
||||||
|
base_mean, noise, _ = _stats(base)
|
||||||
|
curve = []
|
||||||
|
try:
|
||||||
|
z = start
|
||||||
|
while True:
|
||||||
|
z = round(z - step, 6)
|
||||||
|
if z < start - floor:
|
||||||
|
raise gcmd.error(
|
||||||
|
"BDP_TOUCH: no touch within %.3f mm (peak %.0f)"
|
||||||
|
% (floor, max([abs(d) for zz, d in curve] or [0])))
|
||||||
|
self._move_z(z, STEP_SPEED)
|
||||||
|
self.reactor.pause(self.reactor.monotonic() + settle)
|
||||||
|
d = self._read_delta(reads)
|
||||||
|
curve.append((z, d))
|
||||||
|
if abs(d - base_mean) >= stop:
|
||||||
|
break
|
||||||
|
finally:
|
||||||
|
self._move_z(start, LIFT_SPEED)
|
||||||
|
logging.info("bdp_touch: curve start=%.4f base=%.2f noise=%.2f %s",
|
||||||
|
start, base_mean, noise,
|
||||||
|
" ".join("%.4f:%.1f" % p for p in curve))
|
||||||
|
# The sign of the force depends on the gauge: take it from the end
|
||||||
|
sign = 1. if curve[-1][1] - base_mean >= 0 else -1.
|
||||||
|
force = [(zz, sign * (d - base_mean)) for zz, d in curve]
|
||||||
|
thr_z = None
|
||||||
|
prev = (start, 0.)
|
||||||
|
for zz, f in force:
|
||||||
|
if f >= threshold:
|
||||||
|
pz, pf = prev
|
||||||
|
thr_z = pz + (zz - pz) * (threshold - pf) / (f - pf)
|
||||||
|
break
|
||||||
|
prev = (zz, f)
|
||||||
|
fit_z = slope = None
|
||||||
|
pts = [(zz, f) for zz, f in force if f >= threshold]
|
||||||
|
if len(pts) >= 3:
|
||||||
|
n = len(pts)
|
||||||
|
mz = sum(p[0] for p in pts) / n
|
||||||
|
mf = sum(p[1] for p in pts) / n
|
||||||
|
szz = sum((p[0] - mz) ** 2 for p in pts)
|
||||||
|
if szz > 0:
|
||||||
|
a = sum((p[0] - mz) * (p[1] - mf) for p in pts) / szz
|
||||||
|
if a < 0:
|
||||||
|
fit_z = mz - mf / a # where the line reaches force 0
|
||||||
|
slope = -a * 0.01
|
||||||
|
self.last = {'threshold_z': thr_z, 'fit_z': fit_z,
|
||||||
|
'peak': max(f for zz, f in force), 'noise': noise,
|
||||||
|
'slope': slope, 'points': len(pts)}
|
||||||
|
return self.last
|
||||||
|
|
||||||
|
def _touch_params(self, gcmd):
|
||||||
|
return dict(
|
||||||
|
threshold=gcmd.get_float('THRESHOLD', 15., above=0.),
|
||||||
|
stop=gcmd.get_float('STOP', 80., above=0., maxval=150.),
|
||||||
|
step=gcmd.get_float('STEP', 0.005, minval=0.001, maxval=0.02),
|
||||||
|
floor=gcmd.get_float('FLOOR', 0.4, above=0., maxval=1.),
|
||||||
|
settle=gcmd.get_float('SETTLE', 0.05, minval=0., maxval=1.),
|
||||||
|
reads=gcmd.get_int('READS', 3, minval=1, maxval=10))
|
||||||
|
|
||||||
|
def _fmt(self, v):
|
||||||
|
return "-" if v is None else "%.4f" % v
|
||||||
|
|
||||||
|
def cmd_BDP_TOUCH(self, gcmd):
|
||||||
|
p = self._touch_params(gcmd)
|
||||||
|
if p['threshold'] >= p['stop']:
|
||||||
|
raise gcmd.error("BDP_TOUCH: THRESHOLD must be below STOP")
|
||||||
|
r = self.touch(gcmd, **p)
|
||||||
|
gcmd.respond_info(
|
||||||
|
"BDP_TOUCH: threshold z %s, fit z %s, peak %.0f, noise %.1f, "
|
||||||
|
"%s per 0.01 mm, %d points"
|
||||||
|
% (self._fmt(r['threshold_z']), self._fmt(r['fit_z']), r['peak'],
|
||||||
|
r['noise'], "-" if r['slope'] is None else "%.0f" % r['slope'],
|
||||||
|
r['points']))
|
||||||
|
|
||||||
|
def cmd_TOUCH_COMPARE(self, gcmd):
|
||||||
|
beacon = self.printer.lookup_object('beacon', None)
|
||||||
|
if beacon is None:
|
||||||
|
raise gcmd.error("_TOUCH_COMPARE: no [beacon]")
|
||||||
|
n = gcmd.get_int('N', 10, minval=2, maxval=50)
|
||||||
|
start_above = gcmd.get_float('START', 0.1, minval=0.05, maxval=1.)
|
||||||
|
p = self._touch_params(gcmd)
|
||||||
|
if p['threshold'] >= p['stop']:
|
||||||
|
raise gcmd.error("_TOUCH_COMPARE: THRESHOLD must be below STOP")
|
||||||
|
self._check_ready(gcmd)
|
||||||
|
rows = []
|
||||||
|
for i in range(n):
|
||||||
|
self._move_z(2., LIFT_SPEED)
|
||||||
|
probe_cmd = self.gcode.create_gcode_command(
|
||||||
|
"PROBE", "PROBE", {'PROBE_METHOD': 'contact', 'SAMPLES': '1'})
|
||||||
|
bz = beacon.run_probe(probe_cmd)[2]
|
||||||
|
# Beacon lifts at least 1 mm after its touch; come down from
|
||||||
|
# above to the BDP start height, so both approach downwards
|
||||||
|
self._move_z(bz + start_above, LIFT_SPEED)
|
||||||
|
r = self.touch(gcmd, **p)
|
||||||
|
rows.append((bz, r['threshold_z'], r['fit_z'], r['peak']))
|
||||||
|
gcmd.respond_info(
|
||||||
|
"touch %d/%d: beacon %.4f, bdp threshold %s, bdp fit %s, "
|
||||||
|
"peak %.0f" % (i + 1, n, bz, self._fmt(r['threshold_z']),
|
||||||
|
self._fmt(r['fit_z']), r['peak']))
|
||||||
|
self._move_z(5., LIFT_SPEED)
|
||||||
|
lines = ["TOUCH_COMPARE: %d pairs (mean / std / range, mm)" % n]
|
||||||
|
cols = [("beacon contact", [r[0] for r in rows]),
|
||||||
|
("bdp threshold", [r[1] for r in rows]),
|
||||||
|
("bdp fit", [r[2] for r in rows])]
|
||||||
|
for name, vals in cols:
|
||||||
|
vals = [v for v in vals if v is not None]
|
||||||
|
if len(vals) >= 2:
|
||||||
|
lines.append(" %s: %.4f / %.4f / %.4f (%d)"
|
||||||
|
% ((name,) + _stats(vals) + (len(vals),)))
|
||||||
|
for name, k in (("threshold - beacon", 1), ("fit - beacon", 2)):
|
||||||
|
diffs = [r[k] - r[0] for r in rows if r[k] is not None]
|
||||||
|
if len(diffs) >= 2:
|
||||||
|
lines.append(" %s: %.4f / %.4f / %.4f (%d)"
|
||||||
|
% ((name,) + _stats(diffs) + (len(diffs),)))
|
||||||
|
msg = "\n".join(lines)
|
||||||
|
logging.info("bdp_touch: %s", msg)
|
||||||
|
gcmd.respond_info(msg)
|
||||||
|
|
||||||
|
def get_status(self, eventtime):
|
||||||
|
return dict(self.last)
|
||||||
|
|
||||||
|
|
||||||
|
def load_config(config):
|
||||||
|
return BDPTouch(config)
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
# HEAT_SOAK: wait for a sensor to reach thermal equilibrium (community macro)
|
# HEAT_SOAK: wait for a sensor to reach thermal equilibrium (community macro)
|
||||||
|
|
||||||
##
|
##
|
||||||
## HEAT_SOAK HEATER=<heater_name> TARGET=<target_heater_temperature> SOAKER=<heat_soak_temp_sensor_name> [RATE=<heat_soak_temp_rate_of_change>] [TIMEOUT=<time_to_abort_heat_soak>]
|
## HEAT_SOAK HEATER=<heater_name> TARGET=<target_heater_temperature> SOAKER=<heat_soak_temp_sensor_name> [RATE=<heat_soak_temp_rate_of_change>] [TIMEOUT=<time_to_abort_heat_soak>] [MIN_TIME=<minutes>]
|
||||||
|
##
|
||||||
|
## MIN_TIME (added here, default 0): the soak does not complete before this many
|
||||||
|
## minutes of soaking, even when SOAK_TEMP and RATE are already met.
|
||||||
##
|
##
|
||||||
##
|
##
|
||||||
## e.g.
|
## e.g.
|
||||||
@@ -30,6 +33,7 @@ variable_soaker_sensor: None
|
|||||||
variable_target_temp: 0.0
|
variable_target_temp: 0.0
|
||||||
variable_min_soak_temp: 0
|
variable_min_soak_temp: 0
|
||||||
variable_target_rate: 0.3
|
variable_target_rate: 0.3
|
||||||
|
variable_min_soak_time: 0
|
||||||
variable_complete: None
|
variable_complete: None
|
||||||
variable_cancel: None
|
variable_cancel: None
|
||||||
variable_temp_smooth_time: 4.0
|
variable_temp_smooth_time: 4.0
|
||||||
@@ -47,6 +51,7 @@ gcode:
|
|||||||
{% set HEATER = (params.HEATER | string) %} # Optional heater
|
{% set HEATER = (params.HEATER | string) %} # Optional heater
|
||||||
{% set TARGET = params.TARGET | default(0) | float %}
|
{% set TARGET = params.TARGET | default(0) | float %}
|
||||||
{% set TIMEOUT = (params.TIMEOUT | default(30) | int) * 60 %} ## minutes to seconds
|
{% set TIMEOUT = (params.TIMEOUT | default(30) | int) * 60 %} ## minutes to seconds
|
||||||
|
{% set MIN_TIME = (params.MIN_TIME | default(0) | float) * 60 %} ## minutes to seconds
|
||||||
{% set TEMP_SMOOTH = params.TEMP_SMOOTH | default(4.0) | float %} ## seconds for temp smoothing
|
{% set TEMP_SMOOTH = params.TEMP_SMOOTH | default(4.0) | float %} ## seconds for temp smoothing
|
||||||
{% set RATE_SMOOTH = params.RATE_SMOOTH | default(20) | float %} ## seconds for rate smoothing
|
{% set RATE_SMOOTH = params.RATE_SMOOTH | default(20) | float %} ## seconds for rate smoothing
|
||||||
{% set COMPLETE = (params.COMPLETE | string) %}
|
{% set COMPLETE = (params.COMPLETE | string) %}
|
||||||
@@ -61,6 +66,7 @@ gcode:
|
|||||||
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=soaker_sensor VALUE="{SOAKER | pprint}"
|
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=soaker_sensor VALUE="{SOAKER | pprint}"
|
||||||
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=target_rate VALUE={RATE}
|
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=target_rate VALUE={RATE}
|
||||||
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=soak_time_remaining VALUE={TIMEOUT}
|
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=soak_time_remaining VALUE={TIMEOUT}
|
||||||
|
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=min_soak_time VALUE={MIN_TIME}
|
||||||
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=complete VALUE="'{COMPLETE}'"
|
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=complete VALUE="'{COMPLETE}'"
|
||||||
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=cancel VALUE="'{CANCEL}'"
|
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=cancel VALUE="'{CANCEL}'"
|
||||||
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=temp_smooth_time VALUE={TEMP_SMOOTH}
|
SET_GCODE_VARIABLE MACRO=HEAT_SOAK VARIABLE=temp_smooth_time VALUE={TEMP_SMOOTH}
|
||||||
@@ -250,16 +256,18 @@ gcode:
|
|||||||
{action_respond_info(message)}
|
{action_respond_info(message)}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
# if the heat soak must continue for some reason
|
# if the heat soak must continue for some reason
|
||||||
{% elif (slope > heat_soak.target_rate) or (heat_soak.min_soak_temp > 0 and soak_temp_smoothed < heat_soak.min_soak_temp) %}
|
{% elif (slope > heat_soak.target_rate) or (heat_soak.min_soak_temp > 0 and soak_temp_smoothed < heat_soak.min_soak_temp) or (total_time_elapsed < heat_soak.min_soak_time) %}
|
||||||
{% if total_time_elapsed % heat_soak.soaking_report_interval == 0 %}
|
{% if total_time_elapsed % heat_soak.soaking_report_interval == 0 %}
|
||||||
{% set format_vars = [
|
{% set format_vars = [
|
||||||
soak_temp_smoothed | float,
|
soak_temp_smoothed | float,
|
||||||
(heat_soak.min_soak_temp | float | round(0) | string) if (heat_soak.min_soak_temp > 0) else "--",
|
(heat_soak.min_soak_temp | float | round(0) | string) if (heat_soak.min_soak_temp > 0) else "--",
|
||||||
slope,
|
slope,
|
||||||
heat_soak.target_rate,
|
heat_soak.target_rate,
|
||||||
soak_time_remaining / 60.0
|
soak_time_remaining / 60.0,
|
||||||
|
total_time_elapsed / 60.0,
|
||||||
|
heat_soak.min_soak_time / 60.0
|
||||||
] %}
|
] %}
|
||||||
{% set message = "Soaking -- temp: {0:.1f}C / {1}C -- rate: {2:.3f}C/m / {3:.3f}C/m -- {4:.1f}m remaining".format(*format_vars) %}
|
{% set message = "Soaking -- temp: {0:.1f}C / {1}C -- rate: {2:.3f}C/m / {3:.3f}C/m -- {5:.0f}m / min {6:.0f}m -- {4:.1f}m remaining".format(*format_vars) %}
|
||||||
M117 { message }
|
M117 { message }
|
||||||
{action_respond_info(message)}
|
{action_respond_info(message)}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
@@ -50,3 +50,4 @@
|
|||||||
# LEDs and sensors
|
# LEDs and sensors
|
||||||
[include leds/stealthburner_leds.cfg]
|
[include leds/stealthburner_leds.cfg]
|
||||||
[include sensors/motion_sensor.cfg]
|
[include sensors/motion_sensor.cfg]
|
||||||
|
[include sensors/touch_compare.cfg] # TOUCH_COMPARE: Beacon contact vs bd_pressure (needs extras/bdp_touch.py)
|
||||||
@@ -68,14 +68,28 @@ gcode:
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if target_chamber > 30 %}
|
{% if target_chamber > 30 %}
|
||||||
RESPOND MSG="waiting for chamber temperature"
|
RESPOND MSG="soaking the bed (chamber heating)"
|
||||||
M141 S{target_chamber}
|
M141 S{target_chamber}
|
||||||
M106 S255
|
M106 S255
|
||||||
# Unreachable SOAK_TEMP + CANCEL='_NOTHING': soaks until the TIMEOUT, then continues the print
|
|
||||||
HEAT_SOAK HEATER='heater_bed' TARGET={target_bed} SOAKER='temperature_sensor chamber' SOAK_TEMP={target_chamber} TIMEOUT=60 CANCEL='_NOTHING'
|
|
||||||
{% else %}
|
{% else %}
|
||||||
RESPOND MSG="waiting for bed core temperature"
|
RESPOND MSG="soaking the bed"
|
||||||
HEAT_SOAK HEATER='heater_bed' TARGET={target_bed} SOAKER='temperature_sensor bed_core' SOAK_TEMP={target_bed - 5} TIMEOUT=30 CANCEL='_NOTHING'
|
{% endif %}
|
||||||
|
# Soak until the 10 mm plate has its final shape. Measured 2026-11-02
|
||||||
|
# (Beacon mesh every 3 min, tools/soak_run.py in the 3d printer folder):
|
||||||
|
# bed 100C + chamber 50C settles ~33 min after the bed reaches target,
|
||||||
|
# bed 60C with the chamber open ~11 min. bed_core reaches target long
|
||||||
|
# before that, and swings with the PID cycle; bed_side (back edge) rises
|
||||||
|
# until the plate is settled. MIN_TIME covers the measured time, RATE
|
||||||
|
# makes a slower day (cold room) wait longer, SOAK_TEMP (70% of the bed
|
||||||
|
# target) only keeps it from ending while the bed still heats.
|
||||||
|
# CANCEL='_NOTHING': after TIMEOUT the print continues. No soak without
|
||||||
|
# a bed target (nothing to soak, MIN_TIME would only wait).
|
||||||
|
{% set soak_floor = (target_bed * 0.7) | round(1) %}
|
||||||
|
{% if target_bed <= 0 %}
|
||||||
|
{% elif target_chamber > 30 %}
|
||||||
|
HEAT_SOAK HEATER='heater_bed' TARGET={target_bed} SOAKER='temperature_sensor bed_side' SOAK_TEMP={soak_floor} RATE=0.05 RATE_SMOOTH=120 MIN_TIME=35 TIMEOUT=60 CANCEL='_NOTHING'
|
||||||
|
{% else %}
|
||||||
|
HEAT_SOAK HEATER='heater_bed' TARGET={target_bed} SOAKER='temperature_sensor bed_side' SOAK_TEMP={soak_floor} RATE=0.05 RATE_SMOOTH=120 MIN_TIME=12 TIMEOUT=30 CANCEL='_NOTHING'
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
# With the chamber heated, filament in the toolhead path softens: a PLA lane
|
# With the chamber heated, filament in the toolhead path softens: a PLA lane
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
# Touch comparison: Beacon contact vs bd_pressure (needs extras/bdp_touch.py
|
||||||
|
# and the bd_pressure load-check firmware). See extras/bdp_touch.py.
|
||||||
|
#
|
||||||
|
# TOUCH_COMPARE [N=10] [X=175] [Y=175] [TEMP=150] [THRESHOLD=15] [STOP=80]
|
||||||
|
# [STEP=0.005] [START=0.1]
|
||||||
|
# Nozzle to TEMP (Beacon contact refuses above 180C), HOME (contact Z),
|
||||||
|
# then N pairs at X/Y: one Beacon contact probe, one BDP_TOUCH starting
|
||||||
|
# START mm above the Beacon result. Reports per method the mean, standard
|
||||||
|
# deviation and range, and the same for the per-pair difference.
|
||||||
|
# The nozzle must be clean (no ooze blob) and the bed soaked: a bed that
|
||||||
|
# still changes shape moves both results, the difference less so.
|
||||||
|
# Nozzle heater off at the end.
|
||||||
|
#
|
||||||
|
# BDP_TOUCH alone: touch at the current X/Y from the current Z (home first,
|
||||||
|
# start 0.1-0.2 mm above the bed).
|
||||||
|
|
||||||
|
[bdp_touch]
|
||||||
|
sensor: bd_pa
|
||||||
|
|
||||||
|
[gcode_macro TOUCH_COMPARE]
|
||||||
|
description: Compare Beacon contact and bd_pressure touches at one spot
|
||||||
|
gcode:
|
||||||
|
{% set temp = params.TEMP|default(150)|float %}
|
||||||
|
{% set x = params.X|default(175)|float %}
|
||||||
|
{% set y = params.Y|default(175)|float %}
|
||||||
|
{% if printer.print_stats.state in ("printing", "paused") %}
|
||||||
|
_ERROR MSG="TOUCH_COMPARE: a print is running"
|
||||||
|
{% elif temp > 180 or temp < 140 %}
|
||||||
|
_ERROR MSG="TOUCH_COMPARE: TEMP must be 140-180C (Beacon contact)"
|
||||||
|
{% else %}
|
||||||
|
M109 S{temp}
|
||||||
|
HOME
|
||||||
|
G90
|
||||||
|
G1 X{x} Y{y} Z5 F6000
|
||||||
|
M400
|
||||||
|
_TOUCH_COMPARE N={params.N|default(10)|int} START={params.START|default(0.1)|float} THRESHOLD={params.THRESHOLD|default(15)|float} STOP={params.STOP|default(80)|float} STEP={params.STEP|default(0.005)|float}
|
||||||
|
M104 S0
|
||||||
|
{% endif %}
|
||||||
Reference in new issue
Block a user